diff --git a/Makefile b/Makefile
index bde39cd791..233cfaf1fd 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ common:
 	cp -fr sdk zentaopms/
 	cp -fr www zentaopms && rm -fr zentaopms/www/data/ && mkdir -p zentaopms/www/data/upload
 	mkdir zentaopms/tmp
-	mkdir zentaopms/tmp/cache/ 
+	mkdir zentaopms/tmp/cache/
 	mkdir zentaopms/tmp/extension/
 	mkdir zentaopms/tmp/log/
 	mkdir zentaopms/tmp/model/
@@ -58,7 +58,7 @@ zentaoxx:
 	cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip
 	mv $(XUANPATH)/xuan.zip .
 	unzip xuan.zip
-	cp xuan/xxb/config/ext/xuanxuan.php zentaoxx/config/ext/
+	cp xuan/xxb/config/ext/_0_xuanxuan.php zentaoxx/config/ext/
 	cp -r xuan/xxb/lib/phpaes zentaoxx/lib/
 	cp -r xuan/xxb/framework/xuanxuan.class.php zentaoxx/framework/
 	cp -r xuan/xxb/db/*.sql zentaoxx/db/
@@ -78,8 +78,7 @@ zentaoxx:
 	cp -r xuan/xxb/www/x.php zentaoxx/www/
 	mkdir zentaoxx/module/action
 	cp -r xuan/xxb/module/action/ext zentaoxx/module/action
-	cp -r xuan/xxb/config/ext/xxb.php zentaoxx/config/ext/
-	cp -r xuan/xxb/config/ext/maps.php zentaoxx/config/ext/
+	cp -r xuan/xxb/config/ext/_1_maps.php zentaoxx/config/ext/
 	cp -r xuanxuan/config/* zentaoxx/config/
 	cp -r xuanxuan/module/* zentaoxx/module/
 	cp -r xuanxuan/www/* zentaoxx/www/
@@ -87,8 +86,8 @@ zentaoxx:
 	mkdir zentaoxx/db/
 	cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/
 	rm -rf zentaoxx/db_bak/
-	sed -i 's/XXBVERSION/$(XVERSION)/g' zentaoxx/config/ext/xuanxuan.php
-	sed -i "/\$$config->xuanxuan->backend /c\\\$$config->xuanxuan->backend     = 'zentao';" zentaoxx/config/ext/xuanxuan.php
+	sed -i 's/XXBVERSION/$(XVERSION)/g' zentaoxx/config/ext/_0_xuanxuan.php
+	sed -i "/\$$config->xuanxuan->backend /c\\\$$config->xuanxuan->backend     = 'zentao';" zentaoxx/config/ext/_0_xuanxuan.php
 	sed -i 's/site,//' zentaoxx/module/im/model/user.php
 	sed -i 's/admin, g/g/' zentaoxx/module/im/model/user.php
 	sed -i '/password = md5/d' zentaoxx/module/im/model/user.php
@@ -110,7 +109,7 @@ zentaoxx:
 	sed -i '/deviceToken/d' zentaoxx/db/*.sql
 	sed -i '/deviceType/d' zentaoxx/db/*.sql
 	sed -i "/fetch('push', 'pushMessage');/d" zentaoxx/module/im/control.php
-	sed -i "s/marked\.html\.php';?>/marked\.html\.php';?>\n<div id='mainMenu' class='clearfix'><div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('xuanxuan');?><\/div><\/div>/g" zentaoxx/module/client/view/checkupgrade.html.php
+	#sed -i "s/marked\.html\.php';?>/marked\.html\.php';?>\n<div id='mainMenu' class='clearfix'><div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('xuanxuan');?><\/div><\/div>/g" zentaoxx/module/client/view/checkupgrade.html.php
 	sed -i '/var serverVersions/d' zentaoxx/module/client/js/checkupgrade.js
 	sed -i '/var currentVersion/d' zentaoxx/module/client/js/checkupgrade.js
 	sed -i '/setRequiredFields(/d' zentaoxx/module/common/view/header.modal.html.php
@@ -120,7 +119,10 @@ zentaoxx:
 	sed -i 's/helper::jsonEncode(/json_encode(/g' zentaoxx/framework/xuanxuan.class.php
 	sed -i "s/lang->goback,/lang->goback, '',/g" zentaoxx/module/im/view/debug.html.php
 	sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js
+	sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/module/im/control.php
+	sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/module/im/model/conference.php
 	sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
+	echo "ALTER TABLE \`zt_user\` ADD \`pinyin\` varchar(255) NOT NULL DEFAULT '' AFTER \`realname\`;" >> zentaoxx/db/xuanxuan.sql
 	mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
 	cp tools/en2de.php zentaoxx/tools; cd zentaoxx/tools; php en2de.php ../
 	rm -rf zentaoxx/tools
@@ -141,8 +143,8 @@ package:
 	#rm -r zentaopms/module/misc/ext
 	rm -rf zentaopms/tools
 pms:
-	make common 
-	make zentaoxx 
+	make common
+	make zentaoxx
 	unzip zentaoxx.*.zip
 	cp zentaoxx/* zentaopms/ -r
 	cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
diff --git a/VERSION b/VERSION
index 4b99d26192..2bbd2b4b42 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.beta1
+15.0.1
diff --git a/config/config.php b/config/config.php
index 6b8f39d7b3..fad76cba64 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version       = '20.0.beta4';         // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '15.0.1';           // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->charset       = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife    = time() + 2592000;     // Cookie的生存时间。The cookie life time.
 $config->timezone      = 'Asia/Shanghai';      // 时区设置。        The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
@@ -37,10 +37,10 @@ $config->themes['default'] = 'default';
 $config->langs['zh-cn']    = '简体';
 $config->langs['zh-tw']    = '繁體';
 $config->langs['en']       = 'English';
-$config->langs['de']       = 'Deutsch';
-$config->langs['fr']       = 'Français';
-$config->langs['vi']       = 'Tiếng Việt';
-$config->langs['ja']       = '日本語';
+//$config->langs['de']       = 'Deutsch';
+//$config->langs['fr']       = 'Français';
+//$config->langs['vi']       = 'Tiếng Việt';
+//$config->langs['ja']       = '日本語';
 
 /* 设备类型视图文件前缀。The prefix for view file for different device. */
 $config->devicePrefix['mhtml'] = '';
@@ -89,6 +89,10 @@ $config->domainPostfix .= "|villas|foundation|expert|works|tools|watch|zone|barg
 $config->domainPostfix .= "|farm|pics|photo|marketing|holiday|gift|buzz|guitars|trade|construction|";
 $config->domainPostfix .= "|international|house|coffee|florist|rich|ceo|camp|education|repair|win|site|";
 
+/* Config for Content-Security-Policy. */
+$config->CSPs = array();
+$config->CSPs[] = "form-action 'self';connect-src 'self'";
+
 /* 系统框架配置。Framework settings. */
 $config->framework = new stdclass();
 $config->framework->autoConnectDB   = true;  // 是否自动连接数据库。              Whether auto connect database or not.
@@ -106,6 +110,13 @@ $config->framework->logDays         = 14;    // 日志文件保存的天数。
 $config->framework->autoRepairTable = true;
 $config->framework->autoLang        = false;
 $config->framework->filterCSRF      = false;
+$config->framework->setCookieSecure = true;
+$config->framework->sendXCTO        = true;   // Send X-Content-Type-Options header.
+$config->framework->sendXXP         = true;   // Send X-XSS-Protection header.
+$config->framework->sendHSTS        = true;   // Send HTTP Strict Transport Security header.
+$config->framework->sendRP          = true;   // Send Referrer-Policy header.
+$config->framework->sendXPCDP       = true;   // Send X-Permitted-Cross-Domain-Policies header.
+$config->framework->sendXDO         = true;   // Send X-Download-Options header.
 
 $config->framework->detectDevice['zh-cn'] = true; // 在zh-cn语言情况下，是否启用设备检测功能。 Whether enable device detect or not.
 $config->framework->detectDevice['zh-tw'] = true; // 在zh-tw语言情况下，是否启用设备检测功能。 Whether enable device detect or not.
@@ -127,8 +138,9 @@ $config->features->checkClient    = true;
 
 /* 文件上传设置。 Upload settings. */
 $config->file = new stdclass();
-$config->file->dangers = 'php,php3,php4,phtml,php5,jsp,py,rb,asp,aspx,ashx,asa,cer,cdx,aspl,shtm,shtml,html,htm';
-$config->file->allowed = 'txt,doc,docx,dot,wps,wri,pdf,ppt,pptx,xls,xlsx,ett,xlt,xlsm,csv,jpg,jpeg,png,psd,gif,ico,bmp,swf,avi,rmvb,rm,mp3,mp4,3gp,flv,mov,movie,rar,zip,bz,bz2,tar,gz,mpp,rp,pdm,vsdx,vsd,sql';
+$config->file->dangers     = 'php,php3,php4,phtml,php5,jsp,py,rb,asp,aspx,ashx,asa,cer,cdx,aspl,shtm,shtml,html,htm';
+$config->file->allowed     = 'txt,doc,docx,dot,wps,wri,pdf,ppt,pptx,xls,xlsx,ett,xlt,xlsm,csv,jpg,jpeg,png,psd,gif,ico,bmp,swf,avi,rmvb,rm,mp3,mp4,3gp,flv,mov,movie,rar,zip,bz,bz2,tar,gz,mpp,rp,pdm,vsdx,vsd,sql';
+$config->file->storageType = 'fs';         // fs or s3
 
 /* Upload settings. */
 $config->allowedTags = '<p><span><h1><h2><h3><h4><h5><em><u><strong><br><ol><ul><li><img><a><b><font><hr><pre><div><table><td><th><tr><tbody><embed><style>';
@@ -150,6 +162,10 @@ if(file_exists($filterConfig)) include $filterConfig;
 $dbConfig = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'db.php';
 if(file_exists($dbConfig)) include $dbConfig;
 
+/* 引用自定义的配置。 Include the custom config file. */
+$myConfig = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'my.php';
+if(file_exists($myConfig)) include $myConfig;
+
 /* 禅道配置文件。zentaopms settings. */
 $zentaopmsConfig = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'zentaopms.php';
 if(file_exists($zentaopmsConfig)) include $zentaopmsConfig;
@@ -157,7 +173,3 @@ if(file_exists($zentaopmsConfig)) include $zentaopmsConfig;
 /* Include extension config files. */
 $extConfigFiles = glob(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ext/*.php');
 if($extConfigFiles) foreach($extConfigFiles as $extConfigFile) include $extConfigFile;
-
-/* 引用自定义的配置。 Include the custom config file. */
-$myConfig = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'my.php';
-if(file_exists($myConfig)) include $myConfig;
diff --git a/config/filter.php b/config/filter.php
index dca7d428d4..f69a51cd97 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -26,33 +26,36 @@ $filter->default->cookie['lang']        = 'reg::lang';
 $filter->default->cookie['theme']       = 'reg::word';
 $filter->default->cookie['fingerprint'] = 'reg::word';
 $filter->default->cookie['hideMenu']    = 'equal::true';
+$filter->default->cookie['openApp']     = 'reg::word';
 
-$filter->bug        = new stdclass();
-$filter->caselib    = new stdclass();
-$filter->doc        = new stdclass();
-$filter->product    = new stdclass();
-$filter->qa         = new stdclass();
-$filter->story      = new stdclass();
-$filter->task       = new stdclass();
-$filter->testcase   = new stdclass();
-$filter->program    = new stdclass();
-$filter->project    = new stdclass();
-$filter->testreport = new stdclass();
-$filter->testsuite  = new stdclass();
-$filter->todo       = new stdclass();
-$filter->testtask   = new stdclass();
-$filter->upgrade    = new stdclass();
-$filter->sso        = new stdclass();
-$filter->misc       = new stdclass();
-$filter->mail       = new stdclass();
-$filter->user       = new stdclass();
-$filter->block      = new stdclass();
-$filter->file       = new stdclass();
-$filter->repo       = new stdclass();
-$filter->webhook    = new stdclass();
-$filter->git        = new stdclass();
-$filter->svn        = new stdclass();
-$filter->search     = new stdclass();
+$filter->bug          = new stdclass();
+$filter->caselib      = new stdclass();
+$filter->doc          = new stdclass();
+$filter->product      = new stdclass();
+$filter->branch       = new stdclass();
+$filter->qa           = new stdclass();
+$filter->story        = new stdclass();
+$filter->task         = new stdclass();
+$filter->testcase     = new stdclass();
+$filter->program      = new stdclass();
+$filter->project      = new stdclass();
+$filter->projectstory = new stdclass();
+$filter->testreport   = new stdclass();
+$filter->testsuite    = new stdclass();
+$filter->todo         = new stdclass();
+$filter->testtask     = new stdclass();
+$filter->upgrade      = new stdclass();
+$filter->sso          = new stdclass();
+$filter->misc         = new stdclass();
+$filter->mail         = new stdclass();
+$filter->user         = new stdclass();
+$filter->block        = new stdclass();
+$filter->file         = new stdclass();
+$filter->repo         = new stdclass();
+$filter->webhook      = new stdclass();
+$filter->git          = new stdclass();
+$filter->svn          = new stdclass();
+$filter->search       = new stdclass();
 
 $filter->block->default              = new stdclass();
 $filter->block->main                 = new stdclass();
@@ -77,6 +80,7 @@ $filter->product->default            = new stdclass();
 $filter->product->index              = new stdclass();
 $filter->product->export             = new stdclass();
 $filter->product->project            = new stdclass();
+$filter->branch->default             = new stdclass();
 $filter->program->default            = new stdclass();
 $filter->program->pgmproject         = new stdclass();
 $filter->program->prjbrowse          = new stdclass();
@@ -85,12 +89,13 @@ $filter->program->browse             = new stdclass();
 $filter->program->export             = new stdclass();
 $filter->program->pgmbrowse          = new stdclass();
 $filter->program->export             = new stdclass();
-$filter->program->ajaxgetpgmdropmenu = new stdclass();
+$filter->program->ajaxgetdropmenu    = new stdclass();
 $filter->project->default            = new stdclass();
 $filter->project->browse             = new stdclass();
 $filter->project->story              = new stdclass();
 $filter->project->export             = new stdclass();
 $filter->project->task               = new stdclass();
+$filter->projectstory->story         = new stdclass();
 $filter->qa->default                 = new stdclass();
 $filter->story->create               = new stdclass();
 $filter->story->export               = new stdclass();
@@ -165,13 +170,15 @@ $filter->product->index->cookie['preBranch']          = 'int';
 $filter->product->export->cookie['checkedItem']       = 'reg::checked';
 $filter->product->project->cookie['involved']         = 'code';
 
-$filter->program->default->cookie['lastPGM']               = 'int';
-$filter->program->default->cookie['lastPRJ']               = 'int';
-$filter->program->prjbrowse->cookie['programType']         = 'code';
-$filter->program->project->cookie['involved']              = 'code';
-$filter->program->browse->cookie['showClosed']             = 'code';
-$filter->program->export->cookie['checkedItem']            = 'reg::checked';
-$filter->program->ajaxgetpgmdropmenu->cookie['showClosed'] = 'code';
+$filter->branch->default->cookie['preBranch'] = 'int';
+
+$filter->program->default->cookie['lastPGM']            = 'int';
+$filter->program->default->cookie['lastPRJ']            = 'int';
+$filter->program->prjbrowse->cookie['programType']      = 'code';
+$filter->program->project->cookie['involved']           = 'code';
+$filter->program->browse->cookie['showClosed']          = 'code';
+$filter->program->export->cookie['checkedItem']         = 'reg::checked';
+$filter->program->ajaxgetdropmenu->cookie['showClosed'] = 'code';
 
 $filter->project->default->cookie['lastProject']      = 'int';
 $filter->project->default->cookie['lastPRJ']          = 'int';
@@ -189,6 +196,8 @@ $filter->project->task->cookie['projectTaskOrder']    = 'reg::orderBy';
 $filter->project->task->cookie['windowWidth']         = 'int';
 $filter->project->export->cookie['checkedItem']       = 'reg::checked';
 
+$filter->projectstory->story->cookie['storyModuleParam'] = 'int';
+
 $filter->qa->default->cookie['lastProduct']  = 'int';
 $filter->qa->default->cookie['preBranch']    = 'int';
 $filter->qa->default->cookie['preProductID'] = 'int';
diff --git a/config/zentaopms.php b/config/zentaopms.php
index fe30eda702..082f797671 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -136,7 +136,9 @@ define('TABLE_EXPECT',        '`' . $config->db->prefix . 'expect`');
 define('TABLE_STAKEHOLDER',   '`' . $config->db->prefix . 'stakeholder`');
 define('TABLE_STORY',         '`' . $config->db->prefix . 'story`');
 define('TABLE_STORYSPEC',     '`' . $config->db->prefix . 'storyspec`');
+define('TABLE_STORYREVIEW',   '`' . $config->db->prefix . 'storyreview`');
 define('TABLE_STORYSTAGE',    '`' . $config->db->prefix . 'storystage`');
+define('TABLE_STORYESTIMATE', '`' . $config->db->prefix . 'storyestimate`');
 define('TABLE_PRODUCTPLAN',   '`' . $config->db->prefix . 'productplan`');
 define('TABLE_PLANSTORY',     '`' . $config->db->prefix . 'planstory`');
 define('TABLE_RELEASE',       '`' . $config->db->prefix . 'release`');
@@ -193,8 +195,8 @@ if(!defined('TABLE_SEARCHINDEX')) define('TABLE_SEARCHINDEX', $config->db->prefi
 if(!defined('TABLE_SEARCHDICT'))  define('TABLE_SEARCHDICT',  $config->db->prefix . 'searchdict');
 
 $config->objectTables['product']     = TABLE_PRODUCT;
-$config->objectTables['story']       = TABLE_STORY;
 $config->objectTables['productplan'] = TABLE_PRODUCTPLAN;
+$config->objectTables['story']       = TABLE_STORY;
 $config->objectTables['release']     = TABLE_RELEASE;
 $config->objectTables['program']     = TABLE_PROJECT;
 $config->objectTables['project']     = TABLE_PROJECT;
@@ -219,6 +221,7 @@ $config->objectTables['entry']       = TABLE_ENTRY;
 $config->objectTables['webhook']     = TABLE_WEBHOOK;
 $config->objectTables['stakeholder'] = TABLE_STAKEHOLDER;
 $config->objectTables['job']         = TABLE_JOB;
+$config->objectTables['team']        = TABLE_TEAM;
 
 /* Program privs.*/
 $config->programPriv = new stdclass();
diff --git a/db/demo.sql b/db/demo.sql
index be777a3371..5e6f3d6366 100644
--- a/db/demo.sql
+++ b/db/demo.sql
@@ -1,316 +1,692 @@
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(1, 'user', 20, ',0,', 0, 'azhi', 'logout', '2012-06-05 09:24:52', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(2, 'user', 1, ',0,', 0, 'admin', 'login', '2012-06-05 09:25:00', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(3, 'user', 1, ',0,', 0, 'admin', 'logout', '2012-06-05 09:51:10', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(4, 'user', 2, ',0,', 0, 'productManager', 'login', '2012-06-05 09:51:33', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(5, 'user', 2, ',0,', 0, 'productManager', 'logout', '2012-06-05 09:53:05', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(6, 'user', 1, ',0,', 0, 'admin', 'login', '2012-06-05 09:53:10', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(7, 'user', 1, ',0,', 0, 'admin', 'logout', '2012-06-05 09:53:52', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(8, 'user', 2, ',0,', 0, 'productManager', 'login', '2012-06-05 09:54:07', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(9, 'product', 1, ',1,', 0, 'productManager', 'opened', '2012-06-05 09:57:07', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(10, 'productplan', 1, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:02:49', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(11, 'story', 1, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:09:49', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(12, 'story', 2, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:16:37', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(13, 'story', 3, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:18:10', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(14, 'story', 3, ',1,', 0, 'productManager', 'changed', '2012-06-05 10:19:06', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(15, 'story', 4, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:20:16', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(16, 'story', 5, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:21:39', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(17, 'story', 6, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:23:11', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(18, 'story', 7, ',1,', 0, 'productManager', 'opened', '2012-06-05 10:24:19', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(19, 'story', 1, ',1,', 0, 'productManager', 'reviewed', '2012-06-05 10:25:19', '', 'Pass');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(20, 'story', 2, ',1,', 0, 'productManager', 'reviewed', '2012-06-05 10:25:33', '', 'Pass');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(21, 'story', 3, ',1,', 0, 'productManager', 'reviewed', '2012-06-05 10:25:38', '', 'Pass');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(22, 'story', 4, ',1,', 0, 'productManager', 'reviewed', '2012-06-05 10:25:42', '', 'Pass');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(23, 'user', 2, ',0,', 0, 'productManager', 'logout', '2012-06-05 10:26:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(24, 'user', 3, ',0,', 0, 'projectManager', 'login', '2012-06-05 10:26:38', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(25, 'project', 1, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:28:36', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(26, 'story', 4, ',1,', 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(27, 'story', 3, ',1,', 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(28, 'story', 2, ',1,', 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(29, 'story', 1, ',1,', 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(30, 'task', 1, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:32:03', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(31, 'task', 2, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:32:23', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(32, 'task', 3, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:33:01', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(33, 'task', 4, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:33:21', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(34, 'task', 5, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:33:44', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(35, 'task', 6, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:33:59', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(36, 'task', 7, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:34:25', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(37, 'task', 8, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:34:45', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(38, 'task', 9, ',1,', 1, 'projectManager', 'opened', '2012-06-05 10:35:01', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(39, 'user', 3, ',0,', 0, 'projectManager', 'logout', '2012-06-05 10:37:30', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(40, 'user', 4, ',0,', 0, 'dev1', 'login', '2012-06-05 10:37:40', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(41, 'task', 1, ',1,', 1, 'dev1', 'started', '2012-06-05 10:37:54', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(42, 'task', 1, ',1,', 1, 'dev1', 'finished', '2012-06-05 10:38:00', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(43, 'task', 8, ',1,', 1, 'dev1', 'finished', '2012-06-05 10:39:14', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(44, 'task', 9, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(45, 'task', 8, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(46, 'task', 7, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(47, 'task', 6, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(48, 'task', 5, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(49, 'task', 4, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(50, 'task', 3, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(51, 'task', 2, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(52, 'task', 1, ',1,', 1, 'dev1', 'edited', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(53, 'user', 4, ',0,', 0, 'dev1', 'logout', '2012-06-05 10:41:50', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(54, 'user', 5, ',0,', 0, 'dev2', 'login', '2012-06-05 10:41:56', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(55, 'task', 4, ',1,', 1, 'dev2', 'edited', '2012-06-05 10:42:56', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(56, 'task', 3, ',1,', 1, 'dev2', 'edited', '2012-06-05 10:42:57', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(57, 'user', 5, ',0,', 0, 'dev2', 'logout', '2012-06-05 10:43:02', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(58, 'user', 6, ',0,', 0, 'dev3', 'login', '2012-06-05 10:43:07', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(59, 'task', 6, ',1,', 1, 'dev3', 'edited', '2012-06-05 10:43:32', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(60, 'task', 5, ',1,', 1, 'dev3', 'edited', '2012-06-05 10:43:32', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(61, 'user', 6, ',0,', 0, 'dev3', 'logout', '2012-06-05 10:43:42', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(62, 'user', 3, ',0,', 0, 'projectManager', 'login', '2012-06-05 10:44:05', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(63, 'user', 3, ',0,', 0, 'projectManager', 'logout', '2012-06-05 10:50:03', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(64, 'user', 10, ',0,', 0, 'testManager', 'login', '2012-06-05 10:50:09', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(65, 'user', 10, ',0,', 0, 'testManager', 'logout', '2012-06-05 10:50:14', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(66, 'user', 10, ',0,', 0, 'testManager', 'login', '2012-06-05 10:50:23', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(67, 'user', 10, ',0,', 0, 'testManager', 'logout', '2012-06-05 10:50:32', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(68, 'user', 1, ',0,', 0, 'admin', 'login', '2012-06-05 10:50:36', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(69, 'user', 1, ',0,', 0, 'admin', 'logout', '2012-06-05 10:50:53', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(70, 'user', 10, ',0,', 0, 'testManager', 'login', '2012-06-05 10:51:01', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(71, 'user', 10, ',0,', 0, 'testManager', 'logout', '2012-06-05 10:51:33', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(72, 'user', 7, ',0,', 0, 'tester1', 'login', '2012-06-05 10:51:38', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(73, 'bug', 1, ',1,', 1, 'tester1', 'opened', '2012-06-05 10:56:11', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(74, 'bug', 2, ',1,', 1, 'tester1', 'opened', '2012-06-05 10:57:11', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(75, 'user', 7, ',0,', 0, 'tester1', 'logout', '2012-06-05 10:57:13', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(76, 'user', 8, ',0,', 0, 'tester2', 'login', '2012-06-05 10:57:24', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(77, 'bug', 3, ',1,', 1, 'tester2', 'opened', '2012-06-05 10:58:22', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(78, 'user', 8, ',0,', 0, 'tester2', 'logout', '2012-06-05 10:58:39', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(79, 'user', 9, ',0,', 0, 'tester3', 'login', '2012-06-05 10:58:46', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(80, 'bug', 4, ',1,', 1, 'tester3', 'opened', '2012-06-05 11:00:19', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(81, 'case', 1, ',1,', 0, 'tester3', 'opened', '2012-06-05 11:02:18', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(82, 'case', 1, ',1,', 0, 'tester3', 'edited', '2012-06-05 11:02:47', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(83, 'user', 9, ',0,', 0, 'tester3', 'logout', '2012-06-05 11:02:48', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(84, 'user', 7, ',0,', 0, 'tester1', 'login', '2012-06-05 11:02:56', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(85, 'case', 2, ',1,', 0, 'tester1', 'opened', '2012-06-05 11:03:28', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(86, 'case', 3, ',1,', 0, 'tester1', 'opened', '2012-06-05 11:03:54', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(87, 'user', 7, ',0,', 0, 'tester1', 'logout', '2012-06-05 11:04:00', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(88, 'user', 8, ',0,', 0, 'tester2', 'login', '2012-06-05 11:04:10', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(89, 'case', 4, ',1,', 0, 'tester2', 'opened', '2012-06-05 11:04:48', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(90, 'user', 8, ',0,', 0, 'tester2', 'logout', '2012-06-05 11:04:52', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(91, 'user', 10, ',0,', 0, 'testManager', 'login', '2012-06-05 11:04:58', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(92, 'testtask', 1, ',1,', 1, 'testManager', 'opened', '2012-06-05 11:07:41', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(93, 'testtask', 1, ',1,', 1, 'testManager', 'edited', '2012-06-05 11:07:52', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(94, 'user', 10, ',0,', 0, 'testManager', 'logout', '2012-06-05 11:08:10', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(95, 'user', 1, ',0,', 0, 'admin', 'login', '2012-06-05 11:08:15', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(96, 'user', 1, ',0,', 0, 'admin', 'logout', '2012-06-05 11:08:23', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(97, 'user', 10, ',0,', 0, 'testManager', 'login', '2012-06-05 11:08:35', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(98, 'user', 10, ',0,', 0, 'testManager', 'logout', '2012-06-05 11:08:55', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(99, 'user', 7, ',0,', 0, 'tester1', 'login', '2012-06-05 11:08:59', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(100, 'user', 7, ',0,', 0, 'tester1', 'logout', '2012-06-05 11:09:52', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(101, 'user', 1, ',0,', 0, 'admin', 'login', '2012-06-05 11:09:54', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(102, 'user', 1, ',0,', 0, 'admin', 'logout', '2012-06-05 11:10:38', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(103, 'user', 10, ',0,', 0, 'testManager', 'login', '2012-06-05 11:10:42', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(104, 'user', 10, ',0,', 0, 'testManager', 'logout', '2012-06-05 11:11:13', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(105, 'user', 3, ',0,', 0, 'projectManager', 'login', '2012-06-05 11:11:16', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(106, 'build', 1, ',1,', 1, 'projectManager', 'opened', '2012-06-05 11:11:45', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(107, 'project', 2, ',1,', 2, 'projectManager', 'opened', '2012-06-05 11:12:28', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(108, 'user', 3, ',0,', 0, 'projectManager', 'logout', '2012-06-05 11:14:40', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(109, 'user', 2, ',0,', 0, 'productManager', 'login', '2012-06-05 11:14:43', '', '');
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`) VALUES(110, 'product', 2, ',2,', 0, 'productManager', 'opened', '2012-06-05 11:15:20', '', '');
-
-INSERT INTO `zt_bug` (`id`, `product`, `module`, `project`, `story`, `storyVersion`, `task`, `toTask`, `toStory`, `title`, `keywords`, `severity`, `pri`, `type`, `os`, `browser`, `hardware`, `found`, `steps`, `status`, `confirmed`, `activatedCount`, `mailto`, `openedBy`, `openedDate`, `openedBuild`, `assignedTo`, `assignedDate`, `resolvedBy`, `resolution`, `resolvedBuild`, `resolvedDate`, `closedBy`, `closedDate`, `duplicateBug`, `linkBug`, `case`, `caseVersion`, `result`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(1, 1, 8, 1, 1, 1, 1, 0, 0, '首页页面问题', '', 3, 0, 'interface', '', '', '', '', '<p>[步骤]进入首页</p>\r\n<p>[结果]出现乱码&nbsp;&nbsp;&nbsp;&nbsp;</p>\r\n<p>[期望]正常显示</p>', 'active', 0, 0, '', 'tester1', '2012-06-05 10:56:11', 'trunk', 'dev1', '2012-06-05 10:56:11', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, '', '0000-00-00 00:00:00', '0');
-INSERT INTO `zt_bug` (`id`, `product`, `module`, `project`, `story`, `storyVersion`, `task`, `toTask`, `toStory`, `title`, `keywords`, `severity`, `pri`, `type`, `os`, `browser`, `hardware`, `found`, `steps`, `status`, `confirmed`, `activatedCount`, `mailto`, `openedBy`, `openedDate`, `openedBuild`, `assignedTo`, `assignedDate`, `resolvedBy`, `resolution`, `resolvedBuild`, `resolvedDate`, `closedBy`, `closedDate`, `duplicateBug`, `linkBug`, `case`, `caseVersion`, `result`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(2, 1, 9, 1, 2, 1, 4, 0, 0, '新闻中心页面问题', '', 3, 0, 'codeerror', '', '', '', '', '<p>[步骤]进入新闻中心</p>\r\n<p>[结果]页面出现乱码</p>\r\n<p>[期望]正常显示</p>', 'active', 0, 0, '', 'tester1', '2012-06-05 10:57:11', 'trunk', 'dev2', '2012-06-05 10:57:11', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, '', '0000-00-00 00:00:00', '0');
-INSERT INTO `zt_bug` (`id`, `product`, `module`, `project`, `story`, `storyVersion`, `task`, `toTask`, `toStory`, `title`, `keywords`, `severity`, `pri`, `type`, `os`, `browser`, `hardware`, `found`, `steps`, `status`, `confirmed`, `activatedCount`, `mailto`, `openedBy`, `openedDate`, `openedBuild`, `assignedTo`, `assignedDate`, `resolvedBy`, `resolution`, `resolvedBuild`, `resolvedDate`, `closedBy`, `closedDate`, `duplicateBug`, `linkBug`, `case`, `caseVersion`, `result`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(3, 1, 10, 1, 3, 2, 6, 0, 0, '成果展示页面问题', '', 3, 0, 'codeerror', '', '', '', '', '<p>[步骤]进入成果展示&nbsp;&nbsp;&nbsp;&nbsp;</p>\r\n<p>[结果]乱码</p>\r\n<p>[期望]正常显示</p>', 'active', 0, 0, '', 'tester2', '2012-06-05 10:58:22', 'trunk', 'dev3', '2012-06-05 10:58:22', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, '', '0000-00-00 00:00:00', '0');
-INSERT INTO `zt_bug` (`id`, `product`, `module`, `project`, `story`, `storyVersion`, `task`, `toTask`, `toStory`, `title`, `keywords`, `severity`, `pri`, `type`, `os`, `browser`, `hardware`, `found`, `steps`, `status`, `confirmed`, `activatedCount`, `mailto`, `openedBy`, `openedDate`, `openedBuild`, `assignedTo`, `assignedDate`, `resolvedBy`, `resolution`, `resolvedBuild`, `resolvedDate`, `closedBy`, `closedDate`, `duplicateBug`, `linkBug`, `case`, `caseVersion`, `result`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(4, 1, 11, 1, 4, 1, 9, 0, 0, '售后服务页面问题', '', 3, 0, 'codeerror', '', '', '', '', '<p>[步骤]进入售后服务</p>\r\n<p>[结果]乱码</p>\r\n<p>[期望]正常显示</p>', 'active', 0, 0, '', 'tester3', '2012-06-05 11:00:19', 'trunk', 'dev1', '2012-06-05 11:00:19', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, '', '0000-00-00 00:00:00', '0');
-
-INSERT INTO `zt_build` (`id`, `product`, `project`, `name`, `scmPath`, `filePath`, `date`, `stories`, `bugs`, `builder`, `desc`, `deleted`) VALUES(1, 1, 1, '第一期版本', '', '', '2012-06-05', '3,2,1,4', '', 'projectManager', '', '0');
-
-INSERT INTO `zt_burn` (`project`, `date`, `left`, `consumed`) VALUES(1, '2012-06-05', 0, 38);
-
-INSERT INTO `zt_case` (`id`, `product`, `module`, `path`, `story`, `storyVersion`, `title`, `precondition`, `keywords`, `pri`, `type`, `stage`, `howRun`, `scriptedBy`, `scriptedDate`, `scriptStatus`, `scriptLocation`, `status`, `frequency`, `order`, `openedBy`, `openedDate`, `lastEditedBy`, `lastEditedDate`, `version`, `linkCase`, `fromBug`, `deleted`, `lastRunner`, `lastRunDate`, `lastRunResult`) VALUES(1, 1, 0, 0, 4, 1, '售后服务的测试用例', '', '', 1, 'feature', 'feature', '', '', '0000-00-00', '', '', 'normal', '1', 0, 'tester3', '2012-06-05 11:02:18', 'tester3', '2012-06-05 11:02:46', 1, '', 0, '0', 'testManager', '2012-06-05 11:11:00', 'pass');
-INSERT INTO `zt_case` (`id`, `product`, `module`, `path`, `story`, `storyVersion`, `title`, `precondition`, `keywords`, `pri`, `type`, `stage`, `howRun`, `scriptedBy`, `scriptedDate`, `scriptStatus`, `scriptLocation`, `status`, `frequency`, `order`, `openedBy`, `openedDate`, `lastEditedBy`, `lastEditedDate`, `version`, `linkCase`, `fromBug`, `deleted`, `lastRunner`, `lastRunDate`, `lastRunResult`) VALUES(2, 1, 0, 0, 1, 1, '首页的测试用例', '', '', 3, 'feature', '', '', '', '0000-00-00', '', '', 'normal', '1', 0, 'tester1', '2012-06-05 11:03:28', '', '0000-00-00 00:00:00', 1, '', 0, '0', 'testManager', '2012-06-05 11:11:05', 'pass');
-INSERT INTO `zt_case` (`id`, `product`, `module`, `path`, `story`, `storyVersion`, `title`, `precondition`, `keywords`, `pri`, `type`, `stage`, `howRun`, `scriptedBy`, `scriptedDate`, `scriptStatus`, `scriptLocation`, `status`, `frequency`, `order`, `openedBy`, `openedDate`, `lastEditedBy`, `lastEditedDate`, `version`, `linkCase`, `fromBug`, `deleted`, `lastRunner`, `lastRunDate`, `lastRunResult`) VALUES(3, 1, 0, 0, 2, 1, '新闻中心的测试用例', '', '', 3, 'feature', 'feature', '', '', '0000-00-00', '', '', 'normal', '1', 0, 'tester1', '2012-06-05 11:03:54', '', '0000-00-00 00:00:00', 1, '', 0, '0', 'testManager', '2012-06-05 11:11:07', 'pass');
-INSERT INTO `zt_case` (`id`, `product`, `module`, `path`, `story`, `storyVersion`, `title`, `precondition`, `keywords`, `pri`, `type`, `stage`, `howRun`, `scriptedBy`, `scriptedDate`, `scriptStatus`, `scriptLocation`, `status`, `frequency`, `order`, `openedBy`, `openedDate`, `lastEditedBy`, `lastEditedDate`, `version`, `linkCase`, `fromBug`, `deleted`, `lastRunner`, `lastRunDate`, `lastRunResult`) VALUES(4, 1, 0, 0, 3, 2, '成果展示测试用例', '', '', 3, 'feature', 'feature', '', '', '0000-00-00', '', '', 'normal', '1', 0, 'tester2', '2012-06-05 11:04:48', '', '0000-00-00 00:00:00', 1, '', 0, '0', 'testManager', '2012-06-05 11:11:08', 'pass');
-
-INSERT INTO `zt_casestep` (`id`, `case`, `version`, `desc`, `expect`) VALUES(1, 1, 1, '进入首页', '正常显示');
-INSERT INTO `zt_casestep` (`id`, `case`, `version`, `desc`, `expect`) VALUES(2, 2, 1, '进入首页', '正常显示');
-INSERT INTO `zt_casestep` (`id`, `case`, `version`, `desc`, `expect`) VALUES(3, 3, 1, '进入新闻中心', '正常显示');
-INSERT INTO `zt_casestep` (`id`, `case`, `version`, `desc`, `expect`) VALUES(4, 4, 1, '进入成果展示', '正常显示');
-
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(1, '经理', 0, ',1,', 1, 0, '', '', '');
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(2, '开发', 0, ',2,', 1, 0, '', '', '');
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(3, '测试', 0, ',3,', 1, 0, '', '', '');
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(4, '市场', 0, ',4,', 1, 0, '', '', '');
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(5, '产品', 1, ',1,5,', 2, 0, '', '', '');
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(6, '项目', 1, ',1,6,', 2, 0, '', '', '');
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(7, '编程', 2, ',2,7,', 2, 0, '', '', '');
-INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES(8, '美工', 2, ',2,8,', 2, 0, '', '', '');
-
-
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(1, 14, 'version', '1', '2', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(2, 14, 'spec', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '001- <del>作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。<br /></del>\n001+ <ins>作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。<br /></ins>');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(3, 41, 'consumed', '0', '1', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(4, 41, 'status', 'wait', 'doing', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(6, 42, 'consumed', '1', '7', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(7, 42, 'left', '10', '0', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(8, 42, 'assignedTo', 'dev1', 'projectManager', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(9, 42, 'status', 'doing', 'done', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(10, 42, 'finishedBy', '', 'dev1', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(11, 42, 'finishedDate', '', '2012-06-05 10:38:00', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(13, 43, 'consumed', '0', '6', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(14, 43, 'left', '8', '0', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(15, 43, 'assignedTo', 'dev1', 'projectManager', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(16, 43, 'status', 'wait', 'done', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(17, 43, 'finishedBy', '', 'dev1', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(18, 43, 'finishedDate', '', '2012-06-05 10:39:14', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(20, 44, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(21, 45, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(22, 46, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(23, 47, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(24, 48, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(25, 49, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(26, 50, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(27, 51, 'status', 'wait', 'done', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(28, 51, 'consumed', '0', '8', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(29, 51, 'left', '10', '0', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(30, 51, 'finishedBy', '', 'dev1', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(31, 51, 'finishedDate', '', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(32, 52, 'finishedDate', '2012-06-05 10:38:00', '2012-06-05 10:41:20', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(33, 55, 'status', 'closed', 'done', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(34, 55, 'consumed', '0', '5', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(35, 55, 'left', '8', '0', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(36, 55, 'finishedBy', '', 'dev2', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(37, 55, 'closedBy', 'dev1', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(38, 55, 'closedReason', 'done', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(39, 55, 'finishedDate', '', '2012-06-05 10:42:56', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(40, 55, 'closedDate', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(41, 56, 'status', 'closed', 'done', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(42, 56, 'consumed', '0', '8', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(43, 56, 'left', '8', '0', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(44, 56, 'finishedBy', '', 'dev2', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(45, 56, 'closedBy', 'dev1', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(46, 56, 'closedReason', 'done', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(47, 56, 'finishedDate', '', '2012-06-05 10:42:56', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(48, 56, 'closedDate', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(49, 59, 'status', 'closed', 'done', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(50, 59, 'consumed', '0', '5', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(51, 59, 'left', '8', '0', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(52, 59, 'finishedBy', 'dev1', 'dev3', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(53, 59, 'closedBy', 'dev1', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(54, 59, 'closedReason', 'done', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(55, 59, 'finishedDate', '', '2012-06-05 10:43:32', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(56, 59, 'closedDate', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(57, 60, 'status', 'closed', 'done', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(58, 60, 'consumed', '0', '5', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(59, 60, 'left', '8', '0', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(60, 60, 'finishedBy', 'dev1', 'dev3', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(61, 60, 'closedBy', 'dev1', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(62, 60, 'closedReason', 'done', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(63, 60, 'finishedDate', '', '2012-06-05 10:43:32', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(64, 60, 'closedDate', '2012-06-05 10:41:20', '', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(65, 82, 'title', '首页的测试用例', '售后服务的测试用例', '001- <del>首页的测试用例</del>\n001+ <ins>售后服务的测试用例</ins>');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(66, 82, 'story', '1', '4', '');
-INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES(67, 93, 'build', '', 'trunk', '');
-
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(1, 1, '首页', 0, ',1,', 1, 10, 'story', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(2, 1, '新闻中心', 0, ',2,', 1, 20, 'story', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(3, 1, '成果展示', 0, ',3,', 1, 30, 'story', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(4, 1, '售后服务', 0, ',4,', 1, 40, 'story', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(5, 1, '诚聘英才', 0, ',5,', 1, 50, 'story', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(6, 1, '合作洽谈', 0, ',6,', 1, 60, 'story', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(7, 1, '关于我们', 0, ',7,', 1, 70, 'story', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(8, 1, '首页', 0, ',8,', 1, 10, 'bug', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(9, 1, '新闻中心', 0, ',9,', 1, 20, 'bug', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(10, 1, '成果展示', 0, ',10,', 1, 30, 'bug', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(11, 1, '售后服务', 0, ',11,', 1, 40, 'bug', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(12, 1, '诚聘英才', 0, ',12,', 1, 50, 'bug', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(13, 1, '合作洽谈', 0, ',13,', 1, 60, 'bug', '');
-INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(14, 1, '关于我们', 0, ',14,', 1, 70, 'bug', '');
-
-INSERT INTO `zt_product` (`id`, `program`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `deleted`) VALUES(1, 1, '公司企业网站建设', 'companyWebsite', 'normal', '建立公司企业网站，可以更好对外展示。<br />', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 09:57:07', '5', '0');
-INSERT INTO `zt_product` (`id`, `program`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `createdVersion`, `deleted`) VALUES(2, 2, '企业内部工时管理系统', 'workhourManage', 'normal', '', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 11:15:20', '10', '5.2.1', '0');
-
-INSERT INTO `zt_productplan` (`id`, `product`, `title`, `desc`, `begin`, `end`, `deleted`) VALUES(1, 1, '1.0版本', '开发出企业网站1.0版本。<br />', '2000-01-01', '2015-01-01', '0');
-
-INSERT INTO `zt_project` (`id`, `type`, `model`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(1, 'program', '', 0, '企业网站第一期', 'coWeb1', '2012-06-05', '2012-12-04', 184, 'done', '1', '1', '开发企业网站的基本雏形。<br />', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '5', '0');
-INSERT INTO `zt_project` (`id`, `type`, `model`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(2, 'program', '', 0, '企业网站第二期', 'coWebsite2', '2013-06-05', '2014-06-04', 365, 'wait', '1', '1', '', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '10', '0');
-
-INSERT INTO `zt_doclib` (`id`, `type`, `product`, `project`, `name`, `acl`, `main`) VALUES(1, 'product', 1, 0, '产品库', 'default','1');
-INSERT INTO `zt_doclib` (`id`, `type`, `product`, `project`, `name`, `acl`, `main`) VALUES(2, 'product', 2, 0, '产品库', 'default', '1');
-INSERT INTO `zt_doclib` (`id`, `type`, `product`, `project`, `name`, `acl`, `main`) VALUES(3, 'project', 0, 1, '项目库', 'default', '1');
-INSERT INTO `zt_doclib` (`id`, `type`, `product`, `project`, `name`, `acl`, `main`) VALUES(4, 'project', 0, 2, '项目库', 'default', '1');
-
-INSERT INTO `zt_projectproduct` (`project`, `product`) VALUES(1, 1);
-INSERT INTO `zt_projectproduct` (`project`, `product`) VALUES(2, 1);
-
-INSERT INTO `zt_projectstory` (`project`, `product`, `story`, `version`) VALUES(1, 1, 4, 1);
-INSERT INTO `zt_projectstory` (`project`, `product`, `story`, `version`) VALUES(1, 1, 3, 2);
-INSERT INTO `zt_projectstory` (`project`, `product`, `story`, `version`) VALUES(1, 1, 2, 1);
-INSERT INTO `zt_projectstory` (`project`, `product`, `story`, `version`) VALUES(1, 1, 1, 1);
-
-
-INSERT INTO `zt_story` (`id`, `product`, `module`, `plan`, `source`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES(1, 1, 1, 1, 'po', 0, '首页设计和开发', '', '', 1, 1, 'active', 'developed', '', 'productManager', '2012-06-05 10:09:49', 'productManager', '0000-00-00 00:00:00', 'productManager', '2012-06-05 10:25:19', 'productManager, ', '2012-06-05', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0');
-INSERT INTO `zt_story` (`id`, `product`, `module`, `plan`, `source`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES(2, 1, 2, 1, 'po', 0, '新闻中心的设计和开发。', '', '', 1, 1, 'active', 'developed', '', 'productManager', '2012-06-05 10:16:37', 'productManager', '2012-06-05 10:16:37', 'productManager', '2012-06-05 10:25:33', 'productManager, ', '2012-06-05', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0');
-INSERT INTO `zt_story` (`id`, `product`, `module`, `plan`, `source`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES(3, 1, 3, 1, 'po', 0, '成果展示的设计和开发', '', '', 1, 0, 'active', 'developed', '', 'productManager', '2012-06-05 10:18:10', 'productManager', '2012-06-05 10:18:10', 'productManager', '2012-06-05 10:25:38', 'productManager, ', '2012-06-05', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 2, '0');
-INSERT INTO `zt_story` (`id`, `product`, `module`, `plan`, `source`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES(4, 1, 4, 1, 'po', 0, '售后服务的设计和开发', '', '', 1, 1, 'active', 'projected', '', 'productManager', '2012-06-05 10:20:16', 'productManager', '2012-06-05 10:20:16', 'productManager', '2012-06-05 10:25:42', 'productManager, ', '2012-06-05', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0');
-INSERT INTO `zt_story` (`id`, `product`, `module`, `plan`, `source`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES(5, 1, 5, 1, 'po', 0, '诚聘英才的设计和开发', '', '', 1, 1, 'draft', 'planned', '', 'productManager', '2012-06-05 10:21:39', 'productManager', '2012-06-05 10:21:39', '', '0000-00-00 00:00:00', '', '0000-00-00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0');
-INSERT INTO `zt_story` (`id`, `product`, `module`, `plan`, `source`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES(6, 1, 6, 1, 'po', 0, '合作洽谈的设计和开发', '', '', 1, 1, 'draft', 'planned', '', 'productManager', '2012-06-05 10:23:11', 'productManager', '2012-06-05 10:23:11', '', '0000-00-00 00:00:00', '', '0000-00-00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0');
-INSERT INTO `zt_story` (`id`, `product`, `module`, `plan`, `source`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES(7, 1, 7, 1, 'po', 0, '关于我们的设计和开发', '', '', 1, 1, 'draft', 'planned', '', 'productManager', '2012-06-05 10:24:19', 'productManager', '2012-06-05 10:24:19', '', '0000-00-00 00:00:00', '', '0000-00-00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0');
-
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(1, 1, '首页设计和开发', '作为一名本公司的用户，我希望可以在首页看到该公司网站的基本内容，例如最新动态、部分成果展示、联系信息、工商信息等。<br />', '开发并通过验收<br />');
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(2, 1, '新闻中心的设计和开发。', '作为一名本公司的用户，我希望可以在新闻中心看到该公司网站的企业新闻，这样可以通过新闻了解企业的最新动态。<br />', '');
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(3, 1, '成果展示的设计和开发', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '');
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(3, 2, '成果展示的设计和开发', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '');
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(4, 1, '售后服务的设计和开发', '作为一名本公司的用户，我希望可以在售后服务看到该公司网站的售后服务，这样可以方便我联系该公司来解决我的问题。&nbsp;<br />', '');
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(5, 1, '诚聘英才的设计和开发', '作为一名求职者，我希望可以在诚聘英才里看到该公司的招聘信息，这样可以方便我应聘该公司。&nbsp;<br />', '');
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(6, 1, '合作洽谈的设计和开发', '作为一名合作商，我希望可以在合作洽谈里看到该公司对外的合作内容，这样可以方便我和该公司进行合作洽谈。&nbsp;<br />', '');
-INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES(7, 1, '关于我们的设计和开发', '我希望可以在关于我们里看到该公司的基本信息，这样可以方便我了解该公司。<br />', '');
-
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(1, 1, 1, 1, 0, '首页页面的设计', 'design', 1, 10, 7, 0, '0000-00-00', 'done', '', '首页页面的设计<br />', 'projectManager', '2012-06-05 10:32:03', 'projectManager', '2012-06-05 10:41:20', 'dev1', '2012-06-05 10:41:20', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'dev1', '2012-06-05 10:41:20', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(2, 1, 1, 1, 0, '首页的开发', 'devel', 1, 10, 8, 0, '0000-00-00', 'done', '', '首页的开发<br />', 'projectManager', '2012-06-05 10:32:23', 'dev1', '2012-06-05 10:41:20', 'dev1', '2012-06-05 10:41:20', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'dev1', '2012-06-05 10:41:20', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(3, 1, 2, 1, 0, '新闻中心的设计', 'design', 1, 8, 8, 0, '0000-00-00', 'done', '', '新闻中心的设计<br />', 'projectManager', '2012-06-05 10:33:01', 'dev2', '2012-06-05 10:42:56', 'dev2', '2012-06-05 10:42:56', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'dev2', '2012-06-05 10:42:56', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(4, 1, 2, 1, 0, '新闻中心的开发', 'devel', 1, 8, 5, 0, '0000-00-00', 'done', '', '新闻中心的开发<br />', 'projectManager', '2012-06-05 10:33:21', 'dev2', '2012-06-05 10:42:56', 'dev2', '2012-06-05 10:42:56', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'dev2', '2012-06-05 10:42:56', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(5, 1, 3, 2, 0, '成果展示的设计', 'design', 1, 8, 5, 0, '0000-00-00', 'done', '', '成果展示的设计<br />', 'projectManager', '2012-06-05 10:33:44', 'dev3', '2012-06-05 10:43:32', 'dev3', '2012-06-05 10:43:32', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'dev3', '2012-06-05 10:43:32', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(6, 1, 3, 2, 0, '成果展示的开发', 'devel', 1, 8, 5, 0, '0000-00-00', 'done', '', '成果展示的开发<br />', 'projectManager', '2012-06-05 10:33:59', 'dev3', '2012-06-05 10:43:32', 'dev3', '2012-06-05 10:43:32', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'dev3', '2012-06-05 10:43:32', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(7, 1, 4, 1, 0, '售后服务的设计', 'design', 1, 8, 0, 8, '0000-00-00', 'cancel', '', '售后服务的设计<br />', 'projectManager', '2012-06-05 10:34:25', 'projectManager', '2012-06-05 10:41:20', '', '0000-00-00 00:00:00', 'dev1', '2012-06-05 10:41:20', '', '0000-00-00 00:00:00', '', 'dev1', '2012-06-05 10:41:20', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(8, 1, 4, 1, 0, '售后服务的开发', 'devel', 1, 8, 6, 0, '0000-00-00', 'cancel', '', '售后服务的开发<br />', 'projectManager', '2012-06-05 10:34:45', 'projectManager', '2012-06-05 10:41:20', 'dev1', '0000-00-00 00:00:00', 'dev1', '2012-06-05 10:41:20', '', '0000-00-00 00:00:00', '', 'dev1', '2012-06-05 10:41:20', '0');
-INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES(9, 1, 4, 1, 0, '售后服务的开发', 'devel', 1, 8, 0, 8, '0000-00-00', 'cancel', '', '售后服务的开发<br />', 'projectManager', '2012-06-05 10:35:01', 'projectManager', '2012-06-05 10:41:20', '', '0000-00-00 00:00:00', 'dev1', '2012-06-05 10:41:20', '', '0000-00-00 00:00:00', '', 'dev1', '2012-06-05 10:41:20', '0');
-
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'dev3', '研发', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'productManager', '产品经理', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'tester2', '测试', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'tester1', '测试', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'project', 'projectManager', '项目经理', '2013-02-20', 365, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'project', 'tester2', '测试', '2013-02-20', 365, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'project', 'tester1', '测试', '2013-02-20', 365, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'project', 'dev3', '研发', '2013-02-20', 365, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'project', 'dev2', '研发', '2013-02-20', 365, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'project', 'dev1', '研发', '2013-02-20', 365, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'dev1', '研发', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'dev2', '研发', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'projectManager', '项目经理', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'project', 'testManager', '测试主管', '2013-02-20', 184, 7);
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'project', 'productManager', '产品经理', '2013-02-20', 365, 7);
-
-INSERT INTO `zt_testresult` (`id`, `run`, `case`, `version`, `caseResult`, `stepResults`, `lastRunner`, `date`) VALUES(1, 4, 1, 1, 'pass', 'a:1:{i:1;a:2:{s:6:"result";s:4:"pass";s:4:"real";s:0:"";}}', 'testManager', '2012-06-05 11:11:00');
-INSERT INTO `zt_testresult` (`id`, `run`, `case`, `version`, `caseResult`, `stepResults`, `lastRunner`, `date`) VALUES(2, 3, 2, 1, 'pass', 'a:1:{i:2;a:2:{s:6:"result";s:4:"pass";s:4:"real";s:0:"";}}', 'testManager', '2012-06-05 11:11:05');
-INSERT INTO `zt_testresult` (`id`, `run`, `case`, `version`, `caseResult`, `stepResults`, `lastRunner`, `date`) VALUES(3, 2, 3, 1, 'pass', 'a:1:{i:3;a:2:{s:6:"result";s:4:"pass";s:4:"real";s:0:"";}}', 'testManager', '2012-06-05 11:11:07');
-INSERT INTO `zt_testresult` (`id`, `run`, `case`, `version`, `caseResult`, `stepResults`, `lastRunner`, `date`) VALUES(4, 1, 4, 1, 'pass', 'a:1:{i:4;a:2:{s:6:"result";s:4:"pass";s:4:"real";s:0:"";}}', 'testManager', '2012-06-05 11:11:08');
-
-INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRunner`, `lastRunDate`, `lastRunResult`, `status`) VALUES(1, 1, 4, 1, '', 'testManager', '2012-06-05 11:11:08', 'pass', 'done');
-INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRunner`, `lastRunDate`, `lastRunResult`, `status`) VALUES(2, 1, 3, 1, '', 'testManager', '2012-06-05 11:11:07', 'pass', 'done');
-INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRunner`, `lastRunDate`, `lastRunResult`, `status`) VALUES(3, 1, 2, 1, '', 'testManager', '2012-06-05 11:11:05', 'pass', 'done');
-INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRunner`, `lastRunDate`, `lastRunResult`, `status`) VALUES(4, 1, 1, 1, '', 'testManager', '2012-06-05 11:11:00', 'pass', 'done');
-
-INSERT INTO `zt_testtask` (`id`, `name`, `product`, `project`, `build`, `owner`, `begin`, `end`, `desc`, `status`, `deleted`) VALUES(1, '企业网站第一期测试任务', 1, 1, 'trunk', 'testManager', '2012-06-05', '2013-06-21', '', 'wait', '0');
-
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(2, 5, 'productManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, '0');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(3, 6, 'projectManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865876, '0');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(4, 2, 'dev1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338863860, '1');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(5, 2, 'dev2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338864116, '1');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(6, 2, 'dev3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338864187, '1');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(7, 3, 'tester1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, '1');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(8, 3, 'tester2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, '1');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(9, 3, 'tester3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, '1');
-INSERT INTO `zt_user` (`id`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(10, 1, 'testManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, '1');
-
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('productManager', 5);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('projectManager', 4);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('dev1', 2);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('dev2', 2);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('dev3', 2);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('tester3', 3);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('tester2', 3);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('tester1', 3);
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES('testManager', 8);
+INSERT INTO `zt_acl` (`id`, `account`, `objectType`, `objectID`, `type`, `source`) VALUES
+(1, 'tester3', 'project', 7, 'whitelist', 'upgrade'),
+(2, 'admin', 'project', 7, 'whitelist', 'upgrade');
+INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `execution`, `actor`, `action`, `date`, `comment`, `extra`, `read`) VALUES
+(1, 'user', 20, ',0,', 0, 0, 'azhi', 'logout', '2012-06-05 09:24:52', '', '', '0'),
+(2, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 09:25:00', '', '', '0'),
+(3, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 09:51:10', '', '', '0'),
+(4, 'user', 2, ',0,', 0, 0, 'productManager', 'login', '2012-06-05 09:51:33', '', '', '0'),
+(5, 'user', 2, ',0,', 0, 0, 'productManager', 'logout', '2012-06-05 09:53:05', '', '', '0'),
+(6, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 09:53:10', '', '', '0'),
+(7, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 09:53:52', '', '', '0'),
+(8, 'user', 2, ',0,', 0, 0, 'productManager', 'login', '2012-06-05 09:54:07', '', '', '0'),
+(9, 'product', 1, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 09:57:07', '', '', '0'),
+(10, 'productplan', 1, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:02:49', '', '', '0'),
+(11, 'story', 1, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:09:49', '', '', '0'),
+(12, 'story', 2, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:16:37', '', '', '0'),
+(13, 'story', 3, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:18:10', '', '', '0'),
+(14, 'story', 3, ',1,', 0, 0, 'productManager', 'changed', '2012-06-05 10:19:06', '', '', '0'),
+(15, 'story', 4, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:20:16', '', '', '0'),
+(16, 'story', 5, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:21:39', '', '', '0'),
+(17, 'story', 6, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:23:11', '', '', '0'),
+(18, 'story', 7, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:24:19', '', '', '0'),
+(19, 'story', 1, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:19', '', 'Pass', '0'),
+(20, 'story', 2, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:33', '', 'Pass', '0'),
+(21, 'story', 3, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:38', '', 'Pass', '0'),
+(22, 'story', 4, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:42', '', 'Pass', '0'),
+(23, 'user', 2, ',0,', 0, 0, 'productManager', 'logout', '2012-06-05 10:26:20', '', '', '0'),
+(24, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2012-06-05 10:26:38', '', '', '0'),
+(25, 'execution', 1, ',1,', 0, 1, 'projectManager', 'opened', '2012-06-05 10:28:36', '', '', '0'),
+(26, 'story', 4, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(27, 'story', 3, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(28, 'story', 2, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(29, 'story', 1, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(39, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2012-06-05 10:37:30', '', '', '0'),
+(40, 'user', 4, ',0,', 0, 0, 'dev1', 'login', '2012-06-05 10:37:40', '', '', '0'),
+(53, 'user', 4, ',0,', 0, 0, 'dev1', 'logout', '2012-06-05 10:41:50', '', '', '0'),
+(54, 'user', 5, ',0,', 0, 0, 'dev2', 'login', '2012-06-05 10:41:56', '', '', '0'),
+(57, 'user', 5, ',0,', 0, 0, 'dev2', 'logout', '2012-06-05 10:43:02', '', '', '0'),
+(58, 'user', 6, ',0,', 0, 0, 'dev3', 'login', '2012-06-05 10:43:07', '', '', '0'),
+(61, 'user', 6, ',0,', 0, 0, 'dev3', 'logout', '2012-06-05 10:43:42', '', '', '0'),
+(62, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2012-06-05 10:44:05', '', '', '0'),
+(63, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2012-06-05 10:50:03', '', '', '0'),
+(64, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 10:50:09', '', '', '0'),
+(65, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 10:50:14', '', '', '0'),
+(66, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 10:50:23', '', '', '0'),
+(67, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 10:50:32', '', '', '0'),
+(68, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 10:50:36', '', '', '0'),
+(69, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 10:50:53', '', '', '0'),
+(70, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 10:51:01', '', '', '0'),
+(71, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 10:51:33', '', '', '0'),
+(72, 'user', 7, ',0,', 0, 0, 'tester1', 'login', '2012-06-05 10:51:38', '', '', '0'),
+(73, 'bug', 1, ',1,', 0, 1, 'tester1', 'opened', '2012-06-05 10:56:11', '', '', '0'),
+(74, 'bug', 2, ',1,', 0, 1, 'tester1', 'opened', '2012-06-05 10:57:11', '', '', '0'),
+(75, 'user', 7, ',0,', 0, 0, 'tester1', 'logout', '2012-06-05 10:57:13', '', '', '0'),
+(76, 'user', 8, ',0,', 0, 0, 'tester2', 'login', '2012-06-05 10:57:24', '', '', '0'),
+(77, 'bug', 3, ',1,', 0, 1, 'tester2', 'opened', '2012-06-05 10:58:22', '', '', '0'),
+(78, 'user', 8, ',0,', 0, 0, 'tester2', 'logout', '2012-06-05 10:58:39', '', '', '0'),
+(79, 'user', 9, ',0,', 0, 0, 'tester3', 'login', '2012-06-05 10:58:46', '', '', '0'),
+(80, 'bug', 4, ',1,', 0, 1, 'tester3', 'opened', '2012-06-05 11:00:19', '', '', '0'),
+(81, 'case', 1, ',1,', 0, 0, 'tester3', 'opened', '2012-06-05 11:02:18', '', '', '0'),
+(82, 'case', 1, ',1,', 0, 0, 'tester3', 'edited', '2012-06-05 11:02:47', '', '', '0'),
+(83, 'user', 9, ',0,', 0, 0, 'tester3', 'logout', '2012-06-05 11:02:48', '', '', '0'),
+(84, 'user', 7, ',0,', 0, 0, 'tester1', 'login', '2012-06-05 11:02:56', '', '', '0'),
+(85, 'case', 2, ',1,', 0, 0, 'tester1', 'opened', '2012-06-05 11:03:28', '', '', '0'),
+(86, 'case', 3, ',1,', 0, 0, 'tester1', 'opened', '2012-06-05 11:03:54', '', '', '0'),
+(87, 'user', 7, ',0,', 0, 0, 'tester1', 'logout', '2012-06-05 11:04:00', '', '', '0'),
+(88, 'user', 8, ',0,', 0, 0, 'tester2', 'login', '2012-06-05 11:04:10', '', '', '0'),
+(89, 'case', 4, ',1,', 0, 0, 'tester2', 'opened', '2012-06-05 11:04:48', '', '', '0'),
+(90, 'user', 8, ',0,', 0, 0, 'tester2', 'logout', '2012-06-05 11:04:52', '', '', '0'),
+(91, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 11:04:58', '', '', '0'),
+(92, 'testtask', 1, ',1,', 0, 1, 'testManager', 'opened', '2012-06-05 11:07:41', '', '', '0'),
+(93, 'testtask', 1, ',1,', 0, 1, 'testManager', 'edited', '2012-06-05 11:07:52', '', '', '0'),
+(94, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 11:08:10', '', '', '0'),
+(95, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 11:08:15', '', '', '0'),
+(96, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 11:08:23', '', '', '0'),
+(97, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 11:08:35', '', '', '0'),
+(98, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 11:08:55', '', '', '0'),
+(99, 'user', 7, ',0,', 0, 0, 'tester1', 'login', '2012-06-05 11:08:59', '', '', '0'),
+(100, 'user', 7, ',0,', 0, 0, 'tester1', 'logout', '2012-06-05 11:09:52', '', '', '0'),
+(101, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 11:09:54', '', '', '0'),
+(102, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 11:10:38', '', '', '0'),
+(103, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 11:10:42', '', '', '0'),
+(104, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 11:11:13', '', '', '0'),
+(105, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2012-06-05 11:11:16', '', '', '0'),
+(106, 'build', 1, ',1,', 0, 1, 'projectManager', 'opened', '2012-06-05 11:11:45', '', '', '0'),
+(107, 'execution', 2, ',1,', 0, 2, 'projectManager', 'opened', '2012-06-05 11:12:28', '', '', '0'),
+(108, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2012-06-05 11:14:40', '', '', '0'),
+(109, 'user', 2, ',0,', 0, 0, 'productManager', 'login', '2012-06-05 11:14:43', '', '', '0'),
+(110, 'product', 2, ',2,', 0, 0, 'productManager', 'opened', '2012-06-05 11:15:20', '', '', '0'),
+(111, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:03:34', '', '', '0'),
+(112, 'execution', 1, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:06:58', '', '', '0'),
+(113, 'execution', 2, ',1,', 0, 2, 'admin', 'edited', '2021-04-28 11:08:02', '', '', '0'),
+(114, 'bug', 1, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(115, 'bug', 2, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(116, 'bug', 3, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(117, 'bug', 4, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(118, 'testtask', 1, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:10:06', '', '', '0'),
+(119, 'productplan', 1, ',1,', 0, 0, 'admin', 'edited', '2021-04-28 11:11:10', '', '', '0'),
+(120, 'execution', 1, ',1,', 0, 1, 'admin', 'started', '2021-04-28 11:12:22', '', '', '0'),
+(121, 'program', 6, ',0,', 0, 0, '', 'openedbysystem', '2021-04-28 11:22:04', '', '', '0'),
+(122, 'project', 7, ',,', 7, 0, '', 'openedbysystem', '2021-04-28 11:22:04', '', '', '0'),
+(123, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:22:17', '', '', '0'),
+(124, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 11:29:30', '', '', '0'),
+(125, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:29:49', '', '', '0'),
+(131, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 11:33:16', '', '', '0'),
+(132, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2021-04-28 11:33:18', '', '', '0'),
+(133, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2021-04-28 11:37:36', '', '', '0'),
+(134, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:37:42', '', '', '0'),
+(135, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 11:56:34', '', '', '0'),
+(136, 'user', 4, ',0,', 0, 0, 'dev1', 'login', '2021-04-28 11:56:39', '', '', '0'),
+(137, 'user', 4, ',0,', 0, 0, 'dev1', 'logout', '2021-04-28 13:10:08', '', '', '0'),
+(138, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 13:10:15', '', '', '0'),
+(139, 'case', 1, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(140, 'story', 4, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(141, 'case', 4, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(142, 'story', 3, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(143, 'case', 3, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(144, 'story', 2, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(145, 'case', 2, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(146, 'story', 1, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(147, 'case', 1, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(148, 'story', 4, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(149, 'case', 4, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(150, 'story', 3, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(151, 'case', 3, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(152, 'story', 2, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(153, 'case', 2, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(154, 'story', 1, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(155, 'task', 10, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(156, 'task', 11, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(157, 'task', 12, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(158, 'task', 13, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(159, 'task', 14, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(160, 'task', 15, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(161, 'task', 16, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(162, 'task', 17, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(163, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 13:16:30', '', '', '0'),
+(164, 'user', 4, ',0,', 0, 0, 'dev1', 'login', '2021-04-28 13:16:33', '', '', '0'),
+(165, 'task', 10, ',1,', 7, 1, 'dev1', 'finished', '2021-04-28 13:17:54', '', '', '0'),
+(166, 'task', 11, ',1,', 7, 1, 'dev1', 'started', '2021-04-28 13:18:45', '', '', '0'),
+(167, 'user', 4, ',0,', 0, 0, 'dev1', 'logout', '2021-04-28 13:19:30', '', '', '0'),
+(168, 'user', 5, ',0,', 0, 0, 'dev2', 'login', '2021-04-28 13:19:33', '', '', '0'),
+(169, 'task', 14, ',1,', 7, 1, 'dev2', 'started', '2021-04-28 13:19:54', '', '', '0'),
+(170, 'task', 15, ',1,', 7, 1, 'dev2', 'started', '2021-04-28 13:20:09', '', '', '0'),
+(171, 'user', 5, ',0,', 0, 0, 'dev2', 'logout', '2021-04-28 13:20:17', '', '', '0'),
+(172, 'user', 6, ',0,', 0, 0, 'dev3', 'login', '2021-04-28 13:20:20', '', '', '0'),
+(173, 'task', 16, ',1,', 7, 1, 'dev3', 'started', '2021-04-28 13:20:38', '', '', '0'),
+(174, 'task', 17, ',1,', 7, 1, 'dev3', 'started', '2021-04-28 13:20:52', '', '', '0'),
+(175, 'task', 16, ',1,', 7, 1, 'dev3', 'finished', '2021-04-28 13:21:22', '', '', '0'),
+(176, 'task', 17, ',1,', 7, 1, 'dev3', 'finished', '2021-04-28 13:21:51', '', '', '0'),
+(177, 'user', 6, ',0,', 0, 0, 'dev3', 'logout', '2021-04-28 13:22:30', '', '', '0'),
+(178, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 13:22:37', '', '', '0');
+INSERT INTO `zt_block` (`id`, `account`, `module`, `type`, `title`, `source`, `block`, `params`, `order`, `grid`, `height`, `hidden`) VALUES
+(1, 'admin', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(2, 'admin', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(3, 'admin', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(4, 'admin', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(5, 'admin', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(6, 'admin', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(7, 'admin', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(8, 'admin', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(9, 'admin', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(10, 'admin', 'project', 'scrum', '项目概况', 'project', 'scrumoverview', '', 1, 8, 0, 0),
+(11, 'admin', 'project', 'scrum', '迭代列表', 'project', 'scrumlist', '{\"type\":\"undone\",\"count\":\"20\",\"orderBy\":\"id_desc\"}', 2, 8, 0, 0),
+(12, 'admin', 'project', 'scrum', '待测版本', 'project', 'scrumtest', '{\"type\":\"wait\",\"count\":\"15\",\"orderBy\":\"id_desc\"}', 3, 8, 0, 0),
+(13, 'admin', 'project', 'scrum', '迭代总览', 'project', 'sprint', '', 4, 4, 0, 0),
+(14, 'admin', 'project', 'scrum', '最新动态', 'project', 'projectdynamic', '', 5, 4, 0, 0),
+(15, 'admin', 'product', '', '产品统计', 'product', 'statistic', '{\"type\":\"all\",\"count\":\"20\"}', 1, 8, 0, 0),
+(16, 'admin', 'product', '', '产品总览', 'product', 'overview', '', 2, 4, 0, 0),
+(17, 'admin', 'product', '', '未关闭的产品', 'product', 'list', '{\"count\":15,\"type\":\"noclosed\"}', 3, 8, 0, 0),
+(18, 'admin', 'product', '', '指派给我的软件需求', 'product', 'story', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assignedTo\"}', 4, 4, 0, 0),
+(19, 'admin', 'qa', '', '测试统计', 'qa', 'statistic', '{\"type\":\"noclosed\",\"count\":\"20\"}', 1, 8, 0, 0),
+(20, 'admin', 'qa', '', '指派给我的Bug', 'qa', 'bug', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assignedTo\"}', 2, 4, 0, 0),
+(21, 'admin', 'qa', '', '指派给我的用例', 'qa', 'case', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assigntome\"}', 3, 4, 0, 0),
+(22, 'admin', 'qa', '', '待测版本列表', 'qa', 'testtask', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"wait\"}', 4, 8, 0, 0),
+(23, 'projectManager', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(24, 'projectManager', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(25, 'projectManager', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(26, 'projectManager', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(27, 'projectManager', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(28, 'projectManager', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(29, 'projectManager', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(30, 'projectManager', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(31, 'projectManager', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(32, 'projectManager', 'qa', '', '测试统计', 'qa', 'statistic', '{\"type\":\"noclosed\",\"count\":\"20\"}', 1, 8, 0, 0),
+(33, 'projectManager', 'qa', '', '指派给我的Bug', 'qa', 'bug', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assignedTo\"}', 2, 4, 0, 0),
+(34, 'projectManager', 'qa', '', '指派给我的用例', 'qa', 'case', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assigntome\"}', 3, 4, 0, 0),
+(35, 'projectManager', 'qa', '', '待测版本列表', 'qa', 'testtask', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"wait\"}', 4, 8, 0, 0),
+(36, 'dev1', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(37, 'dev1', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(38, 'dev1', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(39, 'dev1', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(40, 'dev1', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(41, 'dev1', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(42, 'dev1', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(43, 'dev1', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(44, 'dev1', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(45, 'dev2', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(46, 'dev2', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(47, 'dev2', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(48, 'dev2', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(49, 'dev2', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(50, 'dev2', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(51, 'dev2', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(52, 'dev2', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(53, 'dev2', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(54, 'dev3', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(55, 'dev3', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(56, 'dev3', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(57, 'dev3', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(58, 'dev3', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(59, 'dev3', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(60, 'dev3', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(61, 'dev3', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(62, 'dev3', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0);
+INSERT INTO `zt_bug` (`id`, `project`, `product`, `branch`, `module`, `execution`, `plan`, `story`, `storyVersion`, `task`, `toTask`, `toStory`, `title`, `keywords`, `severity`, `pri`, `type`, `os`, `browser`, `hardware`, `found`, `steps`, `status`, `subStatus`, `color`, `confirmed`, `activatedCount`, `activatedDate`, `mailto`, `openedBy`, `openedDate`, `openedBuild`, `assignedTo`, `assignedDate`, `deadline`, `resolvedBy`, `resolution`, `resolvedBuild`, `resolvedDate`, `closedBy`, `closedDate`, `duplicateBug`, `linkBug`, `case`, `caseVersion`, `result`, `repo`, `entry`, `lines`, `v1`, `v2`, `repoType`, `testtask`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES
+(1, 7, 1, 0, 8, 1, 0, 1, 1, 1, 0, 0, '首页页面问题', '', 3, 1, 'codeerror', '', '', '', '', '<p>[步骤]进入首页</p>\r\n<p>[结果]出现乱码&nbsp;&nbsp;&nbsp;&nbsp;</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester1', '2012-06-05 10:56:11', 'trunk', 'dev1', '2012-06-05 10:56:11', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0'),
+(2, 7, 1, 0, 9, 1, 0, 2, 1, 4, 0, 0, '新闻中心页面问题', '', 3, 2, 'codeerror', '', '', '', '', '<p>[步骤]进入新闻中心</p>\r\n<p>[结果]页面出现乱码</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester1', '2012-06-05 10:57:11', 'trunk', 'dev1', '2012-06-05 10:57:11', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0'),
+(3, 7, 1, 0, 10, 1, 0, 3, 2, 6, 0, 0, '成果展示页面问题', '', 3, 1, 'codeerror', '', '', '', '', '<p>[步骤]进入成果展示&nbsp;&nbsp;&nbsp;&nbsp;</p>\r\n<p>[结果]乱码</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester2', '2012-06-05 10:58:22', 'trunk', 'dev1', '2012-06-05 10:58:22', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0'),
+(4, 7, 1, 0, 11, 1, 0, 4, 1, 9, 0, 0, '售后服务页面问题', '', 3, 1, 'codeerror', '', '', '', '', '<p>[步骤]进入售后服务</p>\r\n<p>[结果]乱码</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester3', '2012-06-05 11:00:19', 'trunk', 'dev1', '2012-06-05 11:00:19', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0');
+INSERT INTO `zt_build` (`id`, `project`, `product`, `branch`, `execution`, `name`, `scmPath`, `filePath`, `date`, `stories`, `bugs`, `builder`, `desc`, `deleted`) VALUES
+(1, 7, 1, 0, 1, '第一期版本', '', '', '2012-06-05', '3,2,1,4', '', 'projectManager', '', '0');
+INSERT INTO `zt_burn` (`execution`, `product`, `task`, `date`, `estimate`, `left`, `consumed`, `storyPoint`) VALUES
+(1, 0, 0, '2012-06-05', 0, 0, 38, 0);
+INSERT INTO `zt_case` (`id`, `project`, `product`, `branch`, `lib`, `module`, `path`, `story`, `storyVersion`, `title`, `precondition`, `keywords`, `pri`, `type`, `auto`, `frame`, `stage`, `howRun`, `scriptedBy`, `scriptedDate`, `scriptStatus`, `scriptLocation`, `status`, `subStatus`, `color`, `frequency`, `order`, `openedBy`, `openedDate`, `reviewedBy`, `reviewedDate`, `lastEditedBy`, `lastEditedDate`, `version`, `linkCase`, `fromBug`, `fromCaseID`, `fromCaseVersion`, `deleted`, `lastRunner`, `lastRunDate`, `lastRunResult`, `execution`) VALUES
+(1, 7, 1, 0, 0, 0, 0, 4, 1, '售后服务的测试用例', '', '', 1, 'feature', 'no', '', 'feature', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester3', '2012-06-05 11:02:18', '', '0000-00-00', 'tester3', '2012-06-05 11:02:46', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:00', 'pass', 0),
+(2, 7, 1, 0, 0, 0, 0, 1, 1, '首页的测试用例', '', '', 3, 'feature', 'no', '', '', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester1', '2012-06-05 11:03:28', '', '0000-00-00', '', '0000-00-00 00:00:00', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:05', 'pass', 0),
+(3, 7, 1, 0, 0, 0, 0, 2, 1, '新闻中心的测试用例', '', '', 3, 'feature', 'no', '', 'feature', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester1', '2012-06-05 11:03:54', '', '0000-00-00', '', '0000-00-00 00:00:00', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:07', 'pass', 0),
+(4, 7, 1, 0, 0, 0, 0, 3, 2, '成果展示测试用例', '', '', 3, 'feature', 'no', '', 'feature', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester2', '2012-06-05 11:04:48', '', '0000-00-00', '', '0000-00-00 00:00:00', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:08', 'pass', 0);
+INSERT INTO `zt_casestep` (`id`, `parent`, `case`, `version`, `type`, `desc`, `expect`) VALUES
+(1, 0, 1, 1, 'step', '进入首页', '正常显示'),
+(2, 0, 2, 1, 'step', '进入首页', '正常显示'),
+(3, 0, 3, 1, 'step', '进入新闻中心', '正常显示'),
+(4, 0, 4, 1, 'step', '进入成果展示', '正常显示');
+INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES
+(1, '经理', 0, ',1,', 1, 0, '', '', ''),
+(2, '开发', 0, ',2,', 1, 0, '', '', ''),
+(3, '测试', 0, ',3,', 1, 0, '', '', ''),
+(4, '市场', 0, ',4,', 1, 0, '', '', ''),
+(5, '产品', 1, ',1,5,', 2, 0, '', '', ''),
+(6, '项目', 1, ',1,6,', 2, 0, '', '', ''),
+(7, '编程', 2, ',2,7,', 2, 0, '', '', ''),
+(8, '美工', 2, ',2,8,', 2, 0, '', '', '');
+INSERT INTO `zt_doclib` (`id`, `type`, `product`, `project`, `execution`, `name`, `acl`, `groups`, `users`, `main`, `collector`, `order`, `deleted`) VALUES
+(1, 'product', 1, 0, 0, '产品库', 'default', '', '', '1', '', 0, '0'),
+(2, 'product', 2, 0, 0, '产品库', 'default', '', '', '1', '', 0, '0'),
+(3, 'project', 0, 0, 1, '项目库', 'default', '', '', '1', '', 0, '0'),
+(4, 'project', 0, 0, 2, '项目库', 'default', '', '', '1', '', 0, '0'),
+(5, 'project', 0, 7, 0, '项目主库', 'default', '', '', '1', '', 0, '0');
+INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES
+(1, 14, 'version', '1', '2', ''),
+(2, 14, 'spec', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '001- <del>作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。<br /></del>\n001+ <ins>作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。<br /></ins>'),
+(3, 41, 'consumed', '0', '1', ''),
+(4, 41, 'status', 'wait', 'doing', ''),
+(6, 42, 'consumed', '1', '7', ''),
+(7, 42, 'left', '10', '0', ''),
+(8, 42, 'assignedTo', 'dev1', 'projectManager', ''),
+(9, 42, 'status', 'doing', 'done', ''),
+(10, 42, 'finishedBy', '', 'dev1', ''),
+(11, 42, 'finishedDate', '', '2012-06-05 10:38:00', ''),
+(13, 43, 'consumed', '0', '6', ''),
+(14, 43, 'left', '8', '0', ''),
+(15, 43, 'assignedTo', 'dev1', 'projectManager', ''),
+(16, 43, 'status', 'wait', 'done', ''),
+(17, 43, 'finishedBy', '', 'dev1', ''),
+(18, 43, 'finishedDate', '', '2012-06-05 10:39:14', ''),
+(20, 44, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(21, 45, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(22, 46, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(23, 47, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(24, 48, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(25, 49, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(26, 50, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(27, 51, 'status', 'wait', 'done', ''),
+(28, 51, 'consumed', '0', '8', ''),
+(29, 51, 'left', '10', '0', ''),
+(30, 51, 'finishedBy', '', 'dev1', ''),
+(31, 51, 'finishedDate', '', '2012-06-05 10:41:20', ''),
+(32, 52, 'finishedDate', '2012-06-05 10:38:00', '2012-06-05 10:41:20', ''),
+(33, 55, 'status', 'closed', 'done', ''),
+(34, 55, 'consumed', '0', '5', ''),
+(35, 55, 'left', '8', '0', ''),
+(36, 55, 'finishedBy', '', 'dev2', ''),
+(37, 55, 'closedBy', 'dev1', '', ''),
+(38, 55, 'closedReason', 'done', '', ''),
+(39, 55, 'finishedDate', '', '2012-06-05 10:42:56', ''),
+(40, 55, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(41, 56, 'status', 'closed', 'done', ''),
+(42, 56, 'consumed', '0', '8', ''),
+(43, 56, 'left', '8', '0', ''),
+(44, 56, 'finishedBy', '', 'dev2', ''),
+(45, 56, 'closedBy', 'dev1', '', ''),
+(46, 56, 'closedReason', 'done', '', ''),
+(47, 56, 'finishedDate', '', '2012-06-05 10:42:56', ''),
+(48, 56, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(49, 59, 'status', 'closed', 'done', ''),
+(50, 59, 'consumed', '0', '5', ''),
+(51, 59, 'left', '8', '0', ''),
+(52, 59, 'finishedBy', 'dev1', 'dev3', ''),
+(53, 59, 'closedBy', 'dev1', '', ''),
+(54, 59, 'closedReason', 'done', '', ''),
+(55, 59, 'finishedDate', '', '2012-06-05 10:43:32', ''),
+(56, 59, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(57, 60, 'status', 'closed', 'done', ''),
+(58, 60, 'consumed', '0', '5', ''),
+(59, 60, 'left', '8', '0', ''),
+(60, 60, 'finishedBy', 'dev1', 'dev3', ''),
+(61, 60, 'closedBy', 'dev1', '', ''),
+(62, 60, 'closedReason', 'done', '', ''),
+(63, 60, 'finishedDate', '', '2012-06-05 10:43:32', ''),
+(64, 60, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(65, 82, 'title', '首页的测试用例', '售后服务的测试用例', '001- <del>首页的测试用例</del>\n001+ <ins>售后服务的测试用例</ins>'),
+(66, 82, 'story', '1', '4', ''),
+(67, 93, 'build', '', 'trunk', ''),
+(68, 112, 'begin', '2012-06-05', '2020-06-05', ''),
+(69, 112, 'end', '2012-12-04', '2021-12-04', ''),
+(70, 112, 'days', '184', '391', ''),
+(71, 112, 'status', 'done', 'wait', ''),
+(72, 113, 'begin', '2013-06-05', '2021-06-05', ''),
+(73, 113, 'end', '2014-06-04', '2022-06-04', ''),
+(74, 113, 'days', '365', '260', ''),
+(75, 114, 'type', 'interface', 'codeerror', ''),
+(76, 114, 'pri', '0', '1', ''),
+(77, 115, 'pri', '0', '2', ''),
+(78, 116, 'pri', '0', '1', ''),
+(79, 117, 'pri', '0', '1', ''),
+(80, 118, 'build', 'trunk', '1', ''),
+(81, 118, 'begin', '2012-06-05', '2020-06-05', ''),
+(82, 118, 'end', '2013-06-21', '2021-06-21', ''),
+(83, 119, 'begin', '2000-01-01', '2020-06-05', ''),
+(84, 119, 'end', '2015-01-01', '2021-06-04', ''),
+(85, 120, 'status', 'wait', 'doing', ''),
+(86, 126, 'assignedTo', 'dev1', 'projectManager', ''),
+(87, 127, 'assignedTo', 'dev2', 'projectManager', ''),
+(88, 128, 'assignedTo', 'dev2', 'projectManager', ''),
+(89, 129, 'assignedTo', 'dev3', 'projectManager', ''),
+(90, 130, 'assignedTo', 'dev3', 'projectManager', ''),
+(91, 165, 'consumed', '0', '8', ''),
+(92, 165, 'realStarted', '0000-00-00 00:00:00', '2021-04-28 13:17:54', ''),
+(93, 165, 'finishedDate', '', '2021-04-01 16:00', ''),
+(94, 165, 'status', 'wait', 'done', ''),
+(95, 165, 'left', '7', '0', ''),
+(96, 165, 'finishedBy', '', 'dev1', ''),
+(97, 166, 'realStarted', '0000-00-00 00:00:00', '2021-04-01 16:00', ''),
+(98, 166, 'status', 'wait', 'doing', ''),
+(99, 169, 'realStarted', '0000-00-00 00:00:00', '2021-04-01 08:00', ''),
+(100, 169, 'status', 'wait', 'doing', ''),
+(101, 170, 'realStarted', '0000-00-00 00:00:00', '2021-04-01 08:00', ''),
+(102, 170, 'status', 'wait', 'doing', ''),
+(103, 173, 'realStarted', '0000-00-00 00:00:00', '2021-04-02 08:00', ''),
+(104, 173, 'status', 'wait', 'doing', ''),
+(105, 174, 'realStarted', '0000-00-00 00:00:00', '2021-04-02 08:00', ''),
+(106, 174, 'status', 'wait', 'doing', ''),
+(107, 175, 'consumed', '0', '6', ''),
+(108, 175, 'finishedDate', '', '2021-04-05 17:00', ''),
+(109, 175, 'status', 'doing', 'done', ''),
+(110, 175, 'left', '5', '0', ''),
+(111, 175, 'finishedBy', '', 'dev3', ''),
+(112, 176, 'consumed', '0', '5', ''),
+(113, 176, 'finishedDate', '', '2021-04-06 15:30', ''),
+(114, 176, 'status', 'doing', 'done', ''),
+(115, 176, 'left', '5', '0', ''),
+(116, 176, 'finishedBy', '', 'dev3', '');
+INSERT INTO `zt_module` (`id`, `root`, `branch`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`, `collector`, `short`, `deleted`) VALUES
+(1, 1, 0, '首页', 0, ',1,', 1, 10, 'story', '', '', '', '0'),
+(2, 1, 0, '新闻中心', 0, ',2,', 1, 20, 'story', '', '', '', '0'),
+(3, 1, 0, '成果展示', 0, ',3,', 1, 30, 'story', '', '', '', '0'),
+(4, 1, 0, '售后服务', 0, ',4,', 1, 40, 'story', '', '', '', '0'),
+(5, 1, 0, '诚聘英才', 0, ',5,', 1, 50, 'story', '', '', '', '0'),
+(6, 1, 0, '合作洽谈', 0, ',6,', 1, 60, 'story', '', '', '', '0'),
+(7, 1, 0, '关于我们', 0, ',7,', 1, 70, 'story', '', '', '', '0'),
+(8, 1, 0, '首页', 0, ',8,', 1, 10, 'bug', '', '', '', '0'),
+(9, 1, 0, '新闻中心', 0, ',9,', 1, 20, 'bug', '', '', '', '0'),
+(10, 1, 0, '成果展示', 0, ',10,', 1, 30, 'bug', '', '', '', '0'),
+(11, 1, 0, '售后服务', 0, ',11,', 1, 40, 'bug', '', '', '', '0'),
+(12, 1, 0, '诚聘英才', 0, ',12,', 1, 50, 'bug', '', '', '', '0'),
+(13, 1, 0, '合作洽谈', 0, ',13,', 1, 60, 'bug', '', '', '', '0'),
+(14, 1, 0, '关于我们', 0, ',14,', 1, 70, 'bug', '', '', '', '0'),
+(15, 6, 0, '企业管理', 0, ',15,', 1, 0, 'line', '', '', '', '0');
+INSERT INTO `zt_product` (`id`, `program`, `name`, `code`, `bind`, `line`, `type`, `status`, `subStatus`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `createdVersion`, `order`, `deleted`, `storyConcept`) VALUES
+(1, 6, '公司企业网站建设', 'companyWebsite', '0', 0, 'normal', 'normal', '', '建立公司企业网站，可以更好对外展示。<br />', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 09:57:07', '', 5, '0', 0),
+(2, 6, '企业内部工时管理系统', 'workhourManage', '0', 0, 'normal', 'normal', '', '', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 11:15:20', '5.2.1', 10, '0', 0);
+INSERT INTO `zt_productplan` (`id`, `product`, `branch`, `parent`, `title`, `desc`, `begin`, `end`, `order`, `deleted`) VALUES
+(1, 1, 0, 0, '1.0版本', '开发出企业网站1.0版本。<br />', '2020-06-05', '2021-06-04', '', '0');
+INSERT INTO `zt_project` (`id`, `project`, `model`, `type`, `product`, `lifetime`, `budget`, `budgetUnit`, `attribute`, `percent`, `milestone`, `output`, `auth`, `parent`, `path`, `grade`, `name`, `code`, `begin`, `end`, `realBegan`, `realEnd`, `days`, `status`, `subStatus`, `statge`, `pri`, `desc`, `version`, `parentVersion`, `planDuration`, `realDuration`, `openedBy`, `openedDate`, `openedVersion`, `lastEditedBy`, `lastEditedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`, `storyConcept`) VALUES
+(1, 7, '', 'sprint', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', '', 7, ',7,1,', 1, '企业网站第一期', 'coWeb1', '2020-06-05', '2021-12-04', '0000-00-00', '0000-00-00', 391, 'doing', '', '1', '1', '开发企业网站的基本雏形。<br />', 0, 0, 0, 0, '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', 5, '0', 0),
+(2, 7, '', 'sprint', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', '', 7, ',7,2,', 1, '企业网站第二期', 'coWebsite2', '2021-06-05', '2022-06-04', '0000-00-00', '0000-00-00', 260, 'wait', '', '1', '1', '', 0, 0, 0, 0, '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', 10, '0', 0),
+(7, 0, 'scrum', 'project', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', 'extend', 6, ',6,7,', 2, '企业管理系统', '', '2021-06-05', '2022-06-04', '0000-00-00', '0000-00-00', 0, 'doing', '', '1', '1', '', 0, 0, 0, 0, 'admin', '2021-04-28 11:22:04', '15.0.rc3', 'admin', '2021-04-28 11:22:04', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'projectManager', '', '', '', 'open', ',tester3,admin', 35, '0', 0),
+(6, 0, '', 'program', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', '', 0, ',6,', 1, '企业管理', '', '2021-06-05', '2022-06-04', '0000-00-00', '0000-00-00', 0, 'doing', '', '1', '1', '', 0, 0, 0, 0, 'admin', '2021-04-28 11:22:04', '15.0.rc3', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '', '', '', '', 'open', '', 30, '0', 0);
+INSERT INTO `zt_projectcase` (`project`, `product`, `case`, `count`, `version`, `order`) VALUES
+(1, 1, 2, 1, 1, 4),
+(7, 1, 1, 1, 1, 5),
+(1, 1, 1, 1, 1, 1),
+(7, 1, 2, 1, 1, 5),
+(1, 1, 4, 1, 1, 2),
+(7, 1, 3, 1, 1, 5),
+(1, 1, 3, 1, 1, 3),
+(7, 1, 4, 1, 1, 5);
+INSERT INTO `zt_projectproduct` (`project`, `product`, `branch`, `plan`) VALUES
+(1, 1, 0, 0),
+(2, 1, 0, 0),
+(7, 1, 0, 0),
+(7, 2, 0, 0);
+INSERT INTO `zt_projectstory` (`project`, `product`, `story`, `version`, `order`) VALUES
+(1, 1, 1, 1, 0),
+(1, 1, 2, 1, 0),
+(1, 1, 3, 2, 0),
+(1, 1, 4, 1, 0),
+(7, 1, 4, 1, 0),
+(7, 1, 3, 2, 0),
+(7, 1, 2, 1, 0),
+(7, 1, 1, 1, 0);
+INSERT INTO `zt_searchdict` (`key`, `value`) VALUES
+(39318, '首'),
+(39029, '页'),
+(38754, '面'),
+(38382, '问'),
+(39064, '题'),
+(27493, '步'),
+(39588, '骤'),
+(36827, '进'),
+(20837, '入'),
+(32467, '结'),
+(26524, '果'),
+(20986, '出'),
+(29616, '现'),
+(20081, '乱'),
+(30721, '码'),
+(26399, '期'),
+(26395, '望'),
+(27491, '正'),
+(24120, '常'),
+(26174, '显'),
+(31034, '示'),
+(26032, '新'),
+(38395, '闻'),
+(20013, '中'),
+(24515, '心'),
+(25104, '成'),
+(23637, '展'),
+(21806, '售'),
+(21518, '后'),
+(26381, '服'),
+(21153, '务'),
+(31532, '第'),
+(19968, '一'),
+(29256, '版'),
+(26412, '本'),
+(30340, '的'),
+(27979, '测'),
+(35797, '试'),
+(29992, '用'),
+(20363, '例'),
+(20844, '公'),
+(21496, '司'),
+(20225, '企'),
+(19994, '业'),
+(32593, '网'),
+(31449, '站'),
+(24314, '建'),
+(35774, '设'),
+(31435, '立'),
+(65292, '，'),
+(21487, '可'),
+(20197, '以'),
+(26356, '更'),
+(22909, '好'),
+(23545, '对'),
+(22806, '外'),
+(12290, '。'),
+(20869, '内'),
+(37096, '部'),
+(24037, '工'),
+(26102, '时'),
+(31649, '管'),
+(29702, '理'),
+(31995, '系'),
+(32479, '统'),
+(24320, '开'),
+(21457, '发'),
+(35745, '计'),
+(21644, '和'),
+(20316, '作'),
+(20026, '为'),
+(21517, '名'),
+(25143, '户'),
+(25105, '我'),
+(24076, '希'),
+(22312, '在'),
+(30475, '看'),
+(21040, '到'),
+(35813, '该'),
+(22522, '基'),
+(23481, '容'),
+(22914, '如'),
+(26368, '最'),
+(21160, '动'),
+(24577, '态'),
+(12289, '、'),
+(20998, '分'),
+(32852, '联'),
+(20449, '信'),
+(24687, '息'),
+(21830, '商'),
+(31561, '等'),
+(24182, '并'),
+(36890, '通'),
+(36807, '过'),
+(39564, '验'),
+(25910, '收'),
+(36825, '这'),
+(26679, '样'),
+(20102, '了'),
+(35299, '解'),
+(21561, '吹'),
+(20135, '产'),
+(21697, '品'),
+(26041, '方'),
+(20415, '便'),
+(34892, '行'),
+(36141, '购'),
+(20080, '买'),
+(26469, '来'),
+(20915, '决'),
+(35802, '诚'),
+(32856, '聘'),
+(33521, '英'),
+(25165, '才'),
+(27714, '求'),
+(32844, '职'),
+(32773, '者'),
+(37324, '里'),
+(25307, '招'),
+(24212, '应'),
+(21512, '合'),
+(27965, '洽'),
+(35848, '谈'),
+(20851, '关'),
+(20110, '于'),
+(20204, '们'),
+(20219, '任'),
+(38607, '雏'),
+(24418, '形'),
+(20108, '二');
+INSERT INTO `zt_searchindex` (`id`, `objectType`, `objectID`, `title`, `content`, `addedDate`, `editedDate`) VALUES
+(1, 'bug', 1, ' 39318 39029 39029 38754 38382 39064', ' 27493 39588 36827 20837 39318 39029 32467 26524 20986 29616 20081 30721 &nbsp &nbsp &nbsp &nbsp 26399 26395 27491 24120 26174 31034', '2012-06-05 10:56:11', '2021-04-28 11:09:08'),
+(2, 'bug', 2, ' 26032 38395 20013 24515 39029 38754 38382 39064', ' 27493 39588 36827 20837 26032 38395 20013 24515 32467 26524 39029 38754 20986 29616 20081 30721 26399 26395 27491 24120 26174 31034', '2012-06-05 10:57:11', '2021-04-28 11:09:08'),
+(3, 'bug', 3, ' 25104 26524 23637 31034 39029 38754 38382 39064', ' 27493 39588 36827 20837 25104 26524 23637 31034 &nbsp &nbsp &nbsp &nbsp 32467 26524 20081 30721 26399 26395 27491 24120 26174 31034', '2012-06-05 10:58:22', '2021-04-28 11:09:08'),
+(4, 'bug', 4, ' 21806 21518 26381 21153 39029 38754 38382 39064', ' 27493 39588 36827 20837 21806 21518 26381 21153 32467 26524 20081 30721 26399 26395 27491 24120 26174 31034', '2012-06-05 11:00:19', '2021-04-28 11:09:08'),
+(5, 'build', 1, ' 31532 19968 26399 29256 26412', '', '2012-06-05 11:11:45', '2012-06-05 11:11:45'),
+(6, 'case', 1, ' 21806 21518 26381 21153 30340 27979 35797 29992 20363', ' 36827 20837 39318 39029 27491 24120 26174 31034', '2012-06-05 11:02:18', '2012-06-05 11:02:47'),
+(7, 'case', 2, ' 39318 39029 30340 27979 35797 29992 20363', ' 36827 20837 39318 39029 27491 24120 26174 31034', '2012-06-05 11:03:28', '2012-06-05 11:03:28'),
+(8, 'case', 3, ' 26032 38395 20013 24515 30340 27979 35797 29992 20363', ' 36827 20837 26032 38395 20013 24515 27491 24120 26174 31034', '2012-06-05 11:03:54', '2012-06-05 11:03:54'),
+(9, 'case', 4, ' 25104 26524 23637 31034 27979 35797 29992 20363', ' 36827 20837 25104 26524 23637 31034 27491 24120 26174 31034', '2012-06-05 11:04:48', '2012-06-05 11:04:48'),
+(10, 'product', 1, ' 20844 21496 20225 19994 32593 31449 24314 35774', ' companywebsite 24314 31435 20844 21496 20225 19994 32593 31449 65292 21487 20197 26356 22909 23545 22806 23637 31034 12290', '2012-06-05 09:57:07', '2012-06-05 09:57:07'),
+(11, 'product', 2, ' 20225 19994 20869 37096 24037 26102 31649 29702 31995 32479', ' workhourmanage', '2012-06-05 11:15:20', '2012-06-05 11:15:20'),
+(12, 'productplan', 1, ' 1.0__ 29256 26412', ' 24320 21457 20986 20225 19994 32593 31449 1.0__ 29256 26412 12290', '2012-06-05 10:02:49', '2021-04-28 11:11:10'),
+(13, 'project', 7, ' 20225 19994 31649 29702 31995 32479', '', '2021-04-28 11:22:04', '2021-04-28 11:22:04'),
+(14, 'story', 1, ' 39318 39029 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 39318 39029 30475 21040 35813 20844 21496 32593 31449 30340 22522 26412 20869 23481 65292 20363 22914 26368 26032 21160 24577 12289 37096 20998 25104 26524 23637 31034 12289 32852 31995 20449 24687 12289 24037 21830 20449 24687 31561 12290 24320 21457 24182 36890 36807 39564 25910', '2012-06-05 10:09:49', '2012-06-05 10:31:02'),
+(15, 'story', 2, ' 26032 38395 20013 24515 30340 35774 35745 21644 24320 21457 12290', ' 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 26032 38395 20013 24515 30475 21040 35813 20844 21496 32593 31449 30340 20225 19994 26032 38395 65292 36825 26679 21487 20197 36890 36807 26032 38395 20102 35299 20225 19994 30340 26368 26032 21160 24577 12290', '2012-06-05 10:16:37', '2012-06-05 10:31:02'),
+(16, 'story', 3, ' 25104 26524 23637 31034 30340 35774 35745 21644 24320 21457', ' &nbsp 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 25104 26524 23637 31034 30475 21040 35813 20844 21496 32593 31449 30340 21561 20135 21697 65292 36825 26679 21487 20197 26041 20415 25105 36827 34892 20102 35299 35813 20844 21496 30340 20135 21697 24182 36827 34892 36141 20080 12290 &nbsp', '2012-06-05 10:18:10', '2012-06-05 10:31:02'),
+(17, 'story', 4, ' 21806 21518 26381 21153 30340 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 21806 21518 26381 21153 30475 21040 35813 20844 21496 32593 31449 30340 21806 21518 26381 21153 65292 36825 26679 21487 20197 26041 20415 25105 32852 31995 35813 20844 21496 26469 35299 20915 25105 30340 38382 39064 12290 &nbsp', '2012-06-05 10:20:16', '2012-06-05 10:31:02'),
+(18, 'story', 5, ' 35802 32856 33521 25165 30340 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 27714 32844 32773 65292 25105 24076 26395 21487 20197 22312 35802 32856 33521 25165 37324 30475 21040 35813 20844 21496 30340 25307 32856 20449 24687 65292 36825 26679 21487 20197 26041 20415 25105 24212 32856 35813 20844 21496 12290 &nbsp', '2012-06-05 10:21:39', '2012-06-05 10:21:39'),
+(19, 'story', 6, ' 21512 20316 27965 35848 30340 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 21512 20316 21830 65292 25105 24076 26395 21487 20197 22312 21512 20316 27965 35848 37324 30475 21040 35813 20844 21496 23545 22806 30340 21512 20316 20869 23481 65292 36825 26679 21487 20197 26041 20415 25105 21644 35813 20844 21496 36827 34892 21512 20316 27965 35848 12290 &nbsp', '2012-06-05 10:23:11', '2012-06-05 10:23:11'),
+(20, 'story', 7, ' 20851 20110 25105 20204 30340 35774 35745 21644 24320 21457', ' 25105 24076 26395 21487 20197 22312 20851 20110 25105 20204 37324 30475 21040 35813 20844 21496 30340 22522 26412 20449 24687 65292 36825 26679 21487 20197 26041 20415 25105 20102 35299 35813 20844 21496 12290', '2012-06-05 10:24:19', '2012-06-05 10:24:19'),
+(21, 'task', 1, ' 39318 39029 39029 38754 30340 35774 35745', ' 39318 39029 39029 38754 30340 35774 35745', '2012-06-05 10:32:03', '2012-06-05 10:41:20'),
+(22, 'task', 2, ' 39318 39029 30340 24320 21457', ' 39318 39029 30340 24320 21457', '2012-06-05 10:32:23', '2012-06-05 10:41:20'),
+(23, 'task', 3, ' 26032 38395 20013 24515 30340 35774 35745', ' 26032 38395 20013 24515 30340 35774 35745', '2012-06-05 10:33:01', '2012-06-05 10:42:57'),
+(24, 'task', 4, ' 26032 38395 20013 24515 30340 24320 21457', ' 26032 38395 20013 24515 30340 24320 21457', '2012-06-05 10:33:21', '2012-06-05 10:42:56'),
+(25, 'task', 5, ' 25104 26524 23637 31034 30340 35774 35745', ' 25104 26524 23637 31034 30340 35774 35745', '2012-06-05 10:33:44', '2012-06-05 10:43:32'),
+(26, 'task', 6, ' 25104 26524 23637 31034 30340 24320 21457', ' 25104 26524 23637 31034 30340 24320 21457', '2012-06-05 10:33:59', '2012-06-05 10:43:32'),
+(27, 'task', 7, ' 21806 21518 26381 21153 30340 35774 35745', ' 21806 21518 26381 21153 30340 35774 35745', '2012-06-05 10:34:25', '2012-06-05 10:41:20'),
+(28, 'task', 8, ' 21806 21518 26381 21153 30340 24320 21457', ' 21806 21518 26381 21153 30340 24320 21457', '2012-06-05 10:34:45', '2012-06-05 10:41:20'),
+(29, 'task', 9, ' 21806 21518 26381 21153 30340 24320 21457', ' 21806 21518 26381 21153 30340 24320 21457', '2012-06-05 10:35:01', '2012-06-05 10:41:20'),
+(30, 'testtask', 1, ' 20225 19994 32593 31449 31532 19968 26399 27979 35797 20219 21153', '', '2012-06-05 11:07:41', '2021-04-28 11:10:06'),
+(31, 'program', 6, ' 20225 19994 31649 29702', '', '2021-04-28 11:22:04', '2021-04-28 11:22:04'),
+(32, 'execution', 1, ' 20225 19994 32593 31449 31532 19968 26399', ' coweb1 24320 21457 20225 19994 32593 31449 30340 22522 26412 38607 24418 12290', '2012-06-05 10:28:36', '2021-04-28 11:12:22'),
+(33, 'execution', 2, ' 20225 19994 32593 31449 31532 20108 26399', ' cowebsite2', '2012-06-05 11:12:28', '2021-04-28 11:08:02'),
+(34, 'task', 10, ' 39318 39029 39029 38754 30340 35774 35745', ' 39318 39029 39029 38754 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(35, 'task', 11, ' 39318 39029 39029 38754 30340 24320 21457', ' 39318 39029 39029 38754 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(36, 'task', 12, ' 26032 38395 20013 24515 30340 35774 35745', ' 26032 38395 20013 24515 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(37, 'task', 13, ' 26032 38395 20013 24515 30340 24320 21457', ' 26032 38395 20013 24515 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(38, 'task', 14, ' 25104 26524 23637 31034 30340 35774 35745', ' 25104 26524 23637 31034 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(39, 'task', 15, ' 25104 26524 23637 31034 30340 24320 21457', ' 25104 26524 23637 31034 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(40, 'task', 16, ' 21806 21518 26381 21153 30340 35774 35745', ' 21806 21518 26381 21153 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(41, 'task', 17, ' 21806 21518 26381 21153 30340 24320 21457', ' 21806 21518 26381 21153 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15');
+INSERT INTO `zt_story` (`id`, `parent`, `product`, `branch`, `module`, `plan`, `source`, `sourceNote`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `subStatus`, `color`, `stage`, `stagedBy`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `URChanged`, `deleted`) VALUES
+(1, 0, 1, 0, 1, '1', 'po', '', 0, '首页设计和开发', '', 'story', 1, 1, 'active', '', '', 'developing', '', '', 'productManager', '2012-06-05 10:09:49', 'productManager', '0000-00-00 00:00:00', 'productManager', '2012-06-05 10:25:19', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(2, 0, 1, 0, 2, '1', 'po', '', 0, '新闻中心的设计和开发。', '', 'story', 1, 1, 'active', '', '', 'projected', '', '', 'productManager', '2012-06-05 10:16:37', 'productManager', '2012-06-05 10:16:37', 'productManager', '2012-06-05 10:25:33', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(3, 0, 1, 0, 3, '1', 'po', '', 0, '成果展示的设计和开发', '', 'story', 1, 0, 'active', '', '', 'developing', '', '', 'productManager', '2012-06-05 10:18:10', 'productManager', '2012-06-05 10:18:10', 'productManager', '2012-06-05 10:25:38', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 2, '0', '0'),
+(4, 0, 1, 0, 4, '1', 'po', '', 0, '售后服务的设计和开发', '', 'story', 1, 1, 'active', '', '', 'developed', '', '', 'productManager', '2012-06-05 10:20:16', 'productManager', '2012-06-05 10:20:16', 'productManager', '2012-06-05 10:25:42', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(5, 0, 1, 0, 5, '1', 'po', '', 0, '诚聘英才的设计和开发', '', 'story', 1, 1, 'draft', '', '', 'planned', '', '', 'productManager', '2012-06-05 10:21:39', 'productManager', '2012-06-05 10:21:39', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(6, 0, 1, 0, 6, '1', 'po', '', 0, '合作洽谈的设计和开发', '', 'story', 1, 1, 'draft', '', '', 'planned', '', '', 'productManager', '2012-06-05 10:23:11', 'productManager', '2012-06-05 10:23:11', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(7, 0, 1, 0, 7, '1', 'po', '', 0, '关于我们的设计和开发', '', 'story', 1, 1, 'draft', '', '', 'planned', '', '', 'productManager', '2012-06-05 10:24:19', 'productManager', '2012-06-05 10:24:19', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0');
+INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES
+(1, 1, '首页设计和开发', '作为一名本公司的用户，我希望可以在首页看到该公司网站的基本内容，例如最新动态、部分成果展示、联系信息、工商信息等。<br />', '开发并通过验收<br />'),
+(2, 1, '新闻中心的设计和开发。', '作为一名本公司的用户，我希望可以在新闻中心看到该公司网站的企业新闻，这样可以通过新闻了解企业的最新动态。<br />', ''),
+(3, 1, '成果展示的设计和开发', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', ''),
+(3, 2, '成果展示的设计和开发', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', ''),
+(4, 1, '售后服务的设计和开发', '作为一名本公司的用户，我希望可以在售后服务看到该公司网站的售后服务，这样可以方便我联系该公司来解决我的问题。&nbsp;<br />', ''),
+(5, 1, '诚聘英才的设计和开发', '作为一名求职者，我希望可以在诚聘英才里看到该公司的招聘信息，这样可以方便我应聘该公司。&nbsp;<br />', ''),
+(6, 1, '合作洽谈的设计和开发', '作为一名合作商，我希望可以在合作洽谈里看到该公司对外的合作内容，这样可以方便我和该公司进行合作洽谈。&nbsp;<br />', ''),
+(7, 1, '关于我们的设计和开发', '我希望可以在关于我们里看到该公司的基本信息，这样可以方便我了解该公司。<br />', '');
+INSERT INTO `zt_task` (`id`, `project`, `parent`, `execution`, `module`, `design`, `story`, `storyVersion`, `designVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `subStatus`, `color`, `mailto`, `desc`, `version`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `estStarted`, `realStarted`, `finishedBy`, `finishedDate`, `finishedList`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `realDuration`, `planDuration`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `activatedDate`, `deleted`) VALUES
+(17, 7, 0, 1, 0, 0, 4, 1, 0, 0, '售后服务的开发', 'devel', 1, 5, 5, 0, '0000-00-00', 'done', '', '', NULL, '售后服务的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev3', '2021-04-28 13:21:51', '0000-00-00', '2021-04-02 08:00:00', 'dev3', '2021-04-06 15:30:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev3', '2021-04-28 13:21:51', '0000-00-00', '0'),
+(16, 7, 0, 1, 0, 0, 4, 1, 0, 0, '售后服务的设计', 'design', 1, 5, 6, 0, '0000-00-00', 'done', '', '', NULL, '售后服务的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev3', '2021-04-28 13:21:22', '0000-00-00', '2021-04-02 08:00:00', 'dev3', '2021-04-05 17:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev3', '2021-04-28 13:21:22', '0000-00-00', '0'),
+(15, 7, 0, 1, 0, 0, 3, 2, 0, 0, '成果展示的开发', 'devel', 1, 7, 0, 7, '0000-00-00', 'doing', '', '', NULL, '成果展示的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev2', '2021-04-28 13:16:15', '0000-00-00', '2021-04-01 08:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev2', '2021-04-28 13:20:09', '0000-00-00', '0'),
+(14, 7, 0, 1, 0, 0, 3, 2, 0, 0, '成果展示的设计', 'design', 1, 6, 0, 6, '0000-00-00', 'doing', '', '', NULL, '成果展示的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev2', '2021-04-28 13:16:15', '0000-00-00', '2021-04-01 08:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev2', '2021-04-28 13:19:54', '0000-00-00', '0'),
+(13, 7, 0, 1, 0, 0, 2, 1, 0, 0, '新闻中心的开发', 'devel', 1, 7, 0, 7, '0000-00-00', 'wait', '', '', NULL, '新闻中心的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:16:15', '0000-00-00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', '', '0000-00-00 00:00:00', '0000-00-00', '0'),
+(12, 7, 0, 1, 0, 0, 2, 1, 0, 0, '新闻中心的设计', 'design', 1, 7, 0, 7, '0000-00-00', 'wait', '', '', NULL, '新闻中心的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:16:15', '0000-00-00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', '', '0000-00-00 00:00:00', '0000-00-00', '0'),
+(10, 7, 0, 1, 0, 0, 1, 1, 0, 0, '首页页面的设计', 'design', 1, 7, 8, 0, '0000-00-00', 'done', '', '', NULL, '首页页面的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:17:54', '0000-00-00', '2021-04-28 13:17:54', 'dev1', '2021-04-01 16:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev1', '2021-04-28 13:17:54', '0000-00-00', '0'),
+(11, 7, 0, 1, 0, 0, 1, 1, 0, 0, '首页页面的开发', 'devel', 1, 8, 0, 8, '0000-00-00', 'doing', '', '', NULL, '首页页面的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:16:15', '0000-00-00', '2021-04-01 16:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev1', '2021-04-28 13:18:45', '0000-00-00', '0');
+INSERT INTO `zt_taskestimate` (`id`, `task`, `date`, `left`, `consumed`, `account`, `work`) VALUES
+(1, 10, '2021-04-01', 0, 8, 'dev1', ''),
+(2, 11, '2021-04-01', 8, 0, 'dev1', ''),
+(3, 14, '2021-04-01', 6, 0, 'dev2', ''),
+(4, 15, '2021-04-01', 7, 0, 'dev2', ''),
+(5, 16, '2021-04-02', 5, 0, 'dev3', ''),
+(6, 17, '2021-04-02', 5, 0, 'dev3', ''),
+(7, 16, '2021-04-05', 0, 6, 'dev3', ''),
+(8, 17, '2021-04-06', 0, 5, 'dev3', '');
+INSERT INTO `zt_taskspec` (`task`, `version`, `name`, `estStarted`, `deadline`) VALUES
+(10, 1, '首页页面的设计', '0000-00-00', '0000-00-00'),
+(11, 1, '首页页面的开发', '0000-00-00', '0000-00-00'),
+(12, 1, '新闻中心的设计', '0000-00-00', '0000-00-00'),
+(13, 1, '新闻中心的开发', '0000-00-00', '0000-00-00'),
+(14, 1, '成果展示的设计', '0000-00-00', '0000-00-00'),
+(15, 1, '成果展示的开发', '0000-00-00', '0000-00-00'),
+(16, 1, '售后服务的设计', '0000-00-00', '0000-00-00'),
+(17, 1, '售后服务的开发', '0000-00-00', '0000-00-00');
+INSERT INTO `zt_team` (`id`, `root`, `type`, `account`, `role`, `limited`, `join`, `days`, `hours`, `estimate`, `consumed`, `left`, `order`) VALUES
+(1, 1, 'execution', 'dev3', '研发', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(2, 1, 'execution', 'productManager', '产品经理', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(3, 1, 'execution', 'tester2', '测试', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(4, 1, 'execution', 'tester1', '测试', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(5, 2, 'execution', 'projectManager', '项目经理', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(6, 2, 'execution', 'tester2', '测试', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(7, 2, 'execution', 'tester1', '测试', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(8, 2, 'execution', 'dev3', '研发', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(9, 2, 'execution', 'dev2', '研发', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(10, 2, 'execution', 'dev1', '研发', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(11, 1, 'execution', 'dev1', '研发', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(12, 1, 'execution', 'dev2', '研发', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(13, 1, 'execution', 'projectManager', '项目经理', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(16, 1, 'execution', 'testManager', '测试负责人', 'no', '2021-04-28', 391, 7.0, '0.00', '0.00', '0.00', 0),
+(15, 2, 'execution', 'productManager', '产品经理', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(17, 2, 'execution', 'testManager', '测试负责人', 'no', '2021-04-28', 260, 7.0, '0.00', '0.00', '0.00', 0),
+(18, 7, 'project', 'productManager', '', 'no', '2021-04-28', 0, 0.0, '0.00', '0.00', '0.00', 0),
+(19, 7, 'project', 'projectManager', '', 'no', '2021-04-28', 0, 0.0, '0.00', '0.00', '0.00', 0);
+INSERT INTO `zt_testresult` (`id`, `run`, `case`, `version`, `job`, `compile`, `caseResult`, `stepResults`, `lastRunner`, `date`, `duration`, `xml`) VALUES
+(1, 4, 1, 1, 0, 0, 'pass', 'a:1:{i:1;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:00', 0, ''),
+(2, 3, 2, 1, 0, 0, 'pass', 'a:1:{i:2;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:05', 0, ''),
+(3, 2, 3, 1, 0, 0, 'pass', 'a:1:{i:3;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:07', 0, ''),
+(4, 1, 4, 1, 0, 0, 'pass', 'a:1:{i:4;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:08', 0, '');
+INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRunner`, `lastRunDate`, `lastRunResult`, `status`) VALUES
+(1, 1, 4, 1, '', 'testManager', '2012-06-05 11:11:08', 'pass', 'done'),
+(2, 1, 3, 1, '', 'testManager', '2012-06-05 11:11:07', 'pass', 'done'),
+(3, 1, 2, 1, '', 'testManager', '2012-06-05 11:11:05', 'pass', 'done'),
+(4, 1, 1, 1, '', 'testManager', '2012-06-05 11:11:00', 'pass', 'done');
+INSERT INTO `zt_testtask` (`id`, `project`, `name`, `product`, `execution`, `build`, `owner`, `pri`, `begin`, `end`, `mailto`, `desc`, `report`, `status`, `auto`, `subStatus`, `deleted`) VALUES
+(1, 0, '企业网站第一期测试任务', 1, 1, '1', 'testManager', 0, '2020-06-05', '2021-06-21', '', '', '', 'wait', 'no', '', '0');
+REPLACE INTO `zt_user` (`company`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `mobile`, `phone`, `weixin`, `dingding`, `slack`, `whatsapp`, `address`, `zipcode`, `nature`, `analysis`, `strategy`, `join`, `visits`, `ip`, `last`, `fails`, `locked`, `ranzhi`, `score`, `scoreLevel`, `deleted`) VALUES
+(0, 5, 'productManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, 0, '0000-00-00 00:00:00', '', 0, 0, '0'),
+(0, 6, 'projectManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 4, '10.0.2.2', 1619580798, 0, '0000-00-00 00:00:00', '', 0, 0, '0'),
+(0, 2, 'dev1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '10.0.2.2', 1619586993, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 2, 'dev2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587173, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 2, 'dev3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587220, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 3, 'tester1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 3, 'tester2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 3, 'tester3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 1, 'testManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, 0, '0000-00-00 00:00:00', '', 0, 0, '1');
+INSERT INTO `zt_usergroup` (`account`, `group`, `project`) VALUES
+('productManager', 5, ''),
+('projectManager', 4, ''),
+('dev1', 2, ''),
+('dev2', 2, ''),
+('dev3', 2, ''),
+('tester3', 3, ''),
+('tester2', 3, ''),
+('tester1', 3, ''),
+('testManager', 8, '');
+REPLACE INTO `zt_userview` (`account`, `programs`, `projects`, `products`, `sprints`) VALUES
+('admin', '', '', '', ''),
+('dev1', '', '', '', ''),
+('dev2', '', '', '', ''),
+('dev3', '', '', '', ''),
+('productManager', '', '', '', ''),
+('projectManager', '', '', '', ''),
+('tester1', '', '', '', ''),
+('tester2', '', '', '', ''),
+('tester3', '', '', '', ''),
+('testManager', '', '', '', '');
diff --git a/db/endemo.sql b/db/endemo.sql
index d6863101cd..5e6f3d6366 100644
--- a/db/endemo.sql
+++ b/db/endemo.sql
@@ -1,337 +1,692 @@
-SET NAMES utf8;
-SET time_zone = '+00:00';
-SET foreign_key_checks = 0;
-SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
-
-INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `actor`, `action`, `date`, `comment`, `extra`, `read`) VALUES
-(1,	'user',	1,	',0,',	0,	'admin',	'login',	'2017-12-11 18:52:19',	'',	'',	'0'),
-(2,	'user',	1,	',0,',	0,	'admin',	'logout',	'2017-12-12 14:43:47',	'',	'',	'0'),
-(3,	'user',	2,	',0,',	0,	'thePO',	'login',	'2017-12-12 14:43:59',	'',	'',	'0'),
-(4,	'product',	1,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:44:57',	'',	'',	'0'),
-(5,	'productplan',	1,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:48:38',	'',	'',	'0'),
-(6,	'productplan',	2,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:49:38',	'',	'',	'0'),
-(7,	'productplan',	2,	',1,',	0,	'thePO',	'edited',	'2017-12-12 14:50:13',	'',	'',	'0'),
-(8,	'productplan',	1,	',1,',	0,	'thePO',	'edited',	'2017-12-12 14:51:01',	'',	'',	'0'),
-(9,	'story',	1,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(10,	'story',	2,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(11,	'story',	3,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(12,	'story',	4,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(13,	'story',	5,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(14,	'story',	6,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(15,	'story',	7,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(16,	'story',	8,	',1,',	0,	'thePO',	'opened',	'2017-12-12 14:58:30',	'',	'',	'0'),
-(17,	'project',	1,	',1,',	1,	'thePO',	'opened',	'2017-12-12 15:01:14',	'',	'',	'0'),
-(18,	'story',	3,	',1,',	1,	'thePO',	'linked2project',	'2017-12-12 15:02:18',	'',	'1',	'0'),
-(19,	'story',	2,	',1,',	1,	'thePO',	'linked2project',	'2017-12-12 15:02:18',	'',	'1',	'0'),
-(20,	'story',	1,	',1,',	1,	'thePO',	'linked2project',	'2017-12-12 15:02:18',	'',	'1',	'0'),
-(21,	'user',	2,	',0,',	0,	'thePO',	'logout',	'2017-12-12 15:02:58',	'',	'',	'0'),
-(22,	'user',	3,	',0,',	0,	'pm1',	'login',	'2017-12-12 15:03:09',	'',	'',	'0'),
-(23,	'task',	1,	',1,',	1,	'pm1',	'opened',	'2017-12-12 15:05:06',	'',	'',	'0'),
-(24,	'task',	2,	',1,',	1,	'pm1',	'opened',	'2017-12-12 15:05:06',	'',	'',	'0'),
-(25,	'task',	3,	',1,',	1,	'pm1',	'opened',	'2017-12-12 15:05:06',	'',	'',	'0'),
-(26,	'task',	4,	',1,',	1,	'pm1',	'opened',	'2017-12-12 15:05:06',	'',	'',	'0'),
-(27,	'task',	1,	',1,',	1,	'pm1',	'started',	'2017-12-12 15:12:17',	'Start tp design and develop',	'',	'0'),
-(28,	'task',	1,	',1,',	1,	'pm1',	'recordestimate',	'2017-12-12 15:13:13',	'Finish UI design',	'8',	'0'),
-(29,	'task',	2,	',1,',	1,	'pm1',	'started',	'2017-12-12 15:13:25',	'Start<br />',	'',	'0'),
-(30,	'task',	3,	',1,',	1,	'pm1',	'started',	'2017-12-12 15:14:25',	'',	'',	'0'),
-(31,	'task',	3,	',1,',	1,	'pm1',	'recordestimate',	'2017-12-12 15:14:47',	'Finish',	'60',	'0'),
-(32,	'user',	3,	',0,',	0,	'pm1',	'logout',	'2017-12-12 15:18:46',	'',	'',	'0'),
-(33,	'user',	1,	',0,',	0,	'admin',	'login',	'2017-12-12 15:18:58',	'',	'',	'0'),
-(34,	'user',	10,	',0,',	0,	'admin',	'deleted',	'2017-12-12 15:20:05',	'',	'1',	'0'),
-(35,	'user',	1,	',0,',	0,	'admin',	'logout',	'2017-12-12 15:22:11',	'',	'',	'0'),
-(36,	'user',	12,	',0,',	0,	'pm1',	'login',	'2017-12-12 15:22:36',	'',	'',	'0'),
-(37,	'user',	12,	',0,',	0,	'pm1',	'logout',	'2017-12-12 15:22:48',	'',	'',	'0'),
-(38,	'user',	1,	',0,',	0,	'admin',	'login',	'2017-12-12 15:23:02',	'',	'',	'0'),
-(39,	'user',	1,	',0,',	0,	'admin',	'logout',	'2017-12-12 15:23:27',	'',	'',	'0'),
-(40,	'user',	11,	',0,',	0,	'pm1',	'login',	'2017-12-12 15:23:34',	'',	'',	'0'),
-(41,	'build',	1,	',1,',	1,	'pm1',	'opened',	'2017-12-12 15:25:13',	'',	'',	'0'),
-(42,	'bug',	1,	',1,',	1,	'pm1',	'opened',	'2017-12-12 15:27:56',	'',	'',	'0'),
-(43,	'bug',	2,	',1,',	1,	'pm1',	'opened',	'2017-12-12 15:30:32',	'',	'',	'0'),
-(44,	'user',	11,	',0,',	0,	'pm1',	'logout',	'2017-12-12 15:32:26',	'',	'',	'0'),
-(45,	'user',	1,	',0,',	0,	'admin',	'login',	'2017-12-12 15:32:41',	'',	'',	'0'),
-(46,	'project',	1,	',1,',	1,	'admin',	'started',	'2017-12-12 15:32:54',	'',	'',	'0'),
-(47,	'product',	2,	',2,',	0,	'admin',	'opened',	'2017-12-12 23:28:29',	'',	'',	'0'),
-(48,	'productplan',	3,	',2,',	0,	'admin',	'opened',	'2017-12-12 23:31:59',	'',	'',	'0'),
-(49,	'productplan',	4,	',2,',	0,	'admin',	'opened',	'2017-12-12 23:32:30',	'',	'',	'0'),
-(50,	'user',	1,	',0,',	0,	'admin',	'logout',	'2017-12-12 23:33:01',	'',	'',	'0'),
-(51,	'user',	2,	',0,',	0,	'thePO',	'login',	'2017-12-12 23:33:10',	'',	'',	'0'),
-(52,	'story',	9,	',2,',	0,	'thePO',	'opened',	'2017-12-12 23:40:19',	'',	'',	'0'),
-(53,	'story',	10,	',2,',	0,	'thePO',	'opened',	'2017-12-12 23:40:19',	'',	'',	'0'),
-(54,	'story',	11,	',2,',	0,	'thePO',	'opened',	'2017-12-12 23:40:19',	'',	'',	'0'),
-(55,	'story',	12,	',2,',	0,	'thePO',	'opened',	'2017-12-12 23:40:19',	'',	'',	'0'),
-(56,	'story',	13,	',2,',	0,	'thePO',	'opened',	'2017-12-12 23:40:19',	'',	'',	'0'),
-(57,	'story',	14,	',2,',	0,	'thePO',	'opened',	'2017-12-12 23:40:19',	'',	'',	'0'),
-(58,	'story',	15,	',2,',	0,	'thePO',	'opened',	'2017-12-12 23:40:19',	'',	'',	'0'),
-(59,	'user',	2,	',0,',	0,	'thePO',	'logout',	'2017-12-12 23:41:48',	'',	'',	'0'),
-(60,	'user',	3,	',0,',	0,	'pm1',	'login',	'2017-12-12 23:41:58',	'',	'',	'0'),
-(61,	'project',	2,	',,',	2,	'pm1',	'opened',	'2017-12-12 23:42:53',	'',	'',	'0'),
-(62,	'story',	14,	',2,',	2,	'pm1',	'linked2project',	'2017-12-12 23:43:52',	'',	'2',	'0'),
-(63,	'story',	13,	',2,',	2,	'pm1',	'linked2project',	'2017-12-12 23:43:52',	'',	'2',	'0'),
-(64,	'story',	12,	',2,',	2,	'pm1',	'linked2project',	'2017-12-12 23:43:52',	'',	'2',	'0'),
-(65,	'story',	11,	',2,',	2,	'pm1',	'linked2project',	'2017-12-12 23:43:52',	'',	'2',	'0'),
-(66,	'story',	10,	',2,',	2,	'pm1',	'linked2project',	'2017-12-12 23:43:52',	'',	'2',	'0'),
-(67,	'story',	9,	',2,',	2,	'pm1',	'linked2project',	'2017-12-12 23:43:52',	'',	'2',	'0'),
-(68,	'task',	5,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:45:14',	'',	'',	'0'),
-(69,	'task',	6,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:45:14',	'',	'',	'0'),
-(70,	'task',	7,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:45:14',	'',	'',	'0'),
-(71,	'task',	8,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:45:14',	'',	'',	'0'),
-(72,	'task',	9,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:45:14',	'',	'',	'0'),
-(73,	'task',	10,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:45:14',	'',	'',	'0'),
-(74,	'task',	8,	',2,',	2,	'pm1',	'started',	'2017-12-12 23:45:36',	'',	'',	'0'),
-(75,	'task',	7,	',2,',	2,	'pm1',	'recordestimate',	'2017-12-12 23:45:53',	'',	'8',	'0'),
-(76,	'user',	3,	',0,',	0,	'pm1',	'logout',	'2017-12-12 23:46:28',	'',	'',	'0'),
-(77,	'user',	5,	',0,',	0,	'pm1',	'login',	'2017-12-12 23:46:35',	'',	'',	'0'),
-(78,	'task',	9,	',2,',	2,	'pm1',	'started',	'2017-12-12 23:46:58',	'',	'',	'0'),
-(79,	'task',	5,	',2,',	2,	'pm1',	'started',	'2017-12-12 23:47:03',	'',	'',	'0'),
-(80,	'task',	5,	',2,',	2,	'pm1',	'finished',	'2017-12-12 23:47:37',	'Finished general setup at backend',	'',	'0'),
-(81,	'user',	5,	',0,',	0,	'pm1',	'logout',	'2017-12-12 23:48:31',	'',	'',	'0'),
-(82,	'user',	7,	',0,',	0,	'pm1',	'login',	'2017-12-12 23:48:39',	'',	'',	'0'),
-(83,	'build',	2,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:49:31',	'',	'',	'0'),
-(84,	'task',	9,	',2,',	2,	'pm1',	'recordestimate',	'2017-12-12 23:51:14',	'Finished page design.',	'8',	'0'),
-(85,	'user',	7,	',0,',	0,	'pm1',	'logout',	'2017-12-12 23:52:27',	'',	'',	'0'),
-(86,	'user',	2,	',0,',	0,	'thePO',	'login',	'2017-12-12 23:52:30',	'',	'',	'0'),
-(87,	'story',	10,	',2,',	2,	'thePO',	'edited',	'2017-12-12 23:52:40',	'',	'',	'0'),
-(88,	'story',	11,	',2,',	2,	'thePO',	'edited',	'2017-12-12 23:53:04',	'',	'',	'0'),
-(89,	'project',	2,	',2,',	2,	'thePO',	'started',	'2017-12-12 23:54:13',	'',	'',	'0'),
-(90,	'user',	2,	',0,',	0,	'thePO',	'logout',	'2017-12-12 23:55:42',	'',	'',	'0'),
-(91,	'user',	7,	',0,',	0,	'pm1',	'login',	'2017-12-12 23:55:49',	'',	'',	'0'),
-(92,	'testtask',	1,	',2,',	2,	'pm1',	'opened',	'2017-12-12 23:56:59',	'',	'',	'0'),
-(93,	'user',	7,	',0,',	0,	'pm1',	'logout',	'2017-12-12 23:57:22',	'',	'',	'0'),
-(94,	'user',	11,	',0,',	0,	'pm1',	'login',	'2017-12-12 23:57:33',	'',	'',	'0'),
-(95,	'case',	1,	',2,',	0,	'pm1',	'opened',	'2017-12-13 00:00:29',	'',	'',	'0'),
-(96,	'case',	2,	',2,',	0,	'pm1',	'opened',	'2017-12-13 00:04:09',	'',	'',	'0'),
-(97,	'testsuite',	1,	',0,',	0,	'pm1',	'opened',	'2017-12-13 00:05:13',	'',	'',	'0'),
-(98,	'bug',	3,	',2,',	2,	'pm1',	'opened',	'2017-12-13 00:09:48',	'',	'',	'0'),
-(99,	'case',	3,	',2,',	0,	'pm1',	'opened',	'2017-12-13 00:13:25',	'',	'',	'0'),
-(100,	'case',	2,	',2,',	0,	'pm1',	'edited',	'2017-12-13 00:18:17',	'',	'',	'0'),
-(101,	'bug',	4,	',2,',	2,	'pm1',	'opened',	'2017-12-13 00:30:07',	'',	'',	'0'),
-(102,	'bug',	4,	',2,',	2,	'pm1',	'edited',	'2017-12-13 00:30:41',	'',	'',	'0'),
-(103,	'bug',	3,	',2,',	2,	'pm1',	'edited',	'2017-12-13 00:31:10',	'',	'',	'0'),
-(104,	'bug',	5,	',2,',	2,	'pm1',	'opened',	'2017-12-13 00:32:08',	'',	'',	'0'),
-(105,	'user',	11,	',0,',	0,	'pm1',	'logout',	'2017-12-13 00:34:34',	'',	'',	'0');
-
-INSERT INTO `zt_bug` (`id`, `product`, `branch`, `module`, `project`, `plan`, `story`, `storyVersion`, `task`, `toTask`, `toStory`, `title`, `keywords`, `severity`, `pri`, `type`, `os`, `browser`, `hardware`, `found`, `steps`, `status`, `color`, `confirmed`, `activatedCount`, `activatedDate`, `mailto`, `openedBy`, `openedDate`, `openedBuild`, `assignedTo`, `assignedDate`, `deadline`, `resolvedBy`, `resolution`, `resolvedBuild`, `resolvedDate`, `closedBy`, `closedDate`, `duplicateBug`, `linkBug`, `case`, `caseVersion`, `result`, `testtask`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES
-(1,	1,	0,	1,	1,	0,	1,	1,	1,	0,	0,	'Switch desktops three time, then the order of desktops is different from that before.',	'',	3,	0,	'codeerror',	'all',	'',	'',	'',	'<p>[Steps]Switch desktops three times.</p>\r\n<p>[Results]The order of desktops is different from that was before.</p>\r\n<p>[Expectations]The order of desktops is the same as that was before.</p>',	'active',	'',	0,	0,	'0000-00-00 00:00:00',	',pm1',	'pm1',	'2017-12-12 15:27:55',	'1',	'pm1',	'2017-12-12 15:27:55',	'2017-12-16',	'',	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	0,	'',	0,	0,	0,	0,	'',	'0000-00-00 00:00:00',	'0'),
-(2,	1,	0,	2,	1,	0,	0,	1,	0,	0,	0,	'Full text retrieval in Word files. If Chinese characters exist in the file, it cannot be retrieved.',	'',	3,	0,	'codeerror',	'',	'',	'',	'',	'<p>[Steps]Enter “禅道(ZenTao)” in a Word and serach “禅道”.</p>\r\n<p>[Results] “禅道” is not found.</p>\r\n<p>[Expectations] “禅道” is found.</p>',	'active',	'',	0,	0,	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 15:30:32',	'1',	'pm1',	'2017-12-12 15:30:32',	'0000-00-00',	'',	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	0,	'',	0,	0,	0,	0,	'',	'0000-00-00 00:00:00',	'0'),
-(3,	2,	0,	8,	2,	0,	10,	1,	0,	0,	0,	'400 page is incomplete.',	'',	3,	0,	'codeerror',	'',	'',	'',	'',	'<p>[Steps]</p>\r\n1. Click “400 page”<br /><p>[Results]</p>\r\n1. Not all 400 page is displayed.<br /><p>[Expectations]</p>\r\n1. List all 400 error pages.<br />',	'active',	'',	0,	0,	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-13 00:09:48',	'2',	'',	'0000-00-00 00:00:00',	'0000-00-00',	'',	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	0,	'',	2,	1,	1,	1,	'pm1',	'2017-12-13 00:31:10',	'0'),
-(4,	2,	0,	8,	2,	0,	10,	1,	0,	0,	0,	'Generate sitemap.',	'',	3,	0,	'codeerror',	'',	'',	'',	'',	'<p>[Steps]</p>\r\n1. Click “Generate sitemap”.<br /><p>[Results]</p>\r\n1. ‘Contact Us’ page is missing in sitemap.<br /><p>[Expectations]</p>\r\n1. Generate sitemap.<br />',	'active',	'',	0,	0,	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-13 00:30:07',	'2',	'',	'0000-00-00 00:00:00',	'0000-00-00',	'',	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	0,	'',	2,	2,	0,	0,	'pm1',	'2017-12-13 00:30:41',	'0'),
-(5,	2,	0,	8,	2,	0,	10,	1,	0,	0,	0,	'Database error in adding blogroll.',	'',	3,	0,	'codeerror',	'',	'',	'',	'',	'<p>[Steps]</p>\r\n1. Add ”www.zentao.pm\"<br /><p>[Results]</p>\r\n1. It cannot be added, and database error prompts.<br /><p>[Expectations]</p>1. In database form ‘friend link’, add ”www.zentao.pm\"<br />',	'active',	'',	0,	0,	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-13 00:32:08',	'2',	'',	'0000-00-00 00:00:00',	'0000-00-00',	'',	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	0,	'',	2,	2,	0,	0,	'',	'0000-00-00 00:00:00',	'0');
-
-INSERT INTO `zt_build` (`id`, `product`, `branch`, `project`, `name`, `scmPath`, `filePath`, `date`, `stories`, `bugs`, `builder`, `desc`, `deleted`) VALUES
-(1,	1,	0,	1,	'win10 V1.0build1',	'',	'',	'2017-12-12',	'',	'',	'pm1',	'',	'0'),
-(2,	2,	0,	2,	'blog v0.1',	'',	'',	'2017-12-12',	'',	'',	'pm1',	'build for inner test<br />',	'0');
-
-INSERT INTO `zt_burn` (`project`, `date`, `estimate`, `left`, `consumed`) VALUES
-(1,	'2017-12-12',	280,	184,	68);
-
-INSERT INTO `zt_case` (`id`, `product`, `branch`, `lib`, `module`, `path`, `story`, `storyVersion`, `title`, `precondition`, `keywords`, `pri`, `type`, `stage`, `howRun`, `scriptedBy`, `scriptedDate`, `scriptStatus`, `scriptLocation`, `status`, `color`, `frequency`, `order`, `openedBy`, `openedDate`, `reviewedBy`, `reviewedDate`, `lastEditedBy`, `lastEditedDate`, `version`, `linkCase`, `fromBug`, `fromCaseID`, `deleted`, `lastRunner`, `lastRunDate`, `lastRunResult`) VALUES
-(1,	2,	0,	0,	8,	0,	11,	1,	'Cache setup test',	'',	'',	3,	'feature',	',unittest,feature',	'',	'',	'0000-00-00',	'',	'',	'normal',	'',	'1',	0,	'pm1',	'2017-12-13 00:00:29',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	1,	'',	0,	0,	'0',	'pm1',	'2017-12-13 00:10:24',	'pass'),
-(2,	2,	0,	0,	8,	0,	10,	1,	'SEO setup test',	'',	'',	2,	'feature',	',feature',	'',	'',	'0000-00-00',	'',	'',	'normal',	'',	'1',	0,	'pm1',	'2017-12-13 00:04:09',	'',	'0000-00-00',	'pm1',	'2017-12-13 00:18:17',	2,	'',	0,	0,	'0',	'pm1',	'2017-12-13 00:23:48',	'fail'),
-(3,	2,	0,	0,	8,	0,	0,	1,	'general setup test',	'',	'',	3,	'feature',	'',	'',	'',	'0000-00-00',	'',	'',	'normal',	'',	'1',	0,	'pm1',	'2017-12-13 00:13:25',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	1,	'',	0,	0,	'0',	'',	'0000-00-00 00:00:00',	'');
-
+INSERT INTO `zt_acl` (`id`, `account`, `objectType`, `objectID`, `type`, `source`) VALUES
+(1, 'tester3', 'project', 7, 'whitelist', 'upgrade'),
+(2, 'admin', 'project', 7, 'whitelist', 'upgrade');
+INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, `execution`, `actor`, `action`, `date`, `comment`, `extra`, `read`) VALUES
+(1, 'user', 20, ',0,', 0, 0, 'azhi', 'logout', '2012-06-05 09:24:52', '', '', '0'),
+(2, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 09:25:00', '', '', '0'),
+(3, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 09:51:10', '', '', '0'),
+(4, 'user', 2, ',0,', 0, 0, 'productManager', 'login', '2012-06-05 09:51:33', '', '', '0'),
+(5, 'user', 2, ',0,', 0, 0, 'productManager', 'logout', '2012-06-05 09:53:05', '', '', '0'),
+(6, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 09:53:10', '', '', '0'),
+(7, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 09:53:52', '', '', '0'),
+(8, 'user', 2, ',0,', 0, 0, 'productManager', 'login', '2012-06-05 09:54:07', '', '', '0'),
+(9, 'product', 1, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 09:57:07', '', '', '0'),
+(10, 'productplan', 1, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:02:49', '', '', '0'),
+(11, 'story', 1, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:09:49', '', '', '0'),
+(12, 'story', 2, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:16:37', '', '', '0'),
+(13, 'story', 3, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:18:10', '', '', '0'),
+(14, 'story', 3, ',1,', 0, 0, 'productManager', 'changed', '2012-06-05 10:19:06', '', '', '0'),
+(15, 'story', 4, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:20:16', '', '', '0'),
+(16, 'story', 5, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:21:39', '', '', '0'),
+(17, 'story', 6, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:23:11', '', '', '0'),
+(18, 'story', 7, ',1,', 0, 0, 'productManager', 'opened', '2012-06-05 10:24:19', '', '', '0'),
+(19, 'story', 1, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:19', '', 'Pass', '0'),
+(20, 'story', 2, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:33', '', 'Pass', '0'),
+(21, 'story', 3, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:38', '', 'Pass', '0'),
+(22, 'story', 4, ',1,', 0, 0, 'productManager', 'reviewed', '2012-06-05 10:25:42', '', 'Pass', '0'),
+(23, 'user', 2, ',0,', 0, 0, 'productManager', 'logout', '2012-06-05 10:26:20', '', '', '0'),
+(24, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2012-06-05 10:26:38', '', '', '0'),
+(25, 'execution', 1, ',1,', 0, 1, 'projectManager', 'opened', '2012-06-05 10:28:36', '', '', '0'),
+(26, 'story', 4, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(27, 'story', 3, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(28, 'story', 2, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(29, 'story', 1, ',1,', 0, 1, 'projectManager', 'linked2project', '2012-06-05 10:31:02', '', '1', '0'),
+(39, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2012-06-05 10:37:30', '', '', '0'),
+(40, 'user', 4, ',0,', 0, 0, 'dev1', 'login', '2012-06-05 10:37:40', '', '', '0'),
+(53, 'user', 4, ',0,', 0, 0, 'dev1', 'logout', '2012-06-05 10:41:50', '', '', '0'),
+(54, 'user', 5, ',0,', 0, 0, 'dev2', 'login', '2012-06-05 10:41:56', '', '', '0'),
+(57, 'user', 5, ',0,', 0, 0, 'dev2', 'logout', '2012-06-05 10:43:02', '', '', '0'),
+(58, 'user', 6, ',0,', 0, 0, 'dev3', 'login', '2012-06-05 10:43:07', '', '', '0'),
+(61, 'user', 6, ',0,', 0, 0, 'dev3', 'logout', '2012-06-05 10:43:42', '', '', '0'),
+(62, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2012-06-05 10:44:05', '', '', '0'),
+(63, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2012-06-05 10:50:03', '', '', '0'),
+(64, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 10:50:09', '', '', '0'),
+(65, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 10:50:14', '', '', '0'),
+(66, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 10:50:23', '', '', '0'),
+(67, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 10:50:32', '', '', '0'),
+(68, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 10:50:36', '', '', '0'),
+(69, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 10:50:53', '', '', '0'),
+(70, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 10:51:01', '', '', '0'),
+(71, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 10:51:33', '', '', '0'),
+(72, 'user', 7, ',0,', 0, 0, 'tester1', 'login', '2012-06-05 10:51:38', '', '', '0'),
+(73, 'bug', 1, ',1,', 0, 1, 'tester1', 'opened', '2012-06-05 10:56:11', '', '', '0'),
+(74, 'bug', 2, ',1,', 0, 1, 'tester1', 'opened', '2012-06-05 10:57:11', '', '', '0'),
+(75, 'user', 7, ',0,', 0, 0, 'tester1', 'logout', '2012-06-05 10:57:13', '', '', '0'),
+(76, 'user', 8, ',0,', 0, 0, 'tester2', 'login', '2012-06-05 10:57:24', '', '', '0'),
+(77, 'bug', 3, ',1,', 0, 1, 'tester2', 'opened', '2012-06-05 10:58:22', '', '', '0'),
+(78, 'user', 8, ',0,', 0, 0, 'tester2', 'logout', '2012-06-05 10:58:39', '', '', '0'),
+(79, 'user', 9, ',0,', 0, 0, 'tester3', 'login', '2012-06-05 10:58:46', '', '', '0'),
+(80, 'bug', 4, ',1,', 0, 1, 'tester3', 'opened', '2012-06-05 11:00:19', '', '', '0'),
+(81, 'case', 1, ',1,', 0, 0, 'tester3', 'opened', '2012-06-05 11:02:18', '', '', '0'),
+(82, 'case', 1, ',1,', 0, 0, 'tester3', 'edited', '2012-06-05 11:02:47', '', '', '0'),
+(83, 'user', 9, ',0,', 0, 0, 'tester3', 'logout', '2012-06-05 11:02:48', '', '', '0'),
+(84, 'user', 7, ',0,', 0, 0, 'tester1', 'login', '2012-06-05 11:02:56', '', '', '0'),
+(85, 'case', 2, ',1,', 0, 0, 'tester1', 'opened', '2012-06-05 11:03:28', '', '', '0'),
+(86, 'case', 3, ',1,', 0, 0, 'tester1', 'opened', '2012-06-05 11:03:54', '', '', '0'),
+(87, 'user', 7, ',0,', 0, 0, 'tester1', 'logout', '2012-06-05 11:04:00', '', '', '0'),
+(88, 'user', 8, ',0,', 0, 0, 'tester2', 'login', '2012-06-05 11:04:10', '', '', '0'),
+(89, 'case', 4, ',1,', 0, 0, 'tester2', 'opened', '2012-06-05 11:04:48', '', '', '0'),
+(90, 'user', 8, ',0,', 0, 0, 'tester2', 'logout', '2012-06-05 11:04:52', '', '', '0'),
+(91, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 11:04:58', '', '', '0'),
+(92, 'testtask', 1, ',1,', 0, 1, 'testManager', 'opened', '2012-06-05 11:07:41', '', '', '0'),
+(93, 'testtask', 1, ',1,', 0, 1, 'testManager', 'edited', '2012-06-05 11:07:52', '', '', '0'),
+(94, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 11:08:10', '', '', '0'),
+(95, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 11:08:15', '', '', '0'),
+(96, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 11:08:23', '', '', '0'),
+(97, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 11:08:35', '', '', '0'),
+(98, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 11:08:55', '', '', '0'),
+(99, 'user', 7, ',0,', 0, 0, 'tester1', 'login', '2012-06-05 11:08:59', '', '', '0'),
+(100, 'user', 7, ',0,', 0, 0, 'tester1', 'logout', '2012-06-05 11:09:52', '', '', '0'),
+(101, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2012-06-05 11:09:54', '', '', '0'),
+(102, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2012-06-05 11:10:38', '', '', '0'),
+(103, 'user', 10, ',0,', 0, 0, 'testManager', 'login', '2012-06-05 11:10:42', '', '', '0'),
+(104, 'user', 10, ',0,', 0, 0, 'testManager', 'logout', '2012-06-05 11:11:13', '', '', '0'),
+(105, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2012-06-05 11:11:16', '', '', '0'),
+(106, 'build', 1, ',1,', 0, 1, 'projectManager', 'opened', '2012-06-05 11:11:45', '', '', '0'),
+(107, 'execution', 2, ',1,', 0, 2, 'projectManager', 'opened', '2012-06-05 11:12:28', '', '', '0'),
+(108, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2012-06-05 11:14:40', '', '', '0'),
+(109, 'user', 2, ',0,', 0, 0, 'productManager', 'login', '2012-06-05 11:14:43', '', '', '0'),
+(110, 'product', 2, ',2,', 0, 0, 'productManager', 'opened', '2012-06-05 11:15:20', '', '', '0'),
+(111, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:03:34', '', '', '0'),
+(112, 'execution', 1, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:06:58', '', '', '0'),
+(113, 'execution', 2, ',1,', 0, 2, 'admin', 'edited', '2021-04-28 11:08:02', '', '', '0'),
+(114, 'bug', 1, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(115, 'bug', 2, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(116, 'bug', 3, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(117, 'bug', 4, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:09:08', '', '', '0'),
+(118, 'testtask', 1, ',1,', 0, 1, 'admin', 'edited', '2021-04-28 11:10:06', '', '', '0'),
+(119, 'productplan', 1, ',1,', 0, 0, 'admin', 'edited', '2021-04-28 11:11:10', '', '', '0'),
+(120, 'execution', 1, ',1,', 0, 1, 'admin', 'started', '2021-04-28 11:12:22', '', '', '0'),
+(121, 'program', 6, ',0,', 0, 0, '', 'openedbysystem', '2021-04-28 11:22:04', '', '', '0'),
+(122, 'project', 7, ',,', 7, 0, '', 'openedbysystem', '2021-04-28 11:22:04', '', '', '0'),
+(123, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:22:17', '', '', '0'),
+(124, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 11:29:30', '', '', '0'),
+(125, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:29:49', '', '', '0'),
+(131, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 11:33:16', '', '', '0'),
+(132, 'user', 3, ',0,', 0, 0, 'projectManager', 'login', '2021-04-28 11:33:18', '', '', '0'),
+(133, 'user', 3, ',0,', 0, 0, 'projectManager', 'logout', '2021-04-28 11:37:36', '', '', '0'),
+(134, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 11:37:42', '', '', '0'),
+(135, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 11:56:34', '', '', '0'),
+(136, 'user', 4, ',0,', 0, 0, 'dev1', 'login', '2021-04-28 11:56:39', '', '', '0'),
+(137, 'user', 4, ',0,', 0, 0, 'dev1', 'logout', '2021-04-28 13:10:08', '', '', '0'),
+(138, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 13:10:15', '', '', '0'),
+(139, 'case', 1, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(140, 'story', 4, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(141, 'case', 4, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(142, 'story', 3, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(143, 'case', 3, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(144, 'story', 2, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(145, 'case', 2, ',1,', 0, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(146, 'story', 1, ',1,', 7, 1, 'admin', 'unlinkedfromexecution', '2021-04-28 13:10:34', '', '1', '0'),
+(147, 'case', 1, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(148, 'story', 4, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(149, 'case', 4, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(150, 'story', 3, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(151, 'case', 3, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(152, 'story', 2, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(153, 'case', 2, ',1,', 0, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(154, 'story', 1, ',1,', 7, 1, 'admin', 'linked2execution', '2021-04-28 13:10:39', '', '1', '0'),
+(155, 'task', 10, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(156, 'task', 11, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(157, 'task', 12, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(158, 'task', 13, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(159, 'task', 14, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(160, 'task', 15, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(161, 'task', 16, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(162, 'task', 17, ',1,', 7, 1, 'admin', 'opened', '2021-04-28 13:16:15', '', '', '0'),
+(163, 'user', 1, ',0,', 0, 0, 'admin', 'logout', '2021-04-28 13:16:30', '', '', '0'),
+(164, 'user', 4, ',0,', 0, 0, 'dev1', 'login', '2021-04-28 13:16:33', '', '', '0'),
+(165, 'task', 10, ',1,', 7, 1, 'dev1', 'finished', '2021-04-28 13:17:54', '', '', '0'),
+(166, 'task', 11, ',1,', 7, 1, 'dev1', 'started', '2021-04-28 13:18:45', '', '', '0'),
+(167, 'user', 4, ',0,', 0, 0, 'dev1', 'logout', '2021-04-28 13:19:30', '', '', '0'),
+(168, 'user', 5, ',0,', 0, 0, 'dev2', 'login', '2021-04-28 13:19:33', '', '', '0'),
+(169, 'task', 14, ',1,', 7, 1, 'dev2', 'started', '2021-04-28 13:19:54', '', '', '0'),
+(170, 'task', 15, ',1,', 7, 1, 'dev2', 'started', '2021-04-28 13:20:09', '', '', '0'),
+(171, 'user', 5, ',0,', 0, 0, 'dev2', 'logout', '2021-04-28 13:20:17', '', '', '0'),
+(172, 'user', 6, ',0,', 0, 0, 'dev3', 'login', '2021-04-28 13:20:20', '', '', '0'),
+(173, 'task', 16, ',1,', 7, 1, 'dev3', 'started', '2021-04-28 13:20:38', '', '', '0'),
+(174, 'task', 17, ',1,', 7, 1, 'dev3', 'started', '2021-04-28 13:20:52', '', '', '0'),
+(175, 'task', 16, ',1,', 7, 1, 'dev3', 'finished', '2021-04-28 13:21:22', '', '', '0'),
+(176, 'task', 17, ',1,', 7, 1, 'dev3', 'finished', '2021-04-28 13:21:51', '', '', '0'),
+(177, 'user', 6, ',0,', 0, 0, 'dev3', 'logout', '2021-04-28 13:22:30', '', '', '0'),
+(178, 'user', 1, ',0,', 0, 0, 'admin', 'login', '2021-04-28 13:22:37', '', '', '0');
+INSERT INTO `zt_block` (`id`, `account`, `module`, `type`, `title`, `source`, `block`, `params`, `order`, `grid`, `height`, `hidden`) VALUES
+(1, 'admin', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(2, 'admin', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(3, 'admin', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(4, 'admin', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(5, 'admin', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(6, 'admin', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(7, 'admin', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(8, 'admin', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(9, 'admin', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(10, 'admin', 'project', 'scrum', '项目概况', 'project', 'scrumoverview', '', 1, 8, 0, 0),
+(11, 'admin', 'project', 'scrum', '迭代列表', 'project', 'scrumlist', '{\"type\":\"undone\",\"count\":\"20\",\"orderBy\":\"id_desc\"}', 2, 8, 0, 0),
+(12, 'admin', 'project', 'scrum', '待测版本', 'project', 'scrumtest', '{\"type\":\"wait\",\"count\":\"15\",\"orderBy\":\"id_desc\"}', 3, 8, 0, 0),
+(13, 'admin', 'project', 'scrum', '迭代总览', 'project', 'sprint', '', 4, 4, 0, 0),
+(14, 'admin', 'project', 'scrum', '最新动态', 'project', 'projectdynamic', '', 5, 4, 0, 0),
+(15, 'admin', 'product', '', '产品统计', 'product', 'statistic', '{\"type\":\"all\",\"count\":\"20\"}', 1, 8, 0, 0),
+(16, 'admin', 'product', '', '产品总览', 'product', 'overview', '', 2, 4, 0, 0),
+(17, 'admin', 'product', '', '未关闭的产品', 'product', 'list', '{\"count\":15,\"type\":\"noclosed\"}', 3, 8, 0, 0),
+(18, 'admin', 'product', '', '指派给我的软件需求', 'product', 'story', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assignedTo\"}', 4, 4, 0, 0),
+(19, 'admin', 'qa', '', '测试统计', 'qa', 'statistic', '{\"type\":\"noclosed\",\"count\":\"20\"}', 1, 8, 0, 0),
+(20, 'admin', 'qa', '', '指派给我的Bug', 'qa', 'bug', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assignedTo\"}', 2, 4, 0, 0),
+(21, 'admin', 'qa', '', '指派给我的用例', 'qa', 'case', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assigntome\"}', 3, 4, 0, 0),
+(22, 'admin', 'qa', '', '待测版本列表', 'qa', 'testtask', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"wait\"}', 4, 8, 0, 0),
+(23, 'projectManager', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(24, 'projectManager', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(25, 'projectManager', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(26, 'projectManager', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(27, 'projectManager', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(28, 'projectManager', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(29, 'projectManager', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(30, 'projectManager', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(31, 'projectManager', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(32, 'projectManager', 'qa', '', '测试统计', 'qa', 'statistic', '{\"type\":\"noclosed\",\"count\":\"20\"}', 1, 8, 0, 0),
+(33, 'projectManager', 'qa', '', '指派给我的Bug', 'qa', 'bug', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assignedTo\"}', 2, 4, 0, 0),
+(34, 'projectManager', 'qa', '', '指派给我的用例', 'qa', 'case', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assigntome\"}', 3, 4, 0, 0),
+(35, 'projectManager', 'qa', '', '待测版本列表', 'qa', 'testtask', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"wait\"}', 4, 8, 0, 0),
+(36, 'dev1', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(37, 'dev1', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(38, 'dev1', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(39, 'dev1', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(40, 'dev1', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(41, 'dev1', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(42, 'dev1', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(43, 'dev1', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(44, 'dev1', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(45, 'dev2', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(46, 'dev2', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(47, 'dev2', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(48, 'dev2', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(49, 'dev2', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(50, 'dev2', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(51, 'dev2', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(52, 'dev2', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(53, 'dev2', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0),
+(54, 'dev3', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0),
+(55, 'dev3', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0),
+(56, 'dev3', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 3, 4, 0, 0),
+(57, 'dev3', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 4, 8, 0, 0),
+(58, 'dev3', 'my', '', '我的贡献', '', 'contribute', '', 5, 4, 0, 0),
+(59, 'dev3', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 6, 8, 0, 0),
+(60, 'dev3', 'my', '', '待处理', '', 'assigntome', '{\"todoNum\":\"20\",\"taskNum\":\"20\",\"bugNum\":\"20\",\"riskNum\":\"20\",\"issueNum\":\"20\",\"storyNum\":\"20\"}', 7, 8, 0, 0),
+(61, 'dev3', 'my', '', '项目人力投入', 'project', 'projectteam', '', 8, 8, 0, 0),
+(62, 'dev3', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 9, 8, 0, 0);
+INSERT INTO `zt_bug` (`id`, `project`, `product`, `branch`, `module`, `execution`, `plan`, `story`, `storyVersion`, `task`, `toTask`, `toStory`, `title`, `keywords`, `severity`, `pri`, `type`, `os`, `browser`, `hardware`, `found`, `steps`, `status`, `subStatus`, `color`, `confirmed`, `activatedCount`, `activatedDate`, `mailto`, `openedBy`, `openedDate`, `openedBuild`, `assignedTo`, `assignedDate`, `deadline`, `resolvedBy`, `resolution`, `resolvedBuild`, `resolvedDate`, `closedBy`, `closedDate`, `duplicateBug`, `linkBug`, `case`, `caseVersion`, `result`, `repo`, `entry`, `lines`, `v1`, `v2`, `repoType`, `testtask`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES
+(1, 7, 1, 0, 8, 1, 0, 1, 1, 1, 0, 0, '首页页面问题', '', 3, 1, 'codeerror', '', '', '', '', '<p>[步骤]进入首页</p>\r\n<p>[结果]出现乱码&nbsp;&nbsp;&nbsp;&nbsp;</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester1', '2012-06-05 10:56:11', 'trunk', 'dev1', '2012-06-05 10:56:11', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0'),
+(2, 7, 1, 0, 9, 1, 0, 2, 1, 4, 0, 0, '新闻中心页面问题', '', 3, 2, 'codeerror', '', '', '', '', '<p>[步骤]进入新闻中心</p>\r\n<p>[结果]页面出现乱码</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester1', '2012-06-05 10:57:11', 'trunk', 'dev1', '2012-06-05 10:57:11', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0'),
+(3, 7, 1, 0, 10, 1, 0, 3, 2, 6, 0, 0, '成果展示页面问题', '', 3, 1, 'codeerror', '', '', '', '', '<p>[步骤]进入成果展示&nbsp;&nbsp;&nbsp;&nbsp;</p>\r\n<p>[结果]乱码</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester2', '2012-06-05 10:58:22', 'trunk', 'dev1', '2012-06-05 10:58:22', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0'),
+(4, 7, 1, 0, 11, 1, 0, 4, 1, 9, 0, 0, '售后服务页面问题', '', 3, 1, 'codeerror', '', '', '', '', '<p>[步骤]进入售后服务</p>\r\n<p>[结果]乱码</p>\r\n<p>[期望]正常显示</p>', 'active', '', '', 0, 0, '0000-00-00 00:00:00', '', 'tester3', '2012-06-05 11:00:19', 'trunk', 'dev1', '2012-06-05 11:00:19', '0000-00-00', '', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, '', 0, 1, 0, 0, '', '', '', '', '', 0, 'admin', '2021-04-28 11:09:08', '0');
+INSERT INTO `zt_build` (`id`, `project`, `product`, `branch`, `execution`, `name`, `scmPath`, `filePath`, `date`, `stories`, `bugs`, `builder`, `desc`, `deleted`) VALUES
+(1, 7, 1, 0, 1, '第一期版本', '', '', '2012-06-05', '3,2,1,4', '', 'projectManager', '', '0');
+INSERT INTO `zt_burn` (`execution`, `product`, `task`, `date`, `estimate`, `left`, `consumed`, `storyPoint`) VALUES
+(1, 0, 0, '2012-06-05', 0, 0, 38, 0);
+INSERT INTO `zt_case` (`id`, `project`, `product`, `branch`, `lib`, `module`, `path`, `story`, `storyVersion`, `title`, `precondition`, `keywords`, `pri`, `type`, `auto`, `frame`, `stage`, `howRun`, `scriptedBy`, `scriptedDate`, `scriptStatus`, `scriptLocation`, `status`, `subStatus`, `color`, `frequency`, `order`, `openedBy`, `openedDate`, `reviewedBy`, `reviewedDate`, `lastEditedBy`, `lastEditedDate`, `version`, `linkCase`, `fromBug`, `fromCaseID`, `fromCaseVersion`, `deleted`, `lastRunner`, `lastRunDate`, `lastRunResult`, `execution`) VALUES
+(1, 7, 1, 0, 0, 0, 0, 4, 1, '售后服务的测试用例', '', '', 1, 'feature', 'no', '', 'feature', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester3', '2012-06-05 11:02:18', '', '0000-00-00', 'tester3', '2012-06-05 11:02:46', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:00', 'pass', 0),
+(2, 7, 1, 0, 0, 0, 0, 1, 1, '首页的测试用例', '', '', 3, 'feature', 'no', '', '', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester1', '2012-06-05 11:03:28', '', '0000-00-00', '', '0000-00-00 00:00:00', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:05', 'pass', 0),
+(3, 7, 1, 0, 0, 0, 0, 2, 1, '新闻中心的测试用例', '', '', 3, 'feature', 'no', '', 'feature', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester1', '2012-06-05 11:03:54', '', '0000-00-00', '', '0000-00-00 00:00:00', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:07', 'pass', 0),
+(4, 7, 1, 0, 0, 0, 0, 3, 2, '成果展示测试用例', '', '', 3, 'feature', 'no', '', 'feature', '', '', '0000-00-00', '', '', 'normal', '', '', '1', 0, 'tester2', '2012-06-05 11:04:48', '', '0000-00-00', '', '0000-00-00 00:00:00', 1, '', 0, 0, 1, '0', 'testManager', '2012-06-05 11:11:08', 'pass', 0);
 INSERT INTO `zt_casestep` (`id`, `parent`, `case`, `version`, `type`, `desc`, `expect`) VALUES
-(1,	0,	1,	1,	'step',	'Switch on cache.',	'Cache is on.'),
-(2,	0,	1,	1,	'step',	'Switch off cache.',	'Cache is off.'),
-(3,	0,	2,	1,	'step',	'Click “Generate sitemap”',	'Sitemap is generated.'),
-(4,	0,	2,	1,	'step',	'Click “400 page”',	'List all 400 error pages'),
-(5,	0,	2,	1,	'step',	'Set “Individual Blog” as global keyword.',	'Set “Individual Blog” as site keyword.'),
-(6,	0,	3,	1,	'step',	'Set self introduction as “Self Intro ABC&quot;',	'Self introduction is set as “Self Intro ABC&quot;'),
-(7,	0,	2,	2,	'step',	'Click “Generate sitemap”',	'Sitemap is generated.'),
-(8,	0,	2,	2,	'step',	'Click “400 page”',	'List all 400 error pages'),
-(9,	0,	2,	2,	'step',	'Set “Individual Blog” as global keyword.”',	'Set “Individual Blog” as site keyword.”'),
-(10,	0,	2,	2,	'step',	'Add ”www.zentao.pm&quot;',	'In database form ‘friend link’, add ”www.zentao.pm&quot;');
-
+(1, 0, 1, 1, 'step', '进入首页', '正常显示'),
+(2, 0, 2, 1, 'step', '进入首页', '正常显示'),
+(3, 0, 3, 1, 'step', '进入新闻中心', '正常显示'),
+(4, 0, 4, 1, 'step', '进入成果展示', '正常显示');
 INSERT INTO `zt_dept` (`id`, `name`, `parent`, `path`, `grade`, `order`, `position`, `function`, `manager`) VALUES
-(1,	'Product Dept',	0,	',1,',	1,	10,	'',	'',	''),
-(2,	'Dev Dept',	0,	',2,',	1,	20,	'',	'',	''),
-(3,	'QA Dept',	0,	',3,',	1,	30,	'',	'',	''),
-(4,	'Ops Dept',	0,	',4,',	1,	40,	'',	'',	''),
-(5,	'Dev 1',	2,	',2,5,',	2,	10,	'',	'',	''),
-(6,	'Dev 2',	2,	',2,6,',	2,	20,	'',	'',	'');
-
-INSERT INTO `zt_doclib` (`id`, `type`, `product`, `project`, `name`, `acl`, `groups`, `users`, `main`, `order`, `deleted`) VALUES
-(1, 'product', 1,	0,	'Product Main Library',	'default',	'',	'',	'1',	0,	'0'),
-(2, 'project', 0,	1,	'Project Main Library',	'default',	'',	'',	'1',	0,	'0'),
-(3, 'product', 2,	0,	'Product Main Library',	'default',	'',	'',	'1',	0,	'0'),
-(4, 'project', 0,	2,	'Project Main Library',	'default',	'',	'',	'1',	0,	'0');
-
+(1, '经理', 0, ',1,', 1, 0, '', '', ''),
+(2, '开发', 0, ',2,', 1, 0, '', '', ''),
+(3, '测试', 0, ',3,', 1, 0, '', '', ''),
+(4, '市场', 0, ',4,', 1, 0, '', '', ''),
+(5, '产品', 1, ',1,5,', 2, 0, '', '', ''),
+(6, '项目', 1, ',1,6,', 2, 0, '', '', ''),
+(7, '编程', 2, ',2,7,', 2, 0, '', '', ''),
+(8, '美工', 2, ',2,8,', 2, 0, '', '', '');
+INSERT INTO `zt_doclib` (`id`, `type`, `product`, `project`, `execution`, `name`, `acl`, `groups`, `users`, `main`, `collector`, `order`, `deleted`) VALUES
+(1, 'product', 1, 0, 0, '产品库', 'default', '', '', '1', '', 0, '0'),
+(2, 'product', 2, 0, 0, '产品库', 'default', '', '', '1', '', 0, '0'),
+(3, 'project', 0, 0, 1, '项目库', 'default', '', '', '1', '', 0, '0'),
+(4, 'project', 0, 0, 2, '项目库', 'default', '', '', '1', '', 0, '0'),
+(5, 'project', 0, 7, 0, '项目主库', 'default', '', '', '1', '', 0, '0');
 INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES
-(1,	7,	'desc',	'Finish developing system drive program.',	'Add advanced features such as remote desktop.',	'001- <del>Finish developing system drive program.</del>\n001+ <ins>Add advanced features such as remote desktop.</ins>'),
-(2,	8,	'desc',	'Finish developing general features.<br />',	'Finish developing general features for users.<br />',	'001- <del>Finish developing features that are often used.<br /></del>\n001+ <ins>Finish developing general features for users.<br /></ins>'),
-(3,	27,	'realStarted',	'0000-00-00',	'2017-12-12',	''),
-(4,	27,	'assignedTo',	'pm1',	'pm1',	''),
-(5,	27,	'status',	'wait',	'doing',	''),
-(6,	28,	'left',	'100',	'64',	''),
-(7,	28,	'consumed',	'0',	'8',	''),
-(8,	29,	'realStarted',	'0000-00-00',	'2017-12-12',	''),
-(9,	29,	'assignedTo',	'pm1',	'pm1',	''),
-(10,	29,	'status',	'wait',	'doing',	''),
-(11,	30,	'realStarted',	'0000-00-00',	'2017-12-12',	''),
-(12,	30,	'assignedTo',	'pm1',	'pm1',	''),
-(13,	30,	'status',	'wait',	'doing',	''),
-(14,	31,	'left',	'60',	'0',	''),
-(15,	31,	'consumed',	'0',	'60',	''),
-(16,	31,	'status',	'doing',	'done',	''),
-(17,	46,	'status',	'wait',	'doing',	''),
-(18,	74,	'realStarted',	'0000-00-00',	'2017-12-12',	''),
-(19,	74,	'status',	'wait',	'doing',	''),
-(20,	75,	'left',	'30',	'55',	''),
-(21,	75,	'consumed',	'0',	'8',	''),
-(22,	75,	'status',	'wait',	'doing',	''),
-(23,	78,	'realStarted',	'0000-00-00',	'2017-12-12',	''),
-(24,	78,	'status',	'wait',	'doing',	''),
-(25,	79,	'realStarted',	'0000-00-00',	'2017-12-12',	''),
-(26,	79,	'status',	'wait',	'doing',	''),
-(27,	80,	'consumed',	'0',	'30',	''),
-(28,	80,	'assignedTo',	'pm1',	'pm1',	''),
-(29,	80,	'finishedDate',	'',	'2017-12-12 23:47:37',	''),
-(30,	80,	'left',	'40',	'0',	''),
-(31,	80,	'status',	'doing',	'done',	''),
-(32,	80,	'finishedBy',	'',	'pm1',	''),
-(33,	84,	'left',	'60',	'50',	''),
-(34,	84,	'consumed',	'0',	'8',	''),
-(35,	87,	'pri',	'3',	'2',	''),
-(36,	88,	'pri',	'3',	'1',	''),
-(37,	89,	'status',	'wait',	'doing',	''),
-(38,	100,	'version',	'1',	'2',	''),
-(39,	100,	'steps',	'Click “Generate sitemap” EXPECT: Sitemap is generated.\nClick “400 page” EXPECT: List all 400 error pages.\nSet “Individual Blog” as global keyword. EXPECT: Set “Individual Blog” as site keyword.\n',	'Click “Generate sitemap” EXPECT: Sitemap is generated.\nClick “400 page” EXPECT: List all 400 error pages.\nSet “Individual Blog” as global keyword. EXPECT: Set “Individual Blog” as site keyword.\nAdd ”www.zentao.pm&quot; EXPECT:In database form ‘friend link’, add ”www.zentao.pmww.zentao.pm&quot;\n',	'004+ <ins> Add ”www.zentao.pm&quot; EXPECT:In database form ‘friend link’, add ”www.zentao.pmww.zentao.pm&quot;</ins>'),
-(40,	102,	'title',	'SEO setup test',	'Generate sitemap',	'001- <del>SEO setup test</del>\n001+ <ins>Generate sitemap</ins>'),
-(41,	102,	'steps',	'<p>[Steps]</p>\r\n1. Click “Generate sitemap”<br /><p>[Results]</p>\r\n1. ‘Contact Us’ page is missing in sitemap.<br /><p>[Expectations]</p>1. Generate sitemap<br />',	'<p>[Steps]</p>\r\n1. Click “Generate sitemap”<br /><p>[Results]</p>\r\n1. ‘Contact Us’ page is missing in sitemap.<br /><p>[Expectations]</p>\r\n1. Generate sitemap<br />',	'003- <del>1. ‘Contact Us’ page is missing in sitemap.<br /><p>[Expectations]</p>1. Generate sitemap<br /></del>\n003+ <ins>1. ‘Contact Us’ page is missing in sitemap.<br /><p>[Expectations]</p></ins>\n004+ <ins>1. Generate sitemap<br /></ins>'),
-(42,	102,	'resolvedDate',	'0000-00-00 00:00:00',	'',	''),
-(43,	103,	'title',	'SEO setup test',	'400 page is incomplete.',	'001- <del>SEO setup test</del>\n001+ <ins>400 page is incomplete.</ins>'),
-(44,	103,	'steps',	'<p>[Steps]</p>\r\n1. Click “400 page”<br /><p>[Results]</p>\r\n1. Not all 400 page is displayed.<br /><p>[Expectations]</p>1. List all 400 error pages.<br />',	'<p>[Steps]</p>\r\n1. Click “400 page”<br /><p>[Results]</p>\r\n1. Not all 400 page is displayed.<br /><p>[Expectations]</p>\r\n1. List all 400 error pages.<br />',	'003- <del>1. Not all 400 page is displayed.<br /><p>[Expectations]</p>1. List all 400 error pages.<br /></del>\n003+ <ins>1. Not all 400 page is displayed.<br /><p>[Expectations]</p></ins>\n004+ <ins>1. List all 400 error pages.<br /></ins>'),
-(45,	103,	'resolvedDate',	'0000-00-00 00:00:00',	'',	'');
-
-INSERT INTO `zt_module` (`id`, `root`, `branch`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`, `short`, `deleted`) VALUES
-(1,	1,	0,	'Desktop',	0,	',1,',	1,	10,	'story',	'',	'',	'0'),
-(2,	1,	0,	'My Doc',	0,	',2,',	1,	20,	'story',	'',	'',	'0'),
-(3,	1,	0,	'Control Panel',	0,	',3,',	1,	30,	'story',	'',	'',	'0'),
-(4,	1,	0,	'Task Manager',	0,	',4,',	1,	40,	'story',	'',	'',	'0'),
-(5,	1,	0,	'Other',	0,	',5,',	1,	50,	'story',	'',	'',	'0'),
-(6,	2,	0,	'Frontend',	0,	',6,',	1,	10,	'story',	'',	'',	'0'),
-(7,	2,	0,	'Backend',	0,	',7,',	1,	20,	'story',	'',	'',	'0'),
-(8,	2,	0,	'Global setup',	7,	',7,8,',	2,	10,	'story',	'',	'',	'0'),
-(9,	2,	0,	'UI setup',	7,	',7,9,',	2,	20,	'story',	'',	'',	'0'),
-(10,	2,	0,	'Manage Articles',	7,	',7,10,',	2,	30,	'story',	'',	'',	'0');
-
-INSERT INTO `zt_product` (`id`, `name`, `code`, `line`, `type`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `createdVersion`, `order`, `deleted`) VALUES
-(1,	'windows 10',	'win10',	0,	'normal',	'normal',	'',	'thePO',	'pm1',	'pm1',	'open',	'',	'thePO',	'2017-12-12 14:44:55',	'9.6.3',	5,	'0'),
-(2,	'Blog',	'blog',	0,	'normal',	'normal',	'A blogging system<br />',	'thePO',	'pm1',	'pm1',	'open',	'',	'admin',	'2017-12-12 23:28:29',	'9.6.3',	10,	'0');
-
-INSERT INTO `zt_productplan` (`id`, `product`, `branch`, `title`, `desc`, `begin`, `end`, `deleted`) VALUES
-(1,	1,	0,	'win10 v1.0',	'Finish developing general features for users.<br />',	'2017-12-30',	'2018-07-03',	'0'),
-(2,	1,	0,	'win10 v2.0',	'Add advanced features such as remote desktop.',	'2018-07-04',	'2019-01-05',	'0'),
-(3,	2,	0,	'blog v0.1',	'Start developing blog<br />',	'2017-12-30',	'2018-01-29',	'0'),
-(4,	2,	0,	'blog v0.2',	'Add more setup options of the blog.<br />',	'2018-01-30',	'2018-04-01',	'0');
-
-INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `openedVersion`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES
-(1,	'0',	0,	'sprint',	0,	' 1st sprint of win10',	'win10Sprt1',	'2017-12-12',	'2017-12-25',	10,	'doing',	'1',	'1',	'Finish developing desktop.',	'',	0,	'9.6.3',	'',	0,	'',	0,	'',	'',	'',	'',	' 1st sprint of win10',	'open',	'',	5,	'0'),
-(2,	'0',	0,	'sprint',	0,	'1st sprint of blog',	'blog v0.1',	'2017-12-12',	'2017-12-25',	10,	'doing',	'1',	'1',	'',	'',	0,	'9.6.3',	'',	0,	'',	0,	'',	'',	'',	'',	'1st sprint of blog',	'open',	'',	10,	'0');
-
-INSERT INTO `zt_projectproduct` (`project`, `product`, `branch`) VALUES
-(1,	1,	0),
-(2,	2,	0);
-
+(1, 14, 'version', '1', '2', ''),
+(2, 14, 'spec', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', '001- <del>作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。<br /></del>\n001+ <ins>作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。<br /></ins>'),
+(3, 41, 'consumed', '0', '1', ''),
+(4, 41, 'status', 'wait', 'doing', ''),
+(6, 42, 'consumed', '1', '7', ''),
+(7, 42, 'left', '10', '0', ''),
+(8, 42, 'assignedTo', 'dev1', 'projectManager', ''),
+(9, 42, 'status', 'doing', 'done', ''),
+(10, 42, 'finishedBy', '', 'dev1', ''),
+(11, 42, 'finishedDate', '', '2012-06-05 10:38:00', ''),
+(13, 43, 'consumed', '0', '6', ''),
+(14, 43, 'left', '8', '0', ''),
+(15, 43, 'assignedTo', 'dev1', 'projectManager', ''),
+(16, 43, 'status', 'wait', 'done', ''),
+(17, 43, 'finishedBy', '', 'dev1', ''),
+(18, 43, 'finishedDate', '', '2012-06-05 10:39:14', ''),
+(20, 44, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(21, 45, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(22, 46, 'canceledDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(23, 47, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(24, 48, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(25, 49, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(26, 50, 'closedDate', '2012-06-05 10:41:12', '2012-06-05 10:41:20', ''),
+(27, 51, 'status', 'wait', 'done', ''),
+(28, 51, 'consumed', '0', '8', ''),
+(29, 51, 'left', '10', '0', ''),
+(30, 51, 'finishedBy', '', 'dev1', ''),
+(31, 51, 'finishedDate', '', '2012-06-05 10:41:20', ''),
+(32, 52, 'finishedDate', '2012-06-05 10:38:00', '2012-06-05 10:41:20', ''),
+(33, 55, 'status', 'closed', 'done', ''),
+(34, 55, 'consumed', '0', '5', ''),
+(35, 55, 'left', '8', '0', ''),
+(36, 55, 'finishedBy', '', 'dev2', ''),
+(37, 55, 'closedBy', 'dev1', '', ''),
+(38, 55, 'closedReason', 'done', '', ''),
+(39, 55, 'finishedDate', '', '2012-06-05 10:42:56', ''),
+(40, 55, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(41, 56, 'status', 'closed', 'done', ''),
+(42, 56, 'consumed', '0', '8', ''),
+(43, 56, 'left', '8', '0', ''),
+(44, 56, 'finishedBy', '', 'dev2', ''),
+(45, 56, 'closedBy', 'dev1', '', ''),
+(46, 56, 'closedReason', 'done', '', ''),
+(47, 56, 'finishedDate', '', '2012-06-05 10:42:56', ''),
+(48, 56, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(49, 59, 'status', 'closed', 'done', ''),
+(50, 59, 'consumed', '0', '5', ''),
+(51, 59, 'left', '8', '0', ''),
+(52, 59, 'finishedBy', 'dev1', 'dev3', ''),
+(53, 59, 'closedBy', 'dev1', '', ''),
+(54, 59, 'closedReason', 'done', '', ''),
+(55, 59, 'finishedDate', '', '2012-06-05 10:43:32', ''),
+(56, 59, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(57, 60, 'status', 'closed', 'done', ''),
+(58, 60, 'consumed', '0', '5', ''),
+(59, 60, 'left', '8', '0', ''),
+(60, 60, 'finishedBy', 'dev1', 'dev3', ''),
+(61, 60, 'closedBy', 'dev1', '', ''),
+(62, 60, 'closedReason', 'done', '', ''),
+(63, 60, 'finishedDate', '', '2012-06-05 10:43:32', ''),
+(64, 60, 'closedDate', '2012-06-05 10:41:20', '', ''),
+(65, 82, 'title', '首页的测试用例', '售后服务的测试用例', '001- <del>首页的测试用例</del>\n001+ <ins>售后服务的测试用例</ins>'),
+(66, 82, 'story', '1', '4', ''),
+(67, 93, 'build', '', 'trunk', ''),
+(68, 112, 'begin', '2012-06-05', '2020-06-05', ''),
+(69, 112, 'end', '2012-12-04', '2021-12-04', ''),
+(70, 112, 'days', '184', '391', ''),
+(71, 112, 'status', 'done', 'wait', ''),
+(72, 113, 'begin', '2013-06-05', '2021-06-05', ''),
+(73, 113, 'end', '2014-06-04', '2022-06-04', ''),
+(74, 113, 'days', '365', '260', ''),
+(75, 114, 'type', 'interface', 'codeerror', ''),
+(76, 114, 'pri', '0', '1', ''),
+(77, 115, 'pri', '0', '2', ''),
+(78, 116, 'pri', '0', '1', ''),
+(79, 117, 'pri', '0', '1', ''),
+(80, 118, 'build', 'trunk', '1', ''),
+(81, 118, 'begin', '2012-06-05', '2020-06-05', ''),
+(82, 118, 'end', '2013-06-21', '2021-06-21', ''),
+(83, 119, 'begin', '2000-01-01', '2020-06-05', ''),
+(84, 119, 'end', '2015-01-01', '2021-06-04', ''),
+(85, 120, 'status', 'wait', 'doing', ''),
+(86, 126, 'assignedTo', 'dev1', 'projectManager', ''),
+(87, 127, 'assignedTo', 'dev2', 'projectManager', ''),
+(88, 128, 'assignedTo', 'dev2', 'projectManager', ''),
+(89, 129, 'assignedTo', 'dev3', 'projectManager', ''),
+(90, 130, 'assignedTo', 'dev3', 'projectManager', ''),
+(91, 165, 'consumed', '0', '8', ''),
+(92, 165, 'realStarted', '0000-00-00 00:00:00', '2021-04-28 13:17:54', ''),
+(93, 165, 'finishedDate', '', '2021-04-01 16:00', ''),
+(94, 165, 'status', 'wait', 'done', ''),
+(95, 165, 'left', '7', '0', ''),
+(96, 165, 'finishedBy', '', 'dev1', ''),
+(97, 166, 'realStarted', '0000-00-00 00:00:00', '2021-04-01 16:00', ''),
+(98, 166, 'status', 'wait', 'doing', ''),
+(99, 169, 'realStarted', '0000-00-00 00:00:00', '2021-04-01 08:00', ''),
+(100, 169, 'status', 'wait', 'doing', ''),
+(101, 170, 'realStarted', '0000-00-00 00:00:00', '2021-04-01 08:00', ''),
+(102, 170, 'status', 'wait', 'doing', ''),
+(103, 173, 'realStarted', '0000-00-00 00:00:00', '2021-04-02 08:00', ''),
+(104, 173, 'status', 'wait', 'doing', ''),
+(105, 174, 'realStarted', '0000-00-00 00:00:00', '2021-04-02 08:00', ''),
+(106, 174, 'status', 'wait', 'doing', ''),
+(107, 175, 'consumed', '0', '6', ''),
+(108, 175, 'finishedDate', '', '2021-04-05 17:00', ''),
+(109, 175, 'status', 'doing', 'done', ''),
+(110, 175, 'left', '5', '0', ''),
+(111, 175, 'finishedBy', '', 'dev3', ''),
+(112, 176, 'consumed', '0', '5', ''),
+(113, 176, 'finishedDate', '', '2021-04-06 15:30', ''),
+(114, 176, 'status', 'doing', 'done', ''),
+(115, 176, 'left', '5', '0', ''),
+(116, 176, 'finishedBy', '', 'dev3', '');
+INSERT INTO `zt_module` (`id`, `root`, `branch`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`, `collector`, `short`, `deleted`) VALUES
+(1, 1, 0, '首页', 0, ',1,', 1, 10, 'story', '', '', '', '0'),
+(2, 1, 0, '新闻中心', 0, ',2,', 1, 20, 'story', '', '', '', '0'),
+(3, 1, 0, '成果展示', 0, ',3,', 1, 30, 'story', '', '', '', '0'),
+(4, 1, 0, '售后服务', 0, ',4,', 1, 40, 'story', '', '', '', '0'),
+(5, 1, 0, '诚聘英才', 0, ',5,', 1, 50, 'story', '', '', '', '0'),
+(6, 1, 0, '合作洽谈', 0, ',6,', 1, 60, 'story', '', '', '', '0'),
+(7, 1, 0, '关于我们', 0, ',7,', 1, 70, 'story', '', '', '', '0'),
+(8, 1, 0, '首页', 0, ',8,', 1, 10, 'bug', '', '', '', '0'),
+(9, 1, 0, '新闻中心', 0, ',9,', 1, 20, 'bug', '', '', '', '0'),
+(10, 1, 0, '成果展示', 0, ',10,', 1, 30, 'bug', '', '', '', '0'),
+(11, 1, 0, '售后服务', 0, ',11,', 1, 40, 'bug', '', '', '', '0'),
+(12, 1, 0, '诚聘英才', 0, ',12,', 1, 50, 'bug', '', '', '', '0'),
+(13, 1, 0, '合作洽谈', 0, ',13,', 1, 60, 'bug', '', '', '', '0'),
+(14, 1, 0, '关于我们', 0, ',14,', 1, 70, 'bug', '', '', '', '0'),
+(15, 6, 0, '企业管理', 0, ',15,', 1, 0, 'line', '', '', '', '0');
+INSERT INTO `zt_product` (`id`, `program`, `name`, `code`, `bind`, `line`, `type`, `status`, `subStatus`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `createdVersion`, `order`, `deleted`, `storyConcept`) VALUES
+(1, 6, '公司企业网站建设', 'companyWebsite', '0', 0, 'normal', 'normal', '', '建立公司企业网站，可以更好对外展示。<br />', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 09:57:07', '', 5, '0', 0),
+(2, 6, '企业内部工时管理系统', 'workhourManage', '0', 0, 'normal', 'normal', '', '', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 11:15:20', '5.2.1', 10, '0', 0);
+INSERT INTO `zt_productplan` (`id`, `product`, `branch`, `parent`, `title`, `desc`, `begin`, `end`, `order`, `deleted`) VALUES
+(1, 1, 0, 0, '1.0版本', '开发出企业网站1.0版本。<br />', '2020-06-05', '2021-06-04', '', '0');
+INSERT INTO `zt_project` (`id`, `project`, `model`, `type`, `product`, `lifetime`, `budget`, `budgetUnit`, `attribute`, `percent`, `milestone`, `output`, `auth`, `parent`, `path`, `grade`, `name`, `code`, `begin`, `end`, `realBegan`, `realEnd`, `days`, `status`, `subStatus`, `statge`, `pri`, `desc`, `version`, `parentVersion`, `planDuration`, `realDuration`, `openedBy`, `openedDate`, `openedVersion`, `lastEditedBy`, `lastEditedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`, `storyConcept`) VALUES
+(1, 7, '', 'sprint', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', '', 7, ',7,1,', 1, '企业网站第一期', 'coWeb1', '2020-06-05', '2021-12-04', '0000-00-00', '0000-00-00', 391, 'doing', '', '1', '1', '开发企业网站的基本雏形。<br />', 0, 0, 0, 0, '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', 5, '0', 0),
+(2, 7, '', 'sprint', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', '', 7, ',7,2,', 1, '企业网站第二期', 'coWebsite2', '2021-06-05', '2022-06-04', '0000-00-00', '0000-00-00', 260, 'wait', '', '1', '1', '', 0, 0, 0, 0, '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', 10, '0', 0),
+(7, 0, 'scrum', 'project', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', 'extend', 6, ',6,7,', 2, '企业管理系统', '', '2021-06-05', '2022-06-04', '0000-00-00', '0000-00-00', 0, 'doing', '', '1', '1', '', 0, 0, 0, 0, 'admin', '2021-04-28 11:22:04', '15.0.rc3', 'admin', '2021-04-28 11:22:04', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'projectManager', '', '', '', 'open', ',tester3,admin', 35, '0', 0),
+(6, 0, '', 'program', 'single', 'sprint', '0', 'CNY', '', 0, '0', '', '', 0, ',6,', 1, '企业管理', '', '2021-06-05', '2022-06-04', '0000-00-00', '0000-00-00', 0, 'doing', '', '1', '1', '', 0, 0, 0, 0, 'admin', '2021-04-28 11:22:04', '15.0.rc3', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '', '', '', '', 'open', '', 30, '0', 0);
+INSERT INTO `zt_projectcase` (`project`, `product`, `case`, `count`, `version`, `order`) VALUES
+(1, 1, 2, 1, 1, 4),
+(7, 1, 1, 1, 1, 5),
+(1, 1, 1, 1, 1, 1),
+(7, 1, 2, 1, 1, 5),
+(1, 1, 4, 1, 1, 2),
+(7, 1, 3, 1, 1, 5),
+(1, 1, 3, 1, 1, 3),
+(7, 1, 4, 1, 1, 5);
+INSERT INTO `zt_projectproduct` (`project`, `product`, `branch`, `plan`) VALUES
+(1, 1, 0, 0),
+(2, 1, 0, 0),
+(7, 1, 0, 0),
+(7, 2, 0, 0);
 INSERT INTO `zt_projectstory` (`project`, `product`, `story`, `version`, `order`) VALUES
-(1,	1,	3,	1,	1),
-(1,	1,	2,	1,	2),
-(1,	1,	1,	1,	3),
-(2,	2,	14,	1,	1),
-(2,	2,	13,	1,	2),
-(2,	2,	12,	1,	3),
-(2,	2,	11,	1,	4),
-(2,	2,	10,	1,	5),
-(2,	2,	9,	1,	6);
-
-INSERT INTO `zt_story` (`id`, `product`, `branch`, `module`, `plan`, `source`, `sourceNote`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `color`, `stage`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `deleted`) VALUES
-(1,	1,	0,	1,	'1',	'',	'',	0,	'Offer up to 10 desktops to users',	'',	'',	3,	100,	'active',	'',	'developing',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(2,	1,	0,	1,	'1',	'',	'',	0,	'Custom desktop wallpaper.',	'',	'',	3,	80,	'active',	'',	'developing',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(3,	1,	0,	1,	'1',	'',	'',	0,	'Auto classify files.',	'',	'',	3,	60,	'active',	'',	'projected',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(4,	1,	0,	2,	'1',	'',	'',	0,	'Fast search document.',	'',	'',	3,	60,	'active',	'',	'planned',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(5,	1,	0,	2,	'1',	'',	'',	0,	'Full text retrieval',	'',	'',	3,	50,	'active',	'',	'planned',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(6,	1,	0,	2,	'1',	'',	'',	0,	'Add file preview.',	'',	'',	3,	60,	'active',	'',	'planned',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(7,	1,	0,	4,	'1',	'',	'',	0,	'Process list',	'',	'',	3,	50,	'active',	'',	'planned',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(8,	1,	0,	4,	'1',	'',	'',	0,	'Performance overview',	'',	'',	3,	60,	'active',	'',	'planned',	NULL,	'thePO',	'2017-12-12 14:58:30',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(9,	2,	0,	8,	'3',	'',	'',	0,	'General setup',	'',	'',	3,	40,	'active',	'',	'developed',	NULL,	'thePO',	'2017-12-12 23:40:19',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(10,	2,	0,	8,	'3',	'',	'',	0,	'SEO setup',	'',	'',	2,	50,	'active',	'',	'projected',	'',	'thePO',	'2017-12-12 23:40:19',	'',	'0000-00-00 00:00:00',	'thePO',	'2017-12-12 23:52:40',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(11,	2,	0,	8,	'3',	'',	'',	0,	'cache setup',	'',	'',	1,	30,	'active',	'',	'developing',	'',	'thePO',	'2017-12-12 23:40:19',	'',	'0000-00-00 00:00:00',	'thePO',	'2017-12-12 23:53:04',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(12,	2,	0,	8,	'3',	'',	'',	0,	'security setup',	'',	'',	3,	30,	'active',	'',	'developing',	NULL,	'thePO',	'2017-12-12 23:40:19',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(13,	2,	0,	9,	'3',	'',	'',	0,	'UI setup',	'',	'',	3,	60,	'active',	'',	'developing',	NULL,	'thePO',	'2017-12-12 23:40:19',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(14,	2,	0,	6,	'3',	'',	'',	0,	'Page display',	'',	'',	3,	60,	'active',	'',	'projected',	NULL,	'thePO',	'2017-12-12 23:40:19',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0'),
-(15,	2,	0,	10,	'4',	'',	'',	0,	'Article management',	'',	'',	3,	50,	'active',	'',	'planned',	NULL,	'thePO',	'2017-12-12 23:40:19',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	0,	'',	'',	0,	1,	'0');
-
+(1, 1, 1, 1, 0),
+(1, 1, 2, 1, 0),
+(1, 1, 3, 2, 0),
+(1, 1, 4, 1, 0),
+(7, 1, 4, 1, 0),
+(7, 1, 3, 2, 0),
+(7, 1, 2, 1, 0),
+(7, 1, 1, 1, 0);
+INSERT INTO `zt_searchdict` (`key`, `value`) VALUES
+(39318, '首'),
+(39029, '页'),
+(38754, '面'),
+(38382, '问'),
+(39064, '题'),
+(27493, '步'),
+(39588, '骤'),
+(36827, '进'),
+(20837, '入'),
+(32467, '结'),
+(26524, '果'),
+(20986, '出'),
+(29616, '现'),
+(20081, '乱'),
+(30721, '码'),
+(26399, '期'),
+(26395, '望'),
+(27491, '正'),
+(24120, '常'),
+(26174, '显'),
+(31034, '示'),
+(26032, '新'),
+(38395, '闻'),
+(20013, '中'),
+(24515, '心'),
+(25104, '成'),
+(23637, '展'),
+(21806, '售'),
+(21518, '后'),
+(26381, '服'),
+(21153, '务'),
+(31532, '第'),
+(19968, '一'),
+(29256, '版'),
+(26412, '本'),
+(30340, '的'),
+(27979, '测'),
+(35797, '试'),
+(29992, '用'),
+(20363, '例'),
+(20844, '公'),
+(21496, '司'),
+(20225, '企'),
+(19994, '业'),
+(32593, '网'),
+(31449, '站'),
+(24314, '建'),
+(35774, '设'),
+(31435, '立'),
+(65292, '，'),
+(21487, '可'),
+(20197, '以'),
+(26356, '更'),
+(22909, '好'),
+(23545, '对'),
+(22806, '外'),
+(12290, '。'),
+(20869, '内'),
+(37096, '部'),
+(24037, '工'),
+(26102, '时'),
+(31649, '管'),
+(29702, '理'),
+(31995, '系'),
+(32479, '统'),
+(24320, '开'),
+(21457, '发'),
+(35745, '计'),
+(21644, '和'),
+(20316, '作'),
+(20026, '为'),
+(21517, '名'),
+(25143, '户'),
+(25105, '我'),
+(24076, '希'),
+(22312, '在'),
+(30475, '看'),
+(21040, '到'),
+(35813, '该'),
+(22522, '基'),
+(23481, '容'),
+(22914, '如'),
+(26368, '最'),
+(21160, '动'),
+(24577, '态'),
+(12289, '、'),
+(20998, '分'),
+(32852, '联'),
+(20449, '信'),
+(24687, '息'),
+(21830, '商'),
+(31561, '等'),
+(24182, '并'),
+(36890, '通'),
+(36807, '过'),
+(39564, '验'),
+(25910, '收'),
+(36825, '这'),
+(26679, '样'),
+(20102, '了'),
+(35299, '解'),
+(21561, '吹'),
+(20135, '产'),
+(21697, '品'),
+(26041, '方'),
+(20415, '便'),
+(34892, '行'),
+(36141, '购'),
+(20080, '买'),
+(26469, '来'),
+(20915, '决'),
+(35802, '诚'),
+(32856, '聘'),
+(33521, '英'),
+(25165, '才'),
+(27714, '求'),
+(32844, '职'),
+(32773, '者'),
+(37324, '里'),
+(25307, '招'),
+(24212, '应'),
+(21512, '合'),
+(27965, '洽'),
+(35848, '谈'),
+(20851, '关'),
+(20110, '于'),
+(20204, '们'),
+(20219, '任'),
+(38607, '雏'),
+(24418, '形'),
+(20108, '二');
+INSERT INTO `zt_searchindex` (`id`, `objectType`, `objectID`, `title`, `content`, `addedDate`, `editedDate`) VALUES
+(1, 'bug', 1, ' 39318 39029 39029 38754 38382 39064', ' 27493 39588 36827 20837 39318 39029 32467 26524 20986 29616 20081 30721 &nbsp &nbsp &nbsp &nbsp 26399 26395 27491 24120 26174 31034', '2012-06-05 10:56:11', '2021-04-28 11:09:08'),
+(2, 'bug', 2, ' 26032 38395 20013 24515 39029 38754 38382 39064', ' 27493 39588 36827 20837 26032 38395 20013 24515 32467 26524 39029 38754 20986 29616 20081 30721 26399 26395 27491 24120 26174 31034', '2012-06-05 10:57:11', '2021-04-28 11:09:08'),
+(3, 'bug', 3, ' 25104 26524 23637 31034 39029 38754 38382 39064', ' 27493 39588 36827 20837 25104 26524 23637 31034 &nbsp &nbsp &nbsp &nbsp 32467 26524 20081 30721 26399 26395 27491 24120 26174 31034', '2012-06-05 10:58:22', '2021-04-28 11:09:08'),
+(4, 'bug', 4, ' 21806 21518 26381 21153 39029 38754 38382 39064', ' 27493 39588 36827 20837 21806 21518 26381 21153 32467 26524 20081 30721 26399 26395 27491 24120 26174 31034', '2012-06-05 11:00:19', '2021-04-28 11:09:08'),
+(5, 'build', 1, ' 31532 19968 26399 29256 26412', '', '2012-06-05 11:11:45', '2012-06-05 11:11:45'),
+(6, 'case', 1, ' 21806 21518 26381 21153 30340 27979 35797 29992 20363', ' 36827 20837 39318 39029 27491 24120 26174 31034', '2012-06-05 11:02:18', '2012-06-05 11:02:47'),
+(7, 'case', 2, ' 39318 39029 30340 27979 35797 29992 20363', ' 36827 20837 39318 39029 27491 24120 26174 31034', '2012-06-05 11:03:28', '2012-06-05 11:03:28'),
+(8, 'case', 3, ' 26032 38395 20013 24515 30340 27979 35797 29992 20363', ' 36827 20837 26032 38395 20013 24515 27491 24120 26174 31034', '2012-06-05 11:03:54', '2012-06-05 11:03:54'),
+(9, 'case', 4, ' 25104 26524 23637 31034 27979 35797 29992 20363', ' 36827 20837 25104 26524 23637 31034 27491 24120 26174 31034', '2012-06-05 11:04:48', '2012-06-05 11:04:48'),
+(10, 'product', 1, ' 20844 21496 20225 19994 32593 31449 24314 35774', ' companywebsite 24314 31435 20844 21496 20225 19994 32593 31449 65292 21487 20197 26356 22909 23545 22806 23637 31034 12290', '2012-06-05 09:57:07', '2012-06-05 09:57:07'),
+(11, 'product', 2, ' 20225 19994 20869 37096 24037 26102 31649 29702 31995 32479', ' workhourmanage', '2012-06-05 11:15:20', '2012-06-05 11:15:20'),
+(12, 'productplan', 1, ' 1.0__ 29256 26412', ' 24320 21457 20986 20225 19994 32593 31449 1.0__ 29256 26412 12290', '2012-06-05 10:02:49', '2021-04-28 11:11:10'),
+(13, 'project', 7, ' 20225 19994 31649 29702 31995 32479', '', '2021-04-28 11:22:04', '2021-04-28 11:22:04'),
+(14, 'story', 1, ' 39318 39029 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 39318 39029 30475 21040 35813 20844 21496 32593 31449 30340 22522 26412 20869 23481 65292 20363 22914 26368 26032 21160 24577 12289 37096 20998 25104 26524 23637 31034 12289 32852 31995 20449 24687 12289 24037 21830 20449 24687 31561 12290 24320 21457 24182 36890 36807 39564 25910', '2012-06-05 10:09:49', '2012-06-05 10:31:02'),
+(15, 'story', 2, ' 26032 38395 20013 24515 30340 35774 35745 21644 24320 21457 12290', ' 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 26032 38395 20013 24515 30475 21040 35813 20844 21496 32593 31449 30340 20225 19994 26032 38395 65292 36825 26679 21487 20197 36890 36807 26032 38395 20102 35299 20225 19994 30340 26368 26032 21160 24577 12290', '2012-06-05 10:16:37', '2012-06-05 10:31:02'),
+(16, 'story', 3, ' 25104 26524 23637 31034 30340 35774 35745 21644 24320 21457', ' &nbsp 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 25104 26524 23637 31034 30475 21040 35813 20844 21496 32593 31449 30340 21561 20135 21697 65292 36825 26679 21487 20197 26041 20415 25105 36827 34892 20102 35299 35813 20844 21496 30340 20135 21697 24182 36827 34892 36141 20080 12290 &nbsp', '2012-06-05 10:18:10', '2012-06-05 10:31:02'),
+(17, 'story', 4, ' 21806 21518 26381 21153 30340 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 26412 20844 21496 30340 29992 25143 65292 25105 24076 26395 21487 20197 22312 21806 21518 26381 21153 30475 21040 35813 20844 21496 32593 31449 30340 21806 21518 26381 21153 65292 36825 26679 21487 20197 26041 20415 25105 32852 31995 35813 20844 21496 26469 35299 20915 25105 30340 38382 39064 12290 &nbsp', '2012-06-05 10:20:16', '2012-06-05 10:31:02'),
+(18, 'story', 5, ' 35802 32856 33521 25165 30340 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 27714 32844 32773 65292 25105 24076 26395 21487 20197 22312 35802 32856 33521 25165 37324 30475 21040 35813 20844 21496 30340 25307 32856 20449 24687 65292 36825 26679 21487 20197 26041 20415 25105 24212 32856 35813 20844 21496 12290 &nbsp', '2012-06-05 10:21:39', '2012-06-05 10:21:39'),
+(19, 'story', 6, ' 21512 20316 27965 35848 30340 35774 35745 21644 24320 21457', ' 20316 20026 19968 21517 21512 20316 21830 65292 25105 24076 26395 21487 20197 22312 21512 20316 27965 35848 37324 30475 21040 35813 20844 21496 23545 22806 30340 21512 20316 20869 23481 65292 36825 26679 21487 20197 26041 20415 25105 21644 35813 20844 21496 36827 34892 21512 20316 27965 35848 12290 &nbsp', '2012-06-05 10:23:11', '2012-06-05 10:23:11'),
+(20, 'story', 7, ' 20851 20110 25105 20204 30340 35774 35745 21644 24320 21457', ' 25105 24076 26395 21487 20197 22312 20851 20110 25105 20204 37324 30475 21040 35813 20844 21496 30340 22522 26412 20449 24687 65292 36825 26679 21487 20197 26041 20415 25105 20102 35299 35813 20844 21496 12290', '2012-06-05 10:24:19', '2012-06-05 10:24:19'),
+(21, 'task', 1, ' 39318 39029 39029 38754 30340 35774 35745', ' 39318 39029 39029 38754 30340 35774 35745', '2012-06-05 10:32:03', '2012-06-05 10:41:20'),
+(22, 'task', 2, ' 39318 39029 30340 24320 21457', ' 39318 39029 30340 24320 21457', '2012-06-05 10:32:23', '2012-06-05 10:41:20'),
+(23, 'task', 3, ' 26032 38395 20013 24515 30340 35774 35745', ' 26032 38395 20013 24515 30340 35774 35745', '2012-06-05 10:33:01', '2012-06-05 10:42:57'),
+(24, 'task', 4, ' 26032 38395 20013 24515 30340 24320 21457', ' 26032 38395 20013 24515 30340 24320 21457', '2012-06-05 10:33:21', '2012-06-05 10:42:56'),
+(25, 'task', 5, ' 25104 26524 23637 31034 30340 35774 35745', ' 25104 26524 23637 31034 30340 35774 35745', '2012-06-05 10:33:44', '2012-06-05 10:43:32'),
+(26, 'task', 6, ' 25104 26524 23637 31034 30340 24320 21457', ' 25104 26524 23637 31034 30340 24320 21457', '2012-06-05 10:33:59', '2012-06-05 10:43:32'),
+(27, 'task', 7, ' 21806 21518 26381 21153 30340 35774 35745', ' 21806 21518 26381 21153 30340 35774 35745', '2012-06-05 10:34:25', '2012-06-05 10:41:20'),
+(28, 'task', 8, ' 21806 21518 26381 21153 30340 24320 21457', ' 21806 21518 26381 21153 30340 24320 21457', '2012-06-05 10:34:45', '2012-06-05 10:41:20'),
+(29, 'task', 9, ' 21806 21518 26381 21153 30340 24320 21457', ' 21806 21518 26381 21153 30340 24320 21457', '2012-06-05 10:35:01', '2012-06-05 10:41:20'),
+(30, 'testtask', 1, ' 20225 19994 32593 31449 31532 19968 26399 27979 35797 20219 21153', '', '2012-06-05 11:07:41', '2021-04-28 11:10:06'),
+(31, 'program', 6, ' 20225 19994 31649 29702', '', '2021-04-28 11:22:04', '2021-04-28 11:22:04'),
+(32, 'execution', 1, ' 20225 19994 32593 31449 31532 19968 26399', ' coweb1 24320 21457 20225 19994 32593 31449 30340 22522 26412 38607 24418 12290', '2012-06-05 10:28:36', '2021-04-28 11:12:22'),
+(33, 'execution', 2, ' 20225 19994 32593 31449 31532 20108 26399', ' cowebsite2', '2012-06-05 11:12:28', '2021-04-28 11:08:02'),
+(34, 'task', 10, ' 39318 39029 39029 38754 30340 35774 35745', ' 39318 39029 39029 38754 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(35, 'task', 11, ' 39318 39029 39029 38754 30340 24320 21457', ' 39318 39029 39029 38754 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(36, 'task', 12, ' 26032 38395 20013 24515 30340 35774 35745', ' 26032 38395 20013 24515 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(37, 'task', 13, ' 26032 38395 20013 24515 30340 24320 21457', ' 26032 38395 20013 24515 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(38, 'task', 14, ' 25104 26524 23637 31034 30340 35774 35745', ' 25104 26524 23637 31034 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(39, 'task', 15, ' 25104 26524 23637 31034 30340 24320 21457', ' 25104 26524 23637 31034 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(40, 'task', 16, ' 21806 21518 26381 21153 30340 35774 35745', ' 21806 21518 26381 21153 30340 35774 35745', '2021-04-28 13:16:15', '2021-04-28 13:16:15'),
+(41, 'task', 17, ' 21806 21518 26381 21153 30340 24320 21457', ' 21806 21518 26381 21153 30340 24320 21457', '2021-04-28 13:16:15', '2021-04-28 13:16:15');
+INSERT INTO `zt_story` (`id`, `parent`, `product`, `branch`, `module`, `plan`, `source`, `sourceNote`, `fromBug`, `title`, `keywords`, `type`, `pri`, `estimate`, `status`, `subStatus`, `color`, `stage`, `stagedBy`, `mailto`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `lastEditedBy`, `lastEditedDate`, `reviewedBy`, `reviewedDate`, `closedBy`, `closedDate`, `closedReason`, `toBug`, `childStories`, `linkStories`, `duplicateStory`, `version`, `URChanged`, `deleted`) VALUES
+(1, 0, 1, 0, 1, '1', 'po', '', 0, '首页设计和开发', '', 'story', 1, 1, 'active', '', '', 'developing', '', '', 'productManager', '2012-06-05 10:09:49', 'productManager', '0000-00-00 00:00:00', 'productManager', '2012-06-05 10:25:19', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(2, 0, 1, 0, 2, '1', 'po', '', 0, '新闻中心的设计和开发。', '', 'story', 1, 1, 'active', '', '', 'projected', '', '', 'productManager', '2012-06-05 10:16:37', 'productManager', '2012-06-05 10:16:37', 'productManager', '2012-06-05 10:25:33', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(3, 0, 1, 0, 3, '1', 'po', '', 0, '成果展示的设计和开发', '', 'story', 1, 0, 'active', '', '', 'developing', '', '', 'productManager', '2012-06-05 10:18:10', 'productManager', '2012-06-05 10:18:10', 'productManager', '2012-06-05 10:25:38', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 2, '0', '0'),
+(4, 0, 1, 0, 4, '1', 'po', '', 0, '售后服务的设计和开发', '', 'story', 1, 1, 'active', '', '', 'developed', '', '', 'productManager', '2012-06-05 10:20:16', 'productManager', '2012-06-05 10:20:16', 'productManager', '2012-06-05 10:25:42', 'productManager, ', '2012-06-05 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(5, 0, 1, 0, 5, '1', 'po', '', 0, '诚聘英才的设计和开发', '', 'story', 1, 1, 'draft', '', '', 'planned', '', '', 'productManager', '2012-06-05 10:21:39', 'productManager', '2012-06-05 10:21:39', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(6, 0, 1, 0, 6, '1', 'po', '', 0, '合作洽谈的设计和开发', '', 'story', 1, 1, 'draft', '', '', 'planned', '', '', 'productManager', '2012-06-05 10:23:11', 'productManager', '2012-06-05 10:23:11', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0'),
+(7, 0, 1, 0, 7, '1', 'po', '', 0, '关于我们的设计和开发', '', 'story', 1, 1, 'draft', '', '', 'planned', '', '', 'productManager', '2012-06-05 10:24:19', 'productManager', '2012-06-05 10:24:19', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 0, '', '', 0, 1, '0', '0');
 INSERT INTO `zt_storyspec` (`story`, `version`, `title`, `spec`, `verify`) VALUES
-(1,	1,	'Offer up to 10 desktops to users',	'User can do different tasks on different desktops.',	''),
-(2,	1,	'Custom desktop wallpaper',	'',	''),
-(3,	1,	'Auto classify files.',	'',	''),
-(4,	1,	'Fast search document.',	'',	''),
-(5,	1,	'Full text retrieval',	'',	''),
-(6,	1,	'Add file preview.',	'',	''),
-(7,	1,	'Process list',	'',	''),
-(8,	1,	'Performance overview',	'',	''),
-(9,	1,	'General setup',	'',	''),
-(10,	1,	'SEO setup',	'Set SEO switch and report.',	''),
-(11,	1,	'cache setup',	'Set cache switch and time.',	''),
-(12,	1,	'security setup',	'',	''),
-(13,	1,	'UI setup',	'',	''),
-(14,	1,	'Page display',	'',	''),
-(15,	1,	'Article management',	'',	'');
-
-INSERT INTO `zt_suitecase` (`suite`, `product`, `case`, `version`) VALUES
-(1,	0,	2,	1),
-(1,	0,	1,	1);
-
-INSERT INTO `zt_task` (`id`, `parent`, `project`, `module`, `story`, `storyVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `color`, `mailto`, `desc`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `estStarted`, `realStarted`, `finishedBy`, `finishedDate`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES
-(1,	0,	1,	1,	1,	1,	0,	'Offer up to 10 desktops to users.',	'devel',	3,	100,	8,	64,	'0000-00-00',	'doing',	'',	NULL,	'User can do different tasks on different desktops.',	'pm1',	'2017-12-12 15:05:06',	'pm1',	'2017-12-12 15:12:17',	'0000-00-00',	'2017-12-12',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 15:13:13',	'0'),
-(2,	0,	1,	1,	2,	1,	0,	'Custom desktop wallpaper',	'devel',	3,	80,	0,	80,	'0000-00-00',	'doing',	'',	NULL,	'',	'pm1',	'2017-12-12 15:05:06',	'pm1',	'2017-12-12 15:13:25',	'0000-00-00',	'2017-12-12',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 15:13:25',	'0'),
-(3,	0,	1,	1,	3,	1,	0,	'Auto classify files.',	'devel',	3,	60,	60,	0,	'0000-00-00',	'done',	'',	NULL,	'',	'pm1',	'2017-12-12 15:05:06',	'pm1',	'2017-12-12 15:14:47',	'0000-00-00',	'2017-12-12',	'pm1',	'2017-12-12 15:14:47',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 15:14:47',	'0'),
-(4,	0,	1,	1,	3,	1,	0,	'File type configuration',	'devel',	4,	40,	0,	40,	'0000-00-00',	'wait',	'',	NULL,	'',	'pm1',	'2017-12-12 15:05:06',	'pm1',	'2017-12-12 15:05:06',	'0000-00-00',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'',	'0000-00-00 00:00:00',	'0'),
-(5,	0,	2,	8,	9,	1,	0,	'General backend setup',	'devel',	3,	40,	30,	0,	'0000-00-00',	'done',	'',	NULL,	'',	'pm1',	'2017-12-12 23:45:14',	'pm1',	'2017-12-12 23:47:37',	'0000-00-00',	'2017-12-12',	'pm1',	'2017-12-12 23:47:37',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 23:47:37',	'0'),
-(6,	0,	2,	8,	10,	1,	0,	'backend SEO setup',	'devel',	3,	50,	0,	50,	'0000-00-00',	'wait',	'',	NULL,	'Set SEO switch and report.',	'pm1',	'2017-12-12 23:45:14',	'pm1',	'2017-12-12 23:45:14',	'0000-00-00',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'',	'0000-00-00 00:00:00',	'0'),
-(7,	0,	2,	8,	11,	1,	0,	'backend cache setup',	'devel',	3,	30,	8,	55,	'0000-00-00',	'doing',	'',	NULL,	'Set cache switch and time.',	'pm1',	'2017-12-12 23:45:14',	'pm1',	'2017-12-12 23:45:53',	'0000-00-00',	'2017-12-12',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 23:45:53',	'0'),
-(8,	0,	2,	8,	12,	1,	0,	'backend security setup',	'devel',	3,	30,	0,	30,	'0000-00-00',	'doing',	'',	NULL,	'',	'pm1',	'2017-12-12 23:45:14',	'pm1',	'2017-12-12 23:45:14',	'0000-00-00',	'2017-12-12',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 23:45:35',	'0'),
-(9,	0,	2,	9,	13,	1,	0,	'backend UI setup',	'devel',	3,	60,	8,	50,	'0000-00-00',	'doing',	'',	NULL,	'',	'pm1',	'2017-12-12 23:45:14',	'pm1',	'2017-12-12 23:45:14',	'0000-00-00',	'2017-12-12',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'pm1',	'2017-12-12 23:51:14',	'0'),
-(10,	0,	2,	6,	14,	1,	0,	'Page display',	'devel',	3,	60,	0,	60,	'0000-00-00',	'wait',	'',	NULL,	'',	'pm1',	'2017-12-12 23:45:14',	'pm1',	'2017-12-12 23:45:14',	'0000-00-00',	'0000-00-00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00',	'',	'',	'0000-00-00 00:00:00',	'0');
-
+(1, 1, '首页设计和开发', '作为一名本公司的用户，我希望可以在首页看到该公司网站的基本内容，例如最新动态、部分成果展示、联系信息、工商信息等。<br />', '开发并通过验收<br />'),
+(2, 1, '新闻中心的设计和开发。', '作为一名本公司的用户，我希望可以在新闻中心看到该公司网站的企业新闻，这样可以通过新闻了解企业的最新动态。<br />', ''),
+(3, 1, '成果展示的设计和开发', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的企业新闻，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', ''),
+(3, 2, '成果展示的设计和开发', '&nbsp;作为一名本公司的用户，我希望可以在成果展示看到该公司网站的吹产品，这样可以方便我进行了解该公司的产品并进行购买。&nbsp;<br />', ''),
+(4, 1, '售后服务的设计和开发', '作为一名本公司的用户，我希望可以在售后服务看到该公司网站的售后服务，这样可以方便我联系该公司来解决我的问题。&nbsp;<br />', ''),
+(5, 1, '诚聘英才的设计和开发', '作为一名求职者，我希望可以在诚聘英才里看到该公司的招聘信息，这样可以方便我应聘该公司。&nbsp;<br />', ''),
+(6, 1, '合作洽谈的设计和开发', '作为一名合作商，我希望可以在合作洽谈里看到该公司对外的合作内容，这样可以方便我和该公司进行合作洽谈。&nbsp;<br />', ''),
+(7, 1, '关于我们的设计和开发', '我希望可以在关于我们里看到该公司的基本信息，这样可以方便我了解该公司。<br />', '');
+INSERT INTO `zt_task` (`id`, `project`, `parent`, `execution`, `module`, `design`, `story`, `storyVersion`, `designVersion`, `fromBug`, `name`, `type`, `pri`, `estimate`, `consumed`, `left`, `deadline`, `status`, `subStatus`, `color`, `mailto`, `desc`, `version`, `openedBy`, `openedDate`, `assignedTo`, `assignedDate`, `estStarted`, `realStarted`, `finishedBy`, `finishedDate`, `finishedList`, `canceledBy`, `canceledDate`, `closedBy`, `closedDate`, `realDuration`, `planDuration`, `closedReason`, `lastEditedBy`, `lastEditedDate`, `activatedDate`, `deleted`) VALUES
+(17, 7, 0, 1, 0, 0, 4, 1, 0, 0, '售后服务的开发', 'devel', 1, 5, 5, 0, '0000-00-00', 'done', '', '', NULL, '售后服务的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev3', '2021-04-28 13:21:51', '0000-00-00', '2021-04-02 08:00:00', 'dev3', '2021-04-06 15:30:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev3', '2021-04-28 13:21:51', '0000-00-00', '0'),
+(16, 7, 0, 1, 0, 0, 4, 1, 0, 0, '售后服务的设计', 'design', 1, 5, 6, 0, '0000-00-00', 'done', '', '', NULL, '售后服务的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev3', '2021-04-28 13:21:22', '0000-00-00', '2021-04-02 08:00:00', 'dev3', '2021-04-05 17:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev3', '2021-04-28 13:21:22', '0000-00-00', '0'),
+(15, 7, 0, 1, 0, 0, 3, 2, 0, 0, '成果展示的开发', 'devel', 1, 7, 0, 7, '0000-00-00', 'doing', '', '', NULL, '成果展示的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev2', '2021-04-28 13:16:15', '0000-00-00', '2021-04-01 08:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev2', '2021-04-28 13:20:09', '0000-00-00', '0'),
+(14, 7, 0, 1, 0, 0, 3, 2, 0, 0, '成果展示的设计', 'design', 1, 6, 0, 6, '0000-00-00', 'doing', '', '', NULL, '成果展示的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev2', '2021-04-28 13:16:15', '0000-00-00', '2021-04-01 08:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev2', '2021-04-28 13:19:54', '0000-00-00', '0'),
+(13, 7, 0, 1, 0, 0, 2, 1, 0, 0, '新闻中心的开发', 'devel', 1, 7, 0, 7, '0000-00-00', 'wait', '', '', NULL, '新闻中心的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:16:15', '0000-00-00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', '', '0000-00-00 00:00:00', '0000-00-00', '0'),
+(12, 7, 0, 1, 0, 0, 2, 1, 0, 0, '新闻中心的设计', 'design', 1, 7, 0, 7, '0000-00-00', 'wait', '', '', NULL, '新闻中心的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:16:15', '0000-00-00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', '', '0000-00-00 00:00:00', '0000-00-00', '0'),
+(10, 7, 0, 1, 0, 0, 1, 1, 0, 0, '首页页面的设计', 'design', 1, 7, 8, 0, '0000-00-00', 'done', '', '', NULL, '首页页面的设计', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:17:54', '0000-00-00', '2021-04-28 13:17:54', 'dev1', '2021-04-01 16:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev1', '2021-04-28 13:17:54', '0000-00-00', '0'),
+(11, 7, 0, 1, 0, 0, 1, 1, 0, 0, '首页页面的开发', 'devel', 1, 8, 0, 8, '0000-00-00', 'doing', '', '', NULL, '首页页面的开发', 1, 'admin', '2021-04-28 13:16:15', 'dev1', '2021-04-28 13:16:15', '0000-00-00', '2021-04-01 16:00:00', '', '0000-00-00 00:00:00', '', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 0, 0, '', 'dev1', '2021-04-28 13:18:45', '0000-00-00', '0');
 INSERT INTO `zt_taskestimate` (`id`, `task`, `date`, `left`, `consumed`, `account`, `work`) VALUES
-(1,	1,	'2017-12-12',	100,	0,	'pm1',	NULL),
-(2,	1,	'2017-12-12',	64,	8,	'pm1',	'Finish UI design'),
-(3,	2,	'2017-12-12',	80,	0,	'pm1',	NULL),
-(4,	3,	'2017-12-12',	60,	0,	'pm1',	NULL),
-(5,	3,	'2017-12-12',	0,	60,	'pm1',	'Finish'),
-(6,	8,	'2017-12-12',	30,	0,	'pm1',	NULL),
-(7,	7,	'2017-12-12',	55,	8,	'pm1',	''),
-(8,	9,	'2017-12-12',	60,	0,	'pm1',	NULL),
-(9,	5,	'2017-12-12',	40,	0,	'pm1',	NULL),
-(10,	5,	'2017-12-12',	0,	30,	'pm1',	NULL),
-(11,	9,	'2017-12-13',	50,	8,	'pm1',	'Finish page design');
-
-INSERT INTO `zt_team` (`root`, `type`, `account`, `role`, `limited`, `join`, `days`, `hours`, `estimate`, `consumed`, `left`, `order`) VALUES
-(2,	'project',	'thePO',	'Product Owner',	'no',	'2017-12-12',	10,	7.0,	0.00,	0.00,	0.00,	0),
-(2,	'project',	'pm1',	'Project Manager',	'no',	'2017-12-12',	10,	7.0,	0.00,	0.00,	0.00,	0),
-(1,	'project',	'thePO',	'Product Owner',	'no',	'2017-12-12',	10,	7.0,	0.00,	0.00,	0.00,	0),
-(1,	'project',	'pm1',	'Project Manager',	'no',	'2017-12-12',	10,	7.0,	0.00,	0.00,	0.00,	0);
-
-INSERT INTO `zt_testresult` (`id`, `run`, `case`, `version`, `caseResult`, `stepResults`, `lastRunner`, `date`) VALUES
-(1,	1,	2,	1,	'fail',	'a:3:{i:3;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}i:4;a:2:{s:6:\"result\";s:4:\"fail\";s:4:\"real\";s:24:\"Not all 400 page is displayed.\";}i:5;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}',	'pm1',	'2017-12-13 00:08:52'),
-(2,	2,	1,	1,	'pass',	'a:2:{i:1;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}i:2;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}',	'pm1',	'2017-12-13 00:10:24'),
-(3,	0,	2,	2,	'fail',	'a:4:{i:7;a:2:{s:6:\"result\";s:4:\"fail\";s:4:\"real\";s:42:\"‘Contact Us’ page is missing in sitemap.\";}i:8;a:2:{s:6:\"result\";s:4:\"fail\";s:4:\"real\";s:36:\"400 page is missing.‘/notExitPage’；\";}i:9;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}i:10;a:2:{s:6:\"result\";s:3:\"n/a\";s:4:\"real\";s:45:\"Blogroll cannot be added, and database error prompts.\";}}',	'pm1',	'2017-12-13 00:23:41'),
-(4,	0,	2,	2,	'fail',	'a:4:{i:7;a:2:{s:6:\"result\";s:4:\"fail\";s:4:\"real\";s:42:\"‘Contact Us’ page is missing in sitemap.\";}i:8;a:2:{s:6:\"result\";s:4:\"fail\";s:4:\"real\";s:36:\"400 page is missing.‘/notExitPage’；\";}i:9;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}i:10;a:2:{s:6:\"result\";s:4:\"fail\";s:4:\"real\";s:45:\"Blogroll cannot be added, and database error prompts.\";}}',	'pm1',	'2017-12-13 00:23:48');
-
+(1, 10, '2021-04-01', 0, 8, 'dev1', ''),
+(2, 11, '2021-04-01', 8, 0, 'dev1', ''),
+(3, 14, '2021-04-01', 6, 0, 'dev2', ''),
+(4, 15, '2021-04-01', 7, 0, 'dev2', ''),
+(5, 16, '2021-04-02', 5, 0, 'dev3', ''),
+(6, 17, '2021-04-02', 5, 0, 'dev3', ''),
+(7, 16, '2021-04-05', 0, 6, 'dev3', ''),
+(8, 17, '2021-04-06', 0, 5, 'dev3', '');
+INSERT INTO `zt_taskspec` (`task`, `version`, `name`, `estStarted`, `deadline`) VALUES
+(10, 1, '首页页面的设计', '0000-00-00', '0000-00-00'),
+(11, 1, '首页页面的开发', '0000-00-00', '0000-00-00'),
+(12, 1, '新闻中心的设计', '0000-00-00', '0000-00-00'),
+(13, 1, '新闻中心的开发', '0000-00-00', '0000-00-00'),
+(14, 1, '成果展示的设计', '0000-00-00', '0000-00-00'),
+(15, 1, '成果展示的开发', '0000-00-00', '0000-00-00'),
+(16, 1, '售后服务的设计', '0000-00-00', '0000-00-00'),
+(17, 1, '售后服务的开发', '0000-00-00', '0000-00-00');
+INSERT INTO `zt_team` (`id`, `root`, `type`, `account`, `role`, `limited`, `join`, `days`, `hours`, `estimate`, `consumed`, `left`, `order`) VALUES
+(1, 1, 'execution', 'dev3', '研发', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(2, 1, 'execution', 'productManager', '产品经理', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(3, 1, 'execution', 'tester2', '测试', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(4, 1, 'execution', 'tester1', '测试', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(5, 2, 'execution', 'projectManager', '项目经理', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(6, 2, 'execution', 'tester2', '测试', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(7, 2, 'execution', 'tester1', '测试', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(8, 2, 'execution', 'dev3', '研发', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(9, 2, 'execution', 'dev2', '研发', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(10, 2, 'execution', 'dev1', '研发', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(11, 1, 'execution', 'dev1', '研发', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(12, 1, 'execution', 'dev2', '研发', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(13, 1, 'execution', 'projectManager', '项目经理', 'no', '2013-02-20', 184, 7.0, '0.00', '0.00', '0.00', 0),
+(16, 1, 'execution', 'testManager', '测试负责人', 'no', '2021-04-28', 391, 7.0, '0.00', '0.00', '0.00', 0),
+(15, 2, 'execution', 'productManager', '产品经理', 'no', '2013-02-20', 365, 7.0, '0.00', '0.00', '0.00', 0),
+(17, 2, 'execution', 'testManager', '测试负责人', 'no', '2021-04-28', 260, 7.0, '0.00', '0.00', '0.00', 0),
+(18, 7, 'project', 'productManager', '', 'no', '2021-04-28', 0, 0.0, '0.00', '0.00', '0.00', 0),
+(19, 7, 'project', 'projectManager', '', 'no', '2021-04-28', 0, 0.0, '0.00', '0.00', '0.00', 0);
+INSERT INTO `zt_testresult` (`id`, `run`, `case`, `version`, `job`, `compile`, `caseResult`, `stepResults`, `lastRunner`, `date`, `duration`, `xml`) VALUES
+(1, 4, 1, 1, 0, 0, 'pass', 'a:1:{i:1;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:00', 0, ''),
+(2, 3, 2, 1, 0, 0, 'pass', 'a:1:{i:2;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:05', 0, ''),
+(3, 2, 3, 1, 0, 0, 'pass', 'a:1:{i:3;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:07', 0, ''),
+(4, 1, 4, 1, 0, 0, 'pass', 'a:1:{i:4;a:2:{s:6:\"result\";s:4:\"pass\";s:4:\"real\";s:0:\"\";}}', 'testManager', '2012-06-05 11:11:08', 0, '');
 INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRunner`, `lastRunDate`, `lastRunResult`, `status`) VALUES
-(1,	1,	2,	2,	'pm1',	'pm1',	'2017-12-13 00:08:52',	'fail',	'done'),
-(2,	1,	1,	1,	'pm1',	'pm1',	'2017-12-13 00:10:24',	'pass',	'done');
-
-INSERT INTO `zt_testsuite` (`id`, `product`, `name`, `desc`, `type`, `addedBy`, `addedDate`, `lastEditedBy`, `lastEditedDate`, `deleted`) VALUES
-(1,	2,	'Testsuite',	'Testsuite',	'public',	'pm1',	'2017-12-13 00:05:13',	'',	'0000-00-00 00:00:00',	'0');
-
-INSERT INTO `zt_testtask` (`id`, `name`, `product`, `project`, `build`, `owner`, `pri`, `begin`, `end`, `mailto`, `desc`, `report`, `status`, `deleted`) VALUES
-(1,	'test for blog v0.1',	2,	2,	'2',	'thePO',	0,	'2018-01-05',	'2018-01-20',	'',	'',	'',	'wait',	'0');
-
-INSERT INTO `zt_user` (`dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `weixin`, `dingding`, `slack`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `fails`, `locked`, `ranzhi`, `score`, `scoreLevel`, `deleted`) VALUES
-(1,	'thePO',	'e10adc3949ba59abbe56e057f20f883e',	'po',	'Richard',	'',	'',	'',	'0000-00-00',	'm',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'0000-00-00',	3,	'127.0.0.1',	1513093950,	0,	'0000-00-00 00:00:00',	'',	0,	0,	'0'),
-(5,	'pm1',	'e10adc3949ba59abbe56e057f20f883e',	'pm',	'Daniel',	'',	'',	'',	'0000-00-00',	'm',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'0000-00-00',	2,	'127.0.0.1',	1513093318,	0,	'0000-00-00 00:00:00',	'',	0,	0,	'0');
-
-INSERT INTO `zt_usergroup` (`account`, `group`) VALUES
-('pm1',	4),
-('thePO',	5);
+(1, 1, 4, 1, '', 'testManager', '2012-06-05 11:11:08', 'pass', 'done'),
+(2, 1, 3, 1, '', 'testManager', '2012-06-05 11:11:07', 'pass', 'done'),
+(3, 1, 2, 1, '', 'testManager', '2012-06-05 11:11:05', 'pass', 'done'),
+(4, 1, 1, 1, '', 'testManager', '2012-06-05 11:11:00', 'pass', 'done');
+INSERT INTO `zt_testtask` (`id`, `project`, `name`, `product`, `execution`, `build`, `owner`, `pri`, `begin`, `end`, `mailto`, `desc`, `report`, `status`, `auto`, `subStatus`, `deleted`) VALUES
+(1, 0, '企业网站第一期测试任务', 1, 1, '1', 'testManager', 0, '2020-06-05', '2021-06-21', '', '', '', 'wait', 'no', '', '0');
+REPLACE INTO `zt_user` (`company`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `mobile`, `phone`, `weixin`, `dingding`, `slack`, `whatsapp`, `address`, `zipcode`, `nature`, `analysis`, `strategy`, `join`, `visits`, `ip`, `last`, `fails`, `locked`, `ranzhi`, `score`, `scoreLevel`, `deleted`) VALUES
+(0, 5, 'productManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, 0, '0000-00-00 00:00:00', '', 0, 0, '0'),
+(0, 6, 'projectManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 4, '10.0.2.2', 1619580798, 0, '0000-00-00 00:00:00', '', 0, 0, '0'),
+(0, 2, 'dev1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '10.0.2.2', 1619586993, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 2, 'dev2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587173, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 2, 'dev3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587220, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 3, 'tester1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 3, 'tester2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 3, 'tester3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, 0, '0000-00-00 00:00:00', '', 0, 0, '1'),
+(0, 1, 'testManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, 0, '0000-00-00 00:00:00', '', 0, 0, '1');
+INSERT INTO `zt_usergroup` (`account`, `group`, `project`) VALUES
+('productManager', 5, ''),
+('projectManager', 4, ''),
+('dev1', 2, ''),
+('dev2', 2, ''),
+('dev3', 2, ''),
+('tester3', 3, ''),
+('tester2', 3, ''),
+('tester1', 3, ''),
+('testManager', 8, '');
+REPLACE INTO `zt_userview` (`account`, `programs`, `projects`, `products`, `sprints`) VALUES
+('admin', '', '', '', ''),
+('dev1', '', '', '', ''),
+('dev2', '', '', '', ''),
+('dev3', '', '', '', ''),
+('productManager', '', '', '', ''),
+('projectManager', '', '', '', ''),
+('tester1', '', '', '', ''),
+('tester2', '', '', '', ''),
+('tester3', '', '', '', ''),
+('testManager', '', '', '', '');
diff --git a/db/standard/xuanxuan15.0.sql b/db/standard/xuanxuan15.0.sql
new file mode 100644
index 0000000000..4bcf34de60
--- /dev/null
+++ b/db/standard/xuanxuan15.0.sql
@@ -0,0 +1,170 @@
+CREATE TABLE IF NOT EXISTS `zt_im_chat` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `gid` char(40) NOT NULL DEFAULT '',
+  `name` varchar(60) NOT NULL DEFAULT '',
+  `type` varchar(20) NOT NULL DEFAULT 'group',
+  `admins` varchar(255) NOT NULL DEFAULT '',
+  `committers` varchar(255) NOT NULL DEFAULT '',
+  `subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `public` enum('0', '1') NOT NULL DEFAULT '0',
+  `createdBy` varchar(30) NOT NULL DEFAULT '',
+  `createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `editedBy` varchar(30) NOT NULL DEFAULT '',
+  `editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastMessage` int(11) unsigned NOT NULL DEFAULT 0,
+  `dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `pinnedMessages` text NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `gid` (`gid`),
+  KEY `name` (`name`),
+  KEY `type` (`type`),
+  KEY `public` (`public`),
+  KEY `createdBy` (`createdBy`),
+  KEY `editedBy` (`editedBy`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `user` mediumint(8) NOT NULL DEFAULT 0,
+  `order` smallint(5) NOT NULL DEFAULT 0,
+  `star` enum('0', '1') NOT NULL DEFAULT '0',
+  `hide` enum('0', '1') NOT NULL DEFAULT '0',
+  `mute` enum('0', '1') NOT NULL DEFAULT '0',
+  `freeze` enum('0', '1') NOT NULL DEFAULT '0',
+  `join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `category` varchar(40) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `cgid` (`cgid`),
+  KEY `user` (`user`),
+  KEY `order` (`order`),
+  KEY `star` (`star`),
+  KEY `hide` (`hide`),
+  UNIQUE KEY `chatuser` (`cgid`, `user`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_client` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `version` char(30) NOT NULL DEFAULT '',
+  `desc` varchar(100) NOT NULL DEFAULT '',
+  `changeLog` text NOT NULL,
+  `strategy` varchar(10) NOT NULL DEFAULT '',
+  `downloads` text NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `createdBy` varchar(30) NOT NULL DEFAULT '',
+  `editedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL DEFAULT '',
+  `status` enum('released','wait') NOT NULL DEFAULT 'wait',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_message` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `gid` char(40) NOT NULL DEFAULT '',
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `user` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `type` enum('normal', 'broadcast', 'notify', 'bulletin') NOT NULL DEFAULT 'normal',
+  `content` text NOT NULL DEFAULT '',
+  `contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
+  `data` text NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `mgid` (`gid`),
+  KEY `mcgid` (`cgid`),
+  KEY `muser` (`user`),
+  KEY `mtype` (`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_message_backup` (
+  `id` int(11) unsigned NOT NULL,
+  `gid` char(40) NOT NULL DEFAULT '',
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `user` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
+  `content` text NOT NULL DEFAULT '',
+  `contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
+  `data` text NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_message_index` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `tableName` char(64) NOT NULL,
+  `start` int(11) unsigned NOT NULL,
+  `end` int(11) unsigned NOT NULL,
+  `startDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `endDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `chats` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `tableName` (`tableName`),
+  KEY `start` (`start`),
+  KEY `end` (`end`),
+  KEY `startDate` (`startDate`),
+  KEY `endDate` (`endDate`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_chat_message_index` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `gid` char(40) NOT NULL,
+  `tableName` char(64) NOT NULL,
+  `start` int(11) unsigned NOT NULL,
+  `end` int(11) unsigned NOT NULL,
+  `startDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `endDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `count` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `chattable` (`gid`,`tableName`),
+  KEY `start` (`start`),
+  KEY `end` (`end`),
+  KEY `startDate` (`startDate`),
+  KEY `endDate` (`endDate`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
+  `user` mediumint(8) NOT NULL DEFAULT 0,
+  `message` int(11) unsigned NOT NULL,
+  `status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
+  UNIQUE KEY `user` (`user`,`message`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_queue` (
+  `id` mediumint(8) unsigned NOT NULL auto_increment,
+  `type` char(30) NOT NULL,
+  `content` text NOT NULL,
+  `addDate` datetime NOT NULL,
+  `processDate` datetime NOT NULL,
+  `result` text NOT NULL,
+  `status` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_conference` (
+  `id` mediumint(8) unsigned NOT NULL auto_increment,
+  `rid` char(24) NOT NULL DEFAULT '',
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `status` enum('closed','open') NOT NULL DEFAULT 'closed',
+  `participants` text NOT NULL,
+  `invitee` text NOT NULL,
+  `openedBy` mediumint(8) NOT NULL DEFAULT 0,
+  `openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_conferenceaction` (
+  `id` mediumint(8) unsigned NOT NULL auto_increment,
+  `rid` char(24) NOT NULL DEFAULT '',
+  `type` enum('create','join','leave','close') NOT NULL DEFAULT 'create',
+  `user` mediumint(8) NOT NULL DEFAULT 0,
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `device` char(40) NOT NULL DEFAULT 'default',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_im_userdevice` (
+  `id` mediumint(8) unsigned NOT NULL auto_increment,
+  `user` mediumint(8) NOT NULL DEFAULT 0,
+  `device` char(40) NOT NULL DEFAULT 'default',
+  `deviceID` char(40) NOT NULL DEFAULT '',
+  `token` char(64) NOT NULL DEFAULT '',
+  `validUntil` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastLogin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastLogout` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `user` (`user`),
+  KEY `lastLogin` (`lastLogin`),
+  KEY `lastLogout` (`lastLogout`),
+  UNIQUE KEY `userdevice` (`user`, `device`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
diff --git a/db/standard/zentao15.0.rc3.sql b/db/standard/zentao15.0.rc3.sql
new file mode 100644
index 0000000000..d59660d05a
--- /dev/null
+++ b/db/standard/zentao15.0.rc3.sql
@@ -0,0 +1,1218 @@
+CREATE TABLE `zt_acl` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL DEFAULT 0,
+  `type` char(40) NOT NULL DEFAULT 'whitelist',
+  `source` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_action` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL DEFAULT '',
+  `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` varchar(255) NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `actor` varchar(100) NOT NULL DEFAULT '',
+  `action` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL,
+  `comment` text NOT NULL,
+  `extra` text NOT NULL,
+  `read` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `date` (`date`),
+  KEY `actor` (`actor`),
+  KEY `project` (`project`),
+  KEY `action` (`action`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_block` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(20) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(100) NOT NULL,
+  `source` varchar(20) NOT NULL,
+  `block` varchar(20) NOT NULL,
+  `params` text NOT NULL,
+  `order` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `grid` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `height` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `hidden` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account_module_type_order` (`account`,`module`,`type`,`order`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_branch` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_bug` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `plan` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `toTask` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `toStory` mediumint(8) NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `severity` tinyint(4) NOT NULL DEFAULT 0,
+  `pri` tinyint(3) unsigned NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT '',
+  `os` varchar(30) NOT NULL DEFAULT '',
+  `browser` varchar(30) NOT NULL DEFAULT '',
+  `hardware` varchar(30) NOT NULL,
+  `found` varchar(30) NOT NULL DEFAULT '',
+  `steps` text NOT NULL,
+  `status` enum('active','resolved','closed') NOT NULL DEFAULT 'active',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `activatedCount` smallint(6) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedBuild` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `deadline` date NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+  `resolution` varchar(30) NOT NULL DEFAULT '',
+  `resolvedBuild` varchar(30) NOT NULL DEFAULT '',
+  `resolvedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `duplicateBug` mediumint(8) unsigned NOT NULL,
+  `linkBug` varchar(255) NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `caseVersion` smallint(6) NOT NULL DEFAULT 1,
+  `result` mediumint(8) unsigned NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `entry` varchar(255) NOT NULL,
+  `lines` varchar(10) NOT NULL,
+  `v1` varchar(40) NOT NULL,
+  `v2` varchar(40) NOT NULL,
+  `repoType` varchar(30) NOT NULL DEFAULT '',
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `status` (`status`),
+  KEY `plan` (`plan`),
+  KEY `story` (`story`),
+  KEY `case` (`case`),
+  KEY `toStory` (`toStory`),
+  KEY `result` (`result`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_build` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(150) NOT NULL,
+  `scmPath` char(255) NOT NULL,
+  `filePath` char(255) NOT NULL,
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `builder` char(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_burn` (
+  `execution` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `date` date NOT NULL,
+  `estimate` float NOT NULL,
+  `left` float NOT NULL,
+  `consumed` float NOT NULL,
+  `storyPoint` float NOT NULL,
+  PRIMARY KEY (`execution`,`date`,`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_case` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `story` mediumint(30) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `title` varchar(255) NOT NULL,
+  `precondition` text NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+  `type` char(30) NOT NULL DEFAULT '1',
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `frame` varchar(10) NOT NULL,
+  `stage` varchar(255) NOT NULL,
+  `howRun` varchar(30) NOT NULL,
+  `scriptedBy` varchar(30) NOT NULL,
+  `scriptedDate` date NOT NULL,
+  `scriptStatus` varchar(30) NOT NULL,
+  `scriptLocation` varchar(255) NOT NULL,
+  `status` char(30) NOT NULL DEFAULT '1',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `frequency` enum('1','2','3') NOT NULL DEFAULT '1',
+  `order` tinyint(30) unsigned NOT NULL DEFAULT 0,
+  `openedBy` char(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `lastEditedBy` char(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `linkCase` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL,
+  `fromCaseID` mediumint(8) unsigned NOT NULL,
+  `fromCaseVersion` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `story` (`story`),
+  KEY `fromBug` (`fromBug`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_casestep` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` smallint(3) unsigned NOT NULL DEFAULT 0,
+  `type` varchar(10) NOT NULL DEFAULT 'step',
+  `desc` text NOT NULL,
+  `expect` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_company` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(120) DEFAULT NULL,
+  `phone` char(20) DEFAULT NULL,
+  `fax` char(20) DEFAULT NULL,
+  `address` char(120) DEFAULT NULL,
+  `zipcode` char(10) DEFAULT NULL,
+  `website` char(120) DEFAULT NULL,
+  `backyard` char(120) DEFAULT NULL,
+  `guest` enum('1','0') NOT NULL DEFAULT '0',
+  `admins` char(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_compile` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `queue` mediumint(8) NOT NULL,
+  `status` varchar(255) NOT NULL,
+  `logs` text DEFAULT NULL,
+  `atTime` varchar(10) NOT NULL,
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `tag` varchar(255) NOT NULL,
+  `times` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `updateDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_config` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `owner` char(30) NOT NULL DEFAULT '',
+  `module` varchar(30) NOT NULL,
+  `section` char(30) NOT NULL DEFAULT '',
+  `key` char(30) NOT NULL DEFAULT '',
+  `value` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`owner`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_cron` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `m` varchar(20) NOT NULL,
+  `h` varchar(20) NOT NULL,
+  `dom` varchar(20) NOT NULL,
+  `mon` varchar(20) NOT NULL,
+  `dow` varchar(20) NOT NULL,
+  `command` text NOT NULL,
+  `remark` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `buildin` tinyint(1) NOT NULL DEFAULT 0,
+  `status` varchar(20) NOT NULL,
+  `lastTime` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `lastTime` (`lastTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_dept` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(60) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `order` smallint(4) unsigned NOT NULL DEFAULT 0,
+  `position` char(30) NOT NULL DEFAULT '',
+  `function` char(255) NOT NULL DEFAULT '',
+  `manager` char(30) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doc` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `lib` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `views` smallint(5) unsigned NOT NULL,
+  `collector` text NOT NULL,
+  `addedBy` varchar(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT 1,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `lib` (`lib`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doccontent` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `doc` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `digest` varchar(255) NOT NULL,
+  `content` longtext NOT NULL,
+  `files` text NOT NULL,
+  `type` varchar(10) NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `doc_version` (`doc`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doclib` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(30) NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `name` varchar(60) NOT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `main` enum('0','1') NOT NULL DEFAULT '0',
+  `collector` text NOT NULL,
+  `order` tinyint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_effort` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `user` char(30) NOT NULL DEFAULT '',
+  `todo` enum('1','0') NOT NULL DEFAULT '1',
+  `date` date NOT NULL,
+  `begin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `end` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `type` enum('1','2','3') NOT NULL DEFAULT '1',
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `status` enum('1','2','3') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `user` (`user`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_entry` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `account` varchar(30) NOT NULL DEFAULT '',
+  `code` varchar(20) NOT NULL,
+  `key` varchar(32) NOT NULL,
+  `freePasswd` enum('0','1') NOT NULL DEFAULT '0',
+  `ip` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `calledTime` int(10) unsigned NOT NULL DEFAULT 0,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_expect` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `userID` mediumint(8) NOT NULL,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `expect` text NOT NULL,
+  `progress` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_extension` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(150) NOT NULL,
+  `code` varchar(30) NOT NULL,
+  `version` varchar(50) NOT NULL,
+  `author` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `license` text NOT NULL,
+  `type` varchar(20) NOT NULL DEFAULT 'extension',
+  `site` varchar(150) NOT NULL,
+  `zentaoCompatible` varchar(100) NOT NULL,
+  `installedTime` datetime NOT NULL,
+  `depends` varchar(100) NOT NULL,
+  `dirs` mediumtext NOT NULL,
+  `files` mediumtext NOT NULL,
+  `status` varchar(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`),
+  KEY `name` (`name`),
+  KEY `installedTime` (`installedTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_file` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `pathname` char(50) NOT NULL,
+  `title` char(255) NOT NULL,
+  `extension` char(30) NOT NULL,
+  `size` int(10) unsigned NOT NULL DEFAULT 0,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `addedBy` char(30) NOT NULL DEFAULT '',
+  `addedDate` datetime NOT NULL,
+  `downloads` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `extra` varchar(255) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_group` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(30) NOT NULL,
+  `role` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `acl` text DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_grouppriv` (
+  `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` char(30) NOT NULL DEFAULT '',
+  `method` char(30) NOT NULL DEFAULT '',
+  UNIQUE KEY `group` (`group`,`module`,`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_history` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `action` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `field` varchar(30) NOT NULL DEFAULT '',
+  `old` text NOT NULL,
+  `new` text NOT NULL,
+  `diff` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `action` (`action`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_jenkins` (
+  `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `account` varchar(30) DEFAULT NULL,
+  `password` varchar(255) NOT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_job` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `frame` varchar(20) NOT NULL,
+  `jkHost` mediumint(8) unsigned NOT NULL,
+  `jkJob` varchar(500) NOT NULL,
+  `triggerType` varchar(255) NOT NULL,
+  `svnDir` varchar(255) NOT NULL,
+  `atDay` varchar(255) DEFAULT NULL,
+  `atTime` varchar(10) DEFAULT NULL,
+  `customParam` text NOT NULL,
+  `comment` varchar(255) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `lastExec` datetime DEFAULT NULL,
+  `lastStatus` varchar(255) DEFAULT NULL,
+  `lastTag` varchar(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `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,
+  `key` varchar(60) NOT NULL,
+  `value` text NOT NULL,
+  `system` enum('0','1') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_log` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(8) unsigned NOT NULL,
+  `date` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL,
+  `data` text NOT NULL,
+  `result` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `obejctID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_module` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(60) NOT NULL DEFAULT '',
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `type` char(30) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `collector` text NOT NULL,
+  `short` varchar(30) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `root` (`root`),
+  KEY `type` (`type`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_notify` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(50) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(9) NOT NULL,
+  `toList` varchar(255) NOT NULL,
+  `ccList` text NOT NULL,
+  `subject` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `sendTime` datetime NOT NULL,
+  `status` varchar(10) NOT NULL DEFAULT 'wait',
+  `failReason` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType_toList_status` (`objectType`,`toList`,`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_oauth` (
+  `account` varchar(30) NOT NULL,
+  `openID` varchar(255) NOT NULL,
+  `providerType` varchar(30) NOT NULL,
+  `providerID` mediumint(8) unsigned NOT NULL,
+  KEY `account` (`account`),
+  KEY `providerType` (`providerType`),
+  KEY `providerID` (`providerID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_planstory` (
+  `plan` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL,
+  `order` mediumint(9) NOT NULL,
+  UNIQUE KEY `plan_story` (`plan`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_product` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `bind` enum('0','1') NOT NULL DEFAULT '0',
+  `line` mediumint(8) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'normal',
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `PO` varchar(30) NOT NULL,
+  `QD` varchar(30) NOT NULL,
+  `RD` varchar(30) NOT NULL,
+  `storyConcept` smallint(5) NOT NULL,
+  `acl` enum('open','private','custom') NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `createdVersion` varchar(20) NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_productplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(9) NOT NULL DEFAULT 0,
+  `title` varchar(90) NOT NULL,
+  `desc` text NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `order` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `end` (`end`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_project` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `model` char(30) NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'sprint',
+  `product` char(30) NOT NULL DEFAULT 'single',
+  `lifetime` char(30) NOT NULL,
+  `budget` varchar(30) NOT NULL DEFAULT '0',
+  `budgetUnit` char(30) NOT NULL DEFAULT 'CNY',
+  `attribute` varchar(30) NOT NULL DEFAULT '',
+  `percent` float unsigned NOT NULL DEFAULT 0,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `output` text NOT NULL,
+  `auth` char(30) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` varchar(255) NOT NULL,
+  `grade` tinyint(3) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `realBegan` date NOT NULL,
+  `realEnd` date NOT NULL,
+  `days` smallint(5) unsigned NOT NULL,
+  `storyConcept` smallint(5) unsigned NOT NULL,
+  `status` varchar(10) NOT NULL,
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `statge` enum('1','2','3','4','5') NOT NULL DEFAULT '1',
+  `pri` enum('1','2','3','4') NOT NULL DEFAULT '1',
+  `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `parentVersion` smallint(6) NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedVersion` varchar(20) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `canceledBy` varchar(30) NOT NULL DEFAULT '',
+  `canceledDate` datetime NOT NULL,
+  `PO` varchar(30) NOT NULL DEFAULT '',
+  `PM` varchar(30) NOT NULL DEFAULT '',
+  `QD` varchar(30) NOT NULL DEFAULT '',
+  `RD` varchar(30) NOT NULL DEFAULT '',
+  `team` varchar(90) NOT NULL,
+  `acl` char(30) NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `begin` (`begin`),
+  KEY `end` (`end`),
+  KEY `status` (`status`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectcase` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectproduct` (
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `plan` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`project`,`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectspec` (
+  `project` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  UNIQUE KEY `project` (`project`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectstory` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_relation` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL,
+  `product` mediumint(8) NOT NULL,
+  `execution` mediumint(8) NOT NULL,
+  `AType` char(30) NOT NULL,
+  `AID` mediumint(8) NOT NULL,
+  `AVersion` char(30) NOT NULL,
+  `relation` char(30) NOT NULL,
+  `BType` char(30) NOT NULL,
+  `BID` mediumint(8) NOT NULL,
+  `BVersion` char(30) NOT NULL,
+  `extra` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `relation` (`relation`,`AType`,`BType`,`AID`,`BID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_release` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `build` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `marker` enum('0','1') NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `leftBugs` text NOT NULL,
+  `desc` text NOT NULL,
+  `status` varchar(20) NOT NULL DEFAULT 'normal',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repo` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `product` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `prefix` varchar(100) NOT NULL,
+  `encoding` varchar(20) NOT NULL,
+  `SCM` varchar(10) NOT NULL,
+  `client` varchar(100) NOT NULL,
+  `commits` mediumint(8) unsigned NOT NULL,
+  `account` varchar(30) NOT NULL,
+  `password` varchar(30) NOT NULL,
+  `encrypt` varchar(30) NOT NULL DEFAULT 'plain',
+  `acl` text NOT NULL,
+  `synced` tinyint(1) NOT NULL DEFAULT 0,
+  `lastSync` datetime NOT NULL,
+  `desc` text NOT NULL,
+  `deleted` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repobranch` (
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `branch` varchar(255) NOT NULL,
+  UNIQUE KEY `repo_revision_branch` (`repo`,`revision`,`branch`),
+  KEY `branch` (`branch`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repofiles` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `parent` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `action` char(1) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `path` (`path`),
+  KEY `parent` (`parent`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repohistory` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(9) NOT NULL,
+  `revision` varchar(40) NOT NULL,
+  `commit` mediumint(8) unsigned NOT NULL,
+  `comment` text NOT NULL,
+  `committer` varchar(100) NOT NULL,
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_score` (
+  `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
+  `account` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL DEFAULT '',
+  `method` varchar(30) NOT NULL,
+  `desc` varchar(250) NOT NULL DEFAULT '',
+  `before` int(11) NOT NULL DEFAULT 0,
+  `score` int(11) NOT NULL DEFAULT 0,
+  `after` int(11) NOT NULL DEFAULT 0,
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `model` (`module`),
+  KEY `method` (`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchdict` (
+  `key` smallint(5) unsigned NOT NULL,
+  `value` char(3) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchindex` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` char(20) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `title` text NOT NULL,
+  `content` text NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `object` (`objectType`,`objectID`),
+  KEY `addedDate` (`addedDate`),
+  FULLTEXT KEY `content` (`content`),
+  FULLTEXT KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_stakeholder` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `objectID` mediumint(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `user` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `key` enum('0','1') NOT NULL,
+  `from` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_story` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(9) NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `plan` text DEFAULT NULL,
+  `source` varchar(20) NOT NULL,
+  `sourceNote` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'story',
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+  `estimate` float unsigned NOT NULL,
+  `status` enum('','changed','active','draft','closed') NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released','closed') NOT NULL DEFAULT 'wait',
+  `stagedBy` char(30) NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `toBug` mediumint(8) unsigned NOT NULL,
+  `childStories` varchar(255) NOT NULL,
+  `linkStories` varchar(255) NOT NULL,
+  `duplicateStory` mediumint(8) unsigned NOT NULL,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `URChanged` enum('0','1') NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `status` (`status`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyspec` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `spec` text NOT NULL,
+  `verify` text NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storystage` (
+  `story` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `stage` varchar(50) NOT NULL,
+  `stagedBy` char(30) NOT NULL,
+  UNIQUE KEY `story_branch` (`story`,`branch`),
+  KEY `story` (`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_suitecase` (
+  `suite` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  UNIQUE KEY `suitecase` (`suite`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_task` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(8) NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `design` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `designVersion` smallint(6) unsigned NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `estimate` float unsigned NOT NULL,
+  `consumed` float unsigned NOT NULL,
+  `left` float unsigned NOT NULL,
+  `deadline` date NOT NULL,
+  `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL DEFAULT 'wait',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `estStarted` date NOT NULL,
+  `realStarted` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL,
+  `finishedDate` datetime NOT NULL,
+  `finishedList` text NOT NULL,
+  `canceledBy` varchar(30) NOT NULL,
+  `canceledDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `activatedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `execution` (`execution`),
+  KEY `story` (`story`),
+  KEY `parent` (`parent`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskestimate` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `date` date NOT NULL,
+  `left` float unsigned NOT NULL DEFAULT 0,
+  `consumed` float unsigned NOT NULL,
+  `account` char(30) NOT NULL DEFAULT '',
+  `work` text DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `task` (`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskspec` (
+  `task` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `estStarted` date NOT NULL,
+  `deadline` date NOT NULL,
+  UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_team` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `type` enum('project','task','execution') NOT NULL DEFAULT 'project',
+  `account` char(30) NOT NULL DEFAULT '',
+  `role` char(30) NOT NULL DEFAULT '',
+  `limited` char(8) NOT NULL DEFAULT 'no',
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `days` smallint(5) unsigned NOT NULL,
+  `hours` float(2,1) unsigned NOT NULL DEFAULT 0.0,
+  `estimate` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `consumed` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `left` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `order` tinyint(3) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `team` (`root`,`type`,`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `tasks` varchar(255) NOT NULL,
+  `builds` varchar(255) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `owner` char(30) NOT NULL,
+  `members` text NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `cases` text NOT NULL,
+  `report` text NOT NULL,
+  `objectType` varchar(20) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testresult` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `run` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `compile` mediumint(8) unsigned NOT NULL,
+  `caseResult` char(30) NOT NULL,
+  `stepResults` text NOT NULL,
+  `lastRunner` varchar(30) NOT NULL,
+  `date` datetime NOT NULL,
+  `duration` float NOT NULL,
+  `xml` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`),
+  KEY `run` (`run`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testrun` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `assignedTo` char(30) NOT NULL DEFAULT '',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  `status` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `task` (`task`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testsuite` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `addedBy` char(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testtask` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` char(90) NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `build` char(30) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `desc` text NOT NULL,
+  `report` text NOT NULL,
+  `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait',
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_todo` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `date` date NOT NULL,
+  `begin` smallint(4) unsigned zerofill NOT NULL,
+  `end` smallint(4) unsigned zerofill NOT NULL,
+  `type` char(10) NOT NULL,
+  `cycle` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `pri` tinyint(3) unsigned NOT NULL,
+  `name` char(150) NOT NULL,
+  `desc` text NOT NULL,
+  `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+  `private` tinyint(1) NOT NULL,
+  `config` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedBy` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL DEFAULT '',
+  `finishedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `assignedTo` (`assignedTo`),
+  KEY `finishedBy` (`finishedBy`),
+  KEY `date` (`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_user` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `company` mediumint(8) unsigned NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'inside',
+  `dept` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `account` char(30) NOT NULL DEFAULT '',
+  `password` char(32) NOT NULL DEFAULT '',
+  `role` char(10) NOT NULL DEFAULT '',
+  `realname` varchar(100) NOT NULL DEFAULT '',
+  `nickname` char(60) NOT NULL DEFAULT '',
+  `commiter` varchar(100) NOT NULL,
+  `avatar` text NOT NULL,
+  `birthday` date NOT NULL DEFAULT '0000-00-00',
+  `gender` enum('f','m') NOT NULL DEFAULT 'f',
+  `email` char(90) NOT NULL DEFAULT '',
+  `skype` char(90) NOT NULL DEFAULT '',
+  `qq` char(20) NOT NULL DEFAULT '',
+  `mobile` char(11) NOT NULL DEFAULT '',
+  `phone` char(20) NOT NULL DEFAULT '',
+  `weixin` varchar(90) NOT NULL DEFAULT '',
+  `dingding` varchar(90) NOT NULL DEFAULT '',
+  `slack` varchar(90) NOT NULL DEFAULT '',
+  `whatsapp` varchar(90) NOT NULL DEFAULT '',
+  `address` char(120) NOT NULL DEFAULT '',
+  `zipcode` char(10) NOT NULL DEFAULT '',
+  `nature` text NOT NULL,
+  `analysis` text NOT NULL,
+  `strategy` text NOT NULL,
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `visits` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `ip` char(15) NOT NULL DEFAULT '',
+  `last` int(10) unsigned NOT NULL DEFAULT 0,
+  `fails` tinyint(5) NOT NULL DEFAULT 0,
+  `locked` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ranzhi` char(30) NOT NULL DEFAULT '',
+  `score` int(11) NOT NULL DEFAULT 0,
+  `scoreLevel` int(11) NOT NULL DEFAULT 0,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account` (`account`),
+  KEY `dept` (`dept`),
+  KEY `email` (`email`),
+  KEY `commiter` (`commiter`),
+  KEY `deleted` (`deleted`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usercontact` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `listName` varchar(60) NOT NULL,
+  `userList` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usergroup` (
+  `account` char(30) NOT NULL DEFAULT '',
+  `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `project` text NOT NULL,
+  UNIQUE KEY `account` (`account`,`group`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userquery` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(90) NOT NULL,
+  `form` text NOT NULL,
+  `sql` text NOT NULL,
+  `shortcut` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usertpl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(150) NOT NULL,
+  `content` text NOT NULL,
+  `public` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userview` (
+  `account` char(30) NOT NULL,
+  `programs` mediumtext NOT NULL,
+  `products` mediumtext NOT NULL,
+  `projects` mediumtext NOT NULL,
+  `sprints` mediumtext NOT NULL,
+  UNIQUE KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_webhook` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(15) NOT NULL DEFAULT 'default',
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `secret` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL DEFAULT 'application/json',
+  `sendType` enum('sync','async') NOT NULL DEFAULT 'sync',
+  `products` text NOT NULL,
+  `projects` text NOT NULL,
+  `params` varchar(100) NOT NULL,
+  `actions` text NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/db/standard/zentao15.0.sql b/db/standard/zentao15.0.sql
new file mode 100644
index 0000000000..1c5fde19e7
--- /dev/null
+++ b/db/standard/zentao15.0.sql
@@ -0,0 +1,1220 @@
+CREATE TABLE `zt_acl` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL DEFAULT 0,
+  `type` char(40) NOT NULL DEFAULT 'whitelist',
+  `source` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_action` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL DEFAULT '',
+  `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` varchar(255) NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `actor` varchar(100) NOT NULL DEFAULT '',
+  `action` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL,
+  `comment` text NOT NULL,
+  `extra` text NOT NULL,
+  `read` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `date` (`date`),
+  KEY `actor` (`actor`),
+  KEY `project` (`project`),
+  KEY `action` (`action`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_block` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(20) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(100) NOT NULL,
+  `source` varchar(20) NOT NULL,
+  `block` varchar(20) NOT NULL,
+  `params` text NOT NULL,
+  `order` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `grid` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `height` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `hidden` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account_module_type_order` (`account`,`module`,`type`,`order`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_branch` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_bug` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `plan` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `toTask` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `toStory` mediumint(8) NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `severity` tinyint(4) NOT NULL DEFAULT 0,
+  `pri` tinyint(3) unsigned NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT '',
+  `os` varchar(30) NOT NULL DEFAULT '',
+  `browser` varchar(30) NOT NULL DEFAULT '',
+  `hardware` varchar(30) NOT NULL,
+  `found` varchar(30) NOT NULL DEFAULT '',
+  `steps` text NOT NULL,
+  `status` enum('active','resolved','closed') NOT NULL DEFAULT 'active',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `activatedCount` smallint(6) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedBuild` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `deadline` date NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+  `resolution` varchar(30) NOT NULL DEFAULT '',
+  `resolvedBuild` varchar(30) NOT NULL DEFAULT '',
+  `resolvedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `duplicateBug` mediumint(8) unsigned NOT NULL,
+  `linkBug` varchar(255) NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `caseVersion` smallint(6) NOT NULL DEFAULT 1,
+  `result` mediumint(8) unsigned NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `entry` varchar(255) NOT NULL,
+  `lines` varchar(10) NOT NULL,
+  `v1` varchar(40) NOT NULL,
+  `v2` varchar(40) NOT NULL,
+  `repoType` varchar(30) NOT NULL DEFAULT '',
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `status` (`status`),
+  KEY `plan` (`plan`),
+  KEY `story` (`story`),
+  KEY `case` (`case`),
+  KEY `toStory` (`toStory`),
+  KEY `result` (`result`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_build` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(150) NOT NULL,
+  `scmPath` char(255) NOT NULL,
+  `filePath` char(255) NOT NULL,
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `builder` char(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_burn` (
+  `execution` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `date` date NOT NULL,
+  `estimate` float NOT NULL,
+  `left` float NOT NULL,
+  `consumed` float NOT NULL,
+  `storyPoint` float NOT NULL,
+  PRIMARY KEY (`execution`,`date`,`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_case` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `story` mediumint(30) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `title` varchar(255) NOT NULL,
+  `precondition` text NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+  `type` char(30) NOT NULL DEFAULT '1',
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `frame` varchar(10) NOT NULL,
+  `stage` varchar(255) NOT NULL,
+  `howRun` varchar(30) NOT NULL,
+  `scriptedBy` varchar(30) NOT NULL,
+  `scriptedDate` date NOT NULL,
+  `scriptStatus` varchar(30) NOT NULL,
+  `scriptLocation` varchar(255) NOT NULL,
+  `status` char(30) NOT NULL DEFAULT '1',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `frequency` enum('1','2','3') NOT NULL DEFAULT '1',
+  `order` tinyint(30) unsigned NOT NULL DEFAULT 0,
+  `openedBy` char(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `lastEditedBy` char(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `linkCase` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL,
+  `fromCaseID` mediumint(8) unsigned NOT NULL,
+  `fromCaseVersion` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `story` (`story`),
+  KEY `fromBug` (`fromBug`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_casestep` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` smallint(3) unsigned NOT NULL DEFAULT 0,
+  `type` varchar(10) NOT NULL DEFAULT 'step',
+  `desc` text NOT NULL,
+  `expect` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_company` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(120) DEFAULT NULL,
+  `phone` char(20) DEFAULT NULL,
+  `fax` char(20) DEFAULT NULL,
+  `address` char(120) DEFAULT NULL,
+  `zipcode` char(10) DEFAULT NULL,
+  `website` char(120) DEFAULT NULL,
+  `backyard` char(120) DEFAULT NULL,
+  `guest` enum('1','0') NOT NULL DEFAULT '0',
+  `admins` char(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_compile` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `queue` mediumint(8) NOT NULL,
+  `status` varchar(255) NOT NULL,
+  `logs` text DEFAULT NULL,
+  `atTime` varchar(10) NOT NULL,
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `tag` varchar(255) NOT NULL,
+  `times` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `updateDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_config` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `owner` char(30) NOT NULL DEFAULT '',
+  `module` varchar(30) NOT NULL,
+  `section` char(30) NOT NULL DEFAULT '',
+  `key` char(30) NOT NULL DEFAULT '',
+  `value` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`owner`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_cron` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `m` varchar(20) NOT NULL,
+  `h` varchar(20) NOT NULL,
+  `dom` varchar(20) NOT NULL,
+  `mon` varchar(20) NOT NULL,
+  `dow` varchar(20) NOT NULL,
+  `command` text NOT NULL,
+  `remark` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `buildin` tinyint(1) NOT NULL DEFAULT 0,
+  `status` varchar(20) NOT NULL,
+  `lastTime` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `lastTime` (`lastTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_dept` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(60) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `order` smallint(4) unsigned NOT NULL DEFAULT 0,
+  `position` char(30) NOT NULL DEFAULT '',
+  `function` char(255) NOT NULL DEFAULT '',
+  `manager` char(30) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doc` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `lib` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `views` smallint(5) unsigned NOT NULL,
+  `collector` text NOT NULL,
+  `addedBy` varchar(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT 1,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `lib` (`lib`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doccontent` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `doc` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `digest` varchar(255) NOT NULL,
+  `content` longtext NOT NULL,
+  `files` text NOT NULL,
+  `type` varchar(10) NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `doc_version` (`doc`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doclib` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(30) NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `name` varchar(60) NOT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `main` enum('0','1') NOT NULL DEFAULT '0',
+  `collector` text NOT NULL,
+  `order` tinyint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_effort` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `user` char(30) NOT NULL DEFAULT '',
+  `todo` enum('1','0') NOT NULL DEFAULT '1',
+  `date` date NOT NULL,
+  `begin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `end` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `type` enum('1','2','3') NOT NULL DEFAULT '1',
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `status` enum('1','2','3') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `user` (`user`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_entry` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `account` varchar(30) NOT NULL DEFAULT '',
+  `code` varchar(20) NOT NULL,
+  `key` varchar(32) NOT NULL,
+  `freePasswd` enum('0','1') NOT NULL DEFAULT '0',
+  `ip` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `calledTime` int(10) unsigned NOT NULL DEFAULT 0,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_expect` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `userID` mediumint(8) NOT NULL,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `expect` text NOT NULL,
+  `progress` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_extension` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(150) NOT NULL,
+  `code` varchar(30) NOT NULL,
+  `version` varchar(50) NOT NULL,
+  `author` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `license` text NOT NULL,
+  `type` varchar(20) NOT NULL DEFAULT 'extension',
+  `site` varchar(150) NOT NULL,
+  `zentaoCompatible` varchar(100) NOT NULL,
+  `installedTime` datetime NOT NULL,
+  `depends` varchar(100) NOT NULL,
+  `dirs` mediumtext NOT NULL,
+  `files` mediumtext NOT NULL,
+  `status` varchar(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`),
+  KEY `name` (`name`),
+  KEY `installedTime` (`installedTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_file` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `pathname` char(50) NOT NULL,
+  `title` char(255) NOT NULL,
+  `extension` char(30) NOT NULL,
+  `size` int(10) unsigned NOT NULL DEFAULT 0,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `addedBy` char(30) NOT NULL DEFAULT '',
+  `addedDate` datetime NOT NULL,
+  `downloads` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `extra` varchar(255) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_group` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(30) NOT NULL,
+  `role` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `acl` text DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_grouppriv` (
+  `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` char(30) NOT NULL DEFAULT '',
+  `method` char(30) NOT NULL DEFAULT '',
+  UNIQUE KEY `group` (`group`,`module`,`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_history` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `action` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `field` varchar(30) NOT NULL DEFAULT '',
+  `old` text NOT NULL,
+  `new` text NOT NULL,
+  `diff` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `action` (`action`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_jenkins` (
+  `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `account` varchar(30) DEFAULT NULL,
+  `password` varchar(255) NOT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_job` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `frame` varchar(20) NOT NULL,
+  `jkHost` mediumint(8) unsigned NOT NULL,
+  `jkJob` varchar(500) NOT NULL,
+  `triggerType` varchar(255) NOT NULL,
+  `svnDir` varchar(255) NOT NULL,
+  `atDay` varchar(255) DEFAULT NULL,
+  `atTime` varchar(10) DEFAULT NULL,
+  `customParam` text NOT NULL,
+  `comment` varchar(255) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `lastExec` datetime DEFAULT NULL,
+  `lastStatus` varchar(255) DEFAULT NULL,
+  `lastTag` varchar(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `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,
+  `key` varchar(60) NOT NULL,
+  `value` text NOT NULL,
+  `system` enum('0','1') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_log` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(8) unsigned NOT NULL,
+  `date` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL,
+  `data` text NOT NULL,
+  `result` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `obejctID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_module` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(60) NOT NULL DEFAULT '',
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `type` char(30) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `collector` text NOT NULL,
+  `short` varchar(30) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `root` (`root`),
+  KEY `type` (`type`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_notify` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(50) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(9) NOT NULL,
+  `toList` varchar(255) NOT NULL,
+  `ccList` text NOT NULL,
+  `subject` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `sendTime` datetime NOT NULL,
+  `status` varchar(10) NOT NULL DEFAULT 'wait',
+  `failReason` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType_toList_status` (`objectType`,`toList`,`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_oauth` (
+  `account` varchar(30) NOT NULL,
+  `openID` varchar(255) NOT NULL,
+  `providerType` varchar(30) NOT NULL,
+  `providerID` mediumint(8) unsigned NOT NULL,
+  KEY `account` (`account`),
+  KEY `providerType` (`providerType`),
+  KEY `providerID` (`providerID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_planstory` (
+  `plan` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL,
+  `order` mediumint(9) NOT NULL,
+  UNIQUE KEY `plan_story` (`plan`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_product` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `bind` enum('0','1') NOT NULL DEFAULT '0',
+  `line` mediumint(8) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'normal',
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `PO` varchar(30) NOT NULL,
+  `QD` varchar(30) NOT NULL,
+  `RD` varchar(30) NOT NULL,
+  `storyConcept` smallint(5) NOT NULL,
+  `acl` enum('open','private','custom') NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `createdVersion` varchar(20) NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_productplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(9) NOT NULL DEFAULT 0,
+  `title` varchar(90) NOT NULL,
+  `desc` text NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `order` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `end` (`end`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_project` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `model` char(30) NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'sprint',
+  `product` char(30) NOT NULL DEFAULT 'single',
+  `lifetime` char(30) NOT NULL,
+  `budget` varchar(30) NOT NULL DEFAULT '0',
+  `budgetUnit` char(30) NOT NULL DEFAULT 'CNY',
+  `attribute` varchar(30) NOT NULL DEFAULT '',
+  `percent` float unsigned NOT NULL DEFAULT 0,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `output` text NOT NULL,
+  `auth` char(30) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` varchar(255) NOT NULL,
+  `grade` tinyint(3) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `realBegan` date NOT NULL,
+  `realEnd` date NOT NULL,
+  `days` smallint(5) unsigned NOT NULL,
+  `storyConcept` smallint(5) unsigned NOT NULL,
+  `status` varchar(10) NOT NULL,
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `statge` enum('1','2','3','4','5') NOT NULL DEFAULT '1',
+  `pri` enum('1','2','3','4') NOT NULL DEFAULT '1',
+  `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `parentVersion` smallint(6) NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedVersion` varchar(20) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `canceledBy` varchar(30) NOT NULL DEFAULT '',
+  `canceledDate` datetime NOT NULL,
+  `PO` varchar(30) NOT NULL DEFAULT '',
+  `PM` varchar(30) NOT NULL DEFAULT '',
+  `QD` varchar(30) NOT NULL DEFAULT '',
+  `RD` varchar(30) NOT NULL DEFAULT '',
+  `team` varchar(90) NOT NULL,
+  `acl` char(30) NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `begin` (`begin`),
+  KEY `end` (`end`),
+  KEY `status` (`status`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectcase` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `count` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectproduct` (
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `plan` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`project`,`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectspec` (
+  `project` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  UNIQUE KEY `project` (`project`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectstory` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_relation` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL,
+  `product` mediumint(8) NOT NULL,
+  `execution` mediumint(8) NOT NULL,
+  `AType` char(30) NOT NULL,
+  `AID` mediumint(8) NOT NULL,
+  `AVersion` char(30) NOT NULL,
+  `relation` char(30) NOT NULL,
+  `BType` char(30) NOT NULL,
+  `BID` mediumint(8) NOT NULL,
+  `BVersion` char(30) NOT NULL,
+  `extra` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `relation` (`relation`,`AType`,`BType`,`AID`,`BID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_release` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `build` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `marker` enum('0','1') NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `leftBugs` text NOT NULL,
+  `desc` text NOT NULL,
+  `status` varchar(20) NOT NULL DEFAULT 'normal',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repo` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `product` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `prefix` varchar(100) NOT NULL,
+  `encoding` varchar(20) NOT NULL,
+  `SCM` varchar(10) NOT NULL,
+  `client` varchar(100) NOT NULL,
+  `commits` mediumint(8) unsigned NOT NULL,
+  `account` varchar(30) NOT NULL,
+  `password` varchar(30) NOT NULL,
+  `encrypt` varchar(30) NOT NULL DEFAULT 'plain',
+  `acl` text NOT NULL,
+  `synced` tinyint(1) NOT NULL DEFAULT 0,
+  `lastSync` datetime NOT NULL,
+  `desc` text NOT NULL,
+  `extra` char(30) NOT NULL,
+  `deleted` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repobranch` (
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `branch` varchar(255) NOT NULL,
+  UNIQUE KEY `repo_revision_branch` (`repo`,`revision`,`branch`),
+  KEY `branch` (`branch`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repofiles` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `parent` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `action` char(1) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `path` (`path`),
+  KEY `parent` (`parent`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repohistory` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(9) NOT NULL,
+  `revision` varchar(40) NOT NULL,
+  `commit` mediumint(8) unsigned NOT NULL,
+  `comment` text NOT NULL,
+  `committer` varchar(100) NOT NULL,
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_score` (
+  `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
+  `account` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL DEFAULT '',
+  `method` varchar(30) NOT NULL,
+  `desc` varchar(250) NOT NULL DEFAULT '',
+  `before` int(11) NOT NULL DEFAULT 0,
+  `score` int(11) NOT NULL DEFAULT 0,
+  `after` int(11) NOT NULL DEFAULT 0,
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `model` (`module`),
+  KEY `method` (`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchdict` (
+  `key` smallint(5) unsigned NOT NULL,
+  `value` char(3) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchindex` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` char(20) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `title` text NOT NULL,
+  `content` text NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `object` (`objectType`,`objectID`),
+  KEY `addedDate` (`addedDate`),
+  FULLTEXT KEY `content` (`content`),
+  FULLTEXT KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_stakeholder` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `objectID` mediumint(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `user` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `key` enum('0','1') NOT NULL,
+  `from` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_story` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(9) NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `plan` text DEFAULT NULL,
+  `source` varchar(20) NOT NULL,
+  `sourceNote` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'story',
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+  `estimate` float unsigned NOT NULL,
+  `status` enum('','changed','active','draft','closed') NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released','closed') NOT NULL DEFAULT 'wait',
+  `stagedBy` char(30) NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `toBug` mediumint(8) unsigned NOT NULL,
+  `childStories` varchar(255) NOT NULL,
+  `linkStories` varchar(255) NOT NULL,
+  `duplicateStory` mediumint(8) unsigned NOT NULL,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `URChanged` enum('0','1') NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `status` (`status`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyspec` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `spec` text NOT NULL,
+  `verify` text NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storystage` (
+  `story` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `stage` varchar(50) NOT NULL,
+  `stagedBy` char(30) NOT NULL,
+  UNIQUE KEY `story_branch` (`story`,`branch`),
+  KEY `story` (`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_suitecase` (
+  `suite` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  UNIQUE KEY `suitecase` (`suite`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_task` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(8) NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `design` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `designVersion` smallint(6) unsigned NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `estimate` float unsigned NOT NULL,
+  `consumed` float unsigned NOT NULL,
+  `left` float unsigned NOT NULL,
+  `deadline` date NOT NULL,
+  `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL DEFAULT 'wait',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `estStarted` date NOT NULL,
+  `realStarted` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL,
+  `finishedDate` datetime NOT NULL,
+  `finishedList` text NOT NULL,
+  `canceledBy` varchar(30) NOT NULL,
+  `canceledDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `activatedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `execution` (`execution`),
+  KEY `story` (`story`),
+  KEY `parent` (`parent`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskestimate` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `date` date NOT NULL,
+  `left` float unsigned NOT NULL DEFAULT 0,
+  `consumed` float unsigned NOT NULL,
+  `account` char(30) NOT NULL DEFAULT '',
+  `work` text DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `task` (`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskspec` (
+  `task` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `estStarted` date NOT NULL,
+  `deadline` date NOT NULL,
+  UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_team` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `type` enum('project','task','execution') NOT NULL DEFAULT 'project',
+  `account` char(30) NOT NULL DEFAULT '',
+  `role` char(30) NOT NULL DEFAULT '',
+  `limited` char(8) NOT NULL DEFAULT 'no',
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `days` smallint(5) unsigned NOT NULL,
+  `hours` float(2,1) unsigned NOT NULL DEFAULT 0.0,
+  `estimate` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `consumed` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `left` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `order` tinyint(3) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `team` (`root`,`type`,`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `tasks` varchar(255) NOT NULL,
+  `builds` varchar(255) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `owner` char(30) NOT NULL,
+  `members` text NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `cases` text NOT NULL,
+  `report` text NOT NULL,
+  `objectType` varchar(20) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testresult` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `run` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `compile` mediumint(8) unsigned NOT NULL,
+  `caseResult` char(30) NOT NULL,
+  `stepResults` text NOT NULL,
+  `lastRunner` varchar(30) NOT NULL,
+  `date` datetime NOT NULL,
+  `duration` float NOT NULL,
+  `xml` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`),
+  KEY `run` (`run`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testrun` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `assignedTo` char(30) NOT NULL DEFAULT '',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  `status` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `task` (`task`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testsuite` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `addedBy` char(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testtask` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` char(90) NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `build` char(30) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `desc` text NOT NULL,
+  `report` text NOT NULL,
+  `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait',
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_todo` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `date` date NOT NULL,
+  `begin` smallint(4) unsigned zerofill NOT NULL,
+  `end` smallint(4) unsigned zerofill NOT NULL,
+  `type` char(10) NOT NULL,
+  `cycle` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `pri` tinyint(3) unsigned NOT NULL,
+  `name` char(150) NOT NULL,
+  `desc` text NOT NULL,
+  `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+  `private` tinyint(1) NOT NULL,
+  `config` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedBy` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL DEFAULT '',
+  `finishedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `assignedTo` (`assignedTo`),
+  KEY `finishedBy` (`finishedBy`),
+  KEY `date` (`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_user` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `company` mediumint(8) unsigned NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'inside',
+  `dept` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `account` char(30) NOT NULL DEFAULT '',
+  `password` char(32) NOT NULL DEFAULT '',
+  `role` char(10) NOT NULL DEFAULT '',
+  `realname` varchar(100) NOT NULL DEFAULT '',
+  `nickname` char(60) NOT NULL DEFAULT '',
+  `commiter` varchar(100) NOT NULL,
+  `avatar` text NOT NULL,
+  `birthday` date NOT NULL DEFAULT '0000-00-00',
+  `gender` enum('f','m') NOT NULL DEFAULT 'f',
+  `email` char(90) NOT NULL DEFAULT '',
+  `skype` char(90) NOT NULL DEFAULT '',
+  `qq` char(20) NOT NULL DEFAULT '',
+  `mobile` char(11) NOT NULL DEFAULT '',
+  `phone` char(20) NOT NULL DEFAULT '',
+  `weixin` varchar(90) NOT NULL DEFAULT '',
+  `dingding` varchar(90) NOT NULL DEFAULT '',
+  `slack` varchar(90) NOT NULL DEFAULT '',
+  `whatsapp` varchar(90) NOT NULL DEFAULT '',
+  `address` char(120) NOT NULL DEFAULT '',
+  `zipcode` char(10) NOT NULL DEFAULT '',
+  `nature` text NOT NULL,
+  `analysis` text NOT NULL,
+  `strategy` text NOT NULL,
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `visits` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `ip` char(15) NOT NULL DEFAULT '',
+  `last` int(10) unsigned NOT NULL DEFAULT 0,
+  `fails` tinyint(5) NOT NULL DEFAULT 0,
+  `locked` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ranzhi` char(30) NOT NULL DEFAULT '',
+  `score` int(11) NOT NULL DEFAULT 0,
+  `scoreLevel` int(11) NOT NULL DEFAULT 0,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account` (`account`),
+  KEY `dept` (`dept`),
+  KEY `email` (`email`),
+  KEY `commiter` (`commiter`),
+  KEY `deleted` (`deleted`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usercontact` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `listName` varchar(60) NOT NULL,
+  `userList` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usergroup` (
+  `account` char(30) NOT NULL DEFAULT '',
+  `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `project` text NOT NULL,
+  UNIQUE KEY `account` (`account`,`group`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userquery` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(90) NOT NULL,
+  `form` text NOT NULL,
+  `sql` text NOT NULL,
+  `shortcut` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usertpl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(150) NOT NULL,
+  `content` text NOT NULL,
+  `public` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userview` (
+  `account` char(30) NOT NULL,
+  `programs` mediumtext NOT NULL,
+  `products` mediumtext NOT NULL,
+  `projects` mediumtext NOT NULL,
+  `sprints` mediumtext NOT NULL,
+  UNIQUE KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_webhook` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(15) NOT NULL DEFAULT 'default',
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `secret` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL DEFAULT 'application/json',
+  `sendType` enum('sync','async') NOT NULL DEFAULT 'sync',
+  `products` text NOT NULL,
+  `executions` text NOT NULL,
+  `params` varchar(100) NOT NULL,
+  `actions` text NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/db/standard/zentao15.1.sql b/db/standard/zentao15.1.sql
new file mode 100644
index 0000000000..dfbe848935
--- /dev/null
+++ b/db/standard/zentao15.1.sql
@@ -0,0 +1,1240 @@
+CREATE TABLE `zt_acl` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL DEFAULT 0,
+  `type` char(40) NOT NULL DEFAULT 'whitelist',
+  `source` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_action` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL DEFAULT '',
+  `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` varchar(255) NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `actor` varchar(100) NOT NULL DEFAULT '',
+  `action` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL,
+  `comment` text NOT NULL,
+  `extra` text NOT NULL,
+  `read` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `date` (`date`),
+  KEY `actor` (`actor`),
+  KEY `project` (`project`),
+  KEY `action` (`action`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_block` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(20) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(100) NOT NULL,
+  `source` varchar(20) NOT NULL,
+  `block` varchar(20) NOT NULL,
+  `params` text NOT NULL,
+  `order` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `grid` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `height` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `hidden` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account_module_type_order` (`account`,`module`,`type`,`order`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_branch` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_bug` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `plan` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `toTask` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `toStory` mediumint(8) NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `severity` tinyint(4) NOT NULL DEFAULT 0,
+  `pri` tinyint(3) unsigned NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT '',
+  `os` varchar(30) NOT NULL DEFAULT '',
+  `browser` varchar(30) NOT NULL DEFAULT '',
+  `hardware` varchar(30) NOT NULL,
+  `found` varchar(30) NOT NULL DEFAULT '',
+  `steps` text NOT NULL,
+  `status` enum('active','resolved','closed') NOT NULL DEFAULT 'active',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `activatedCount` smallint(6) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedBuild` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `deadline` date NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+  `resolution` varchar(30) NOT NULL DEFAULT '',
+  `resolvedBuild` varchar(30) NOT NULL DEFAULT '',
+  `resolvedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `duplicateBug` mediumint(8) unsigned NOT NULL,
+  `linkBug` varchar(255) NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `caseVersion` smallint(6) NOT NULL DEFAULT 1,
+  `result` mediumint(8) unsigned NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `entry` varchar(255) NOT NULL,
+  `lines` varchar(10) NOT NULL,
+  `v1` varchar(40) NOT NULL,
+  `v2` varchar(40) NOT NULL,
+  `repoType` varchar(30) NOT NULL DEFAULT '',
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `status` (`status`),
+  KEY `plan` (`plan`),
+  KEY `story` (`story`),
+  KEY `case` (`case`),
+  KEY `toStory` (`toStory`),
+  KEY `result` (`result`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_build` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(150) NOT NULL,
+  `scmPath` char(255) NOT NULL,
+  `filePath` char(255) NOT NULL,
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `builder` char(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_burn` (
+  `execution` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `date` date NOT NULL,
+  `estimate` float NOT NULL,
+  `left` float NOT NULL,
+  `consumed` float NOT NULL,
+  `storyPoint` float NOT NULL,
+  PRIMARY KEY (`execution`,`date`,`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_case` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `story` mediumint(30) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `title` varchar(255) NOT NULL,
+  `precondition` text NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+  `type` char(30) NOT NULL DEFAULT '1',
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `frame` varchar(10) NOT NULL,
+  `stage` varchar(255) NOT NULL,
+  `howRun` varchar(30) NOT NULL,
+  `scriptedBy` varchar(30) NOT NULL,
+  `scriptedDate` date NOT NULL,
+  `scriptStatus` varchar(30) NOT NULL,
+  `scriptLocation` varchar(255) NOT NULL,
+  `status` char(30) NOT NULL DEFAULT '1',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `frequency` enum('1','2','3') NOT NULL DEFAULT '1',
+  `order` tinyint(30) unsigned NOT NULL DEFAULT 0,
+  `openedBy` char(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `lastEditedBy` char(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `linkCase` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL,
+  `fromCaseID` mediumint(8) unsigned NOT NULL,
+  `fromCaseVersion` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `story` (`story`),
+  KEY `fromBug` (`fromBug`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_casestep` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` smallint(3) unsigned NOT NULL DEFAULT 0,
+  `type` varchar(10) NOT NULL DEFAULT 'step',
+  `desc` text NOT NULL,
+  `expect` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_company` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(120) DEFAULT NULL,
+  `phone` char(20) DEFAULT NULL,
+  `fax` char(20) DEFAULT NULL,
+  `address` char(120) DEFAULT NULL,
+  `zipcode` char(10) DEFAULT NULL,
+  `website` char(120) DEFAULT NULL,
+  `backyard` char(120) DEFAULT NULL,
+  `guest` enum('1','0') NOT NULL DEFAULT '0',
+  `admins` char(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_compile` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `queue` mediumint(8) NOT NULL,
+  `status` varchar(255) NOT NULL,
+  `logs` text DEFAULT NULL,
+  `atTime` varchar(10) NOT NULL,
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `tag` varchar(255) NOT NULL,
+  `times` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `updateDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_config` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `owner` char(30) NOT NULL DEFAULT '',
+  `module` varchar(30) NOT NULL,
+  `section` char(30) NOT NULL DEFAULT '',
+  `key` char(30) NOT NULL DEFAULT '',
+  `value` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`owner`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_cron` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `m` varchar(20) NOT NULL,
+  `h` varchar(20) NOT NULL,
+  `dom` varchar(20) NOT NULL,
+  `mon` varchar(20) NOT NULL,
+  `dow` varchar(20) NOT NULL,
+  `command` text NOT NULL,
+  `remark` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `buildin` tinyint(1) NOT NULL DEFAULT 0,
+  `status` varchar(20) NOT NULL,
+  `lastTime` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `lastTime` (`lastTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_dept` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(60) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `order` smallint(4) unsigned NOT NULL DEFAULT 0,
+  `position` char(30) NOT NULL DEFAULT '',
+  `function` char(255) NOT NULL DEFAULT '',
+  `manager` char(30) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doc` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `lib` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `views` smallint(5) unsigned NOT NULL,
+  `collector` text NOT NULL,
+  `addedBy` varchar(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT 1,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `lib` (`lib`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doccontent` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `doc` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `digest` varchar(255) NOT NULL,
+  `content` longtext NOT NULL,
+  `files` text NOT NULL,
+  `type` varchar(10) NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `doc_version` (`doc`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doclib` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(30) NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `name` varchar(60) NOT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `main` enum('0','1') NOT NULL DEFAULT '0',
+  `collector` text NOT NULL,
+  `order` tinyint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_effort` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `user` char(30) NOT NULL DEFAULT '',
+  `todo` enum('1','0') NOT NULL DEFAULT '1',
+  `date` date NOT NULL,
+  `begin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `end` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `type` enum('1','2','3') NOT NULL DEFAULT '1',
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `status` enum('1','2','3') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `user` (`user`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_entry` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `account` varchar(30) NOT NULL DEFAULT '',
+  `code` varchar(20) NOT NULL,
+  `key` varchar(32) NOT NULL,
+  `freePasswd` enum('0','1') NOT NULL DEFAULT '0',
+  `ip` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `calledTime` int(10) unsigned NOT NULL DEFAULT 0,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_expect` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `userID` mediumint(8) NOT NULL,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `expect` text NOT NULL,
+  `progress` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_extension` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(150) NOT NULL,
+  `code` varchar(30) NOT NULL,
+  `version` varchar(50) NOT NULL,
+  `author` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `license` text NOT NULL,
+  `type` varchar(20) NOT NULL DEFAULT 'extension',
+  `site` varchar(150) NOT NULL,
+  `zentaoCompatible` varchar(100) NOT NULL,
+  `installedTime` datetime NOT NULL,
+  `depends` varchar(100) NOT NULL,
+  `dirs` mediumtext NOT NULL,
+  `files` mediumtext NOT NULL,
+  `status` varchar(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`),
+  KEY `name` (`name`),
+  KEY `installedTime` (`installedTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_file` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `pathname` char(50) NOT NULL,
+  `title` char(255) NOT NULL,
+  `extension` char(30) NOT NULL,
+  `size` int(10) unsigned NOT NULL DEFAULT 0,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `addedBy` char(30) NOT NULL DEFAULT '',
+  `addedDate` datetime NOT NULL,
+  `downloads` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `extra` varchar(255) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_group` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(30) NOT NULL,
+  `role` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `acl` text DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_grouppriv` (
+  `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` char(30) NOT NULL DEFAULT '',
+  `method` char(30) NOT NULL DEFAULT '',
+  UNIQUE KEY `group` (`group`,`module`,`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_history` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `action` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `field` varchar(30) NOT NULL DEFAULT '',
+  `old` text NOT NULL,
+  `new` text NOT NULL,
+  `diff` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `action` (`action`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_jenkins` (
+  `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `account` varchar(30) DEFAULT NULL,
+  `password` varchar(255) NOT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_job` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `frame` varchar(20) NOT NULL,
+  `jkHost` mediumint(8) unsigned NOT NULL,
+  `jkJob` varchar(500) NOT NULL,
+  `triggerType` varchar(255) NOT NULL,
+  `svnDir` varchar(255) NOT NULL,
+  `atDay` varchar(255) DEFAULT NULL,
+  `atTime` varchar(10) DEFAULT NULL,
+  `customParam` text NOT NULL,
+  `comment` varchar(255) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `lastExec` datetime DEFAULT NULL,
+  `lastStatus` varchar(255) DEFAULT NULL,
+  `lastTag` varchar(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `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,
+  `key` varchar(60) NOT NULL,
+  `value` text NOT NULL,
+  `system` enum('0','1') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_log` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(8) unsigned NOT NULL,
+  `date` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL,
+  `data` text NOT NULL,
+  `result` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `obejctID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_module` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` char(60) NOT NULL DEFAULT '',
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `type` char(30) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `collector` text NOT NULL,
+  `short` varchar(30) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `root` (`root`),
+  KEY `type` (`type`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_notify` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(50) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(9) NOT NULL,
+  `toList` varchar(255) NOT NULL,
+  `ccList` text NOT NULL,
+  `subject` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `sendTime` datetime NOT NULL,
+  `status` varchar(10) NOT NULL DEFAULT 'wait',
+  `failReason` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType_toList_status` (`objectType`,`toList`,`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_oauth` (
+  `account` varchar(30) NOT NULL,
+  `openID` varchar(255) NOT NULL,
+  `providerType` varchar(30) NOT NULL,
+  `providerID` mediumint(8) unsigned NOT NULL,
+  KEY `account` (`account`),
+  KEY `providerType` (`providerType`),
+  KEY `providerID` (`providerID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_planstory` (
+  `plan` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL,
+  `order` mediumint(9) NOT NULL,
+  UNIQUE KEY `plan_story` (`plan`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_product` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `bind` enum('0','1') NOT NULL DEFAULT '0',
+  `line` mediumint(8) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'normal',
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `PO` varchar(30) NOT NULL,
+  `QD` varchar(30) NOT NULL,
+  `RD` varchar(30) NOT NULL,
+  `storyConcept` smallint(5) NOT NULL,
+  `acl` enum('open','private','custom') NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `createdVersion` varchar(20) NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_productplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(9) NOT NULL DEFAULT 0,
+  `title` varchar(90) NOT NULL,
+  `desc` text NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `order` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `end` (`end`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_project` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `model` char(30) NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'sprint',
+  `product` char(30) NOT NULL DEFAULT 'single',
+  `lifetime` char(30) NOT NULL,
+  `budget` varchar(30) NOT NULL DEFAULT '0',
+  `budgetUnit` char(30) NOT NULL DEFAULT 'CNY',
+  `attribute` varchar(30) NOT NULL DEFAULT '',
+  `percent` float unsigned NOT NULL DEFAULT 0,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `output` text NOT NULL,
+  `auth` char(30) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `path` varchar(255) NOT NULL,
+  `grade` tinyint(3) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `realBegan` date NOT NULL,
+  `realEnd` date NOT NULL,
+  `days` smallint(5) unsigned NOT NULL,
+  `storyConcept` smallint(5) unsigned NOT NULL,
+  `status` varchar(10) NOT NULL,
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `statge` enum('1','2','3','4','5') NOT NULL DEFAULT '1',
+  `pri` enum('1','2','3','4') NOT NULL DEFAULT '1',
+  `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `parentVersion` smallint(6) NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedVersion` varchar(20) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `canceledBy` varchar(30) NOT NULL DEFAULT '',
+  `canceledDate` datetime NOT NULL,
+  `PO` varchar(30) NOT NULL DEFAULT '',
+  `PM` varchar(30) NOT NULL DEFAULT '',
+  `QD` varchar(30) NOT NULL DEFAULT '',
+  `RD` varchar(30) NOT NULL DEFAULT '',
+  `team` varchar(90) NOT NULL,
+  `acl` char(30) NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `begin` (`begin`),
+  KEY `end` (`end`),
+  KEY `status` (`status`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectcase` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `count` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectproduct` (
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `plan` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`project`,`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectspec` (
+  `project` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  UNIQUE KEY `project` (`project`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectstory` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_relation` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL,
+  `product` mediumint(8) NOT NULL,
+  `execution` mediumint(8) NOT NULL,
+  `AType` char(30) NOT NULL,
+  `AID` mediumint(8) NOT NULL,
+  `AVersion` char(30) NOT NULL,
+  `relation` char(30) NOT NULL,
+  `BType` char(30) NOT NULL,
+  `BID` mediumint(8) NOT NULL,
+  `BVersion` char(30) NOT NULL,
+  `extra` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `relation` (`relation`,`AType`,`BType`,`AID`,`BID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_release` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `build` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `marker` enum('0','1') NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `leftBugs` text NOT NULL,
+  `desc` text NOT NULL,
+  `status` varchar(20) NOT NULL DEFAULT 'normal',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repo` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `product` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `prefix` varchar(100) NOT NULL,
+  `encoding` varchar(20) NOT NULL,
+  `SCM` varchar(10) NOT NULL,
+  `client` varchar(100) NOT NULL,
+  `commits` mediumint(8) unsigned NOT NULL,
+  `account` varchar(30) NOT NULL,
+  `password` varchar(30) NOT NULL,
+  `encrypt` varchar(30) NOT NULL DEFAULT 'plain',
+  `acl` text NOT NULL,
+  `synced` tinyint(1) NOT NULL DEFAULT 0,
+  `lastSync` datetime NOT NULL,
+  `desc` text NOT NULL,
+  `extra` char(30) NOT NULL,
+  `deleted` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repobranch` (
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `branch` varchar(255) NOT NULL,
+  UNIQUE KEY `repo_revision_branch` (`repo`,`revision`,`branch`),
+  KEY `branch` (`branch`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repofiles` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `parent` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `action` char(1) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `path` (`path`),
+  KEY `parent` (`parent`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repohistory` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(9) NOT NULL,
+  `revision` varchar(40) NOT NULL,
+  `commit` mediumint(8) unsigned NOT NULL,
+  `comment` text NOT NULL,
+  `committer` varchar(100) NOT NULL,
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_score` (
+  `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
+  `account` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL DEFAULT '',
+  `method` varchar(30) NOT NULL,
+  `desc` varchar(250) NOT NULL DEFAULT '',
+  `before` int(11) NOT NULL DEFAULT 0,
+  `score` int(11) NOT NULL DEFAULT 0,
+  `after` int(11) NOT NULL DEFAULT 0,
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `model` (`module`),
+  KEY `method` (`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchdict` (
+  `key` smallint(5) unsigned NOT NULL,
+  `value` char(3) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchindex` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` char(20) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `title` text NOT NULL,
+  `content` text NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `object` (`objectType`,`objectID`),
+  KEY `addedDate` (`addedDate`),
+  FULLTEXT KEY `content` (`content`),
+  FULLTEXT KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_stakeholder` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `objectID` mediumint(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `user` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `key` enum('0','1') NOT NULL,
+  `from` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_story` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(9) NOT NULL DEFAULT 0,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `plan` text DEFAULT NULL,
+  `source` varchar(20) NOT NULL,
+  `sourceNote` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'story',
+  `category` varchar(30) NOT NULL DEFAULT 'feature',
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+  `estimate` float unsigned NOT NULL,
+  `status` enum('','changed','active','draft','closed') NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released','closed') NOT NULL DEFAULT 'wait',
+  `stagedBy` char(30) NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `toBug` mediumint(8) unsigned NOT NULL,
+  `childStories` varchar(255) NOT NULL,
+  `linkStories` varchar(255) NOT NULL,
+  `duplicateStory` mediumint(8) unsigned NOT NULL,
+  `version` smallint(6) NOT NULL DEFAULT 1,
+  `URChanged` enum('0','1') NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `status` (`status`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyreview` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `reviewer` varchar(30) NOT NULL,
+  `result` varchar(30) NOT NULL,
+  `reviewDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`,`reviewer`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyestimate` (
+  `story` mediumint(9) NOT NULL,
+  `round` smallint(6) NOT NULL,
+  `estimate` text NOT NULL,
+  `average` float(10,2) NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`round`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyspec` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `spec` text NOT NULL,
+  `verify` text NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storystage` (
+  `story` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `stage` varchar(50) NOT NULL,
+  `stagedBy` char(30) NOT NULL,
+  UNIQUE KEY `story_branch` (`story`,`branch`),
+  KEY `story` (`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_suitecase` (
+  `suite` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  UNIQUE KEY `suitecase` (`suite`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_task` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(8) NOT NULL DEFAULT 0,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `design` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+  `designVersion` smallint(6) unsigned NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `estimate` float unsigned NOT NULL,
+  `consumed` float unsigned NOT NULL,
+  `left` float unsigned NOT NULL,
+  `deadline` date NOT NULL,
+  `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL DEFAULT 'wait',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `estStarted` date NOT NULL,
+  `realStarted` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL,
+  `finishedDate` datetime NOT NULL,
+  `finishedList` text NOT NULL,
+  `canceledBy` varchar(30) NOT NULL,
+  `canceledDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `activatedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `execution` (`execution`),
+  KEY `story` (`story`),
+  KEY `parent` (`parent`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskestimate` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `date` date NOT NULL,
+  `left` float unsigned NOT NULL DEFAULT 0,
+  `consumed` float unsigned NOT NULL,
+  `account` char(30) NOT NULL DEFAULT '',
+  `work` text DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `task` (`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskspec` (
+  `task` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `estStarted` date NOT NULL,
+  `deadline` date NOT NULL,
+  UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_team` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `type` enum('project','task','execution') NOT NULL DEFAULT 'project',
+  `account` char(30) NOT NULL DEFAULT '',
+  `role` char(30) NOT NULL DEFAULT '',
+  `limited` char(8) NOT NULL DEFAULT 'no',
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `days` smallint(5) unsigned NOT NULL,
+  `hours` float(2,1) unsigned NOT NULL DEFAULT 0.0,
+  `estimate` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `consumed` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `left` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+  `order` tinyint(3) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `team` (`root`,`type`,`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `tasks` varchar(255) NOT NULL,
+  `builds` varchar(255) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `owner` char(30) NOT NULL,
+  `members` text NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `cases` text NOT NULL,
+  `report` text NOT NULL,
+  `objectType` varchar(20) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testresult` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `run` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `compile` mediumint(8) unsigned NOT NULL,
+  `caseResult` char(30) NOT NULL,
+  `stepResults` text NOT NULL,
+  `lastRunner` varchar(30) NOT NULL,
+  `date` datetime NOT NULL,
+  `duration` float NOT NULL,
+  `xml` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`),
+  KEY `run` (`run`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testrun` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `assignedTo` char(30) NOT NULL DEFAULT '',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  `status` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `task` (`task`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testsuite` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `addedBy` char(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testtask` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` char(90) NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `build` char(30) NOT NULL,
+  `type` varchar(255) NOT NULL DEFAULT '',
+  `owner` varchar(30) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `mailto` text DEFAULT NULL,
+  `desc` text NOT NULL,
+  `report` text NOT NULL,
+  `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait',
+  `testreport` mediumint(8) unsigned NOT NULL,
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_todo` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `date` date NOT NULL,
+  `begin` smallint(4) unsigned zerofill NOT NULL,
+  `end` smallint(4) unsigned zerofill NOT NULL,
+  `type` char(10) NOT NULL,
+  `cycle` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `pri` tinyint(3) unsigned NOT NULL,
+  `name` char(150) NOT NULL,
+  `desc` text NOT NULL,
+  `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+  `private` tinyint(1) NOT NULL,
+  `config` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedBy` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL DEFAULT '',
+  `finishedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `assignedTo` (`assignedTo`),
+  KEY `finishedBy` (`finishedBy`),
+  KEY `date` (`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_user` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `company` mediumint(8) unsigned NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'inside',
+  `dept` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `account` char(30) NOT NULL DEFAULT '',
+  `password` char(32) NOT NULL DEFAULT '',
+  `role` char(10) NOT NULL DEFAULT '',
+  `realname` varchar(100) NOT NULL DEFAULT '',
+  `nickname` char(60) NOT NULL DEFAULT '',
+  `commiter` varchar(100) NOT NULL,
+  `avatar` text NOT NULL,
+  `birthday` date NOT NULL DEFAULT '0000-00-00',
+  `gender` enum('f','m') NOT NULL DEFAULT 'f',
+  `email` char(90) NOT NULL DEFAULT '',
+  `skype` char(90) NOT NULL DEFAULT '',
+  `qq` char(20) NOT NULL DEFAULT '',
+  `mobile` char(11) NOT NULL DEFAULT '',
+  `phone` char(20) NOT NULL DEFAULT '',
+  `weixin` varchar(90) NOT NULL DEFAULT '',
+  `dingding` varchar(90) NOT NULL DEFAULT '',
+  `slack` varchar(90) NOT NULL DEFAULT '',
+  `whatsapp` varchar(90) NOT NULL DEFAULT '',
+  `address` char(120) NOT NULL DEFAULT '',
+  `zipcode` char(10) NOT NULL DEFAULT '',
+  `nature` text NOT NULL,
+  `analysis` text NOT NULL,
+  `strategy` text NOT NULL,
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `visits` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `ip` char(15) NOT NULL DEFAULT '',
+  `last` int(10) unsigned NOT NULL DEFAULT 0,
+  `fails` tinyint(5) NOT NULL DEFAULT 0,
+  `locked` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ranzhi` char(30) NOT NULL DEFAULT '',
+  `score` int(11) NOT NULL DEFAULT 0,
+  `scoreLevel` int(11) NOT NULL DEFAULT 0,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account` (`account`),
+  KEY `dept` (`dept`),
+  KEY `email` (`email`),
+  KEY `commiter` (`commiter`),
+  KEY `deleted` (`deleted`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usercontact` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `listName` varchar(60) NOT NULL,
+  `userList` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usergroup` (
+  `account` char(30) NOT NULL DEFAULT '',
+  `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+  `project` text NOT NULL,
+  UNIQUE KEY `account` (`account`,`group`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userquery` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(90) NOT NULL,
+  `form` text NOT NULL,
+  `sql` text NOT NULL,
+  `shortcut` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usertpl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(150) NOT NULL,
+  `content` text NOT NULL,
+  `public` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userview` (
+  `account` char(30) NOT NULL,
+  `programs` mediumtext NOT NULL,
+  `products` mediumtext NOT NULL,
+  `projects` mediumtext NOT NULL,
+  `sprints` mediumtext NOT NULL,
+  UNIQUE KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_webhook` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(15) NOT NULL DEFAULT 'default',
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `secret` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL DEFAULT 'application/json',
+  `sendType` enum('sync','async') NOT NULL DEFAULT 'sync',
+  `products` text NOT NULL,
+  `executions` text NOT NULL,
+  `params` varchar(100) NOT NULL,
+  `actions` text NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/db/update12.5.3.sql b/db/update12.5.3.sql
new file mode 100644
index 0000000000..0a926b6d50
--- /dev/null
+++ b/db/update12.5.3.sql
@@ -0,0 +1,358 @@
+ALTER TABLE `zt_project` DROP `isCat`, DROP `catID`;
+ALTER TABLE `zt_project` ADD `project` mediumint(8) NOT NULL DEFAULT 0 AFTER `id`;
+ALTER TABLE `zt_project` ADD `model` char(30) NOT NULL AFTER `project`;
+ALTER TABLE `zt_project` CHANGE `type` `lifetime` char(30) NOT NULL DEFAULT '';
+ALTER TABLE `zt_project` CHANGE `acl` `acl` char(30) NOT NULL DEFAULT 'open';
+ALTER TABLE `zt_project` ADD `type` char(30) NOT NULL DEFAULT 'sprint' AFTER `model`;
+ALTER TABLE `zt_project` ADD `product` varchar(20) NOT NULL DEFAULT 'single' AFTER `type`;
+ALTER TABLE `zt_project` ADD `budget` varchar(30) NOT NULL DEFAULT '0' AFTER `lifetime`;
+ALTER TABLE `zt_project` ADD `budgetUnit` char(30) NOT NULL DEFAULT 'CNY' AFTER `budget`;
+ALTER TABLE `zt_project` ADD `percent` float unsigned NOT NULL DEFAULT '0' AFTER `budgetUnit`;
+ALTER TABLE `zt_project` ADD `path` varchar(255) NOT NULL AFTER `parent`;
+ALTER TABLE `zt_project` ADD `grade` tinyint unsigned NOT NULL AFTER `path`;
+ALTER TABLE `zt_project` ADD `auth` char(30) NOT NULL AFTER `percent`;
+ALTER TABLE `zt_project` ADD `milestone` enum('0','1') NOT NULL default '0' AFTER `percent`;
+ALTER TABLE `zt_project` ADD `attribute` varchar(30) NOT NULL DEFAULT '' AFTER `budgetUnit`;
+ALTER TABLE `zt_project` ADD `realBegan` date NOT NULL AFTER `end`;
+ALTER TABLE `zt_project` ADD `realEnd` date NOT NULL AFTER `realBegan`;
+ALTER TABLE `zt_project` ADD `version` smallint(6) NOT NULL AFTER `desc`;
+ALTER TABLE `zt_project` ADD `parentVersion` smallint(6) NOT NULL AFTER `version`;
+ALTER TABLE `zt_project` ADD `planDuration` int(11) NOT NULL AFTER `parentVersion`;
+ALTER TABLE `zt_project` ADD `realDuration` int(11) NOT NULL AFTER `planDuration`;
+ALTER TABLE `zt_project` ADD `output` text NOT NULL AFTER `milestone`;
+ALTER TABLE `zt_project` ADD `lastEditedBy` varchar(30) NOT NULL DEFAULT '' AFTER `openedVersion`;
+ALTER TABLE `zt_project` ADD `lastEditedDate` datetime NOT NULL AFTER `lastEditedBy`;
+
+ALTER TABLE `zt_action` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_bug` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_build` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_burn` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_doc` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_relation` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_relation` CHANGE `program` `project` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_doclib` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_task` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_testreport` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_testtask` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
+ALTER TABLE `zt_webhook` CHANGE `projects` `executions` text NOT NULL;
+
+ALTER TABLE `zt_action` ADD `project` mediumint(8) unsigned NOT NULL AFTER `product`;
+ALTER TABLE `zt_task` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_doclib` ADD `project` mediumint(8) unsigned NOT NULL AFTER `product`;
+ALTER TABLE `zt_doc` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_story` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_bug` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_case` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_testtask` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_testreport` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_testsuite` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_build` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_release` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+
+ALTER TABLE `zt_product` ADD `bind` enum('0','1') NOT NULL DEFAULT '0' AFTER `code`;
+ALTER TABLE `zt_product` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_repo` ADD `product` varchar(255) NOT NULL AFTER `id`;
+
+ALTER TABLE `zt_group` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
+INSERT INTO `zt_group` (`name`, `role`, `desc`) VALUES ('项目管理员', 'projectAdmin', '项目管理员可以维护项目的权限');
+
+ALTER TABLE `zt_usergroup` ADD `project` text NOT NULL;
+
+ALTER TABLE `zt_userview` CHANGE `projects` `sprints` mediumtext NOT NULL;
+ALTER TABLE `zt_userview` ADD `programs` mediumtext NOT NULL AFTER `account`;
+ALTER TABLE `zt_userview` ADD `projects` mediumtext NOT NULL AFTER `programs`;
+
+ALTER TABLE `zt_user` ADD `company` mediumint unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_user` ADD `type` char(30) NOT NULL default 'inside' AFTER `account`;
+ALTER TABLE `zt_user` ADD `nature` text NOT NULL AFTER `zipcode`;
+ALTER TABLE `zt_user` ADD `analysis` text NOT NULL AFTER `nature`;
+ALTER TABLE `zt_user` ADD `strategy` text NOT NULL AFTER `analysis`;
+ALTER TABLE `zt_user` CHANGE `avatar` `avatar` text NOT NULL AFTER `commiter`;
+
+REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'URSR', '2');
+REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'unitList', 'CNY,USD');
+REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'defaultCurrency', 'CNY');
+
+ALTER TABLE `zt_config` MODIFY COLUMN `value` longtext NOT NULL AFTER `key`;
+
+UPDATE `zt_config` SET `key` = 'CRExecution' WHERE `module` = 'common' AND `key` = 'CRProject';
+
+-- DROP TABLE IF EXISTS `zt_stakeholder`;
+CREATE TABLE IF NOT EXISTS `zt_stakeholder` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ `objectID` mediumint(8) NOT NULL,
+ `objectType` char(30) NOT NULL,
+ `user` char(30) NOT NULL,
+ `type` char(30) NOT NULL,
+ `key` enum('0','1') NOT NULL,
+ `from` char(30) NOT NULL,
+ `createdBy` char(30) NOT NULL,
+ `createdDate` date NOT NULL,
+ `editedBy` char(30) NOT NULL,
+ `editedDate` date NOT NULL,
+ `deleted` enum('0','1') NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `zt_expect`;
+CREATE TABLE IF NOT EXISTS `zt_expect` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `userID` mediumint(8) NOT NULL,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `expect` text NOT NULL,
+  `progress` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `zt_projectspec`;
+CREATE TABLE IF NOT EXISTS `zt_projectspec` (
+  `project` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  UNIQUE KEY `project` (`project`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `zt_projectcase`;
+CREATE TABLE `zt_projectcase` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+ALTER TABLE `zt_task` ADD `design` mediumint(8) unsigned NOT NULL AFTER `module`;
+ALTER TABLE `zt_task` ADD `version` smallint(6) NOT NULL AFTER `desc`;
+ALTER TABLE `zt_task` ADD `activatedDate` date NOT NULL AFTER `lastEditedDate`;
+ALTER TABLE `zt_task` ADD `planDuration` int(11) NOT NULL AFTER `closedDate`;
+ALTER TABLE `zt_task` ADD `realDuration` int(11) NOT NULL AFTER `closedDate`;
+ALTER TABLE `zt_task` ADD `designVersion` smallint(6) unsigned NOT NULL AFTER `storyVersion`;
+
+ALTER TABLE `zt_burn` ADD `storyPoint` float NOT NULL AFTER `consumed`;
+ALTER TABLE `zt_burn` ADD `product` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `execution`;
+
+ALTER TABLE `zt_projectcase` ADD `count` mediumint(8) unsigned NOT NULL DEFAULT '1' AFTER `case`;
+
+-- DROP TABLE IF EXISTS `zt_taskspec`;
+CREATE TABLE IF NOT EXISTS `zt_taskspec` (
+  `task` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `estStarted` date NOT NULL,
+  `deadline` date NOT NULL,
+  UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+ALTER TABLE `zt_block` ADD `type` char(30) NOT NULL AFTER `module`;
+ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `module`, `type`, `order`), DROP INDEX `accountModuleOrder`;
+
+ALTER TABLE `zt_story` ADD `URChanged` enum('0','1') NOT NULL DEFAULT '0' AFTER `version`;
+
+ALTER TABLE `zt_team` MODIFY `type` enum('project','task','execution') NOT NULL DEFAULT 'project' AFTER `root`;
+
+CREATE TABLE IF NOT EXISTS `zt_planstory` (
+  `plan` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL,
+  `order` mediumint(9) NOT NULL,
+  UNIQUE KEY `unique` (`plan`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `zt_acl` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL DEFAULT '0',
+  `type` char(40) NOT NULL DEFAULT 'whitelist',
+  `source` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `zt_searchindex`;
+CREATE TABLE IF NOT EXISTS `zt_searchindex` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` char(20) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `title` text NOT NULL,
+  `content` text NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `object` (`objectType`,`objectID`),
+  KEY `addedDate` (`addedDate`),
+  FULLTEXT KEY `content` (`content`),
+  FULLTEXT KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `zt_searchdict`;
+CREATE TABLE IF NOT EXISTS `zt_searchdict` (
+  `key` smallint(5) unsigned NOT NULL,
+  `value` char(3) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
+(1,  'product',      'dashboard'),
+(1,  'product',      'manageLine'),
+(1,  'projectstory', 'story'),
+(1,  'projectstory', 'track'),
+(1,  'projectstory', 'view'),
+(1,  'projectstory', 'linkStory'),
+(1,  'projectstory', 'unLinkStory'),
+(1,  'my',           'preference'),
+(1,  'my',           'uploadAvatar'),
+(1,  'user',         'execution'),
+(1,  'user',         'cropAvatar'),
+(1,  'program',      'browse'),
+(1,  'program',      'view'),
+(1,  'search',       'index'),
+(1,  'search',       'buildIndex'),
+(2,  'product',      'dashboard'),
+(2,  'product',      'manageLine'),
+(2,  'projectstory', 'story'),
+(2,  'projectstory', 'track'),
+(2,  'projectstory', 'view'),
+(2,  'my',           'preference'),
+(2,  'my',           'uploadAvatar'),
+(2,  'user',         'execution'),
+(2,  'user',         'cropAvatar'),
+(2,  'search',       'index'),
+(2,  'program',      'browse'),
+(3,  'product',      'dashboard'),
+(3,  'product',      'manageLine'),
+(3,  'projectstory', 'story'),
+(3,  'projectstory', 'track'),
+(3,  'projectstory', 'view'),
+(3,  'my',           'preference'),
+(3,  'my',           'uploadAvatar'),
+(3,  'user',         'execution'),
+(3,  'user',         'cropAvatar'),
+(3,  'search',       'index'),
+(3,  'program',      'browse'),
+(4,  'product',      'dashboard'),
+(4,  'product',      'manageLine'),
+(4,  'projectstory', 'story'),
+(4,  'projectstory', 'track'),
+(4,  'projectstory', 'view'),
+(4,  'my',           'preference'),
+(4,  'my',           'uploadAvatar'),
+(4,  'user',         'execution'),
+(4,  'user',         'cropAvatar'),
+(4,  'program',      'view'),
+(4,  'program',      'browse'),
+(4,  'search',       'index'),
+(5,  'product',      'dashboard'),
+(5,  'product',      'manageLine'),
+(5,  'projectstory', 'story'),
+(5,  'projectstory', 'track'),
+(5,  'projectstory', 'view'),
+(5,  'projectstory', 'linkStory'),
+(5,  'projectstory', 'unLinkStory'),
+(5,  'my',           'preference'),
+(5,  'my',           'uploadAvatar'),
+(5,  'user',         'execution'),
+(5,  'user',         'cropAvatar'),
+(5,  'program',      'view'),
+(5,  'program',      'browse'),
+(5,  'search',       'index'),
+(6,  'product',      'dashboard'),
+(6,  'product',      'manageLine'),
+(6,  'projectstory', 'story'),
+(6,  'projectstory', 'track'),
+(6,  'projectstory', 'view'),
+(6,  'my',           'preference'),
+(6,  'my',           'uploadAvatar'),
+(6,  'user',         'execution'),
+(6,  'user',         'cropAvatar'),
+(6,  'program',      'view'),
+(6,  'program',      'browse'),
+(6,  'search',       'index'),
+(7,  'product',      'dashboard'),
+(7,  'product',      'manageLine'),
+(7,  'projectstory', 'story'),
+(7,  'projectstory', 'track'),
+(7,  'projectstory', 'view'),
+(7,  'projectstory', 'linkStory'),
+(7,  'projectstory', 'unLinkStory'),
+(7,  'my',           'preference'),
+(7,  'my',           'uploadAvatar'),
+(7,  'user',         'execution'),
+(7,  'user',         'cropAvatar'),
+(7,  'program',      'view'),
+(7,  'program',      'browse'),
+(7,  'search',       'index'),
+(8,  'product',      'dashboard'),
+(8,  'product',      'manageLine'),
+(8,  'projectstory', 'story'),
+(8,  'projectstory', 'track'),
+(8,  'projectstory', 'view'),
+(8,  'my',           'preference'),
+(8,  'my',           'uploadAvatar'),
+(8,  'user',         'execution'),
+(8,  'user',         'cropAvatar'),
+(8,  'program',      'view'),
+(8,  'program',      'browse'),
+(8,  'search',       'index'),
+(9,  'product',      'dashboard'),
+(9,  'product',      'manageLine'),
+(9,  'projectstory', 'story'),
+(9,  'projectstory', 'track'),
+(9,  'projectstory', 'view'),
+(9,  'projectstory', 'linkStory'),
+(9,  'projectstory', 'unLinkStory'),
+(9,  'my',           'preference'),
+(9,  'my',           'uploadAvatar'),
+(9,  'user',         'execution'),
+(9,  'user',         'cropAvatar'),
+(9,  'program',      'view'),
+(9,  'program',      'browse'),
+(9,  'search',       'index'),
+(10, 'product',      'dashboard'),
+(10, 'product',      'manageLine'),
+(10, 'projectstory', 'story'),
+(10, 'projectstory', 'track'),
+(10, 'projectstory', 'view'),
+(10, 'my',           'preference'),
+(10, 'my',           'uploadAvatar'),
+(10, 'user',         'execution'),
+(10, 'user',         'cropAvatar'),
+(10, 'search',       'index'),
+(10, 'program',      'browse'),
+(11, 'product',      'dashboard'),
+(11, 'product',      'manageLine'),
+(11, 'projectstory', 'story'),
+(11, 'projectstory', 'track'),
+(11, 'projectstory', 'view'),
+(11, 'my',           'preference'),
+(11, 'my',           'uploadAvatar'),
+(11, 'user',         'execution'),
+(11, 'program',      'browse'),
+(11, 'user',         'cropAvatar');
+
+REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
+('zh-cn', 'custom', 'URSRList', '1', '{\"SRName\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '2', '{\"SRName\":\"\\u7814\\u53d1\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '3', '{\"SRName\":\"\\u8f6f\\u9700\",\"URName\":\"\\u7528\\u9700\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '4', '{\"SRName\":\"\\u6545\\u4e8b\",\"URName\":\"\\u53f2\\u8bd7\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '5', '{\"SRName\":\"\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
+('en', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'),
+('en', 'custom', 'URSRList', '2', '{\"SRName\":\"Story\",\"URName\":\"Requirement\"}', '0');
+
+REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProduct', '1');
+REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRExecution', '1');
+
+update zt_config set `value`='project-browse' where `key`='projectLink';
+update zt_config set `value`='program-browse' where `key`='programLink';
+
+update zt_team set type='execution' where type='project';
+update zt_action set objectType='execution' where objectType='project';
+update zt_file set objectType='execution' where objectType='project';
+
+ALTER TABLE `zt_todo` ADD `deleted` ENUM( "0", "1" ) NOT NULL DEFAULT '0';
+
+TRUNCATE `zt_block`;
+DELETE FROM `zt_config` WHERE `key` = 'blockInited';
diff --git a/db/update15.0.rc2.sql b/db/update15.0.rc2.sql
new file mode 100644
index 0000000000..0fabf2c405
--- /dev/null
+++ b/db/update15.0.rc2.sql
@@ -0,0 +1,2 @@
+DELETE FROM zt_cron WHERE command='moduleName=weekly&methodName=computeWeekly';
+ALTER TABLE zt_story drop column `project`;
diff --git a/db/update15.0.rc3.sql b/db/update15.0.rc3.sql
new file mode 100644
index 0000000000..8185fd6600
--- /dev/null
+++ b/db/update15.0.rc3.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `zt_webhook` CHANGE `projects` `executions` text NOT NULL;
+ALTER TABLE `zt_webhook` CHANGE `executions` `executions` text NOT NULL;
+ALTER TABLE `zt_projectcase` ADD `count` mediumint(8) unsigned NOT NULL DEFAULT '1' AFTER `case`;
+
+ALTER TABLE `zt_repo` ADD `extra` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `desc`;
+
+UPDATE `zt_config` set `value`='program-browse' where `key`='programLink' and `value`='program-pgmbrowse';
+UPDATE `zt_config` set `value`='project-browse' where `key`='projectLink' and `value`='program-prjbrowse';
diff --git a/db/update15.0.sql b/db/update15.0.sql
index 89cd171267..193e250ca4 100644
--- a/db/update15.0.sql
+++ b/db/update15.0.sql
@@ -1,342 +1,30 @@
-ALTER TABLE `zt_project` DROP `isCat`, DROP `catID`;
-ALTER TABLE `zt_project` ADD `project` mediumint(8) NOT NULL DEFAULT 0 AFTER `id`;
-ALTER TABLE `zt_project` ADD `model` char(30) NOT NULL AFTER `project`;
-ALTER TABLE `zt_project` CHANGE `type` `type` char(30) NOT NULL DEFAULT 'sprint' AFTER `model`;
-ALTER TABLE `zt_project` CHANGE `acl` `acl` char(30) NOT NULL DEFAULT 'open';
-ALTER TABLE `zt_project` ADD `product` varchar(20) NOT NULL DEFAULT 'single' AFTER `type`;
-ALTER TABLE `zt_project` ADD `lifetime` char(30) NOT NULL AFTER `product`;
-ALTER TABLE `zt_project` ADD `budget` varchar(30) NOT NULL DEFAULT '0' AFTER `lifetime`;
-ALTER TABLE `zt_project` ADD `budgetUnit` char(30) NOT NULL DEFAULT 'CNY' AFTER `budget`;
-ALTER TABLE `zt_project` ADD `percent` float unsigned NOT NULL DEFAULT '0' AFTER `budgetUnit`;
-ALTER TABLE `zt_project` ADD `path` varchar(255) NOT NULL AFTER `parent`;
-ALTER TABLE `zt_project` ADD `grade` tinyint unsigned NOT NULL AFTER `path`;
-ALTER TABLE `zt_project` ADD `auth` char(30) NOT NULL AFTER `percent`;
-ALTER TABLE `zt_project` ADD `milestone` enum('0','1') NOT NULL default '0' AFTER `percent`;
-ALTER TABLE `zt_project` ADD `attribute` varchar(30) NOT NULL DEFAULT '' AFTER `budgetUnit`;
-ALTER TABLE `zt_project` ADD `realBegan` date NOT NULL AFTER `end`;
-ALTER TABLE `zt_project` ADD `realEnd` date NOT NULL AFTER `realBegan`;
-ALTER TABLE `zt_project` ADD `version` smallint(6) NOT NULL AFTER `desc`;
-ALTER TABLE `zt_project` ADD `parentVersion` smallint(6) NOT NULL AFTER `version`;
-ALTER TABLE `zt_project` ADD `planDuration` int(11) NOT NULL AFTER `parentVersion`;
-ALTER TABLE `zt_project` ADD `realDuration` int(11) NOT NULL AFTER `planDuration`;
-ALTER TABLE `zt_project` ADD `output` text NOT NULL AFTER `milestone`;
-ALTER TABLE `zt_project` ADD `lastEditedBy` varchar(30) NOT NULL DEFAULT '' AFTER `openedVersion`;
-ALTER TABLE `zt_project` ADD `lastEditedDate` datetime NOT NULL AFTER `lastEditedBy`;
-
-ALTER TABLE `zt_action` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_bug` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_build` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_burn` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_doc` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_relation` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_relation` CHANGE `program` `project` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_doclib` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_task` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_testreport` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_testtask` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
-ALTER TABLE `zt_webhook` CHANGE `projects` `executions` mediumint(8) unsigned NOT NULL;
-
-ALTER TABLE `zt_task` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_doclib` ADD `project` mediumint(8) unsigned NOT NULL AFTER `product`;
-ALTER TABLE `zt_doc` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_story` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_bug` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_case` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_testtask` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_testreport` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_testsuite` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_build` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_release` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-
-ALTER TABLE `zt_product` ADD `bind` enum('0','1') NOT NULL DEFAULT '0' AFTER `code`;
-ALTER TABLE `zt_product` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_repo` ADD `product` varchar(255) NOT NULL AFTER `id`;
-
-ALTER TABLE `zt_group` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-INSERT INTO `zt_group` (`name`, `role`, `desc`) VALUES ('项目管理员', 'projectAdmin', '项目管理员可以维护项目的权限');
-
-ALTER TABLE `zt_usergroup` ADD `project` text NOT NULL;
-
-ALTER TABLE `zt_userview` ADD `programs` mediumtext NOT NULL AFTER `account`;
-ALTER TABLE `zt_userview` ADD `sprints` mediumtext NOT NULL AFTER `programs`;
-
-ALTER TABLE `zt_user` ADD `company` mediumint unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_user` ADD `type` char(30) NOT NULL default 'inside' AFTER `account`;
-ALTER TABLE `zt_user` ADD `nature` text NOT NULL AFTER `zipcode`;
-ALTER TABLE `zt_user` ADD `analysis` text NOT NULL AFTER `nature`;
-ALTER TABLE `zt_user` ADD `strategy` text NOT NULL AFTER `analysis`;
-ALTER TABLE `zt_user` CHANGE `avatar` `avatar` text NOT NULL AFTER `commiter`;
-
-REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'URSR', '6');
-REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'unitList', 'CNY,USD');
-REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'defaultCurrency', 'CNY');
-
-ALTER TABLE `zt_config` MODIFY COLUMN `value` longtext NOT NULL AFTER `key`;
-
-UPDATE `zt_config` SET `key` = 'CRExecution' WHERE `module` = 'common' AND `key` = 'CRProject';
-
--- DROP TABLE IF EXISTS `zt_stakeholder`;
-CREATE TABLE IF NOT EXISTS `zt_stakeholder` (
- `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
- `objectID` mediumint(8) NOT NULL,
- `objectType` char(30) NOT NULL,
- `user` char(30) NOT NULL,
- `type` char(30) NOT NULL,
- `key` enum('0','1') NOT NULL,
- `from` char(30) NOT NULL,
- `createdBy` char(30) NOT NULL,
- `createdDate` date NOT NULL,
- `editedBy` char(30) NOT NULL,
- `editedDate` date NOT NULL,
- `deleted` enum('0','1') NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- DROP TABLE IF EXISTS `zt_expect`;
-CREATE TABLE IF NOT EXISTS `zt_expect` (
-  `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  `userID` mediumint(8) NOT NULL,
-  `project` mediumint(8) NOT NULL DEFAULT 0,
-  `expect` text NOT NULL,
-  `progress` text NOT NULL,
-  `createdBy` char(30) NOT NULL,
-  `createdDate` date NOT NULL,
-  `deleted` enum('0','1') NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- DROP TABLE IF EXISTS `zt_projectspec`;
-CREATE TABLE IF NOT EXISTS `zt_projectspec` (
-  `project` mediumint(8) NOT NULL,
+-- DROP TABLE IF EXISTS `zt_storyreview`;
+CREATE TABLE IF NOT EXISTS `zt_storyreview` (
+  `story` mediumint(9) NOT NULL,
   `version` smallint(6) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `milestone` enum('0','1') NOT NULL DEFAULT '0',
-  `begin` date NOT NULL,
-  `end` date NOT NULL,
-  UNIQUE KEY `project` (`project`,`version`)
+  `reviewer` varchar(30) NOT NULL,
+  `result` varchar(30) NOT NULL,
+  `reviewDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`,`reviewer`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
--- DROP TABLE IF EXISTS `zt_projectcase`;
-CREATE TABLE `zt_projectcase` (
-  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `version` smallint(6) NOT NULL DEFAULT '1',
-  `order` smallint(6) unsigned NOT NULL,
-  UNIQUE KEY `project` (`project`,`case`)
+-- DROP TABLE IF EXISTS `zt_storyestimate`;
+CREATE TABLE IF NOT EXISTS `zt_storyestimate` (
+  `story` mediumint(9) NOT NULL,
+  `round` smallint(6) NOT NULL,
+  `estimate` text NOT NULL,
+  `average` float(10,2) NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`round`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-ALTER TABLE `zt_task` ADD `design` mediumint(8) unsigned NOT NULL AFTER `module`;
-ALTER TABLE `zt_task` ADD `version` smallint(6) NOT NULL AFTER `desc`;
-ALTER TABLE `zt_task` ADD `activatedDate` date NOT NULL AFTER `lastEditedDate`;
-ALTER TABLE `zt_task` ADD `planDuration` int(11) NOT NULL AFTER `closedDate`;
-ALTER TABLE `zt_task` ADD `realDuration` int(11) NOT NULL AFTER `closedDate`;
-ALTER TABLE `zt_task` ADD `designVersion` smallint(6) unsigned NOT NULL AFTER `storyVersion`;
+ALTER TABLE `zt_project` CHANGE `lifetime` `lifetime` char(30) NOT NULL DEFAULT '';
+ALTER TABLE `zt_story` ADD `category` varchar(30) NOT NULL DEFAULT 'feature' AFTER `type`;
+ALTER TABLE `zt_testtask` ADD `type` varchar(255) NOT NULL DEFAULT '' AFTER `build`;
+ALTER TABLE `zt_testtask` ADD `testreport` mediumint(8) unsigned NOT NULL AFTER `status`;
+ALTER TABLE `zt_story` MODIFY COLUMN `reviewedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
 
-ALTER TABLE `zt_burn` ADD `storyPoint` float NOT NULL AFTER `consumed`;
-ALTER TABLE `zt_burn` ADD `product` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `execution`;
+REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'story', '', 'reviewRules', 'allpass');
 
--- DROP TABLE IF EXISTS `zt_taskspec`;
-CREATE TABLE IF NOT EXISTS `zt_taskspec` (
-  `task` mediumint(8) NOT NULL,
-  `version` smallint(6) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `estStarted` date NOT NULL,
-  `deadline` date NOT NULL,
-  UNIQUE KEY `task` (`task`,`version`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-ALTER TABLE `zt_block` ADD `type` char(30) NOT NULL AFTER `module`;
-ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `module`, `type`, `order`), DROP INDEX `accountModuleOrder`;
-
-INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53');
-
-ALTER TABLE `zt_story` ADD `URChanged` enum('0','1') NOT NULL DEFAULT '0' AFTER `version`;
-
-ALTER TABLE `zt_team` MODIFY `type` enum('project','task','execution') NOT NULL DEFAULT 'project' AFTER `root`;
-
-CREATE TABLE IF NOT EXISTS `zt_planstory` (
-  `plan` mediumint(8) unsigned NOT NULL,
-  `story` mediumint(8) unsigned NOT NULL,
-  `order` mediumint(9) NOT NULL,
-  UNIQUE KEY `unique` (`plan`,`story`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `zt_acl` (
-  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
-  `account` char(30) NOT NULL,
-  `objectType` char(30) NOT NULL,
-  `objectID` mediumint(9) NOT NULL DEFAULT '0',
-  `type` char(40) NOT NULL DEFAULT 'whitelist',
-  `source` char(30) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- DROP TABLE IF EXISTS `zt_searchindex`;
-CREATE TABLE IF NOT EXISTS `zt_searchindex` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `objectType` char(20) NOT NULL,
-  `objectID` mediumint(9) NOT NULL,
-  `title` text NOT NULL,
-  `content` text NOT NULL,
-  `addedDate` datetime NOT NULL,
-  `editedDate` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `object` (`objectType`,`objectID`),
-  KEY `addedDate` (`addedDate`),
-  FULLTEXT KEY `content` (`content`),
-  FULLTEXT KEY `title` (`title`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- DROP TABLE IF EXISTS `zt_searchdict`;
-CREATE TABLE IF NOT EXISTS `zt_searchdict` (
-  `key` smallint(5) unsigned NOT NULL,
-  `value` char(3) NOT NULL,
-  PRIMARY KEY (`key`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
-(1,  'product',      'dashboard'),
-(1,  'product',      'manageLine'),
-(1,  'projectstory', 'story'),
-(1,  'projectstory', 'track'),
-(1,  'projectstory', 'view'),
-(1,  'projectstory', 'linkStory'),
-(1,  'projectstory', 'unLinkStory'),
-(1,  'my',           'preference'),
-(1,  'my',           'uploadAvatar'),
-(1,  'user',         'execution'),
-(1,  'user',         'cropAvatar'),
-(1,  'program',      'browse'),
-(1,  'program',      'view'),
-(1,  'search',       'index'),
-(1,  'search',       'buildIndex'),
-(2,  'product',      'dashboard'),
-(2,  'product',      'manageLine'),
-(2,  'projectstory', 'story'),
-(2,  'projectstory', 'track'),
-(2,  'projectstory', 'view'),
-(2,  'my',           'preference'),
-(2,  'my',           'uploadAvatar'),
-(2,  'user',         'execution'),
-(2,  'user',         'cropAvatar'),
-(2,  'search',       'index'),
-(2,  'program',      'browse'),
-(3,  'product',      'dashboard'),
-(3,  'product',      'manageLine'),
-(3,  'projectstory', 'story'),
-(3,  'projectstory', 'track'),
-(3,  'projectstory', 'view'),
-(3,  'my',           'preference'),
-(3,  'my',           'uploadAvatar'),
-(3,  'user',         'execution'),
-(3,  'user',         'cropAvatar'),
-(3,  'search',       'index'),
-(3,  'program',      'browse'),
-(4,  'product',      'dashboard'),
-(4,  'product',      'manageLine'),
-(4,  'projectstory', 'story'),
-(4,  'projectstory', 'track'),
-(4,  'projectstory', 'view'),
-(4,  'my',           'preference'),
-(4,  'my',           'uploadAvatar'),
-(4,  'user',         'execution'),
-(4,  'user',         'cropAvatar'),
-(4,  'program',      'view'),
-(4,  'program',      'browse'),
-(4,  'search',       'index'),
-(5,  'product',      'dashboard'),
-(5,  'product',      'manageLine'),
-(5,  'projectstory', 'story'),
-(5,  'projectstory', 'track'),
-(5,  'projectstory', 'view'),
-(5,  'projectstory', 'linkStory'),
-(5,  'projectstory', 'unLinkStory'),
-(5,  'my',           'preference'),
-(5,  'my',           'uploadAvatar'),
-(5,  'user',         'execution'),
-(5,  'user',         'cropAvatar'),
-(5,  'program',      'view'),
-(5,  'program',      'browse'),
-(5,  'search',       'index'),
-(6,  'product',      'dashboard'),
-(6,  'product',      'manageLine'),
-(6,  'projectstory', 'story'),
-(6,  'projectstory', 'track'),
-(6,  'projectstory', 'view'),
-(6,  'my',           'preference'),
-(6,  'my',           'uploadAvatar'),
-(6,  'user',         'execution'),
-(6,  'user',         'cropAvatar'),
-(6,  'program',      'view'),
-(6,  'program',      'browse'),
-(6,  'search',       'index'),
-(7,  'product',      'dashboard'),
-(7,  'product',      'manageLine'),
-(7,  'projectstory', 'story'),
-(7,  'projectstory', 'track'),
-(7,  'projectstory', 'view'),
-(7,  'projectstory', 'linkStory'),
-(7,  'projectstory', 'unLinkStory'),
-(7,  'my',           'preference'),
-(7,  'my',           'uploadAvatar'),
-(7,  'user',         'execution'),
-(7,  'user',         'cropAvatar'),
-(7,  'program',      'view'),
-(7,  'program',      'browse'),
-(7,  'search',       'index'),
-(8,  'product',      'dashboard'),
-(8,  'product',      'manageLine'),
-(8,  'projectstory', 'story'),
-(8,  'projectstory', 'track'),
-(8,  'projectstory', 'view'),
-(8,  'my',           'preference'),
-(8,  'my',           'uploadAvatar'),
-(8,  'user',         'execution'),
-(8,  'user',         'cropAvatar'),
-(8,  'program',      'view'),
-(8,  'program',      'browse'),
-(8,  'search',       'index'),
-(9,  'product',      'dashboard'),
-(9,  'product',      'manageLine'),
-(9,  'projectstory', 'story'),
-(9,  'projectstory', 'track'),
-(9,  'projectstory', 'view'),
-(9,  'projectstory', 'linkStory'),
-(9,  'projectstory', 'unLinkStory'),
-(9,  'my',           'preference'),
-(9,  'my',           'uploadAvatar'),
-(9,  'user',         'execution'),
-(9,  'user',         'cropAvatar'),
-(9,  'program',      'view'),
-(9,  'program',      'browse'),
-(9,  'search',       'index'),
-(10, 'product',      'dashboard'),
-(10, 'product',      'manageLine'),
-(10, 'projectstory', 'story'),
-(10, 'projectstory', 'track'),
-(10, 'projectstory', 'view'),
-(10, 'my',           'preference'),
-(10, 'my',           'uploadAvatar'),
-(10, 'user',         'execution'),
-(10, 'user',         'cropAvatar'),
-(10, 'search',       'index'),
-(10, 'program',      'browse'),
-(11, 'product',      'dashboard'),
-(11, 'product',      'manageLine'),
-(11, 'projectstory', 'story'),
-(11, 'projectstory', 'track'),
-(11, 'projectstory', 'view'),
-(11, 'my',           'preference'),
-(11, 'my',           'uploadAvatar'),
-(11, 'user',         'execution'),
-(11, 'program',      'browse'),
-(11, 'user',         'cropAvatar');
-
-INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
-('zh-cn', 'custom', 'URSRList', '1', '{\"SRName\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
-('zh-cn', 'custom', 'URSRList', '2', '{\"SRName\":\"\\u7814\\u53d1\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
-('zh-cn', 'custom', 'URSRList', '3', '{\"SRName\":\"\\u8f6f\\u9700\",\"URName\":\"\\u7528\\u9700\"}', '1'),
-('zh-cn', 'custom', 'URSRList', '4', '{\"SRName\":\"\\u6545\\u4e8b\",\"URName\":\"\\u53f2\\u8bd7\"}', '1'),
-('zh-cn', 'custom', 'URSRList', '5', '{\"SRName\":\"\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1');
-
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProduct', '1');
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRExecution', '1');
+UPDATE zt_project SET lifetime = '' WHERE lifetime = 'sprint';
diff --git a/db/zentao.sql b/db/zentao.sql
index 0752a52985..fa9301cc1e 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1,26 +1,3 @@
--- DROP TABLE IF EXISTS `zt_searchindex`;
-CREATE TABLE IF NOT EXISTS `zt_searchindex` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `objectType` char(20) NOT NULL,
-  `objectID` mediumint(9) NOT NULL,
-  `title` text NOT NULL,
-  `content` text NOT NULL,
-  `addedDate` datetime NOT NULL,
-  `editedDate` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `object` (`objectType`,`objectID`),
-  KEY `addedDate` (`addedDate`),
-  FULLTEXT KEY `content` (`content`),
-  FULLTEXT KEY `title` (`title`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- DROP TABLE IF EXISTS `zt_searchdict`;
-CREATE TABLE IF NOT EXISTS `zt_searchdict` (
-  `key` smallint(5) unsigned NOT NULL,
-  `value` char(3) NOT NULL,
-  PRIMARY KEY (`key`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 -- DROP TABLE IF EXISTS `zt_acl`;
 CREATE TABLE IF NOT EXISTS `zt_acl` (
   `id` mediumint(9) NOT NULL AUTO_INCREMENT,
@@ -37,7 +14,8 @@ CREATE TABLE IF NOT EXISTS `zt_action` (
   `objectType` varchar(30) NOT NULL default '',
   `objectID` mediumint(8) unsigned NOT NULL default '0',
   `product` varchar(255) NOT NULL,
-  `project` mediumint(9) NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
   `actor` varchar(100) NOT NULL default '',
   `action` varchar(30) NOT NULL default '',
   `date` datetime NOT NULL,
@@ -185,6 +163,7 @@ CREATE TABLE IF NOT EXISTS `zt_case` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
   `project` mediumint(8) unsigned NOT NULL,
   `product` mediumint(8) unsigned NOT NULL default '0',
+  `execution` mediumint(8) unsigned NOT NULL,
   `branch` mediumint(8) unsigned NOT NULL default '0',
   `lib` mediumint(8) unsigned NOT NULL default '0',
   `module` mediumint(8) unsigned NOT NULL default '0',
@@ -304,18 +283,6 @@ CREATE TABLE IF NOT EXISTS `zt_cron` (
   PRIMARY KEY (`id`),
   KEY `lastTime` (`lastTime`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_lang`;
-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,
-  `key` varchar(60) NOT NULL,
-  `value` text NOT NULL,
-  `system` enum('0','1') NOT NULL default '1',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_dept`;
 CREATE TABLE IF NOT EXISTS `zt_dept` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -407,6 +374,35 @@ CREATE TABLE IF NOT EXISTS `zt_effort` (
   PRIMARY KEY  (`id`),
   KEY `user` (`user`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_entry`;
+CREATE TABLE IF NOT EXISTS `zt_entry` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `account` varchar(30) NOT NULL DEFAULT '',
+  `code` varchar(20) NOT NULL,
+  `key` varchar(32) NOT NULL,
+  `freePasswd` enum('0','1') NOT NULL DEFAULT '0',
+  `ip` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `calledTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0', '1') NOT NULL DEFAULT '0',
+  PRIMARY KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_expect`;
+CREATE TABLE IF NOT EXISTS `zt_expect` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `userID` mediumint(8) NOT NULL,
+  `project` mediumint(8) NOT NULL DEFAULT 0,
+  `expect` text NOT NULL,
+  `progress` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_extension`;
 CREATE TABLE IF NOT EXISTS `zt_extension` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -515,6 +511,33 @@ CREATE TABLE IF NOT EXISTS `zt_job` (
   `deleted` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_lang`;
+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,
+  `key` varchar(60) NOT NULL,
+  `value` text NOT NULL,
+  `system` enum('0','1') NOT NULL default '1',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_log`;
+CREATE TABLE IF NOT EXISTS `zt_log` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(8) unsigned NOT NULL,
+  `date` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL,
+  `data` text NOT NULL,
+  `result` text  NOT NULL,
+  PRIMARY KEY `id` (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `obejctID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_module`;
 CREATE TABLE IF NOT EXISTS `zt_module` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -674,6 +697,24 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
   KEY `acl` (`acl`),
   KEY `order` (`order`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_projectcase`;
+CREATE TABLE IF NOT EXISTS `zt_projectcase` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `count` mediumint(8) unsigned NOT NULL DEFAULT '1',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_projectproduct`;
+CREATE TABLE IF NOT EXISTS `zt_projectproduct` (
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `plan` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY  (`project`,`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_projectspec`;
 CREATE TABLE IF NOT EXISTS `zt_projectspec` (
   `project` mediumint(8) NOT NULL,
@@ -684,14 +725,6 @@ CREATE TABLE IF NOT EXISTS `zt_projectspec` (
   `end` date NOT NULL,
   UNIQUE KEY `project` (`project`,`version`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_projectproduct`;
-CREATE TABLE IF NOT EXISTS `zt_projectproduct` (
-  `project` mediumint(8) unsigned NOT NULL,
-  `product` mediumint(8) unsigned NOT NULL,
-  `branch` mediumint(8) unsigned NOT NULL,
-  `plan` mediumint(8) unsigned NOT NULL,
-  PRIMARY KEY  (`project`,`product`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_projectstory`;
 CREATE TABLE IF NOT EXISTS `zt_projectstory` (
   `project` mediumint(8) unsigned NOT NULL default '0',
@@ -701,15 +734,23 @@ CREATE TABLE IF NOT EXISTS `zt_projectstory` (
   `order` smallint(6) unsigned NOT NULL,
   UNIQUE KEY `project` (`project`,`story`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_projectcase`;
-CREATE TABLE `zt_projectcase` (
-  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `version` smallint(6) NOT NULL DEFAULT '1',
-  `order` smallint(6) unsigned NOT NULL,
-  UNIQUE KEY `project` (`project`,`case`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_relation`;
+CREATE TABLE IF NOT EXISTS `zt_relation` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL,
+  `product` mediumint(8) NOT NULL,
+  `execution` mediumint(8) NOT NULL,
+  `AType` char(30) NOT NULL,
+  `AID` mediumint(8) NOT NULL,
+  `AVersion` char(30) NOT NULL,
+  `relation` char(30) NOT NULL,
+  `BType` char(30) NOT NULL,
+  `BID` mediumint(8) NOT NULL,
+  `BVersion` char(30) NOT NULL,
+  `extra` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `relation` (`relation`,`AType`,`BType`, `AID`, `BID`)
+) ENGINE='MyISAM' DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_release`;
 CREATE TABLE IF NOT EXISTS `zt_release` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -749,6 +790,7 @@ CREATE TABLE IF NOT EXISTS `zt_repo` (
   `synced` tinyint(1) NOT NULL DEFAULT '0',
   `lastSync` datetime NOT NULL,
   `desc` text NOT NULL,
+  `extra` char(30) NOT NULL,
   `deleted` tinyint(1) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -789,6 +831,43 @@ CREATE TABLE IF NOT EXISTS `zt_repohistory` (
   KEY `repo` (`repo`),
   KEY `revision` (`revision`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_score`;
+CREATE TABLE IF NOT EXISTS `zt_score` (
+  `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
+  `account` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL DEFAULT '',
+  `method` varchar(30) NOT NULL,
+  `desc` varchar(250) NOT NULL DEFAULT '',
+  `before` int(11) NOT NULL DEFAULT '0',
+  `score` int(11) NOT NULL DEFAULT '0',
+  `after` int(11) NOT NULL DEFAULT '0',
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `model` (`module`),
+  KEY `method` (`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_searchdict`;
+CREATE TABLE IF NOT EXISTS `zt_searchdict` (
+  `key` smallint(5) unsigned NOT NULL,
+  `value` char(3) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_searchindex`;
+CREATE TABLE IF NOT EXISTS `zt_searchindex` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` char(20) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `title` text NOT NULL,
+  `content` text NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `object` (`objectType`,`objectID`),
+  KEY `addedDate` (`addedDate`),
+  FULLTEXT KEY `content` (`content`),
+  FULLTEXT KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_stakeholder`;
 CREATE TABLE IF NOT EXISTS `zt_stakeholder` (
   `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -807,7 +886,6 @@ CREATE TABLE IF NOT EXISTS `zt_stakeholder` (
 -- DROP TABLE IF EXISTS `zt_story`;
 CREATE TABLE IF NOT EXISTS `zt_story` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
-  `project` mediumint(8) unsigned NOT NULL,
   `parent` mediumint(9) NOT NULL default '0',
   `product` mediumint(8) unsigned NOT NULL default '0',
   `branch` mediumint(8) unsigned NOT NULL default '0',
@@ -819,6 +897,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   `title` varchar(255) NOT NULL,
   `keywords` varchar(255) NOT NULL,
   `type` varchar(30) NOT NULL default 'story',
+  `category` varchar(30) NOT NULL default 'feature',
   `pri` tinyint(3) unsigned NOT NULL default '3',
   `estimate` float unsigned NOT NULL,
   `status` enum('','changed','active','draft','closed') NOT NULL default '',
@@ -834,7 +913,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   `lastEditedBy` varchar(30) NOT NULL default '',
   `lastEditedDate` datetime NOT NULL,
   `reviewedBy` varchar(255) NOT NULL,
-  `reviewedDate` date NOT NULL,
+  `reviewedDate` datetime NOT NULL default '0000-00-00 00:00:00',
   `closedBy` varchar(30) NOT NULL default '',
   `closedDate` datetime NOT NULL,
   `closedReason` varchar(30) NOT NULL,
@@ -850,6 +929,25 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   KEY `status` (`status`),
   KEY `assignedTo` (`assignedTo`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_storyreview`;
+CREATE TABLE IF NOT EXISTS `zt_storyreview` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `reviewer` varchar(30) NOT NULL,
+  `result` varchar(30) NOT NULL,
+  `reviewDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`,`reviewer`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_storyestimate`;
+CREATE TABLE IF NOT EXISTS `zt_storyestimate` (
+  `story` mediumint(9) NOT NULL,
+  `round` smallint(6) NOT NULL,
+  `estimate` text NOT NULL,
+  `average` float(10,2) NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`round`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_storyspec`;
 CREATE TABLE IF NOT EXISTS `zt_storyspec` (
   `story` mediumint(9) NOT NULL,
@@ -927,15 +1025,6 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
   KEY `parent` (`parent`),
   KEY `assignedTo` (`assignedTo`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_taskspec`;
-CREATE TABLE IF NOT EXISTS `zt_taskspec` (
-  `task` mediumint(8) NOT NULL,
-  `version` smallint(6) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `estStarted` date NOT NULL,
-  `deadline` date NOT NULL,
-  UNIQUE KEY `task` (`task`,`version`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_taskestimate`;
 CREATE TABLE IF NOT EXISTS `zt_taskestimate` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -948,6 +1037,15 @@ CREATE TABLE IF NOT EXISTS `zt_taskestimate` (
   PRIMARY KEY (`id`),
   KEY `task` (`task`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_taskspec`;
+CREATE TABLE IF NOT EXISTS `zt_taskspec` (
+  `task` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `estStarted` date NOT NULL,
+  `deadline` date NOT NULL,
+  UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_team`;
 CREATE TABLE IF NOT EXISTS `zt_team` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -1047,6 +1145,7 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` (
   `name` char(90) NOT NULL,
   `execution` mediumint(8) unsigned NOT NULL default '0',
   `build` char(30) NOT NULL,
+  `type` varchar(255) NOT NULL DEFAULT '',
   `owner` varchar(30) NOT NULL,
   `pri` tinyint(3) unsigned NOT NULL default '0',
   `begin` date NOT NULL,
@@ -1055,6 +1154,7 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` (
   `desc` text NOT NULL,
   `report` text NOT NULL,
   `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait',
+  `testreport` mediumint(8) unsigned NOT NULL,
   `auto` varchar(10) NOT NULL DEFAULT 'no',
   `subStatus` varchar(30) NOT NULL default '',
   `deleted` enum('0','1') NOT NULL default '0',
@@ -1085,6 +1185,7 @@ CREATE TABLE IF NOT EXISTS `zt_todo` (
   `finishedDate` datetime NOT NULL,
   `closedBy` varchar(30) NOT NULL DEFAULT '',
   `closedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL default '0',
   PRIMARY KEY (`id`),
   KEY `account` (`account`),
   KEY `assignedTo` (`assignedTo`),
@@ -1186,35 +1287,6 @@ CREATE TABLE IF NOT EXISTS `zt_userview` (
   `sprints` mediumtext NOT NULL,
   UNIQUE KEY `account` (`account`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_entry`;
-CREATE TABLE IF NOT EXISTS `zt_entry` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) NOT NULL,
-  `account` varchar(30) NOT NULL DEFAULT '',
-  `code` varchar(20) NOT NULL,
-  `key` varchar(32) NOT NULL,
-  `freePasswd` enum('0','1') NOT NULL DEFAULT '0',
-  `ip` varchar(100) NOT NULL,
-  `desc` text NOT NULL,
-  `createdBy` varchar(30) NOT NULL,
-  `createdDate` datetime NOT NULL,
-  `calledTime` int(10) unsigned NOT NULL DEFAULT '0',
-  `editedBy` varchar(30) NOT NULL,
-  `editedDate` datetime NOT NULL,
-  `deleted` enum('0', '1') NOT NULL DEFAULT '0',
-  PRIMARY KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_expect`;
-CREATE TABLE IF NOT EXISTS `zt_expect` (
-  `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  `userID` mediumint(8) NOT NULL,
-  `project` mediumint(8) NOT NULL DEFAULT 0,
-  `expect` text NOT NULL,
-  `progress` text NOT NULL,
-  `createdBy` char(30) NOT NULL,
-  `createdDate` date NOT NULL,
-  `deleted` enum('0','1') NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_webhook`;
 CREATE TABLE IF NOT EXISTS `zt_webhook` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
@@ -1226,7 +1298,7 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` (
   `contentType` varchar(30) NOT NULL DEFAULT 'application/json',
   `sendType` enum('sync','async') NOT NULL DEFAULT 'sync',
   `products` text NOT NULL,
-  `projects` text NOT NULL,
+  `executions` text NOT NULL,
   `params` varchar(100) NOT NULL,
   `actions` text NOT NULL,
   `desc` text NOT NULL,
@@ -1237,54 +1309,6 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` (
   `deleted` enum('0', '1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_log`;
-CREATE TABLE IF NOT EXISTS `zt_log` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `objectType` varchar(30) NOT NULL,
-  `objectID` mediumint(8) unsigned NOT NULL,
-  `action` mediumint(8) unsigned NOT NULL,
-  `date` datetime NOT NULL,
-  `url` varchar(255) NOT NULL,
-  `contentType` varchar(30) NOT NULL,
-  `data` text NOT NULL,
-  `result` text  NOT NULL,
-  PRIMARY KEY `id` (`id`),
-  KEY `objectType` (`objectType`),
-  KEY `obejctID` (`objectID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_score`;
-CREATE TABLE IF NOT EXISTS `zt_score` (
-  `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
-  `account` varchar(30) NOT NULL,
-  `module` varchar(30) NOT NULL DEFAULT '',
-  `method` varchar(30) NOT NULL,
-  `desc` varchar(250) NOT NULL DEFAULT '',
-  `before` int(11) NOT NULL DEFAULT '0',
-  `score` int(11) NOT NULL DEFAULT '0',
-  `after` int(11) NOT NULL DEFAULT '0',
-  `time` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `account` (`account`),
-  KEY `model` (`module`),
-  KEY `method` (`method`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- DROP TABLE IF EXISTS `zt_relation`;
-CREATE TABLE IF NOT EXISTS `zt_relation` (
-  `id` int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  `project` mediumint(8) NOT NULL,
-  `product` mediumint(8) NOT NULL,
-  `execution` mediumint(8) NOT NULL,
-  `AType` char(30) NOT NULL,
-  `AID` mediumint(8) NOT NULL,
-  `AVersion` char(30) NOT NULL,
-  `relation` char(30) NOT NULL,
-  `BType` char(30) NOT NULL,
-  `BID` mediumint(8) NOT NULL,
-  `BVersion` char(30) NOT NULL,
-  `extra` char(30) NOT NULL,
-  UNIQUE KEY `relation` (`relation`,`AType`,`BType`, `AID`, `BID`)
-) ENGINE='MyISAM' DEFAULT CHARSET=utf8;
 
 INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES
 ('*',    '*',    '*',    '*',    '*',    '', '监控定时任务', 'zentao', 1, 'normal',   '0000-00-00 00:00:00'),
@@ -1299,8 +1323,7 @@ INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type
 ('1',    '1',    '*',    '*',    '*',    'moduleName=todo&methodName=createCycle',    '生成周期性待办',  'zentao', 1, 'normal', '0000-00-00 00:00:00'),
 ('1',    '0',    '*',    '*',    '*',    'moduleName=ci&methodName=initQueue', '创建周期性任务', 'zentao', 1, 'normal',   '0000-00-00 00:00:00'),
 ('*/5',  '*',    '*',    '*',    '*',    'moduleName=ci&methodName=checkCompileStatus', '同步Jenkins任务状态', 'zentao', 1, 'normal',   '0000-00-00 00:00:00'),
-('*/5',  '*',    '*',    '*',    '*',    'moduleName=ci&methodName=exec', '执行Jenkins任务', 'zentao', 1, 'normal',   '0000-00-00 00:00:00'),
-('1',    '0',    '*',    '*',    '*',    'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53');
+('*/5',  '*',    '*',    '*',    '*',    'moduleName=ci&methodName=exec', '执行Jenkins任务', 'zentao', 1, 'normal',   '0000-00-00 00:00:00');
 
 INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES
 (1, 'ADMIN', 'admin', 'for administrator'),
@@ -1473,6 +1496,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'message','setting'),
 (1,'misc','ping'),
 (1,'my','calendar'),
+(1,'my','team'),
+(1,'my','work'),
+(1,'my','contribute'),
 (1,'my','changePassword'),
 (1,'my','deleteContacts'),
 (1,'my','dynamic'),
@@ -1512,80 +1538,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'productplan','unlinkBug'),
 (1,'productplan','unlinkStory'),
 (1,'productplan','view'),
-(1,'program','createGuide'),
-(1,'program','createStakeholder'),
 (1,'program','index'),
-(1,'program','PGMActivate'),
-(1,'program','PGMBrowse'),
-(1,'program','PGMClose'),
-(1,'program','PGMCreate'),
-(1,'program','PGMDelete'),
-(1,'program','PGMEdit'),
-(1,'program','PGMProduct'),
-(1,'program','PGMProject'),
-(1,'program','PGMStakeholder'),
-(1,'program','PGMStart'),
-(1,'program','PGMSuspend'),
 (1,'program','activate'),
-(1,'program','addWhitelist'),
 (1,'program','browse'),
 (1,'program','close'),
-(1,'program','copyGroup'),
 (1,'program','create'),
-(1,'program','createGroup'),
 (1,'program','delete'),
 (1,'program','edit'),
-(1,'program','editGroup'),
-(1,'program','group'),
-(1,'program','manageGroupMember'),
-(1,'program','manageMembers'),
-(1,'program','managePriv'),
-(1,'program','manageProducts'),
-(1,'program','manageView'),
-(1,'program','programTitle'),
+(1,'program','product'),
+(1,'program','project'),
+(1,'program','stakeholder'),
 (1,'program','start'),
 (1,'program','suspend'),
-(1,'program','view'),
-(1,'program','updateOrder'),
-(1,'program','whitelist'),
-(1,'program','unbindWhielist'),
-(1,'program','unlinkStakeholder'),
-(1,'program','view'),
-(1,'project','activate'),
-(1,'project','all'),
-(1,'project','batchedit'),
-(1,'project','batchUnlinkStory'),
-(1,'project','browse'),
-(1,'project','bug'),
-(1,'project','build'),
-(1,'project','burn'),
-(1,'project','close'),
-(1,'project','computeBurn'),
-(1,'project','create'),
-(1,'project','delete'),
-(1,'project','doc'),
-(1,'project','dynamic'),
-(1,'project','edit'),
-(1,'project','grouptask'),
-(1,'project','importBug'),
-(1,'project','importtask'),
+(1,'project','createGuide'),
+(1,'project','createStakeholder'),
 (1,'project','index'),
-(1,'project','kanban'),
-(1,'project','linkStory'),
+(1,'project','activate'),
+(1,'project','addWhitelist'),
+(1,'project','browse'),
+(1,'project','close'),
+(1,'project','copyGroup'),
+(1,'project','create'),
+(1,'project','createGroup'),
+(1,'project','delete'),
+(1,'project','edit'),
+(1,'project','editGroup'),
+(1,'project','group'),
+(1,'project','manageGroupMember'),
 (1,'project','manageMembers'),
+(1,'project','managePriv'),
 (1,'project','manageProducts'),
-(1,'project','putoff'),
+(1,'project','manageView'),
+(1,'project','programTitle'),
 (1,'project','start'),
-(1,'project','story'),
 (1,'project','suspend'),
-(1,'project','task'),
-(1,'project','team'),
-(1,'project','testtask'),
-(1,'project','tree'),
-(1,'project','unlinkMember'),
-(1,'project','unlinkStory'),
-(1,'project','updateOrder'),
 (1,'project','view'),
+(1,'project','updateOrder'),
+(1,'project','whitelist'),
+(1,'project','unbindWhielist'),
+(1,'project','unlinkStakeholder'),
+(1,'execution','activate'),
+(1,'execution','all'),
+(1,'execution','batchedit'),
+(1,'execution','batchUnlinkStory'),
+(1,'execution','browse'),
+(1,'execution','bug'),
+(1,'execution','build'),
+(1,'execution','burn'),
+(1,'execution','close'),
+(1,'execution','computeBurn'),
+(1,'execution','create'),
+(1,'execution','delete'),
+(1,'execution','doc'),
+(1,'execution','dynamic'),
+(1,'execution','edit'),
+(1,'execution','grouptask'),
+(1,'execution','importBug'),
+(1,'execution','importtask'),
+(1,'execution','index'),
+(1,'execution','kanban'),
+(1,'execution','linkStory'),
+(1,'execution','manageMembers'),
+(1,'execution','manageProducts'),
+(1,'execution','putoff'),
+(1,'execution','start'),
+(1,'execution','story'),
+(1,'execution','suspend'),
+(1,'execution','task'),
+(1,'execution','team'),
+(1,'execution','testtask'),
+(1,'execution','tree'),
+(1,'execution','unlinkMember'),
+(1,'execution','unlinkStory'),
+(1,'execution','updateOrder'),
+(1,'execution','view'),
 (1,'projectbuild','browse'),
 (1,'projectrelease','batchUnlinkBug'),
 (1,'projectrelease','batchUnlinkStory'),
@@ -1843,6 +1869,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'index','index'),
 (2,'misc','ping'),
 (2,'my','calendar'),
+(2,'my','team'),
+(2,'my','work'),
+(2,'my','contribute'),
 (2,'my','changePassword'),
 (2,'my','deleteContacts'),
 (2,'my','dynamic'),
@@ -1867,25 +1896,25 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'product','view'),
 (2,'productplan','browse'),
 (2,'productplan','view'),
-(2,'project','all'),
-(2,'project','browse'),
-(2,'project','bug'),
-(2,'project','build'),
-(2,'project','burn'),
-(2,'project','computeBurn'),
-(2,'project','doc'),
-(2,'project','dynamic'),
-(2,'project','grouptask'),
-(2,'project','importBug'),
-(2,'project','importtask'),
-(2,'project','index'),
-(2,'project','kanban'),
-(2,'project','story'),
-(2,'project','task'),
-(2,'project','team'),
-(2,'project','testtask'),
-(2,'project','tree'),
-(2,'project','view'),
+(2,'execution','all'),
+(2,'execution','browse'),
+(2,'execution','bug'),
+(2,'execution','build'),
+(2,'execution','burn'),
+(2,'execution','computeBurn'),
+(2,'execution','doc'),
+(2,'execution','dynamic'),
+(2,'execution','grouptask'),
+(2,'execution','importBug'),
+(2,'execution','importtask'),
+(2,'execution','index'),
+(2,'execution','kanban'),
+(2,'execution','story'),
+(2,'execution','task'),
+(2,'execution','team'),
+(2,'execution','testtask'),
+(2,'execution','tree'),
+(2,'execution','view'),
 (2,'projectstory','story'),
 (2,'projectstory','track'),
 (2,'projectstory','view'),
@@ -2035,6 +2064,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (3,'index','index'),
 (3,'misc','ping'),
 (3,'my','calendar'),
+(3,'my','team'),
+(3,'my','work'),
+(3,'my','contribute'),
 (3,'my','changePassword'),
 (3,'my','deleteContacts'),
 (3,'my','dynamic'),
@@ -2059,25 +2091,25 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (3,'product','view'),
 (3,'productplan','browse'),
 (3,'productplan','view'),
-(3,'project','all'),
-(3,'project','browse'),
-(3,'project','bug'),
-(3,'project','build'),
-(3,'project','burn'),
-(3,'project','computeBurn'),
-(3,'project','doc'),
-(3,'project','dynamic'),
-(3,'project','grouptask'),
-(3,'project','importBug'),
-(3,'project','importtask'),
-(3,'project','index'),
-(3,'project','kanban'),
-(3,'project','story'),
-(3,'project','task'),
-(3,'project','team'),
-(3,'project','testtask'),
-(3,'project','tree'),
-(3,'project','view'),
+(3,'execution','all'),
+(3,'execution','browse'),
+(3,'execution','bug'),
+(3,'execution','build'),
+(3,'execution','burn'),
+(3,'execution','computeBurn'),
+(3,'execution','doc'),
+(3,'execution','dynamic'),
+(3,'execution','grouptask'),
+(3,'execution','importBug'),
+(3,'execution','importtask'),
+(3,'execution','index'),
+(3,'execution','kanban'),
+(3,'execution','story'),
+(3,'execution','task'),
+(3,'execution','team'),
+(3,'execution','testtask'),
+(3,'execution','tree'),
+(3,'execution','view'),
 (3,'projectstory','story'),
 (3,'projectstory','track'),
 (3,'projectstory','view'),
@@ -2296,6 +2328,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,'job','exec'),
 (4,'misc','ping'),
 (4,'my','calendar'),
+(4,'my','team'),
+(4,'my','work'),
+(4,'my','contribute'),
 (4,'my','changePassword'),
 (4,'my','deleteContacts'),
 (4,'my','dynamic'),
@@ -2320,80 +2355,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,'product','view'),
 (4,'productplan','browse'),
 (4,'productplan','view'),
-(4,'program','createGuide'),
-(4,'program','createStakeholder'),
 (4,'program','index'),
-(4,'program','PGMActivate'),
-(4,'program','PGMBrowse'),
-(4,'program','PGMClose'),
-(4,'program','PGMCreate'),
-(4,'program','PGMDelete'),
-(4,'program','PGMEdit'),
-(4,'program','PGMProduct'),
-(4,'program','PGMProject'),
-(4,'program','PGMStakeholder'),
-(4,'program','PGMStart'),
-(4,'program','PGMSuspend'),
 (4,'program','activate'),
-(4,'program','addWhitelist'),
 (4,'program','browse'),
 (4,'program','close'),
-(4,'program','copyGroup'),
 (4,'program','create'),
-(4,'program','createGroup'),
 (4,'program','delete'),
 (4,'program','edit'),
-(4,'program','editGroup'),
-(4,'program','group'),
-(4,'program','manageGroupMember'),
-(4,'program','manageMembers'),
-(4,'program','managePriv'),
-(4,'program','manageProducts'),
-(4,'program','manageView'),
-(4,'program','programTitle'),
+(4,'program','product'),
+(4,'program','project'),
+(4,'program','stakeholder'),
 (4,'program','start'),
 (4,'program','suspend'),
-(4,'program','updateOrder'),
-(4,'program','view'),
-(4,'program','whitelist'),
-(4,'program','unbindWhielist'),
-(4,'program','unlinkStakeholder'),
-(4,'program','view'),
-(4,'project','activate'),
-(4,'project','all'),
-(4,'project','batchedit'),
-(4,'project','batchUnlinkStory'),
-(4,'project','browse'),
-(4,'project','bug'),
-(4,'project','build'),
-(4,'project','burn'),
-(4,'project','close'),
-(4,'project','computeBurn'),
-(4,'project','create'),
-(4,'project','delete'),
-(4,'project','doc'),
-(4,'project','dynamic'),
-(4,'project','edit'),
-(4,'project','grouptask'),
-(4,'project','importBug'),
-(4,'project','importtask'),
+(4,'project','createGuide'),
+(4,'project','createStakeholder'),
 (4,'project','index'),
-(4,'project','kanban'),
-(4,'project','linkStory'),
+(4,'project','activate'),
+(4,'project','addWhitelist'),
+(4,'project','browse'),
+(4,'project','close'),
+(4,'project','copyGroup'),
+(4,'project','create'),
+(4,'project','createGroup'),
+(4,'project','delete'),
+(4,'project','edit'),
+(4,'project','editGroup'),
+(4,'project','group'),
+(4,'project','manageGroupMember'),
 (4,'project','manageMembers'),
+(4,'project','managePriv'),
 (4,'project','manageProducts'),
-(4,'project','putoff'),
+(4,'project','manageView'),
+(4,'project','programTitle'),
 (4,'project','start'),
-(4,'project','story'),
 (4,'project','suspend'),
-(4,'project','task'),
-(4,'project','team'),
-(4,'project','testtask'),
-(4,'project','tree'),
-(4,'project','unlinkMember'),
-(4,'project','unlinkStory'),
 (4,'project','updateOrder'),
 (4,'project','view'),
+(4,'project','whitelist'),
+(4,'project','unbindWhielist'),
+(4,'project','unlinkStakeholder'),
+(4,'execution','activate'),
+(4,'execution','all'),
+(4,'execution','batchedit'),
+(4,'execution','batchUnlinkStory'),
+(4,'execution','browse'),
+(4,'execution','bug'),
+(4,'execution','build'),
+(4,'execution','burn'),
+(4,'execution','close'),
+(4,'execution','computeBurn'),
+(4,'execution','create'),
+(4,'execution','delete'),
+(4,'execution','doc'),
+(4,'execution','dynamic'),
+(4,'execution','edit'),
+(4,'execution','grouptask'),
+(4,'execution','importBug'),
+(4,'execution','importtask'),
+(4,'execution','index'),
+(4,'execution','kanban'),
+(4,'execution','linkStory'),
+(4,'execution','manageMembers'),
+(4,'execution','manageProducts'),
+(4,'execution','putoff'),
+(4,'execution','start'),
+(4,'execution','story'),
+(4,'execution','suspend'),
+(4,'execution','task'),
+(4,'execution','team'),
+(4,'execution','testtask'),
+(4,'execution','tree'),
+(4,'execution','unlinkMember'),
+(4,'execution','unlinkStory'),
+(4,'execution','updateOrder'),
+(4,'execution','view'),
 (4,'projectstory','story'),
 (4,'projectstory','track'),
 (4,'projectstory','view'),
@@ -2587,6 +2622,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'job','exec'),
 (5,'misc','ping'),
 (5,'my','calendar'),
+(5,'my','team'),
+(5,'my','work'),
+(5,'my','contribute'),
 (5,'my','changePassword'),
 (5,'my','deleteContacts'),
 (5,'my','dynamic'),
@@ -2626,79 +2664,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'productplan','unlinkBug'),
 (5,'productplan','unlinkStory'),
 (5,'productplan','view'),
-(5,'program','createGuide'),
-(5,'program','createStakeholder'),
 (5,'program','index'),
-(5,'program','PGMActivate'),
-(5,'program','PGMBrowse'),
-(5,'program','PGMClose'),
-(5,'program','PGMCreate'),
-(5,'program','PGMDelete'),
-(5,'program','PGMEdit'),
-(5,'program','PGMProduct'),
-(5,'program','PGMProject'),
-(5,'program','PGMStakeholder'),
-(5,'program','PGMStart'),
-(5,'program','PGMSuspend'),
 (5,'program','activate'),
-(5,'program','addWhitelist'),
 (5,'program','browse'),
 (5,'program','close'),
-(5,'program','copyGroup'),
 (5,'program','create'),
-(5,'program','createGroup'),
 (5,'program','delete'),
 (5,'program','edit'),
-(5,'program','editGroup'),
-(5,'program','group'),
-(5,'program','manageGroupMember'),
-(5,'program','manageMembers'),
-(5,'program','managePriv'),
-(5,'program','manageProducts'),
-(5,'program','manageView'),
-(5,'program','programTitle'),
+(5,'program','product'),
+(5,'program','project'),
+(5,'program','stakeholder'),
 (5,'program','start'),
 (5,'program','suspend'),
-(5,'program','view'),
-(5,'program','updateOrder'),
-(5,'program','whitelist'),
-(5,'program','unbindWhielist'),
-(5,'program','unlinkStakeholder'),
-(5,'project','activate'),
-(5,'project','all'),
-(5,'project','batchedit'),
-(5,'project','batchUnlinkStory'),
-(5,'project','browse'),
-(5,'project','bug'),
-(5,'project','build'),
-(5,'project','burn'),
-(5,'project','close'),
-(5,'project','computeBurn'),
-(5,'project','create'),
-(5,'project','delete'),
-(5,'project','doc'),
-(5,'project','dynamic'),
-(5,'project','edit'),
-(5,'project','grouptask'),
-(5,'project','importBug'),
-(5,'project','importtask'),
+(5,'project','createGuide'),
+(5,'project','createStakeholder'),
 (5,'project','index'),
-(5,'project','kanban'),
-(5,'project','linkStory'),
+(5,'project','activate'),
+(5,'project','addWhitelist'),
+(5,'project','browse'),
+(5,'project','close'),
+(5,'project','copyGroup'),
+(5,'project','create'),
+(5,'project','createGroup'),
+(5,'project','delete'),
+(5,'project','edit'),
+(5,'project','editGroup'),
+(5,'project','group'),
+(5,'project','manageGroupMember'),
 (5,'project','manageMembers'),
+(5,'project','managePriv'),
 (5,'project','manageProducts'),
-(5,'project','putoff'),
+(5,'project','manageView'),
+(5,'project','programTitle'),
 (5,'project','start'),
-(5,'project','story'),
 (5,'project','suspend'),
-(5,'project','task'),
-(5,'project','team'),
-(5,'project','testtask'),
-(5,'project','tree'),
-(5,'project','unlinkMember'),
-(5,'project','unlinkStory'),
-(5,'project','updateOrder'),
 (5,'project','view'),
+(5,'project','updateOrder'),
+(5,'project','whitelist'),
+(5,'project','unbindWhielist'),
+(5,'project','unlinkStakeholder'),
+(5,'execution','activate'),
+(5,'execution','all'),
+(5,'execution','batchedit'),
+(5,'execution','batchUnlinkStory'),
+(5,'execution','browse'),
+(5,'execution','bug'),
+(5,'execution','build'),
+(5,'execution','burn'),
+(5,'execution','close'),
+(5,'execution','computeBurn'),
+(5,'execution','create'),
+(5,'execution','delete'),
+(5,'execution','doc'),
+(5,'execution','dynamic'),
+(5,'execution','edit'),
+(5,'execution','grouptask'),
+(5,'execution','importBug'),
+(5,'execution','importtask'),
+(5,'execution','index'),
+(5,'execution','kanban'),
+(5,'execution','linkStory'),
+(5,'execution','manageMembers'),
+(5,'execution','manageProducts'),
+(5,'execution','putoff'),
+(5,'execution','start'),
+(5,'execution','story'),
+(5,'execution','suspend'),
+(5,'execution','task'),
+(5,'execution','team'),
+(5,'execution','testtask'),
+(5,'execution','tree'),
+(5,'execution','unlinkMember'),
+(5,'execution','unlinkStory'),
+(5,'execution','updateOrder'),
+(5,'execution','view'),
 (5,'projectstory','linkStory'),
 (5,'projectstory','story'),
 (5,'projectstory','track'),
@@ -2896,6 +2935,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,'index','index'),
 (6,'misc','ping'),
 (6,'my','calendar'),
+(6,'my','team'),
+(6,'my','work'),
+(6,'my','contribute'),
 (6,'my','changePassword'),
 (6,'my','deleteContacts'),
 (6,'my','dynamic'),
@@ -2920,79 +2962,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,'product','view'),
 (6,'productplan','browse'),
 (6,'productplan','view'),
-(6,'program','createGuide'),
-(6,'program','createStakeholder'),
 (6,'program','index'),
-(6,'program','PGMActivate'),
-(6,'program','PGMBrowse'),
-(6,'program','PGMClose'),
-(6,'program','PGMCreate'),
-(6,'program','PGMDelete'),
-(6,'program','PGMEdit'),
-(6,'program','PGMProduct'),
-(6,'program','PGMProject'),
-(6,'program','PGMStakeholder'),
-(6,'program','PGMStart'),
-(6,'program','PGMSuspend'),
 (6,'program','activate'),
-(6,'program','addWhitelist'),
 (6,'program','browse'),
 (6,'program','close'),
-(6,'program','copyGroup'),
 (6,'program','create'),
-(6,'program','createGroup'),
 (6,'program','delete'),
 (6,'program','edit'),
-(6,'program','editGroup'),
-(6,'program','group'),
-(6,'program','manageGroupMember'),
-(6,'program','manageMembers'),
-(6,'program','managePriv'),
-(6,'program','manageProducts'),
-(6,'program','manageView'),
-(6,'program','programTitle'),
+(6,'program','product'),
+(6,'program','project'),
+(6,'program','stakeholder'),
 (6,'program','start'),
 (6,'program','suspend'),
-(6,'program','view'),
-(6,'program','updateOrder'),
-(6,'program','whitelist'),
-(6,'program','unbindWhielist'),
-(6,'program','unlinkStakeholder'),
-(6,'project','activate'),
-(6,'project','all'),
-(6,'project','batchedit'),
-(6,'project','batchUnlinkStory'),
-(6,'project','browse'),
-(6,'project','bug'),
-(6,'project','build'),
-(6,'project','burn'),
-(6,'project','close'),
-(6,'project','computeBurn'),
-(6,'project','create'),
-(6,'project','delete'),
-(6,'project','doc'),
-(6,'project','dynamic'),
-(6,'project','edit'),
-(6,'project','grouptask'),
-(6,'project','importBug'),
-(6,'project','importtask'),
+(6,'project','createGuide'),
+(6,'project','createStakeholder'),
 (6,'project','index'),
-(6,'project','kanban'),
-(6,'project','linkStory'),
+(6,'project','activate'),
+(6,'project','addWhitelist'),
+(6,'project','browse'),
+(6,'project','close'),
+(6,'project','copyGroup'),
+(6,'project','create'),
+(6,'project','createGroup'),
+(6,'project','delete'),
+(6,'project','edit'),
+(6,'project','editGroup'),
+(6,'project','group'),
+(6,'project','manageGroupMember'),
 (6,'project','manageMembers'),
+(6,'project','managePriv'),
 (6,'project','manageProducts'),
-(6,'project','putoff'),
+(6,'project','manageView'),
+(6,'project','programTitle'),
 (6,'project','start'),
-(6,'project','story'),
 (6,'project','suspend'),
-(6,'project','task'),
-(6,'project','team'),
-(6,'project','testtask'),
-(6,'project','tree'),
-(6,'project','unlinkMember'),
-(6,'project','unlinkStory'),
-(6,'project','updateOrder'),
 (6,'project','view'),
+(6,'project','updateOrder'),
+(6,'project','whitelist'),
+(6,'project','unbindWhielist'),
+(6,'project','unlinkStakeholder'),
+(6,'execution','activate'),
+(6,'execution','all'),
+(6,'execution','batchedit'),
+(6,'execution','batchUnlinkStory'),
+(6,'execution','browse'),
+(6,'execution','bug'),
+(6,'execution','build'),
+(6,'execution','burn'),
+(6,'execution','close'),
+(6,'execution','computeBurn'),
+(6,'execution','create'),
+(6,'execution','delete'),
+(6,'execution','doc'),
+(6,'execution','dynamic'),
+(6,'execution','edit'),
+(6,'execution','grouptask'),
+(6,'execution','importBug'),
+(6,'execution','importtask'),
+(6,'execution','index'),
+(6,'execution','kanban'),
+(6,'execution','linkStory'),
+(6,'execution','manageMembers'),
+(6,'execution','manageProducts'),
+(6,'execution','putoff'),
+(6,'execution','start'),
+(6,'execution','story'),
+(6,'execution','suspend'),
+(6,'execution','task'),
+(6,'execution','team'),
+(6,'execution','testtask'),
+(6,'execution','tree'),
+(6,'execution','unlinkMember'),
+(6,'execution','unlinkStory'),
+(6,'execution','updateOrder'),
+(6,'execution','view'),
 (6,'projectstory','story'),
 (6,'projectstory','track'),
 (6,'projectstory','view'),
@@ -3168,6 +3211,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'index','index'),
 (7,'misc','ping'),
 (7,'my','calendar'),
+(7,'my','team'),
+(7,'my','work'),
+(7,'my','contribute'),
 (7,'my','changePassword'),
 (7,'my','deleteContacts'),
 (7,'my','dynamic'),
@@ -3207,63 +3253,64 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'productplan','unlinkBug'),
 (7,'productplan','unlinkStory'),
 (7,'productplan','view'),
-(7,'program','createGuide'),
-(7,'program','createStakeholder'),
 (7,'program','index'),
-(7,'program','PGMActivate'),
-(7,'program','PGMBrowse'),
-(7,'program','PGMClose'),
-(7,'program','PGMCreate'),
-(7,'program','PGMDelete'),
-(7,'program','PGMEdit'),
-(7,'program','PGMProduct'),
-(7,'program','PGMProject'),
-(7,'program','PGMStakeholder'),
-(7,'program','PGMStart'),
-(7,'program','PGMSuspend'),
 (7,'program','activate'),
-(7,'program','addWhitelist'),
 (7,'program','browse'),
 (7,'program','close'),
-(7,'program','copyGroup'),
 (7,'program','create'),
-(7,'program','createGroup'),
 (7,'program','delete'),
 (7,'program','edit'),
-(7,'program','editGroup'),
-(7,'program','group'),
-(7,'program','manageGroupMember'),
-(7,'program','manageMembers'),
-(7,'program','managePriv'),
-(7,'program','manageProducts'),
-(7,'program','manageView'),
-(7,'program','programTitle'),
+(7,'program','product'),
+(7,'program','project'),
+(7,'program','stakeholder'),
 (7,'program','start'),
 (7,'program','suspend'),
-(7,'program','view'),
-(7,'program','updateOrder'),
-(7,'program','whitelist'),
-(7,'program','unbindWhielist'),
-(7,'program','unlinkStakeholder'),
-(7,'project','all'),
-(7,'project','browse'),
-(7,'project','bug'),
-(7,'project','build'),
-(7,'project','burn'),
-(7,'project','doc'),
-(7,'project','dynamic'),
-(7,'project','grouptask'),
+(7,'project','createGuide'),
+(7,'project','createStakeholder'),
 (7,'project','index'),
-(7,'project','kanban'),
-(7,'project','linkStory'),
+(7,'project','activate'),
+(7,'project','addWhitelist'),
+(7,'project','browse'),
+(7,'project','close'),
+(7,'project','copyGroup'),
+(7,'project','create'),
+(7,'project','createGroup'),
+(7,'project','delete'),
+(7,'project','edit'),
+(7,'project','editGroup'),
+(7,'project','group'),
+(7,'project','manageGroupMember'),
+(7,'project','manageMembers'),
+(7,'project','managePriv'),
 (7,'project','manageProducts'),
-(7,'project','story'),
-(7,'project','task'),
-(7,'project','team'),
-(7,'project','testtask'),
-(7,'project','tree'),
-(7,'project','unlinkStory'),
+(7,'project','manageView'),
+(7,'project','programTitle'),
+(7,'project','start'),
+(7,'project','suspend'),
 (7,'project','view'),
+(7,'project','updateOrder'),
+(7,'project','whitelist'),
+(7,'project','unbindWhielist'),
+(7,'project','unlinkStakeholder'),
+(7,'execution','all'),
+(7,'execution','browse'),
+(7,'execution','bug'),
+(7,'execution','build'),
+(7,'execution','burn'),
+(7,'execution','doc'),
+(7,'execution','dynamic'),
+(7,'execution','grouptask'),
+(7,'execution','index'),
+(7,'execution','kanban'),
+(7,'execution','linkStory'),
+(7,'execution','manageProducts'),
+(7,'execution','story'),
+(7,'execution','task'),
+(7,'execution','team'),
+(7,'execution','testtask'),
+(7,'execution','tree'),
+(7,'execution','unlinkStory'),
+(7,'execution','view'),
 (7,'projectstory','linkStory'),
 (7,'projectstory','story'),
 (7,'projectstory','track'),
@@ -3452,6 +3499,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'index','index'),
 (8,'misc','ping'),
 (8,'my','calendar'),
+(8,'my','team'),
+(8,'my','work'),
+(8,'my','contribute'),
 (8,'my','changePassword'),
 (8,'my','deleteContacts'),
 (8,'my','dynamic'),
@@ -3476,61 +3526,62 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'product','view'),
 (8,'productplan','browse'),
 (8,'productplan','view'),
-(8,'program','createGuide'),
-(8,'program','createStakeholder'),
 (8,'program','index'),
-(8,'program','PGMActivate'),
-(8,'program','PGMBrowse'),
-(8,'program','PGMClose'),
-(8,'program','PGMCreate'),
-(8,'program','PGMDelete'),
-(8,'program','PGMEdit'),
-(8,'program','PGMProduct'),
-(8,'program','PGMProject'),
-(8,'program','PGMStakeholder'),
-(8,'program','PGMStart'),
-(8,'program','PGMSuspend'),
 (8,'program','activate'),
-(8,'program','addWhitelist'),
 (8,'program','browse'),
 (8,'program','close'),
-(8,'program','copyGroup'),
 (8,'program','create'),
-(8,'program','createGroup'),
 (8,'program','delete'),
 (8,'program','edit'),
-(8,'program','editGroup'),
-(8,'program','group'),
-(8,'program','manageGroupMember'),
-(8,'program','manageMembers'),
-(8,'program','managePriv'),
-(8,'program','manageProducts'),
-(8,'program','manageView'),
-(8,'program','programTitle'),
+(8,'program','product'),
+(8,'program','project'),
+(8,'program','stakeholder'),
 (8,'program','start'),
 (8,'program','suspend'),
-(8,'program','view'),
-(8,'program','updateOrder'),
-(8,'program','whitelist'),
-(8,'program','unbindWhielist'),
-(8,'program','unlinkStakeholder'),
-(8,'project','all'),
-(8,'project','bug'),
-(8,'project','build'),
-(8,'project','burn'),
-(8,'project','doc'),
-(8,'project','dynamic'),
-(8,'project','grouptask'),
-(8,'project','importBug'),
-(8,'project','importtask'),
+(8,'project','createGuide'),
+(8,'project','createStakeholder'),
 (8,'project','index'),
-(8,'project','kanban'),
-(8,'project','story'),
-(8,'project','task'),
-(8,'project','team'),
-(8,'project','testtask'),
-(8,'project','tree'),
+(8,'project','activate'),
+(8,'project','addWhitelist'),
+(8,'project','browse'),
+(8,'project','close'),
+(8,'project','copyGroup'),
+(8,'project','create'),
+(8,'project','createGroup'),
+(8,'project','delete'),
+(8,'project','edit'),
+(8,'project','editGroup'),
+(8,'project','group'),
+(8,'project','manageGroupMember'),
+(8,'project','manageMembers'),
+(8,'project','managePriv'),
+(8,'project','manageProducts'),
+(8,'project','manageView'),
+(8,'project','programTitle'),
+(8,'project','start'),
+(8,'project','suspend'),
 (8,'project','view'),
+(8,'project','updateOrder'),
+(8,'project','whitelist'),
+(8,'project','unbindWhielist'),
+(8,'project','unlinkStakeholder'),
+(8,'execution','all'),
+(8,'execution','bug'),
+(8,'execution','build'),
+(8,'execution','burn'),
+(8,'execution','doc'),
+(8,'execution','dynamic'),
+(8,'execution','grouptask'),
+(8,'execution','importBug'),
+(8,'execution','importtask'),
+(8,'execution','index'),
+(8,'execution','kanban'),
+(8,'execution','story'),
+(8,'execution','task'),
+(8,'execution','team'),
+(8,'execution','testtask'),
+(8,'execution','tree'),
+(8,'execution','view'),
 (8,'projectstory','story'),
 (8,'projectstory','track'),
 (8,'projectstory','view'),
@@ -3731,6 +3782,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'index','index'),
 (9,'misc','ping'),
 (9,'my','calendar'),
+(9,'my','team'),
+(9,'my','work'),
+(9,'my','contribute'),
 (9,'my','changePassword'),
 (9,'my','deleteContacts'),
 (9,'my','dynamic'),
@@ -3755,60 +3809,61 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'product','view'),
 (9,'productplan','browse'),
 (9,'productplan','view'),
-(9,'program','createGuide'),
-(9,'program','createStakeholder'),
 (9,'program','index'),
-(9,'program','PGMActivate'),
-(9,'program','PGMBrowse'),
-(9,'program','PGMClose'),
-(9,'program','PGMCreate'),
-(9,'program','PGMDelete'),
-(9,'program','PGMEdit'),
-(9,'program','PGMProduct'),
-(9,'program','PGMProject'),
-(9,'program','PGMStakeholder'),
-(9,'program','PGMStart'),
-(9,'program','PGMSuspend'),
 (9,'program','activate'),
-(9,'program','addWhitelist'),
 (9,'program','browse'),
 (9,'program','close'),
-(9,'program','copyGroup'),
 (9,'program','create'),
-(9,'program','createGroup'),
 (9,'program','delete'),
 (9,'program','edit'),
-(9,'program','editGroup'),
-(9,'program','group'),
-(9,'program','manageGroupMember'),
-(9,'program','manageMembers'),
-(9,'program','managePriv'),
-(9,'program','manageProducts'),
-(9,'program','manageView'),
-(9,'program','programTitle'),
+(9,'program','product'),
+(9,'program','project'),
+(9,'program','stakeholder'),
 (9,'program','start'),
 (9,'program','suspend'),
-(9,'program','view'),
-(9,'program','updateOrder'),
-(9,'program','whitelist'),
-(9,'program','unbindWhielist'),
-(9,'program','unlinkStakeholder'),
-(9,'project','all'),
-(9,'project','browse'),
-(9,'project','bug'),
-(9,'project','build'),
-(9,'project','burn'),
-(9,'project','computeBurn'),
-(9,'project','doc'),
-(9,'project','dynamic'),
-(9,'project','grouptask'),
+(9,'project','createGuide'),
+(9,'project','createStakeholder'),
 (9,'project','index'),
-(9,'project','kanban'),
-(9,'project','story'),
-(9,'project','task'),
-(9,'project','team'),
-(9,'project','tree'),
+(9,'project','activate'),
+(9,'project','addWhitelist'),
+(9,'project','browse'),
+(9,'project','close'),
+(9,'project','copyGroup'),
+(9,'project','create'),
+(9,'project','createGroup'),
+(9,'project','delete'),
+(9,'project','edit'),
+(9,'project','editGroup'),
+(9,'project','group'),
+(9,'project','manageGroupMember'),
+(9,'project','manageMembers'),
+(9,'project','managePriv'),
+(9,'project','manageProducts'),
+(9,'project','manageView'),
+(9,'project','programTitle'),
+(9,'project','start'),
+(9,'project','suspend'),
 (9,'project','view'),
+(9,'project','updateOrder'),
+(9,'project','whitelist'),
+(9,'project','unbindWhielist'),
+(9,'project','unlinkStakeholder'),
+(9,'execution','all'),
+(9,'execution','browse'),
+(9,'execution','bug'),
+(9,'execution','build'),
+(9,'execution','burn'),
+(9,'execution','computeBurn'),
+(9,'execution','doc'),
+(9,'execution','dynamic'),
+(9,'execution','grouptask'),
+(9,'execution','index'),
+(9,'execution','kanban'),
+(9,'execution','story'),
+(9,'execution','task'),
+(9,'execution','team'),
+(9,'execution','tree'),
+(9,'execution','view'),
 (9,'projectstory','linkStory'),
 (9,'projectstory','story'),
 (9,'projectstory','track'),
@@ -3929,6 +3984,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'index','index'),
 (10,'misc','ping'),
 (10,'my','calendar'),
+(10,'my','team'),
+(10,'my','work'),
+(10,'my','contribute'),
 (10,'my','changePassword'),
 (10,'my','dynamic'),
 (10,'my','editProfile'),
@@ -3949,22 +4007,22 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'product','view'),
 (10,'productplan','browse'),
 (10,'productplan','view'),
-(10,'project','all'),
-(10,'project','browse'),
-(10,'project','bug'),
-(10,'project','build'),
-(10,'project','burn'),
-(10,'project','doc'),
-(10,'project','dynamic'),
-(10,'project','grouptask'),
-(10,'project','index'),
-(10,'project','kanban'),
-(10,'project','story'),
-(10,'project','task'),
-(10,'project','team'),
-(10,'project','testtask'),
-(10,'project','tree'),
-(10,'project','view'),
+(10,'execution','all'),
+(10,'execution','browse'),
+(10,'execution','bug'),
+(10,'execution','build'),
+(10,'execution','burn'),
+(10,'execution','doc'),
+(10,'execution','dynamic'),
+(10,'execution','grouptask'),
+(10,'execution','index'),
+(10,'execution','kanban'),
+(10,'execution','story'),
+(10,'execution','task'),
+(10,'execution','team'),
+(10,'execution','testtask'),
+(10,'execution','tree'),
+(10,'execution','view'),
 (10,'projectstory','story'),
 (10,'projectstory','track'),
 (10,'projectstory','view'),
@@ -4064,24 +4122,24 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11,'product','view'),
 (11,'productplan','browse'),
 (11,'productplan','view'),
-(11,'project','all'),
-(11,'project','browse'),
-(11,'project','bug'),
-(11,'project','build'),
-(11,'project','burn'),
-(11,'project','doc'),
-(11,'project','dynamic'),
-(11,'project','grouptask'),
-(11,'project','index'),
-(11,'project','kanban'),
-(11,'project','story'),
-(11,'project','task'),
-(11,'project','team'),
-(11,'project','testtask'),
-(11,'project','tree'),
-(11,'project','treestory'),
-(11,'project','treetask'),
-(11,'project','view'),
+(11,'execution','all'),
+(11,'execution','browse'),
+(11,'execution','bug'),
+(11,'execution','build'),
+(11,'execution','burn'),
+(11,'execution','doc'),
+(11,'execution','dynamic'),
+(11,'execution','grouptask'),
+(11,'execution','index'),
+(11,'execution','kanban'),
+(11,'execution','story'),
+(11,'execution','task'),
+(11,'execution','team'),
+(11,'execution','testtask'),
+(11,'execution','tree'),
+(11,'execution','treestory'),
+(11,'execution','treetask'),
+(11,'execution','view'),
 (11,'projectstory','story'),
 (11,'projectstory','track'),
 (11,'projectstory','view'),
@@ -4134,18 +4192,20 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11,'user','view'),
 (12,'my','limited');
 
-INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
+REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
 ('zh-cn', 'custom', 'URSRList', '1', '{\"SRName\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
 ('zh-cn', 'custom', 'URSRList', '2', '{\"SRName\":\"\\u7814\\u53d1\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
 ('zh-cn', 'custom', 'URSRList', '3', '{\"SRName\":\"\\u8f6f\\u9700\",\"URName\":\"\\u7528\\u9700\"}', '1'),
 ('zh-cn', 'custom', 'URSRList', '4', '{\"SRName\":\"\\u6545\\u4e8b\",\"URName\":\"\\u53f2\\u8bd7\"}', '1'),
-('zh-cn', 'custom', 'URSRList', '5', '{\"SRName\":\"\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1');
+('zh-cn', 'custom', 'URSRList', '5', '{\"SRName\":\"\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
+('en', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'),
+('en', 'custom', 'URSRList', '2', '{\"SRName\":\"Story\",\"URName\":\"Requirement\"}', '0');
 
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'hourPoint',   '1');
+INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'hourPoint',   '0');
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProduct',   '1');
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRExecution', '1');
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'URSR', '6');
+INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'URSR', '2');
+INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', 'global', 'mode', 'new');
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'unitList', 'CNY,USD');
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'defaultCurrency', 'CNY');
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProduct', '1');
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRExecution', '1');
+INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'story', '', 'reviewRules', 'allpass');
diff --git a/framework/base/control.class.php b/framework/base/control.class.php
index 17dd3bfb10..fb9a960bc3 100644
--- a/framework/base/control.class.php
+++ b/framework/base/control.class.php
@@ -16,7 +16,7 @@ class baseControl
     /**
      * 全局对象 $app。
      * The global $app object.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -25,7 +25,7 @@ class baseControl
     /**
      * 应用名称 $appName
      * The global $appName.
-     * 
+     *
      * @var string
      * @access public
      */
@@ -34,7 +34,7 @@ class baseControl
     /**
      * 全局对象 $config。
      * The global $config object.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -43,7 +43,7 @@ class baseControl
     /**
      * 全局对象 $lang。
      * The global $lang object.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -52,7 +52,7 @@ class baseControl
     /**
      * 全局对象 $dbh，数据库连接句柄。
      * The global $dbh object, the database connection handler.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -61,7 +61,7 @@ class baseControl
     /**
      * $dao对象，实现sql的拼装和执行。
      * The $dao object, used to join sql and excute sql.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -70,7 +70,7 @@ class baseControl
     /**
      * $post对象，用户可以通过$this->post->key来引用$_POST变量。
      * The $post object, useer can access a post var by $this->post->key.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -79,7 +79,7 @@ class baseControl
     /**
      * $get对象，用户可以通过$this->get->key来引用$_GET变量。
      * The $get object, useer can access a get var by $this->get->key.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -88,7 +88,7 @@ class baseControl
     /**
      * $session对象，用户可以通过$this->session->key来引用$_SESSION变量。
      * The $session object, useer can access a session var by $this->session->key.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -97,7 +97,7 @@ class baseControl
     /**
      * $server对象，用户可以通过$this->server->key来引用$_SERVER变量。
      * The $server object, useer can access a server var by $this->server->key.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -106,7 +106,7 @@ class baseControl
     /**
      * $cookie对象，用户可以通过$this->cookie->key来引用$_COOKIE变量。
      * The $cookie object, useer can access a cookie var by $this->cookie->key.
-     * 
+     *
      * @var object
      * @access public
      */
@@ -115,7 +115,7 @@ class baseControl
     /**
      * 当前模块的名称。
      * The name of current module.
-     * 
+     *
      * @var string
      * @access public
      */
@@ -124,16 +124,16 @@ class baseControl
     /**
      * $view用于存放从control传到view视图的数据。
      * The vars assigned to the view page.
-     * 
+     *
      * @var object
      * @access public
      */
-    public $view; 
+    public $view;
 
     /**
      * 视图的类型，比如html, json。
      * The type of the view, such html, json.
-     * 
+     *
      * @var string
      * @access public
      */
@@ -142,7 +142,7 @@ class baseControl
     /**
      * 输出到浏览器的内容。
      * The content to display.
-     * 
+     *
      * @var string
      * @access public
      */
@@ -151,25 +151,25 @@ class baseControl
     /**
      * 客户端设备。
      * The client device.
-     * 
-     * @var string   
+     *
+     * @var string
      * @access public
      */
     public $clientDevice;
 
     /**
      * 不同设备下视图文件的前缀。
-     * The prefix of view file for mobile or PC. 
-     * 
-     * @var string   
+     * The prefix of view file for mobile or PC.
+     *
+     * @var string
      * @access public
      */
     public $devicePrefix;
 
     /**
-     * 构造方法。 
-     * 
-     * 1. 将全局变量设为baseControl类的成员变量，方便baseControl的派生类调用； 
+     * 构造方法。
+     *
+     * 1. 将全局变量设为baseControl类的成员变量，方便baseControl的派生类调用；
      * 2. 设置当前模块，读取该模块的model类；
      * 3. 初始化$view视图类。
      *
@@ -178,10 +178,10 @@ class baseControl
      * 1. global the global vars, refer them by the class member such as $this->app.
      * 2. set the pathes of current module, and load it's model class.
      * 3. auto assign the $lang and $config to the view.
-     * 
-     * @param  string $moduleName 
-     * @param  string $methodName 
-     * @param  string $appName 
+     *
+     * @param  string $moduleName
+     * @param  string $methodName
+     * @param  string $appName
      * @access public
      * @return void
      */
@@ -234,10 +234,10 @@ class baseControl
 
     //-------------------- Model相关方法(Model related methods) --------------------//
 
-    /* 
-     * 设置模块名。 
-     * Set the module name. 
-     * 
+    /*
+     * 设置模块名。
+     * Set the module name.
+     *
      * @param   string  $moduleName  模块名，如果为空，则从$app中获取. The module name, if empty, get it from $app.
      * @access  public
      * @return  void
@@ -250,8 +250,8 @@ class baseControl
     /**
      * 设置方法名。
      * Set the method name.
-     * 
-     * @param   string  $methodName   方法名，如果为空，则从$app中获取。The method name, if empty, get it from $app.   
+     *
+     * @param   string  $methodName   方法名，如果为空，则从$app中获取。The method name, if empty, get it from $app.
      * @access  public
      * @return  void
      */
@@ -263,7 +263,7 @@ class baseControl
     /**
      * 加载指定模块的model文件。
      * Load the model file of one module.
-     * 
+     *
      * @param   string  $moduleName 模块名，如果为空，使用当前模块。The module name, if empty, use current module's name.
      * @param   string  $appName    The app name, if empty, use current app's name.
      * @access  public
@@ -286,9 +286,9 @@ class baseControl
 
         /**
          * 如果没有model文件，尝试加载config配置信息。
-         * If no model file, try load config. 
+         * If no model file, try load config.
          */
-        if(!helper::import($modelFile)) 
+        if(!helper::import($modelFile))
         {
             $this->app->loadModuleConfig($moduleName, $appName);
             $this->app->loadLang($moduleName, $appName);
@@ -296,7 +296,7 @@ class baseControl
             return false;
         }
 
-        /** 
+        /**
          * 如果没有扩展文件，model类名是$moduleName + 'model'，如果有扩展，还需要增加ext前缀。
          * If no extension file, model class name is $moduleName + 'model', else with 'ext' as the prefix.
          */
@@ -307,7 +307,7 @@ class baseControl
             if(!class_exists($modelClass)) $this->app->triggerError(" The model $modelClass not found", __FILE__, __LINE__, $exit = true);
         }
 
-        /** 
+        /**
          * 初始化model对象，在control对象中可以通过$this->$moduleName来引用。同时将dao对象赋为control对象的成员变量，方便引用。
          * Init the model object thus you can try $this->$moduleName to access it. Also assign the $dao object as a member of control object.
          */
@@ -320,7 +320,7 @@ class baseControl
     /**
      * 设置超级全局变量，方便直接引用。
      * Set the super vars.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -336,7 +336,7 @@ class baseControl
     /**
      * 设置客户端的设备类型。
      * Set client device.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -362,7 +362,7 @@ class baseControl
     /**
      * 设置视图文件：主视图文件，扩展视图文件， 站点扩展视图文件，以及钩子脚本。
      * Set view files: the main file, extension view file, site extension view file and hook files.
-     * 
+     *
      * @param  string   $moduleName    module name
      * @param  string   $methodName    method name
      * @access public
@@ -401,15 +401,15 @@ class baseControl
     /**
      * 获取某一个视图文件的扩展。
      * Get the extension file of an view.
-     * 
-     * @param  string $viewFile 
+     *
+     * @param  string $viewFile
      * @access public
      * @return string|bool  If extension view file exists, return the path. Else return fasle.
      */
     public function getExtViewFile($viewFile)
     {
         /**
-         * 首先找sitecode下的扩展文件，如果没有，再找ext下的扩展文件。 
+         * 首先找sitecode下的扩展文件，如果没有，再找ext下的扩展文件。
          * Find extViewFile in ext/_$siteCode/view first, then try ext/view/.
          */
         if($this->app->siteCode)
@@ -437,9 +437,9 @@ class baseControl
     /**
      * 获取适用于当前方法的css：该模块公用的css + 当前方法的css + 扩展的css。
      * Get css codes applied to current method: module common css + method css + extension css.
-     * 
-     * @param  string    $moduleName 
-     * @param  string    $methodName 
+     *
+     * @param  string    $moduleName
+     * @param  string    $methodName
      * @access public
      * @return string
      */
@@ -504,8 +504,8 @@ class baseControl
 
     /**
      * Get extension css and extension css with lang.
-     * 
-     * @param  array $files 
+     *
+     * @param  array $files
      * @access public
      * @return string
      */
@@ -556,9 +556,9 @@ class baseControl
     /**
      * 获取适用于当前方法的js：该模块公用的js + 当前方法的js + 扩展的js。
      * Get js codes applied to current method: module common js + method js + extension js.
-     * 
-     * @param  string    $moduleName 
-     * @param  string    $methodName 
+     *
+     * @param  string    $moduleName
+     * @param  string    $methodName
      * @access public
      * @return string
      */
@@ -599,14 +599,14 @@ class baseControl
                 if(!empty($jsExtFiles) and is_array($jsExtFiles)) foreach($jsExtFiles as $jsFile) $js .= file_get_contents($jsFile);
             }
         }
-        
+
         return $js;
     }
 
     /**
      * 向$view传递一个变量。
      * Assign one var to the view vars.
-     * 
+     *
      * @param   string  $name       the name.
      * @param   mixed   $value      the value.
      * @access  public
@@ -631,7 +631,7 @@ class baseControl
 
     /**
      * 渲染视图文件。
-     * Parse view file. 
+     * Parse view file.
      *
      * @param  string $moduleName    module name, if empty, use current module.
      * @param  string $methodName    method name, if empty, use current method.
@@ -698,7 +698,7 @@ class baseControl
 
         /**
          * 获得当前页面的CSS和JS。
-         * Get css and js codes for current method. 
+         * Get css and js codes for current method.
          */
         $css = $this->getCSS($moduleName, $methodName);
         $js  = $this->getJS($moduleName, $methodName);
@@ -707,7 +707,7 @@ class baseControl
 
         /**
          * 切换到视图文件所在的目录，以保证视图文件里面的include语句能够正常运行。
-         * Change the dir to the view file to keep the relative pathes work. 
+         * Change the dir to the view file to keep the relative pathes work.
          */
         $currentPWD = getcwd();
         chdir(dirname($viewFile));
@@ -725,7 +725,7 @@ class baseControl
 
         /**
          * 渲染完毕后，再切换回之前的路径。
-         * At the end, chang the dir to the previous. 
+         * At the end, chang the dir to the previous.
          */
         chdir($currentPWD);
     }
@@ -752,7 +752,7 @@ class baseControl
         if($moduleName == '') $moduleName = $this->moduleName;
         if($methodName == '') $methodName = $this->methodName;
         if($appName == '')    $appName    = $this->appName;
-        if($moduleName == $this->moduleName and $methodName == $this->methodName) 
+        if($moduleName == $this->moduleName and $methodName == $this->methodName)
         {
             $this->parse($moduleName, $methodName);
             return $this->output;
@@ -810,7 +810,7 @@ class baseControl
 
         /**
          * 加载控制器文件。
-         * Load the control file. 
+         * Load the control file.
          */
         if(!is_file($file2Included)) $this->app->triggerError("The control file $file2Included not found", __FILE__, __LINE__, $exit = true);
         if(!class_exists($classNameToFetch))
@@ -821,26 +821,26 @@ class baseControl
 
         /**
          * 设置调用的类名。
-         * Set the name of the class to be called. 
+         * Set the name of the class to be called.
          */
         $className = class_exists("my$moduleName") ? "my$moduleName" : $moduleName;
         if(!class_exists($className)) $this->app->triggerError(" The class $className not found", __FILE__, __LINE__, $exit = true);
 
         /**
          * 解析参数，创建模块control对象。
-         * Parse the params, create the $module control object. 
+         * Parse the params, create the $module control object.
          */
         $module = new $className($moduleName, $methodName, $appName);
 
         /**
          * 调用对应方法，使用ob方法获取输出内容。
-         * Call the method and use ob function to get the output. 
+         * Call the method and use ob function to get the output.
          */
         ob_start();
         call_user_func_array(array($module, $methodName), $params);
         $output = ob_get_contents();
         ob_end_clean();
-        
+
         unset($module);
 
         /**
@@ -855,14 +855,14 @@ class baseControl
 
         /**
          * 返回内容。
-         * Return the content. 
+         * Return the content.
          */
         return $output;
     }
 
     /**
      * 向浏览器输出内容。
-     * Print the content of the view. 
+     * Print the content of the view.
      *
      * @param   string  $moduleName    module name
      * @param   string  $methodName    method name
@@ -875,12 +875,12 @@ class baseControl
         echo $this->output;
     }
 
-    /** 
+    /**
      * 直接输出data数据，通常用于ajax请求中。
      * Send data directly, for ajax requests.
      *
-     * @param  misc   $data 
-     * @param  string $type 
+     * @param  misc   $data
+     * @param  string $type
      * @access public
      * @return void
      */
@@ -897,7 +897,7 @@ class baseControl
 
         /**
          * 响应非ajax的请求。
-         * Response request not ajax. 
+         * Response request not ajax.
          */
         if(isset($data['result']) and $data['result'] == 'success')
         {
@@ -928,21 +928,19 @@ class baseControl
      * @param   string|array   $vars          the params passed, can be array(key=>value) or key1=value1&key2=value2
      * @param   string         $viewType      the view type
      * @param   string         $onlybody      remove header and footer or not in iframe
-     * @param   string         $PRJID         the project id 
-     * @param   string         $removePRJ     if remove PRJ param 
      * @access  public
      * @return  string the link string.
      */
-    public function createLink($moduleName, $methodName = 'index', $vars = array(), $viewType = '', $onlybody = false, $PRJID = 0, $removePRJ = false)
+    public function createLink($moduleName, $methodName = 'index', $vars = array(), $viewType = '', $onlybody = false)
     {
         if(empty($moduleName)) $moduleName = $this->moduleName;
-        return helper::createLink($moduleName, $methodName, $vars, $viewType, $onlybody, $PRJID, $removePRJ);
+        return helper::createLink($moduleName, $methodName, $vars, $viewType, $onlybody);
     }
 
     /**
      * 创建当前模块的一个方法链接。
      * Create a link to the inner method of current module.
-     * 
+     *
      * @param   string         $methodName    method name
      * @param   string|array   $vars          the params passed, can be array(key=>value) or key1=value1&key2=value2
      * @param   string         $viewType      the view type
@@ -957,7 +955,7 @@ class baseControl
     /**
      * 重定向到另一个页面。
      * Location to another page.
-     * 
+     *
      * @param   string   $url   the target url.
      * @access  public
      * @return  void
diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index 226983f1a6..33e13afff4 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -56,17 +56,14 @@ class baseHelper
      * @param string|array $vars           the params passed to the method, can be array('key' => 'value') or key1=value1&key2=value2) or key1=value1&key2=value2
      * @param string       $viewType       the view type
      * @param bool         $onlyBody       pass onlyBody=yes to the link thus the app can control the header and footer hide or show..
-     * @param bool         $PRJID      set PRJ id in to session.
-     * @param bool         $removePRJ  if true, remove PRJ param.
      * @static
      * @access public
      * @return string the link string.
      */
-    static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false, $PRJID = 0, $removePRJ = false)
+    static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false)
     {
         /* 设置$appName和$moduleName。Set appName and moduleName. */
         global $app, $config;
-        $PRJID = $PRJID ? $PRJID : $app->session->PRJ;
 
         if(strpos($moduleName, '.') !== false)
         {
@@ -98,8 +95,7 @@ class baseHelper
             if($viewType != 'html') $link .= "&{$config->viewVar}=" . $viewType;
             foreach($vars as $key => $value) $link .= "&$key=$value";
 
-            $link = self::processOnlyBodyParam($link, $onlyBody);
-            return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
+            return self::processOnlyBodyParam($link, $onlyBody);
         }
 
         /**
@@ -114,8 +110,7 @@ class baseHelper
             foreach($vars as $value) $link .= "{$config->requestFix}$value";
             $link .= '.' . $viewType;
 
-            $link = self::processOnlyBodyParam($link, $onlyBody);
-            return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
+            return self::processOnlyBodyParam($link, $onlyBody);
         }
 
         /**
@@ -126,8 +121,7 @@ class baseHelper
         if($moduleName == $config->default->module)
         {
             $link .= $config->default->method . '.' . $viewType;
-            $link  = self::processOnlyBodyParam($link, $onlyBody);
-            return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
+            return self::processOnlyBodyParam($link, $onlyBody);
         }
 
         /**
@@ -138,8 +132,7 @@ class baseHelper
         if($viewType == $app->getViewType())
         {
             $link .= $moduleName . '/';
-            $link  = self::processOnlyBodyParam($link, $onlyBody);
-            return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
+            return self::processOnlyBodyParam($link, $onlyBody);
         }
 
         /**
@@ -148,36 +141,7 @@ class baseHelper
          *
          */
         $link .= $moduleName . '.' . $viewType;
-        $link  = self::processOnlyBodyParam($link, $onlyBody);
-        return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
-    }
-
-    /**
-     *  处理PRJ 参数。
-     *  Process the PRJID param in url.
-     *
-     *  如果传参的时候设定了$PRJID，在生成链接的时候继续追加。
-     *  If $progrmID in the url, append it to the link.
-     *
-     *  @param  string  $link
-     *  @param  int     $PRJID
-     *  @param  bool    $onlybody
-     *  @param  string  $moduleName
-     *  @param  bool    $removePRJ
-     *  @static
-     *  @access public
-     *  @return string
-     */
-    public static function processProjectParam($link, $PRJID = '', $onlybody = false, $moduleName = '', $removePRJ = false)
-    {
-        global $config, $lang;
-
-        if(!$PRJID || $removePRJ) return $link;
-        $app = zget($lang->navGroup, $moduleName);
-        if($app != 'project' and $app != 'execution') return $link;
-
-        $link .= strpos($link, '?') === false ? "?PRJ=$PRJID" : "&PRJ=$PRJID";
-        return $link;
+        return self::processOnlyBodyParam($link, $onlyBody);
     }
 
     /**
@@ -251,15 +215,12 @@ class baseHelper
     {
         if(is_array($idList))
         {
-            if(!function_exists('get_magic_quotes_gpc') or !get_magic_quotes_gpc())
-            {
-                foreach($idList as $key=>$value) $idList[$key] = addslashes($value);
-            }
+            foreach($idList as $key=>$value) $idList[$key] = addslashes($value);
             return "IN ('" . join("','", $idList) . "')";
         }
 
         if(!is_string($idList)) $idList = json_encode($idList);
-        if(!function_exists('get_magic_quotes_gpc') or !get_magic_quotes_gpc()) $idList = addslashes($idList);
+        $idList = addslashes($idList);
         return "IN ('" . str_replace(',', "','", str_replace(' ', '', $idList)) . "')";
     }
 
@@ -302,7 +263,7 @@ class baseHelper
      */
     static public function jsonEncode($data)
     {
-        return (function_exists('get_magic_quotes_gpc') and get_magic_quotes_gpc()) ? addslashes(json_encode($data)) : json_encode($data);
+        return json_encode($data);
     }
 
     /**
@@ -331,7 +292,7 @@ class baseHelper
                 $oversize = strlen($password) % 8;
                 if($oversize != 0) $password .= str_repeat("\0", 8 - $oversize);
 
-                $encrypted = @openssl_encrypt($password, 'DES-CBC', $secret, OPENSSL_ZERO_PADDING);
+                $encrypted = @openssl_encrypt($password, 'DES-CBC', substr($secret, 0, 8), OPENSSL_ZERO_PADDING);
             }
         }
         if(empty($encrypted)) $encrypted = $password;
@@ -357,7 +318,7 @@ class baseHelper
             $secret = $config->encryptSecret;
             if(function_exists('mcrypt_decrypt'))
             {
-                $decryptedPassword = @mcrypt_decrypt(MCRYPT_DES, $secret, base64_decode($password), MCRYPT_MODE_CBC);
+                $decryptedPassword = @mcrypt_decrypt(MCRYPT_DES, substr($secret, 0, 8), base64_decode($password), MCRYPT_MODE_CBC);
             }
             elseif(function_exists('openssl_decrypt'))
             {
@@ -907,3 +868,17 @@ function zget($var, $key, $valueWhenNone = false, $valueWhenExists = false)
     if($valueWhenNone !== false) return $valueWhenNone;
     return $key;
 }
+
+/**
+ * Is https.
+ *
+ * @access public
+ * @return bool
+ */
+function isHttps()
+{
+    if(!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') return true;
+    if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') return true;
+    if(!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') return true;
+    return false;
+}
diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index e8adf04cce..ad4e48f97d 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -376,13 +376,13 @@ class baseRouter
         $this->loadClass('dao',    $static = true);
         $this->loadClass('mobile', $static = true);
 
+        $this->setCookieSecure();
+        $this->setOpenApp();
         $this->setSuperVars();
         $this->setDebug();
         $this->setErrorHandler();
         $this->setTimezone();
         $this->startSession();
-        $this->setProject();
-        $this->setOpenApp();
 
         if($this->config->framework->multiSite)     $this->setSiteCode() && $this->loadExtraConfig();
         if($this->config->framework->autoConnectDB) $this->connectDB();
@@ -600,7 +600,7 @@ class baseRouter
         $this->get     = new super('get');
         $this->server  = new super('server');
         $this->cookie  = new super('cookie');
-        $this->session = new super('session');
+        $this->session = new super('session', $this->openApp);
 
         unset($GLOBALS);
         unset($_REQUEST);
@@ -619,6 +619,18 @@ class baseRouter
         $_COOKIE = validater::filterSuper($_COOKIE);
     }
 
+    /**
+     * Set cookieSecure config.
+     *
+     * @access public
+     * @return void
+     */
+    public function setCookieSecure()
+    {
+        $this->config->cookieSecure = false;
+        if($this->config->framework->setCookieSecure and isHttps()) $this->config->cookieSecure = true;
+    }
+
     /**
      * 设置Debug模式。
      * set Debug.
@@ -841,7 +853,7 @@ class baseRouter
         {
             $sessionName = $this->config->sessionVar;
             session_name($sessionName);
-            session_set_cookie_params(0, $this->config->webRoot);
+            session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
             if($this->config->customSession) session_save_path($this->getTmpRoot() . 'session');
             session_start();
 
@@ -854,18 +866,6 @@ class baseRouter
         }
     }
 
-    /**
-     * 从Get里取project id 设置到session中。
-     * Get project id from Get and set it to session.
-     *
-     * @access public
-     * @return void
-     */
-    public function setProject()
-    {
-        if(isset($_GET['PRJ'])) $this->session->set('PRJ', $_GET['PRJ']); //Set project id into session.
-    }
-
     /**
      * 从cookie中获取当前的group, 即URL锚链接'#open=?'。
      * Get current group from cookie, original source is url '#open=?'.
@@ -875,7 +875,15 @@ class baseRouter
      */
     public function setOpenApp()
     {
-        if(isset($_COOKIE['openApp'])) $this->openApp = $_COOKIE['openApp'];
+        if(isset($_COOKIE['openApp']) and $_COOKIE['openApp'])
+        {
+            $this->openApp = $_COOKIE['openApp'];
+        }
+        else
+        {
+            $module = $this->rawModule;
+            $this->openApp = isset($this->lang->navGroup->$module) ? $this->lang->navGroup->$module : 'my';
+        }
     }
 
     /**
@@ -906,7 +914,7 @@ class baseRouter
             $this->clientLang = $this->config->default->lang;
         }
 
-        setcookie('lang', $this->clientLang, $this->config->cookieLife, $this->config->webRoot, '', false, false);
+        setcookie('lang', $this->clientLang, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
         if(!isset($_COOKIE['lang'])) $_COOKIE['lang'] = $this->clientLang;
 
         return true;
@@ -960,7 +968,7 @@ class baseRouter
             $this->clientTheme = $this->config->default->theme;
         }
 
-        setcookie('theme', $this->clientTheme, $this->config->cookieLife, $this->config->webRoot, '', false, false);
+        setcookie('theme', $this->clientTheme, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
         if(!isset($_COOKIE['theme'])) $_COOKIE['theme'] = $this->clientTheme;
 
         return true;
@@ -986,7 +994,7 @@ class baseRouter
             $this->clientDevice = ($mobile->isMobile() and !$mobile->isTablet()) ? 'mobile' : 'desktop';
         }
 
-        setcookie('device', $this->clientDevice, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie('device', $this->clientDevice, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
         if(!isset($_COOKIE['device'])) $_COOKIE['device'] = $this->clientDevice;
 
         return $this->clientDevice;
@@ -1830,7 +1838,6 @@ class baseRouter
         global $filter;
 
         /* Remove these three params. */
-        unset($passedParams['PRJ']);
         unset($passedParams['onlybody']);
         unset($passedParams['HTTP_X_REQUESTED_WITH']);
 
@@ -2269,6 +2276,9 @@ class baseRouter
         extract($trace[1]);
         $log .= ", last called by $file on line $line through function $function.\n";
 
+        /* Change absolute path to relative path. */
+        $log = str_replace($this->basePath, '', $log);
+
         /* 触发错误(Trigger the error) */
         trigger_error($log, $exit ? E_USER_ERROR : E_USER_WARNING);
     }
@@ -2477,9 +2487,10 @@ class super
      * @access  public
      * @return  void
      */
-    public function __construct($scope)
+    public function __construct($scope, $openApp = '')
     {
-        $this->scope = $scope;
+        $this->scope   = $scope;
+        $this->openApp = $openApp;
     }
 
     /**
@@ -2491,7 +2502,7 @@ class super
      * @access  public
      * @return  void
      */
-    public function set($key, $value)
+    public function set($key, $value, $openApp = '')
     {
         if($this->scope == 'post')
         {
@@ -2511,6 +2522,7 @@ class super
         }
         elseif($this->scope == 'session')
         {
+            if($openApp) $_SESSION["app-$openApp"][$key] = $value;
             $_SESSION[$key] = $value;
         }
         elseif($this->scope == 'env')
@@ -2558,6 +2570,8 @@ class super
         }
         elseif($this->scope == 'session')
         {
+            $openApp = $this->openApp;
+            if($openApp and isset($_SESSION["app-$openApp"][$key])) return $_SESSION["app-$openApp"][$key];
             if(isset($_SESSION[$key])) return $_SESSION[$key];
             return false;
         }
diff --git a/framework/control.class.php b/framework/control.class.php
index b8dd49f08b..d6ce3486ec 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -21,11 +21,11 @@ include dirname(__FILE__) . '/base/control.class.php';
 class control extends baseControl
 {
     /**
-     * Check requiredFields and set exportFields for workflow. 
-     * 
-     * @param  string $moduleName 
-     * @param  string $methodName 
-     * @param  string $appName 
+     * Check requiredFields and set exportFields for workflow.
+     *
+     * @param  string $moduleName
+     * @param  string $methodName
+     * @param  string $appName
      * @access public
      * @return void
      */
@@ -33,6 +33,8 @@ class control extends baseControl
     {
         parent::__construct($moduleName, $methodName, $appName);
 
+        $this->app->setOpenApp();
+
         if(defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api')) $this->setPreference();
 
         if(!isset($this->config->bizVersion)) return false;
@@ -78,7 +80,7 @@ class control extends baseControl
 
     /**
      * Go to preference setting page if preference not setted.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -89,7 +91,7 @@ class control extends baseControl
         if($this->app->getModuleName() == 'my' and $this->app->getMethodName() == 'changepassword') return true;
         if($this->app->getModuleName() == 'my' and $this->app->getMethodName() == 'preference') return true;
 
-        if(!isset($this->config->preferenceSetted)) 
+        if(!isset($this->config->preferenceSetted))
         {
             $this->locate(helper::createLink('my', 'preference'));
         }
@@ -208,7 +210,7 @@ class control extends baseControl
         chdir(dirname($viewFile));
 
         /**
-         * 使用extract安定ob方法渲染$viewFile里面的代码。
+         * 使用extract和ob方法渲染$viewFile里面的代码。
          * Use extract and ob functions to eval the codes in $viewFile.
          */
         extract((array)$this->view);
@@ -293,7 +295,7 @@ class control extends baseControl
 
     /**
      * Check require with flow field when post data.
-     * 
+     *
      * @access public
      * @return void
      */
diff --git a/framework/helper.class.php b/framework/helper.class.php
index 6f964ec9eb..fe2f3683c3 100644
--- a/framework/helper.class.php
+++ b/framework/helper.class.php
@@ -66,7 +66,7 @@ class helper extends baseHelper
      * @access public
      * @return string
      */
-    static public function jsonEncode4Parse($data, $options = 0)
+    public static function jsonEncode4Parse($data, $options = 0)
     {
         $json = json_encode($data);
         if($options) $json = str_replace(array("'", '"'), array('\u0027', '\u0022'), $json);
@@ -86,7 +86,7 @@ class helper extends baseHelper
      * @access public
      * @return string
      */
-    static public function convertEncoding($string, $fromEncoding, $toEncoding = 'utf-8')
+    public static function convertEncoding($string, $fromEncoding, $toEncoding = 'utf-8')
     {
         $toEncoding = str_replace('utf8', 'utf-8', $toEncoding);
         if(function_exists('mb_convert_encoding'))
@@ -121,7 +121,7 @@ class helper extends baseHelper
      *
      * @return bool|float
      */
-    static public function workDays($begin, $end)
+    public static function workDays($begin, $end)
     {
         $begin = strtotime($begin);
         $end   = strtotime($end);
diff --git a/framework/router.class.php b/framework/router.class.php
index 868527f49c..d544f7e939 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -154,7 +154,6 @@ class router extends baseRouter
     {
         if(!defined('ITERATION_KEY'))     define('ITERATION_KEY', 0);
         if(!defined('SPRINT_KEY'))        define('SPRINT_KEY', 1);
-        if(!defined('STAGE_KEY'))         define('STAGE_KEY', 2);
         if(!defined('PRODUCT_KEY'))       define('PRODUCT_KEY', 0);
         if(!defined('STORYPOINT_KEY'))    define('STORYPOINT_KEY', 1);
         if(!defined('FUNCTIONPOINT_KEY')) define('FUNCTIONPOINT_KEY', 2);
@@ -171,7 +170,7 @@ class router extends baseRouter
             $commonSettings = array();
             try
             {
-                $commonSettings = $this->dbh->query('SELECT section, `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND (`module`='custom' or `module`='common') and `key` in ('sprintConcept', 'hourPoint', 'URSR', 'mode', 'URAndSR')")->fetchAll();
+                $commonSettings = $this->dbh->query('SELECT section, `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND (`module`='custom' or `module`='common') and `key` in ('sprintConcept', 'hourPoint', 'URSR', 'mode', 'URAndSR', 'scoreStatus')")->fetchAll();
             }
             catch (PDOException $exception)
             {
@@ -179,8 +178,9 @@ class router extends baseRouter
             }
         }
 
-        $hourKey = $planKey = $URSR = $URAndSR = 0;
-        $mode    = 'new';
+        $hourKey    = $planKey = $URSR = $URAndSR = 0;
+        $mode       = 'new';
+        $score      = '0';
         $projectKey = empty($this->config->isINT) ? ITERATION_KEY : SPRINT_KEY;
 
         foreach($commonSettings as $setting)
@@ -190,23 +190,22 @@ class router extends baseRouter
             if($setting->key == 'URSR')          $URSR       = $setting->value;
             if($setting->key == 'URAndSR')       $URAndSR    = $setting->value;
             if($setting->key == 'mode' and $setting->section == 'global') $mode = $setting->value;
+            if($setting->key == 'scoreStatus' and $setting->section == 'global') $score = $setting->value;
         }
 
         /* Record system mode. */
         $config->systemMode = $mode;
         if($config->systemMode == 'classic') $this->config->executionCommonList = $this->config->projectCommonList;
 
-        /* Record hour unit. */
-        $config->hourUnit = 'H';
-        if($hourKey == STORYPOINT_KEY)    $config->hourUnit = 'SP';
-        if($hourKey == FUNCTIONPOINT_KEY) $config->hourUnit = 'FP';
+        /* Record system score.*/
+        $config->systemScore = $score;
 
-        $model = new stdclass();
-        $model->model = 'scrum';
-        if($this->session->PRJ) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->PRJ}")->fetch();
+        /* Record hour unit. */
+        $config->hourUnit = 'h';
+        if($hourKey == STORYPOINT_KEY)    $config->hourUnit = 'sp';
+        if($hourKey == FUNCTIONPOINT_KEY) $config->hourUnit = 'fp';
 
         $iterationKey = $projectKey;
-        if(isset($model->model) && $model->model == 'waterfall') $projectKey = STAGE_KEY;
 
         /* Set productCommon, projectCommon and hourCommon. Default english lang. */
         $lang->productCommon   = $this->config->productCommonList[$this->clientLang][PRODUCT_KEY];
@@ -239,7 +238,8 @@ class router extends baseRouter
         if($this->dbh and !empty($this->config->db->name) and !defined('IN_UPGRADE'))
         {
             /* Get story concept in project and product. */
-            $URSRList = $this->dbh->query('SELECT `key`, `value` FROM' . TABLE_LANG . "WHERE module = 'custom' and section = 'URSRList' and lang = \"{$this->clientLang}\"")->fetchAll();
+            $URSRList = $this->dbh->query('SELECT `key`, `value` FROM' . TABLE_LANG . "WHERE module = 'custom' and section = 'URSRList' and `lang` = \"{$this->clientLang}\"")->fetchAll();
+            if(empty($URSRList)) $URSRList = $this->dbh->query('SELECT `key`, `value` FROM' . TABLE_LANG . "WHERE module = 'custom' and section = 'URSRList' and `key` = \"{$config->URSR}\"")->fetchAll();
 
             /* Get UR pairs and SR pairs. */
             $URPairs  = array();
@@ -252,8 +252,8 @@ class router extends baseRouter
             }
 
             /* Set default story concept and init UR and SR concept. */
-            $lang->URCommon = zget($URPairs, $config->URSR);
-            $lang->SRCommon = zget($SRPairs, $config->URSR);
+            $lang->URCommon = isset($URPairs[$config->URSR]) ? $URPairs[$config->URSR] : reset($URPairs);
+            $lang->SRCommon = isset($SRPairs[$config->URSR]) ? $SRPairs[$config->URSR] : reset($SRPairs);
         }
     }
 
@@ -498,6 +498,18 @@ class router extends baseRouter
             /* Prepend other params. */
             if($methodName == 'operate')      array_unshift($params, $this->rawMethod); // $params = array('close', 1);
             if($methodName == 'batchOperate') array_unshift($params, $this->rawMethod); // $params = array('close', 1);
+            if($methodName == 'browse')
+            {
+                if(isset($params[0]) and $params[0] == 'bysearch')
+                {
+                    $params[0] = '';
+                    array_unshift($params, 'bysearch');
+                }
+                else
+                {
+                    array_unshift($params, 'browse');
+                }
+            }
             array_unshift($params, $this->rawModule);                                   // $params = array($module, 'close', 1);
             array_unshift($params, $methodName);                                        // $params = array('operate', $module, 'close', 1);
             array_unshift($params, $moduleName);                                        // $params = array('flow', 'operate', $module, 'close', 1);
@@ -519,6 +531,18 @@ class router extends baseRouter
             $params = array_reverse($params);           // $params = array('label' => 1, 'mode' => 'search');
 
             /* Prepend other params. */
+            if($methodName == 'browse')
+            {
+                if(isset($params['label']) and $params['label'] == 'bysearch')
+                {
+                    $params['label'] = '';
+                    $params['mode'] = 'bysearch';
+                }
+                else
+                {
+                    $params['mode'] = 'browse';
+                }
+            }
             $params['module']                 = $this->rawModule;   // $param = array('label' => 1, 'mode' => 'search', 'module' => $module);
             $params[$this->config->methodVar] = $methodName;        // $param = array('label' => 1, 'mode' => 'search', 'module' => $module, 'f' => 'browse');
             $params[$this->config->moduleVar] = $moduleName;        // $param = array('label' => 1, 'mode' => 'search', 'module' => $module, 'f' => 'browse', 'm' => 'flow');
diff --git a/lib/base/filter/filter.class.php b/lib/base/filter/filter.class.php
index 91e1673c04..9188df18c3 100644
--- a/lib/base/filter/filter.class.php
+++ b/lib/base/filter/filter.class.php
@@ -264,9 +264,9 @@ class baseValidater
     {
         if(empty($date)) return true;
         if($date == '0000-00-00') return true;
-        $stamp = strtotime($date);
-        if(!is_numeric($stamp)) return false; 
-        return checkdate(date('m', $stamp), date('d', $stamp), date('Y', $stamp));
+        $date = substr($date, 0, 10);
+        if(preg_match ("/^([0-9]{4})-([0-9]{2})-([0-9]{2})$/", $date, $parts)) return checkdate($parts[2], $parts[3], $parts[1]);
+        return false;
     }
 
     /**
@@ -282,9 +282,9 @@ class baseValidater
         if(empty($datetime)) return true;
         if($datetime == '0000-00-00') return true;
         if($datetime == '0000-00-00 00:00:00') return true;
-        $stamp = strtotime($datetime);
-        if(!is_numeric($stamp)) return false; 
-        return checkdate(date('m', $stamp), date('d', $stamp), date('Y', $stamp));
+        $date = substr($datetime, 0, 10);
+        if(preg_match ("/^([0-9]{4})-([0-9]{2})-([0-9]{2})$/", $date, $parts)) return checkdate($parts[2], $parts[3], $parts[1]);
+        return false;
     }
 
     /**
@@ -1029,8 +1029,6 @@ class baseFixer
         $fields = $this->processFields($fieldName);
         foreach($fields as $fieldName)
         {
-            if(function_exists('get_magic_quotes_gpc') and get_magic_quotes_gpc()) $this->data->$fieldName = stripslashes($this->data->$fieldName);
-
             if(!isset($this->stripedFields[$fieldName]) and (!defined('RUN_MODE') or RUN_MODE != 'admin'))
             {
                 $this->data->$fieldName = self::stripDataTags($this->data->$fieldName, $allowedTags, $attributes);
diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index d9858e1afc..5a0fccc830 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -813,6 +813,10 @@ class baseJS
             return json_encode($output);
         }
 
+        /* Convert ' to \'. */
+        $message = str_replace("\\'", "'", $message);
+        $message = str_replace("'", "\\'", $message);
+
         return self::start($full) . "alert('" . $message . "')" . self::end() . self::resetForm();
     }
 
@@ -885,16 +889,18 @@ class baseJS
      * 显示一个确认框，点击确定跳转到$okURL，点击取消跳转到$cancelURL。
      * show a confirm box, press ok go to okURL, else go to cancleURL.
      *
-     * @param  string $message      显示的内容。              the text to be showed.
-     * @param  string $okURL        点击确定后跳转的地址。    the url to go to when press 'ok'.
-     * @param  string $cancleURL    点击取消后跳转的地址。    the url to go to when press 'cancle'.
-     * @param  string $okTarget     点击确定后跳转的target。  the target to go to when press 'ok'.
-     * @param  string $cancleTarget 点击取消后跳转的target。  the target to go to when press 'cancle'.
+     * @param  string $message       显示的内容。              the text to be showed.
+     * @param  string $okURL         点击确定后跳转的地址。    the url to go to when press 'ok'.
+     * @param  string $cancleURL     点击取消后跳转的地址。    the url to go to when press 'cancle'.
+     * @param  string $okTarget      点击确定后跳转的target。  the target to go to when press 'ok'.
+     * @param  string $cancleTarget  点击取消后跳转的target。  the target to go to when press 'cancle'.
+     * @param  string $okOpenApp     点击确定后跳转的应用。    the app to go to when press 'ok'.
+     * @param  string $cancleOpenApp 点击取消后跳转的应用。    the app to go to when press 'cancle'.
      * @static
      * @access public
      * @return string
      */
-    static public function confirm($message = '', $okURL = '', $cancleURL = '', $okTarget = "self", $cancleTarget = "self")
+    static public function confirm($message = '', $okURL = '', $cancleURL = '', $okTarget = "self", $cancleTarget = "self", $okOpenApp = '', $cancleOpenApp = '')
     {
         global $app;
         if($app->viewType == 'json')
@@ -921,6 +927,10 @@ class baseJS
         {
             $confirmAction = "history.back(-1);";
         }
+        elseif(strpos($okTarget, '$.apps.open') !== false)
+        {
+            $confirmAction = "$okTarget('$okURL', '$okOpenApp');";
+        }
         elseif(!empty($okURL))
         {
             $confirmAction = "$okTarget.location = '$okURL';";
@@ -931,6 +941,10 @@ class baseJS
         {
             $cancleAction = "history.back(-1);";
         }
+        elseif(strpos($cancleTarget, '$.apps.open') !== false)
+        {
+            $cancleAction = "$cancleTarget('$cancleURL', '$cancleOpenApp');";
+        }
         elseif(!empty($cancleURL))
         {
             $cancleAction = "$cancleTarget.location = '$cancleURL';";
diff --git a/lib/front/front.class.php b/lib/front/front.class.php
index 4777fb3936..1f70cd3b39 100644
--- a/lib/front/front.class.php
+++ b/lib/front/front.class.php
@@ -12,6 +12,7 @@
  */
 
 helper::import(dirname(dirname(__FILE__)) . '/base/front/front.class.php');
+
 /**
  * html类，生成html标签。
  * The html class, to build html tags.
diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php
index 5457e36153..e825ba7d04 100644
--- a/lib/scm/gitlab.class.php
+++ b/lib/scm/gitlab.class.php
@@ -2,86 +2,83 @@
 class gitlab
 {
     public $client;
-    public $root;
+    public $projectID;
 
     /**
-     * Construct 
-     * 
-     * @param  string $client 
-     * @param  string $root 
+     * Construct
+     *
+     * @param  string    $client    gitlab api url.
+     * @param  string    $root      id of gitlab project.
+     * @param  string    $username  null
+     * @param  string    $password  token of gitlab api.
+     * @param  string    $encoding
      * @access public
      * @return void
      */
-    public function __construct($client, $token)
+    public function __construct($client, $root, $username, $password, $encoding = 'UTF-8')
     {
-        putenv('LC_CTYPE=en_US.UTF-8');
-
         $this->client = $client;
-        $this->root   = rtrim($root, DIRECTORY_SEPARATOR);
-        $this->branch = isset($_COOKIE['repoBranch']) ? $_COOKIE['repoBranch'] : '';
-
-        chdir($this->root);
-        exec("{$this->client} config core.quotepath false");
-    }
-
-    public function projects()
-    {
-        
+        $this->root   = rtrim($root, '/') . '/';
+        $this->token  = $password;
+        $this->branch = isset($_COOKIE['repoBranch']) ? $_COOKIE['repoBranch'] : 'HEAD';
     }
 
     /**
      * List files.
-     * 
-     * @param  string $path 
-     * @param  string $revision 
+     *
+     * @param  string $path
+     * @param  string $revision
      * @access public
      * @return array
      */
     public function ls($path, $revision = 'HEAD')
     {
         if(!scm::checkRevision($revision)) return array();
+        $api  = "tree";
 
-        $path = ltrim($path, DIRECTORY_SEPARATOR);
-        $sub  = ''; 
-        chdir($this->root);
-        if(!empty($path)) $sub = ":$path";
-        if(!empty($this->branch))$revision = $this->branch;
-        $cmd = escapeCmd("$this->client ls-tree -l $revision$sub");
-        $list = execCmd($cmd . ' 2>&1', 'array', $result);
-        if($result) return array();
+        $param = new stdclass();
+        $param->path      = ltrim($path, '/');
+        $param->ref       = $revision;
+        $param->recursive = 0;
+        if(!empty($this->branch)) $param->ref = $this->branch;
 
-        $infos   = array();
-        foreach($list as $entry)
+        $list = $this->fetch($api, $param);
+        if(empty($list)) return array();
+
+        $infos = array();
+        foreach($list as $file)
         {
-            list($mod, $kind, $revision, $size, $name) = preg_split('/[\t ]+/', $entry);
+            if(!isset($file->type)) continue;
 
-            /* Get commit info. */
-            $pathName = ltrim($path . DIRECTORY_SEPARATOR . $name, DIRECTORY_SEPARATOR);
-            $cmd      = escapeCmd("$this->client log -1 $this->branch -- $pathName");
-            $commit   = execCmd($cmd, 'array');
-            $logs    = $this->parseLog($commit);
+            $info = new stdClass();
+            if($file->type == 'blob')
+            {
+                $path = $file->path;
+                $file = $this->files($file->path);
 
-            if($size > 1024 * 1024)
-            {
-                $size = round($size / (1024 * 1024), 2) . 'MB';
-            }
-            else if($size > 1024)
-            {
-                $size = round($size / 1024, 2) . 'KB';
+                $info->name     = $file->file_name;
+                $info->kind     = 'file';
+                $info->account  = $file->committer;
+                $info->date     = $file->date;
+                $info->size     = $file->size;
+                $info->comment  = $file->comment;
+                $info->revision = $file->revision;
             }
             else
             {
-                $size .= 'Bytes'; 
+                $commits = $this->getCommitsByPath($file->path);
+                if(empty($commits)) continue;
+                $commit = $commits[0];
+
+                $info->name     = $file->name;
+                $info->kind     = 'dir';
+                $info->revision = $commit->id;
+                $info->account  = $commit->committer_name;
+                $info->date     = date('Y-m-d H:i:s', strtotime($commit->committed_date));
+                $info->size     = 0;
+                $info->comment  = $commit->message;
             }
 
-            $info = new stdClass();
-            $info->name     = $name;
-            $info->kind     = $kind == 'tree' ? 'dir' : 'file';
-            $info->revision = $logs ? $logs[0]->revision : $revision;
-            $info->size     = $size;
-            $info->account  = $logs ? $logs[0]->committer : '';
-            $info->date     = $logs ? $logs[0]->time : '';
-            $info->comment  = $logs ? $logs[0]->comment : '';
             $infos[] = $info;
             unset($info);
         }
@@ -89,84 +86,97 @@ class gitlab
         /* Sort by kind */
         foreach($infos as $key => $info) $kinds[$key] = $info->kind;
         if($infos) array_multisort($kinds, SORT_ASC, $infos);
-
         return $infos;
     }
 
     /**
-     * Get tags 
-     * 
-     * @param  string $path 
-     * @param  string $revision 
+     * Get files info.
+     *
+     * @param  string    $path
+     * @param  string    $ref
+     * @access public
+     * @return array
+     */
+    public function files($path, $ref = 'master')
+    {
+        $path = urlencode($path);
+        $api  = "files/$path";
+        $param = new stdclass();
+        $param->ref = $ref;
+        $file = $this->fetch($api, $param);
+
+        $commits = $this->getCommitsByPath($path);
+        $file->revision = $file->commit_id;
+        $file->size     = $this->formatBytes($file->size);
+
+        if(!empty($commits))
+        {
+            $commit = $commits[0];
+            $file->committer = $commit->committer_name;
+            $file->comment   = $commit->message;
+            $file->date      = date('Y-m-d H:i:s', strtotime($commit->committed_date));
+        }
+
+        return $file;
+    }
+
+    /**
+     * Get tags
+     *
+     * @param  string $path
+     * @param  string $revision
      * @access public
      * @return array
      */
     public function tags($path, $revision = 'HEAD')
     {
-        if(!scm::checkRevision($revision)) return array();
+        $api = "tags";
+        $list = $this->fetch($api);
 
-        chdir($this->root);
-        $cmd  = escapeCmd("$this->client tag --sort=taggerdate");
-        $list = execCmd($cmd . ' 2>&1', 'array', $result);
-        if($result) return array();
-        return $list;
+        $tags = array();
+        foreach($list as $tag) $tags[] = $tag->name;
+
+        return $tags;
     }
 
     /**
-     * Get branch 
-     * 
+     * Get branch
+     *
      * @access public
      * @return array
      */
     public function branch()
     {
-        chdir($this->root);
-
-        /* Get local branch. */
-        $cmd  = escapeCmd("$this->client branch");
-        $list = execCmd($cmd . ' 2>&1', 'array', $result);
-        if($result) return array();
+        $api  = "branches";
+        $list = $this->fetch($api);
 
         $branches = array();
-        foreach($list as $localBranch)
-        {
-            if($localBranch[0] == '*') $localBranch = substr($localBranch, 1);
-
-            $localBranch = trim($localBranch);
-            if(empty($localBranch))continue;
-            $branches[$localBranch] = $localBranch;
-        }
+        foreach($list as $branch) $branches[$branch->name] = $branch->name;
         asort($branches);
+
         return $branches;
     }
 
     /**
-     * Get last log. 
-     * 
-     * @param  string $path 
-     * @param  int    $count 
+     * Get last log.
+     *
+     * @param  string $path
+     * @param  int    $count
      * @access public
      * @return array
      */
     public function getLastLog($path, $count = 10)
     {
-        $path     = ltrim($path, DIRECTORY_SEPARATOR);
-        $revision = $this->branch ? $this->branch : 'HEAD';
-
-        chdir($this->root);
-        $list = execCmd(escapeCmd("$this->client log -10 $revision -- $path"), 'array');
-        $logs = $this->parseLog($list);
-
-        return $logs;
+        return $this->log($path);
     }
 
     /**
-     * Get logs
-     * 
-     * @param  string $path 
-     * @param  string $fromRevision 
-     * @param  string $toRevision 
-     * @param  int    $count 
+     * Get logs.
+     *
+     * @param  string $path
+     * @param  string $fromRevision
+     * @param  string $toRevision
+     * @param  int    $count
      * @access public
      * @return array
      */
@@ -177,39 +187,18 @@ class gitlab
 
         $path  = ltrim($path, DIRECTORY_SEPARATOR);
         $count = $count == 0 ? '' : "-n $count";
-        /* compatible with svn. */
-        if($fromRevision == 'HEAD' and $this->branch) $fromRevision = $this->branch;
-        if($toRevision   == 'HEAD' and $this->branch) $toRevision   = $this->branch;
-        if($fromRevision === $toRevision)
-        {
-            $logs = array();
-            chdir($this->root);
 
-            $list = execCmd(escapeCmd("$this->client log --stat=1024 --name-status --stat-name-width=1000 -1 $fromRevision -- $path"), 'array');
-            $logs = $this->parseLog($list);
-            return $logs;
-        }
+        $list = $this->getCommitsByPath($path, $fromRevision, $toRevision);
+        foreach($list as $commit) $commit->diffs = $this->getFilesByCommit($commit->id);
 
-        if(!$fromRevision)
-        {
-            $revisions = " $toRevision";
-        }
-        else
-        {
-            $revisions = "$fromRevision..$toRevision"; 
-        }
-        chdir($this->root);
-        $list = execCmd(escapeCmd("$this->client log  --stat=1024 --name-status --stat-name-width=1000 $count $revisions -- $path"), 'array');
-        $logs = $this->parseLog($list);
-
-        return $logs;
+        return $this->parseLog($list);
     }
 
     /**
      * Blame file
-     * 
-     * @param  string $path 
-     * @param  string $revision 
+     *
+     * @param  string $path
+     * @param  string $revision
      * @access public
      * @return array
      */
@@ -218,51 +207,47 @@ class gitlab
         if(!scm::checkRevision($revision)) return array();
 
         $path = ltrim($path, DIRECTORY_SEPARATOR);
-        chdir($this->root);
-        $list = execCmd(escapeCmd("$this->client blame -l $revision -- $path"), 'array');
+        $path = urlencode($path);
+        $api  = "files/$path/blame";
+        $param = new stdclass;
+        $param->ref = $this->branch;
+        $results = $this->fetch($api, $param);
 
         $blames   = array();
         $revLine  = 0;
         $revision = '';
-        foreach($list as $line)
+
+        $lineNumber = 1;
+        foreach($results as $blame)
         {
-            if(empty($line)) continue;
-            if($line[0] == '^') $line = substr($line, 1);
-            preg_match('/^([0-9a-f]{39,40})\s.*\((\S+)\s+([\d-]+)\s(.*)\s(\d+)\)(.*)$/U', $line, $matches);
+            $line = array();
+            $line['revision']  = $blame->commit->id;
+            $line['committer'] = $blame->commit->committer_name;
+            $line['time']      = $blame->commit->committer_name;
+            $line['line']      = $lineNumber;
+            $line['lines']     = count($blame->lines);
+            $line['content']   = array_shift($blame->lines);
 
-            if(isset($matches[1]) and $matches[1] != $revision)
+            $blames[] = $line;
+
+            $lineNumber ++;
+
+            foreach($blame->lines as $line)
             {
-                $blame = array();
-                $blame['revision']  = $matches[1];
-                $blame['committer'] = $matches[2];
-                $blame['time']      = $matches[3];
-                $blame['line']      = $matches[5];
-                $blame['lines']     = 1;
-                $blame['content']   = strpos($matches[6], ' ') === false ? $matches[6] : substr($matches[6], 1);
-
-                $revision         = $matches[1];
-                $revLine          = $matches[5];
-                $blames[$revLine] = $blame;
-            }
-            elseif(isset($matches[5]))
-            {
-                $blame            = array();
-                $blame['line']    = $matches[5];
-                $blame['content'] = strpos($matches[6], ' ') === false ? $matches[6] : substr($matches[6], 1);
-
-                $blames[$matches[5]] = $blame;
-                $blames[$revLine]['lines'] ++;
+                $blames[] = array('line' => $lineNumber, 'content' => $line);
+                $lineNumber ++;
             }
         }
+
         return $blames;
     }
 
     /**
      * Diff file.
-     * 
-     * @param  string $path 
-     * @param  string $fromRevision 
-     * @param  string $toRevision 
+     *
+     * @param  string $path
+     * @param  string $fromRevision
+     * @param  string $toRevision
      * @access public
      * @return array
      */
@@ -271,44 +256,50 @@ class gitlab
         if(!scm::checkRevision($fromRevision)) return array();
         if(!scm::checkRevision($toRevision))   return array();
 
-        $path = ltrim($path, DIRECTORY_SEPARATOR);
-        chdir($this->root);
-        if($toRevision == 'HEAD' and $this->branch) $toRevision = $this->branch;
-        if($fromRevision == '^') $fromRevision = $toRevision . '^';
-        if(strpos($fromRevision, '^') !== false)
+        $api     = "compare";
+        $params  = array('from' => $fromRevision, 'to' => $toRevision, 'straight' => 1);
+        if($toRevision == 'HEAD' and $this->branch) $params['to'] = $this->branch;
+        $results = $this->fetch($api, $params);
+        foreach($results->diffs as $key => $diff)
         {
-            $list = execCmd(escapeCmd("$this->client log -2 $toRevision --pretty=format:%H -- $path"), 'array');
-            if(isset($list[1])) $fromRevision = $list[1];
+            if($path != '' and strpos($diff->new_path, $path) === false) unset($results->diffs[$key]);
+        }
+        $diffs = $results->diffs;
+        $lines = array();
+        foreach($diffs as $diff)
+        {
+            $lines[] = sprintf("diff --git a/%s b/%s", $diff->old_path, $diff->new_path);
+            $lines[] = sprintf("index %s ... %s %s ", $fromRevision, $toRevision, $diff->b_mode);
+            $lines[] = sprintf("--a/%s", $diff->old_path);
+            $lines[] = sprintf("--b/%s", $diff->new_path);
+            $diffLines = explode("\n", $diff->diff);
+            foreach($diffLines as $diffLine) $lines[] = $diffLine;
         }
-        $lines = execCmd(escapeCmd("$this->client diff $fromRevision $toRevision -- $path"), 'array');
         return $lines;
+        //return $results->diffs;
     }
 
     /**
      * Cat file.
-     * 
-     * @param  string $entry 
-     * @param  string $revision 
+     *
+     * @param  string $entry
+     * @param  string $revision
      * @access public
      * @return string
      */
     public function cat($entry, $revision = 'HEAD')
     {
         if(!scm::checkRevision($revision)) return false;
-
-        chdir($this->root);
         if($revision == 'HEAD' and $this->branch) $revision = $this->branch;
-        $cmd     = escapeCmd("$this->client show $revision:$entry");
-        $content = execCmd($cmd);
-        if(is_array($content)) $content = implode("\n", $content);
-        return $content;
+        $file = $this->files($entry, $revision);
+        return base64_decode($file->content);
     }
 
     /**
      * Get info.
-     * 
-     * @param  string $entry 
-     * @param  string $revision 
+     *
+     * @param  string $entry
+     * @param  string $revision
      * @access public
      * @return object
      */
@@ -316,53 +307,48 @@ class gitlab
     {
         if(!scm::checkRevision($revision)) return false;
 
-        chdir($this->root);
-        if($revision == 'HEAD' and $this->branch) $revision = $this->branch;
-        $path   = ltrim($entry, DIRECTORY_SEPARATOR);
-        $cmd    = escapeCmd("$this->client ls-tree $revision -- $path");
-        $result = execCmd($cmd);
-        $kind   = '';
-        if($result)
+        $info = new stdclass();
+        $info->kind     = 'dir';
+        $info->path     = $entry;
+        $info->revision = $revision;
+        $info->root     = '';
+        if($revision == 'HEAD' and $this->branch) $info->revision = $this->branch;
+
+        if($entry)
         {
-            $results = explode("\n", trim($result));
-            if(count($results) >= 2)
-            {
-                $kind = 'dir';
-            }
-            else
-            {
-                list($mode, $type) = explode(' ', $results[0]);
-                $kind = $type == 'tree' ? 'dir' : 'file';
-            }
+            $parent = dirname($entry);
+            if($parent == '.') $parent = '/';
+            if($parent == '')  $parent = '/';
+            $list = $this->tree($parent, 0);
+
+            foreach($list as $node) if($node->path == $entry) $file = $node;
+
+            $commits = $this->getCommitsByPath($entry);
+
+            if(!empty($commits)) $file->revision = zget($commits[0], 'id', '');
+            $info->kind = $file->type == 'tree' ? 'dir' : 'file';
         }
 
-        $list = execCmd(escapeCmd("$this->client log -1 $revision --pretty=format:%H -- $path"), 'array');
-        $revision = $list[0];
-        $info     = new stdclass();
-        $info->kind     = $kind; 
-        $info->path     = $entry; 
-        $info->revision = $revision; 
-        $info->root     = $this->root; 
         return $info;
     }
 
     /**
      * Exec git cmd.
-     * 
-     * @param  string $cmd 
+     *
+     * @param  string $cmd
      * @access public
+     * @todo Exec commads by gitlab api.
      * @return array
      */
     public function exec($cmd)
     {
-        chdir($this->root);
         return execCmd(escapeCmd("$this->client $cmd"), 'array');
     }
 
     /**
      * Parse diff.
-     * 
-     * @param  array $lines 
+     *
+     * @param  array $lines
      * @access public
      * @return array
      */
@@ -456,9 +442,9 @@ class gitlab
 
     /**
      * Get commit count.
-     * 
-     * @param  int    $commits 
-     * @param  string $lastVersion 
+     *
+     * @param  int    $commits
+     * @param  string $lastVersion
      * @access public
      * @return int
      */
@@ -473,7 +459,7 @@ class gitlab
 
     /**
      * Get first revision.
-     * 
+     *
      * @access public
      * @return string
      */
@@ -485,8 +471,8 @@ class gitlab
     }
 
     /**
-     * Get latest revision 
-     * 
+     * Get latest revision
+     *
      * @access public
      * @return string
      */
@@ -500,71 +486,205 @@ class gitlab
 
     /**
      * Get commits.
-     * 
-     * @param  string $version 
-     * @param  int    $count 
-     * @param  string $branch 
+     *
+     * @param  string $version
+     * @param  int    $count
+     * @param  string $branch
      * @access public
      * @return array
      */
     public function getCommits($version = '', $count = 0, $branch = '')
     {
         if(!scm::checkRevision($version)) return array();
+        $api = "commits";
 
-        if($version == 'HEAD' and $branch) $version = $branch;
-        $revision = empty($version) ? $revision : $version;
-        $revision = is_numeric($revision) ? "--skip=$revision $branch" : $revision;
-        $count    = $count == 0 ? '' : "-n $count";
+        if(empty($count)) $count = 100;
+        $params = array();
+        $params['ref_name'] = $branch;
+        $params['per_page'] = $count;
+        $params['all']      = 1;
 
-        chdir($this->root);
-        $list    = execCmd(escapeCmd("$this->client log $count $revision -- ./"), 'array');
-        $commits = $this->parseLog($list);
-
-        $logs = array();
-        foreach($commits as $commit)
+        if($version and $version != 'HEAD')
         {
-            $hash = $commit->revision;
-            $log  = new stdClass();
-            $log->committer = $commit->committer;
-            $log->revision  = $commit->revision;
-            $log->comment   = $commit->comment;
-            $log->time      = $commit->time;
-            $logs['commits'][$hash] = $log;
-            $logs['files'][$hash]   = array();
-        }
-        if(empty($logs)) return $logs;
+            $lastCommit = $this->getSingleCommit($version);
+            if(!isset($lastCommit->committed_date)) return array('commits' => array(), 'files' => array());
 
-        $hash  = '';
-        $files = execCmd(escapeCmd("$this->client whatchanged $count $revision --pretty=format:%an@_@%cd@_@%H@_@%s -- ./"), 'array');
-        foreach($files as $commit)
-        {
-            $commit = trim($commit);
-            if(empty($commit)) continue;
-            $parsedCommit = explode('@_@', $commit);
-            if(count($parsedCommit) == 4)
-            {
-                list($account, $date, $hash, $comment) = $parsedCommit;
-            }
-            else 
-            {
-                $file = explode(' ', $commit);
-                $file = end($file);
-                list($action, $path) = explode("\t", $file);
-                $parsedFile = new stdclass();
-                $parsedFile->revision = $hash;
-                $parsedFile->path     = '/' . trim($path);
-                $parsedFile->type     = 'file';
-                $parsedFile->action   = $action;
-                $logs['files'][$hash][]  = $parsedFile;
-            }
+            $params['until'] = $lastCommit->committed_date;
         }
-        return $logs;
+
+        $list = $this->fetch($api, $params);
+
+        $commits = array();
+        foreach($list as $commit)
+        {
+            $log = new stdclass;
+            $log->committer = $commit->committer_name;
+            $log->revision  = $commit->id;
+            $log->comment   = $commit->message;
+            $log->time      = date('Y-m-d H:i:s', strtotime($commit->created_at));
+
+            $commits[$commit->id] = $log;
+            $files[$commit->id]   = $this->getFilesByCommit($log->revision);
+        }
+
+        return array('commits' => $commits, 'files' => $files);
+    }
+
+    /**
+     * getCommit
+     *
+     * @param  int    $sha
+     * @access public
+     * @return void
+     */
+    public function getSingleCommit($sha)
+    {
+        if(!scm::checkRevision($sha)) return null;
+        $api = "commits/$sha";
+        return $this->fetch($api);
+    }
+
+    /**
+     * Get commits by path.
+     *
+     * @param  string    $path
+     * @access public
+     * @return array
+     */
+    public function getCommitsByPath($path, $fromRevision = '', $toRevision = '')
+    {
+        $path = ltrim($path, DIRECTORY_SEPARATOR);
+        $api = "commits";
+
+        $param = new stdclass();
+        $param->path     = urldecode($path);
+        $param->ref_name = $this->branch;
+
+        $fromRevision = ($fromRevision and $fromRevision != 'HEAD') ? $this->getSingleCommit($fromRevision) : '';
+        $toRevision   = ($toRevision and $toRevision != 'HEAD') ? $this->getSingleCommit($toRevision) : '';
+
+        $since = '';
+        $until = '';
+        if($fromRevision and $toRevision)
+        {
+            $since = min($fromRevision->committed_date, $toRevision->committed_date);
+            $until = max($fromRevision->committed_date, $toRevision->committed_date);
+        }
+        elseif($fromRevision)
+        {
+            $since = $fromRevision->committed_date;
+        }
+
+        if($since) $param->since = $since;
+        if($until) $param->until = $until;
+
+        return $this->fetch($api, $param);
+    }
+
+    /**
+     * Get files by commit.
+     *
+     * @param  string    $commit
+     * @access public
+     * @return void
+     */
+    public function getFilesByCommit($revision)
+    {
+        if(!scm::checkRevision($revision)) return array();
+        $api  = "commits/{$revision}/diff";
+        $params = new stdclass;
+        $params->page     = 1;
+        $params->per_page = 200;
+
+        $allResults = array();
+        while($results = $this->fetch($api, $params))
+        {
+            $params->page ++;
+            $allResults = $allResults + $results;
+        }
+
+        $files = array();
+        foreach($allResults as $row)
+        {
+            $file = new stdclass();
+            $file->revision = $revision;
+            $file->path     = '/' . $row->new_path;
+            $file->type     = 'file';
+
+            $file->action   = 'M';
+            if($row->new_file) $file->action = 'A';
+            if($row->renamed_file) $file->action = 'R';
+            if($row->deleted_file) $file->action = 'D';
+            $files[] = $file;
+        }
+
+        return $files;
+    }
+
+    /**
+     * Repository/tree api.
+     *
+     * @param  string    $path
+     * @param  bool      $recursive
+     * @access public
+     * @return void
+     */
+    public function tree($path, $recursive = 1)
+    {
+        $api = "tree";
+
+        $params = array();
+        $params['path']      = ltrim($path, '/');
+        $params['ref']       = $this->branch;
+        $params['recursive'] = (int) $recursive;
+        return $this->fetch($api, $params);
+    }
+
+    /**
+     * Fetch data from gitlab api.
+     *
+     * @param  string    $api
+     * @access public
+     * @return void
+     */
+    public function fetch($api, $params = array())
+    {
+        $params = (array) $params;
+        $params['private_token'] = $this->token;
+
+        $api = ltrim($api, '/');
+        $api = $this->root . $api . '?' . http_build_query($params);
+
+        $response = commonModel::http($api);
+        if(!empty(commonModel::$requestErrors))
+        {
+            commonModel::$requestErrors = array();
+            return array();
+        }
+
+        return json_decode($response);
+    }
+
+    /**
+     * Format bytes shown.
+     *
+     * @param  int    $size
+     * @static
+     * @access public
+     * @return string
+     */
+    public static function formatBytes($size)
+    {
+        if($size < 1024) return $size . 'Bytes';
+        if(round($size / (1024 * 1024), 2) > 1) return round($size / (1024 * 1024), 2) . 'G';
+        if(round($size / 1024, 2) > 1) return round($size / 1024, 2) . 'M';
+        return round($size, 2) . 'KB';
     }
 
     /**
      * Parse log.
-     * 
-     * @param  array  $logs 
+     *
+     * @param  array  $logs
      * @access public
      * @return array
      */
@@ -572,54 +692,21 @@ class gitlab
     {
         $parsedLogs = array();
         $i          = 0;
-        foreach($logs as $line)
+        foreach($logs as $commit)
         {
-            if(strpos($line, 'commit ') === 0)
+            $parsedLog = new stdclass();
+            $parsedLog->revision  = $commit->id;
+            $parsedLog->committer = $commit->committer_name;
+            $parsedLog->time      = date('Y-m-d H:i:s', strtotime($commit->committed_date));
+            $parsedLog->comment   = $commit->message;
+            $parsedLog->change    = array();
+            foreach($commit->diffs as $diff)
             {
-                if(isset($log))
-                {
-                    $log->comment = trim($comment);
-                    $log->change  = $changes;
-                    $parsedLogs[$i] = $log;
-                    $i++;
-                }
-
-                $log     = new stdclass();
-                $comment = '';
-                $changes = array();
-
-                $log->revision = trim(preg_replace('/^commit/', '', $line));
+                $parsedLog->change[$diff->path] = array();
+                $parsedLog->change[$diff->path]['action'] = $diff->action;
+                $parsedLog->change[$diff->path]['kind']   = $diff->type;
             }
-            elseif(strpos($line, 'Author:') === 0)
-            {
-                $account        = preg_replace('/^Author:/', '', $line);
-                $log->committer = trim(preg_replace('/<[a-zA-Z0-9_\-\.]+@[a-zA-Z0-9_\-\.]+>/', '', $account));
-            }
-            elseif(strpos($line, 'Date:') === 0)
-            {
-                $date      = trim(preg_replace('/^Date:/', '', $line));
-                $log->time = date('Y-m-d H:i:s', strtotime($date)); 
-            }
-            elseif(preg_match('/^\s{2,}/', $line))
-            {
-                $comment .= $line;
-            }
-            elseif(strpos($line, "\t") !== false)
-            {
-                list($action, $entry) = explode("\t", $line);
-                $entry = '/' . trim($entry);
-                $pathInfo = array();
-                $pathInfo['action'] = $action;
-                $pathInfo['kind']   = 'file';
-                $changes[$entry]    = $pathInfo;
-            }
-        }
-
-        if(isset($log))
-        {
-            $log->comment   = trim($comment);
-            $log->change    = $changes;
-            $parsedLogs[$i] = $log;
+            $parsedLogs[] = $parsedLog;
         }
 
         return $parsedLogs;
diff --git a/lib/scm/gitrepo.class.php b/lib/scm/gitrepo.class.php
index 85dc840167..550ae4e754 100644
--- a/lib/scm/gitrepo.class.php
+++ b/lib/scm/gitrepo.class.php
@@ -5,13 +5,13 @@ class GitRepo
     public $root;
 
     /**
-     * Construct 
-     * 
-     * @param  string $client 
-     * @param  string $root 
-     * @param  string $username 
-     * @param  string $password 
-     * @param  string $encoding 
+     * Construct
+     *
+     * @param  string $client
+     * @param  string $root
+     * @param  string $username
+     * @param  string $password
+     * @param  string $encoding
      * @access public
      * @return void
      */
@@ -29,9 +29,9 @@ class GitRepo
 
     /**
      * List files.
-     * 
-     * @param  string $path 
-     * @param  string $revision 
+     *
+     * @param  string $path
+     * @param  string $revision
      * @access public
      * @return array
      */
@@ -40,7 +40,7 @@ class GitRepo
         if(!scm::checkRevision($revision)) return array();
 
         $path = ltrim($path, DIRECTORY_SEPARATOR);
-        $sub  = ''; 
+        $sub  = '';
         chdir($this->root);
         if(!empty($path)) $sub = ":$path";
         if(!empty($this->branch))$revision = $this->branch;
@@ -69,7 +69,7 @@ class GitRepo
             }
             else
             {
-                $size .= 'Bytes'; 
+                $size .= 'Bytes';
             }
 
             $info = new stdClass();
@@ -92,10 +92,10 @@ class GitRepo
     }
 
     /**
-     * Get tags 
-     * 
-     * @param  string $path 
-     * @param  string $revision 
+     * Get tags
+     *
+     * @param  string $path
+     * @param  string $revision
      * @access public
      * @return array
      */
@@ -111,8 +111,8 @@ class GitRepo
     }
 
     /**
-     * Get branch 
-     * 
+     * Get branch
+     *
      * @access public
      * @return array
      */
@@ -139,10 +139,10 @@ class GitRepo
     }
 
     /**
-     * Get last log. 
-     * 
-     * @param  string $path 
-     * @param  int    $count 
+     * Get last log.
+     *
+     * @param  string $path
+     * @param  int    $count
      * @access public
      * @return array
      */
@@ -160,11 +160,11 @@ class GitRepo
 
     /**
      * Get logs
-     * 
-     * @param  string $path 
-     * @param  string $fromRevision 
-     * @param  string $toRevision 
-     * @param  int    $count 
+     *
+     * @param  string $path
+     * @param  string $fromRevision
+     * @param  string $toRevision
+     * @param  int    $count
      * @access public
      * @return array
      */
@@ -194,7 +194,7 @@ class GitRepo
         }
         else
         {
-            $revisions = "$fromRevision..$toRevision"; 
+            $revisions = "$fromRevision..$toRevision";
         }
         chdir($this->root);
         $list = execCmd(escapeCmd("$this->client log  --stat=1024 --name-status --stat-name-width=1000 $count $revisions -- $path"), 'array');
@@ -205,9 +205,9 @@ class GitRepo
 
     /**
      * Blame file
-     * 
-     * @param  string $path 
-     * @param  string $revision 
+     *
+     * @param  string $path
+     * @param  string $revision
      * @access public
      * @return array
      */
@@ -257,10 +257,10 @@ class GitRepo
 
     /**
      * Diff file.
-     * 
-     * @param  string $path 
-     * @param  string $fromRevision 
-     * @param  string $toRevision 
+     *
+     * @param  string $path
+     * @param  string $fromRevision
+     * @param  string $toRevision
      * @access public
      * @return array
      */
@@ -284,9 +284,9 @@ class GitRepo
 
     /**
      * Cat file.
-     * 
-     * @param  string $entry 
-     * @param  string $revision 
+     *
+     * @param  string $entry
+     * @param  string $revision
      * @access public
      * @return string
      */
@@ -304,9 +304,9 @@ class GitRepo
 
     /**
      * Get info.
-     * 
-     * @param  string $entry 
-     * @param  string $revision 
+     *
+     * @param  string $entry
+     * @param  string $revision
      * @access public
      * @return object
      */
@@ -337,17 +337,17 @@ class GitRepo
         $list = execCmd(escapeCmd("$this->client log -1 $revision --pretty=format:%H -- $path"), 'array');
         $revision = $list[0];
         $info     = new stdclass();
-        $info->kind     = $kind; 
-        $info->path     = $entry; 
-        $info->revision = $revision; 
-        $info->root     = $this->root; 
+        $info->kind     = $kind;
+        $info->path     = $entry;
+        $info->revision = $revision;
+        $info->root     = $this->root;
         return $info;
     }
 
     /**
      * Exec git cmd.
-     * 
-     * @param  string $cmd 
+     *
+     * @param  string $cmd
      * @access public
      * @return array
      */
@@ -359,8 +359,8 @@ class GitRepo
 
     /**
      * Parse diff.
-     * 
-     * @param  array $lines 
+     *
+     * @param  array $lines
      * @access public
      * @return array
      */
@@ -454,9 +454,9 @@ class GitRepo
 
     /**
      * Get commit count.
-     * 
-     * @param  int    $commits 
-     * @param  string $lastVersion 
+     *
+     * @param  int    $commits
+     * @param  string $lastVersion
      * @access public
      * @return int
      */
@@ -471,7 +471,7 @@ class GitRepo
 
     /**
      * Get first revision.
-     * 
+     *
      * @access public
      * @return string
      */
@@ -483,8 +483,8 @@ class GitRepo
     }
 
     /**
-     * Get latest revision 
-     * 
+     * Get latest revision
+     *
      * @access public
      * @return string
      */
@@ -498,10 +498,10 @@ class GitRepo
 
     /**
      * Get commits.
-     * 
-     * @param  string $version 
-     * @param  int    $count 
-     * @param  string $branch 
+     *
+     * @param  string $version
+     * @param  int    $count
+     * @param  string $branch
      * @access public
      * @return array
      */
@@ -543,7 +543,7 @@ class GitRepo
             {
                 list($account, $date, $hash, $comment) = $parsedCommit;
             }
-            else 
+            else
             {
                 $file = explode(' ', $commit);
                 $file = end($file);
@@ -561,8 +561,8 @@ class GitRepo
 
     /**
      * Parse log.
-     * 
-     * @param  array  $logs 
+     *
+     * @param  array  $logs
      * @access public
      * @return array
      */
@@ -596,7 +596,7 @@ class GitRepo
             elseif(strpos($line, 'Date:') === 0)
             {
                 $date      = trim(preg_replace('/^Date:/', '', $line));
-                $log->time = date('Y-m-d H:i:s', strtotime($date)); 
+                $log->time = date('Y-m-d H:i:s', strtotime($date));
             }
             elseif(preg_match('/^\s{2,}/', $line))
             {
diff --git a/lib/spliter/spliter.class.php b/lib/spliter/spliter.class.php
index c630596a22..f1ad87b7b8 100644
--- a/lib/spliter/spliter.class.php
+++ b/lib/spliter/spliter.class.php
@@ -8,22 +8,22 @@
  * @package     spliter
  * @version     $Id$
  * @link        http://www.chanzhi.org
- * @see         http://www.cnblogs.com/chenwenbiao/archive/2011/08/11/2134503.html 
+ * @see         http://www.cnblogs.com/chenwenbiao/archive/2011/08/11/2134503.html
  * @see         http://stackoverflow.com/questions/9361303/can-i-get-the-unicode-value-of-a-character-or-vise-versa-with-php
  */
 class spliter
 {
     /**
      * Split a utf-8 string into words, computing unicode for every word.
-     * 
-     * @param  string    $string 
+     *
+     * @param  string    $string
      * @access public
      * @return array
      */
     public function utf8Split($string)
     {
         $string = strtolower($string);
-        $i = 0; 
+        $i = 0;
         $length = strlen($string);
         $dict   = array();
         $words  = '';
@@ -50,12 +50,16 @@ class spliter
                         $word .= $letter;
                         $i++;
                     }
-                    
+
                     /* Process intigers. */
                     if(is_numeric($word) and (strpos($word, '.') === false)) $word = "|" . $word . "|";
                     $word   = str_pad(strtolower($word), 5, '_');
                     $words .= ' ' . $word;
                 }
+                elseif($ord == 32)
+                {
+                    $words .= ' ';
+                }
                 continue;
             }
 
@@ -76,7 +80,14 @@ class spliter
                 }
                 else
                 {
-                    $words .= ' ' . $letter;
+                    if(is_numeric(substr($words, strlen($words) - 1, 1)))
+                    {
+                        $words .= ' ' . $letter;
+                    }
+                    else
+                    {
+                        $words .= $letter;
+                    }
                 }
                 $i += $offset;
             }
@@ -86,13 +97,13 @@ class spliter
     }
 
     /**
-     * Return unicode value for a char. 
-     * 
-     * @param  string    $c 
+     * Return unicode value for a char.
+     *
+     * @param  string    $c
      * @access public
      * @return int
      */
-    public function unicode($c) 
+    public function unicode($c)
     {
         if(ord($c{0}) >= 0   && ord($c{0}) <= 127) return  ord($c{0});
         if(ord($c{0}) >= 192 && ord($c{0}) <= 223) return (ord($c{0}) - 192) * 64         + (ord($c{1}) - 128);
@@ -107,8 +118,8 @@ class spliter
 
     /**
      * Judge a char is Letter or not.
-     * 
-     * @param  string    $letter 
+     *
+     * @param  string    $letter
      * @access public
      * @return bool
      */
diff --git a/module/action/config.php b/module/action/config.php
index 08de88daec..03d04cece9 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -29,6 +29,7 @@ $config->action->objectNameFields['design']      = 'name';
 $config->action->objectNameFields['stakeholder'] = 'user';
 $config->action->objectNameFields['budget']      = 'name';
 $config->action->objectNameFields['job']         = 'name';
+$config->action->objectNameFields['team']        = 'name';
 
 $config->action->commonImgSize = 870;
 
@@ -42,4 +43,5 @@ $config->action->majorList['program']   = array('opened', 'edited');
 $config->action->majorList['project']   = array('opened', 'edited');
 $config->action->majorList['execution'] = array('opened', 'edited');
 
-$config->action->needGetProjectType = 'story,build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design';
+$config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis';
+$config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,';
diff --git a/module/action/control.php b/module/action/control.php
index 2d67b28ee0..2355ae678d 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -28,17 +28,22 @@ class action extends control
 
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('projectList',     $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
-        $this->session->set('docList',         $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('programList',     $uri, 'program');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('docList',         $uri, 'doc');
+        $this->session->set('opportunityList', $uri, 'project');
+        $this->session->set('riskList',        $uri, 'project');
+        $this->session->set('trainplanList',   $uri, 'project');
 
         /* Get deleted objects. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index e5ba08019c..b61f9c8c03 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -97,53 +97,58 @@ $lang->action->objectTypes['budget']      = 'Cost Estimate';
 $lang->action->objectTypes['entry']       = 'Eintrag';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 $lang->action->objectTypes['job']         = 'Job';
+$lang->action->objectTypes['team']        = 'Team';
+$lang->action->objectTypes['whitelist']   = 'Whitelist';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
-$lang->action->desc->common         = '$date, <strong>$action</strong> von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->extra          = '$date, <strong>$action</strong> als <strong>$extra</strong> von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->opened         = '$date, erstellt von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->openedbysystem = '$date, opened by system.' . "\n";
-$lang->action->desc->created        = '$date, erstellt von  <strong>$actor</strong> .' . "\n";
-$lang->action->desc->added          = '$date, hinzugefügt durch <strong>$actor</strong> .' . "\n";
-$lang->action->desc->changed        = '$date, bearbeitet von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->edited         = '$date, bearbeitet von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->assigned       = '$date, <strong>$actor</strong> zugewisen an <strong>$extra</strong>.' . "\n";
-$lang->action->desc->closed         = '$date, geschlossen von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->closedbysystem = '$date, closed by system.' . "\n";
-$lang->action->desc->deleted        = '$date, gelöscht von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->deletedfile    = '$date, <strong>$actor</strong> löschte <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->editfile       = '$date, <strong>$actor</strong> bearbeitete <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->erased         = '$date, gelöscht von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->undeleted      = '$date, wiederhergestellt von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->hidden         = '$date, versteckt von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->commented      = '$date, hinzugefügt von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->activated      = '$date, aktiviert von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->blocked        = '$date, geblockt von <strong>$actor</strong> .' . "\n";
-$lang->action->desc->moved          = '$date, verschoben von <strong>$actor</strong> , ursprünglich "$extra".' . "\n";
-$lang->action->desc->confirmed      = '$date, <strong>$actor</strong> hat die Anpassung der Story bestätigt. Das letzte Build ist <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->caseconfirmed  = '$date, <strong>$actor</strong> hat die Anpassung des Falls bestätigt. Das letzte Build ist <strong>#$extra</strong>' . "\n";
-$lang->action->desc->bugconfirmed   = '$date, <strong>$actor</strong> hat den Bug bestätigt.' . "\n";
-$lang->action->desc->frombug        = '$date, konvertiert von <strong>$actor</strong>. Die ID war <strong>$extra</strong>.';
-$lang->action->desc->started        = '$date, gestartet von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->restarted      = '$date, continued by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->delayed        = '$date, zurückgestellt von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->suspended      = '$date, ausgesetzt von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->recordestimate = '$date, aufgenommen von <strong>$actor</strong> und hat <strong>$extra</strong> Stunden aufgebraucht.';
-$lang->action->desc->editestimate   = '$date, <strong>$actor</strong> Stunden angepaast.';
-$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> Stunden gelöscht.';
-$lang->action->desc->canceled       = '$date, abgebrochen von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->svncommited    = '$date, <strong>$actor</strong> festgelegt. Build ist <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->gitcommited    = '$date, <strong>$actor</strong> festgelegt. Build ist <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->finished       = '$date, abgeschlossen von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->paused         = '$date, pausiert von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->verified       = '$date, überprüft von <strong>$actor</strong>.' . "\n";
-$lang->action->desc->diff1          = '<strong><i>%s</i></strong> wurde geändert. Es war "%s" und ist jetzt "%s".<br />' . "\n";
-$lang->action->desc->diff2          = '<strong><i>%s</i></strong> wurde geändert. Die Differenz ist ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
-$lang->action->desc->diff3          = 'Dateiname %s wurde geändert zu %s .' . "\n";
-$lang->action->desc->linked2bug     = '$date Verknüpft mit <strong>$extra</strong> von <strong>$actor</strong>';
-$lang->action->desc->resolved       = '$date, resolved by <strong>$actor</strong> ' . "\n";
-$lang->action->desc->managed        = '$date, by <strong>$actor</strong> managed.' . "\n";
+$lang->action->desc->common          = '$date, <strong>$action</strong> von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->extra           = '$date, <strong>$action</strong> als <strong>$extra</strong> von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->opened          = '$date, erstellt von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->openedbysystem  = '$date, opened by system.' . "\n";
+$lang->action->desc->created         = '$date, erstellt von  <strong>$actor</strong> .' . "\n";
+$lang->action->desc->added           = '$date, hinzugefügt durch <strong>$actor</strong> .' . "\n";
+$lang->action->desc->changed         = '$date, bearbeitet von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->edited          = '$date, bearbeitet von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->assigned        = '$date, <strong>$actor</strong> zugewisen an <strong>$extra</strong>.' . "\n";
+$lang->action->desc->closed          = '$date, geschlossen von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->closedbysystem  = '$date, closed by system.' . "\n";
+$lang->action->desc->deleted         = '$date, gelöscht von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->deletedfile     = '$date, <strong>$actor</strong> löschte <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->editfile        = '$date, <strong>$actor</strong> bearbeitete <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->erased          = '$date, gelöscht von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->undeleted       = '$date, wiederhergestellt von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->hidden          = '$date, versteckt von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->commented       = '$date, hinzugefügt von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->activated       = '$date, aktiviert von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->blocked         = '$date, geblockt von <strong>$actor</strong> .' . "\n";
+$lang->action->desc->moved           = '$date, verschoben von <strong>$actor</strong> , ursprünglich "$extra".' . "\n";
+$lang->action->desc->confirmed       = '$date, <strong>$actor</strong> hat die Anpassung der Story bestätigt. Das letzte Build ist <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->caseconfirmed   = '$date, <strong>$actor</strong> hat die Anpassung des Falls bestätigt. Das letzte Build ist <strong>#$extra</strong>' . "\n";
+$lang->action->desc->bugconfirmed    = '$date, <strong>$actor</strong> hat den Bug bestätigt.' . "\n";
+$lang->action->desc->frombug         = '$date, konvertiert von <strong>$actor</strong>. Die ID war <strong>$extra</strong>.';
+$lang->action->desc->started         = '$date, gestartet von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->restarted       = '$date, continued by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->delayed         = '$date, zurückgestellt von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->suspended       = '$date, ausgesetzt von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->recordestimate  = '$date, aufgenommen von <strong>$actor</strong> und hat <strong>$extra</strong> Stunden aufgebraucht.';
+$lang->action->desc->editestimate    = '$date, <strong>$actor</strong> Stunden angepaast.';
+$lang->action->desc->deleteestimate  = '$date, <strong>$actor</strong> Stunden gelöscht.';
+$lang->action->desc->canceled        = '$date, abgebrochen von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->svncommited     = '$date, <strong>$actor</strong> festgelegt. Build ist <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->gitcommited     = '$date, <strong>$actor</strong> festgelegt. Build ist <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->finished        = '$date, abgeschlossen von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->paused          = '$date, pausiert von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->verified        = '$date, überprüft von <strong>$actor</strong>.' . "\n";
+$lang->action->desc->diff1           = '<strong><i>%s</i></strong> wurde geändert. Es war "%s" und ist jetzt "%s".<br />' . "\n";
+$lang->action->desc->diff2           = '<strong><i>%s</i></strong> wurde geändert. Die Differenz ist ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
+$lang->action->desc->diff3           = 'Dateiname %s wurde geändert zu %s .' . "\n";
+$lang->action->desc->linked2bug      = '$date Verknüpft mit <strong>$extra</strong> von <strong>$actor</strong>';
+$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->resolved        = '$date, resolved by <strong>$actor</strong> ' . "\n";
+$lang->action->desc->managed         = '$date, by <strong>$actor</strong> managed.' . "\n";
+$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->createchildren     = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -231,6 +236,8 @@ $lang->action->label->logout                = "Logout";
 $lang->action->label->deleteestimate        = "deleted ";
 $lang->action->label->linked2build          = "linked ";
 $lang->action->label->linked2bug            = "linked ";
+$lang->action->label->linked2testtask       = "linked";
+$lang->action->label->unlinkedfromtesttask  = "unlinked";
 $lang->action->label->linkchildtask         = "linked a child task";
 $lang->action->label->unlinkchildrentask    = "unlinked a child task";
 $lang->action->label->linkparenttask        = "linked a parent task";
@@ -238,6 +245,8 @@ $lang->action->label->unlinkparenttask      = "unlink from parent task";
 $lang->action->label->batchcreate           = "batch created tasks";
 $lang->action->label->createchildren        = "create child tasks";
 $lang->action->label->managed               = "managed";
+$lang->action->label->managedteam           = "managed";
+$lang->action->label->managedwhitelist      = "managed";
 $lang->action->label->deletechildrentask    = "delete children task";
 $lang->action->label->createchildrenstory   = "create child stories";
 $lang->action->label->linkchildstory        = "linked a child story";
@@ -247,6 +256,13 @@ $lang->action->label->unlinkparentstory     = "unlink from parent story";
 $lang->action->label->deletechildrenstory   = "delete children story";
 $lang->action->label->tracked               = 'tracked';
 $lang->action->label->hangup                = 'hangup';
+$lang->action->label->run                   = 'run';
+$lang->action->label->estimated             = 'estimated';
+$lang->action->label->reviewclosed          = 'Review Failed';
+$lang->action->label->passreviewed          = 'Pass';
+$lang->action->label->clarifyreviewed       = 'Clarify';
+$lang->action->label->commitsummary         = 'Commit Summary';
+$lang->action->label->updatetrainee         = 'Update Trainee';
 
 /* 动态信息按照对象分组 */
 $lang->action->dynamicAction                    = new stdclass;
@@ -289,22 +305,25 @@ $lang->action->dynamicAction->release['changestatus'] = 'Change Release Status';
 $lang->action->dynamicAction->release['undeleted']    = 'Restore Release';
 $lang->action->dynamicAction->release['hidden']       = 'Hide Release';
 
-$lang->action->dynamicAction->story['opened']              = 'Create Story';
-$lang->action->dynamicAction->story['edited']              = 'Edit Story';
-$lang->action->dynamicAction->story['activated']           = 'Activate Story';
-$lang->action->dynamicAction->story['reviewed']            = 'Review Story';
-$lang->action->dynamicAction->story['closed']              = 'Close Story';
-$lang->action->dynamicAction->story['assigned']            = 'Assign Story';
-$lang->action->dynamicAction->story['changed']             = 'Change Story';
-$lang->action->dynamicAction->story['linked2plan']         = 'Link Story to Plan';
-$lang->action->dynamicAction->story['unlinkedfromplan']    = 'Unlink Story from Plan';
-$lang->action->dynamicAction->story['linked2release']      = 'Link Story to Release';
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'Unlink Story from Plan';
-$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['undeleted']           = 'Restore Story';
-$lang->action->dynamicAction->story['hidden']              = 'Hide Story';
+$lang->action->dynamicAction->story['opened']                = 'Create Story';
+$lang->action->dynamicAction->story['edited']                = 'Edit Story';
+$lang->action->dynamicAction->story['activated']             = 'Activate Story';
+$lang->action->dynamicAction->story['reviewed']              = 'Review Story';
+$lang->action->dynamicAction->story['closed']                = 'Close Story';
+$lang->action->dynamicAction->story['assigned']              = 'Assign Story';
+$lang->action->dynamicAction->story['changed']               = 'Change Story';
+$lang->action->dynamicAction->story['linked2plan']           = 'Link Story to Plan';
+$lang->action->dynamicAction->story['unlinkedfromplan']      = 'Unlink Story from Plan';
+$lang->action->dynamicAction->story['linked2release']        = 'Link Story to Release';
+$lang->action->dynamicAction->story['unlinkedfromrelease']   = 'Unlink Story from Plan';
+$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['undeleted']             = 'Restore Story';
+$lang->action->dynamicAction->story['hidden']                = 'Hide Story';
+$lang->action->dynamicAction->story['linked2execution']      = "Link Story";
+$lang->action->dynamicAction->story['unlinkedfromexecution'] = "Unlink Story";
+$lang->action->dynamicAction->story['estimated']             = "Estimate $lang->SRCommon";
 
 $lang->action->dynamicAction->execution['opened']    = 'Create ' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['edited']    = 'Edit ' . $lang->executionCommon;
@@ -319,6 +338,8 @@ $lang->action->dynamicAction->execution['undeleted'] = 'Restore ' . $lang->execu
 $lang->action->dynamicAction->execution['hidden']    = 'Hide ' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['moved']     = 'Improt Task';
 
+$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
+
 $lang->action->dynamicAction->task['opened']              = 'Create Task';
 $lang->action->dynamicAction->task['edited']              = 'Edit Task';
 $lang->action->dynamicAction->task['commented']           = 'Task Comment';
@@ -348,8 +369,9 @@ $lang->action->dynamicAction->task['hidden']              = 'Hide Task';
 $lang->action->dynamicAction->task['svncommited']         = 'SVN Commit';
 $lang->action->dynamicAction->task['gitcommited']         = 'GIT Commit';
 
-$lang->action->dynamicAction->build['opened'] = 'Create Build';
-$lang->action->dynamicAction->build['edited'] = 'Edit Build';
+$lang->action->dynamicAction->build['opened']  = 'Create Build';
+$lang->action->dynamicAction->build['edited']  = 'Edit Build';
+$lang->action->dynamicAction->build['deleted'] = 'Delete Build';
 
 $lang->action->dynamicAction->bug['opened']              = 'Report Bug';
 $lang->action->dynamicAction->bug['edited']              = 'Edit Bug';
@@ -407,6 +429,7 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Hide Case Lib';
 
 $lang->action->dynamicAction->doclib['created'] = 'Create Doc Library';
 $lang->action->dynamicAction->doclib['edited']  = 'Edit Doc Library';
+$lang->action->dynamicAction->doclib['deleted'] = 'Delete Doc Library';
 
 $lang->action->dynamicAction->doc['created']   = 'Create Document';
 $lang->action->dynamicAction->doc['edited']    = 'Edit Document';
@@ -468,12 +491,12 @@ $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['execution']   = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution']   = 'Execution';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = 'Fälle';
 $lang->action->search->objectTypeList['caseresult']  = 'Fallergebnisse';
 $lang->action->search->objectTypeList['stepresult']  = 'Fallschritte';
-$lang->action->search->objectTypeList['story']       = 'Story';
+$lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
 $lang->action->search->objectTypeList['task']        = 'Aufgaben';
 $lang->action->search->objectTypeList['testtask']    = 'Testaufgaben';
 $lang->action->search->objectTypeList['user']        = 'Benutzer';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index eed297bd88..2cee6ad09d 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -9,6 +9,8 @@
  * @version     $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+global $config;
+
 $lang->action->common     = 'Log';
 $lang->action->product    = $lang->productCommon;
 $lang->action->project    = 'Project';
@@ -30,6 +32,9 @@ $lang->action->editComment = 'Edit Comment';
 $lang->action->create      = 'Add Comment';
 $lang->action->comment     = 'Comment';
 
+$lang->action->undeleteAction = 'Reset Data';
+$lang->action->hideOneAction  = 'Hide Data';
+
 $lang->action->trashTips      = 'Note: Delete in ZenTao is logic.';
 $lang->action->textDiff       = 'Text Format';
 $lang->action->original       = 'Original Format';
@@ -96,54 +101,58 @@ $lang->action->objectTypes['stakeholder'] = 'Stakeholder';
 $lang->action->objectTypes['budget']      = 'Cost Estimate';
 $lang->action->objectTypes['entry']       = 'Entry';
 $lang->action->objectTypes['webhook']     = 'Webhook';
-$lang->action->objectTypes['job']         = 'Job';
+$lang->action->objectTypes['team']        = 'Team';
+$lang->action->objectTypes['whitelist']   = 'Whitelist';
 
 /* Used to describe operation history. */
 $lang->action->desc = new stdclass();
-$lang->action->desc->common         = '$date, <strong>$action</strong> by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->extra          = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->opened         = '$date, created by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->openedbysystem = '$date, opened by system.' . "\n";
-$lang->action->desc->created        = '$date, created by  <strong>$actor</strong> .' . "\n";
-$lang->action->desc->added          = '$date, added by  <strong>$actor</strong> .' . "\n";
-$lang->action->desc->changed        = '$date, changed by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->edited         = '$date, edited by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->assigned       = '$date, <strong>$actor</strong> assigned to <strong>$extra</strong>.' . "\n";
-$lang->action->desc->closed         = '$date, closed by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->closedbysystem = '$date, closed by system.' . "\n";
-$lang->action->desc->deleted        = '$date, deleted by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->deletedfile    = '$date, <strong>$actor</strong> deleted <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->editfile       = '$date, <strong>$actor</strong> edited <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->erased         = '$date, deleted by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->undeleted      = '$date, restored by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->hidden         = '$date, hidden by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->commented      = '$date, added by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->activated      = '$date, activated by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->blocked        = '$date, blocked by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->moved          = '$date, moved by <strong>$actor</strong> , which was "$extra".' . "\n";
-$lang->action->desc->confirmed      = '$date, <strong>$actor</strong> confirmed the story change. The latest build is <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->caseconfirmed  = '$date, <strong>$actor</strong> confirmed the case change. The latest build is <strong>#$extra</strong>' . "\n";
-$lang->action->desc->bugconfirmed   = '$date, <strong>$actor</strong> confirmed Bug.' . "\n";
-$lang->action->desc->frombug        = '$date, converted from <strong>$actor</strong>. Its ID was <strong>$extra</strong>.';
-$lang->action->desc->started        = '$date, started by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->restarted      = '$date, continued by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->delayed        = '$date, postponed by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->suspended      = '$date, suspended by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->recordestimate = '$date, recorded by <strong>$actor</strong> and it cost <strong>$extra</strong> hours.';
-$lang->action->desc->editestimate   = '$date, <strong>$actor</strong> edited Hour.';
-$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> deleted Hour.';
-$lang->action->desc->canceled       = '$date, cancelled by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->svncommited    = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->gitcommited    = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->finished       = '$date, finished by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->paused         = '$date, paused by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->verified       = '$date, verified by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->diff1          = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
-$lang->action->desc->diff2          = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
-$lang->action->desc->diff3          = 'File Name %s was changed to %s .' . "\n";
-$lang->action->desc->linked2bug     = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
-$lang->action->desc->resolved       = '$date, resolved by <strong>$actor</strong> ' . "\n";
-$lang->action->desc->managed        = '$date, by <strong>$actor</strong> managed.' . "\n";
+$lang->action->desc->common          = '$date, <strong>$action</strong> by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->extra           = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->opened          = '$date, created by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->openedbysystem  = '$date, opened by system.' . "\n";
+$lang->action->desc->created         = '$date, created by  <strong>$actor</strong> .' . "\n";
+$lang->action->desc->added           = '$date, added by  <strong>$actor</strong> .' . "\n";
+$lang->action->desc->changed         = '$date, changed by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->edited          = '$date, edited by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->assigned        = '$date, <strong>$actor</strong> assigned to <strong>$extra</strong>.' . "\n";
+$lang->action->desc->closed          = '$date, closed by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->closedbysystem  = '$date, closed by system.' . "\n";
+$lang->action->desc->deleted         = '$date, deleted by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->deletedfile     = '$date, <strong>$actor</strong> deleted <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->editfile        = '$date, <strong>$actor</strong> edited <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->erased          = '$date, deleted by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->undeleted       = '$date, restored by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->hidden          = '$date, hidden by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->commented       = '$date, added by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->activated       = '$date, activated by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->blocked         = '$date, blocked by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->moved           = '$date, moved by <strong>$actor</strong> , which was "$extra".' . "\n";
+$lang->action->desc->confirmed       = '$date, <strong>$actor</strong> confirmed the story change. The latest build is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->caseconfirmed   = '$date, <strong>$actor</strong> confirmed the case change. The latest build is <strong>#$extra</strong>' . "\n";
+$lang->action->desc->bugconfirmed    = '$date, <strong>$actor</strong> confirmed Bug.' . "\n";
+$lang->action->desc->frombug         = '$date, converted from <strong>$actor</strong>. Its ID was <strong>$extra</strong>.';
+$lang->action->desc->started         = '$date, started by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->restarted       = '$date, continued by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->delayed         = '$date, postponed by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->suspended       = '$date, suspended by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->recordestimate  = '$date, recorded by <strong>$actor</strong> and it cost <strong>$extra</strong> hours.';
+$lang->action->desc->editestimate    = '$date, <strong>$actor</strong> edited Hour.';
+$lang->action->desc->deleteestimate  = '$date, <strong>$actor</strong> deleted Hour.';
+$lang->action->desc->canceled        = '$date, cancelled by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->svncommited     = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->gitcommited     = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->finished        = '$date, finished by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->paused          = '$date, paused by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->verified        = '$date, verified by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->diff1           = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
+$lang->action->desc->diff2           = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
+$lang->action->desc->diff3           = 'File Name %s was changed to %s .' . "\n";
+$lang->action->desc->linked2bug      = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->resolved        = '$date, resolved by <strong>$actor</strong> ' . "\n";
+$lang->action->desc->managed         = '$date, by <strong>$actor</strong> managed.' . "\n";
+$lang->action->desc->estimated       = '$date, by <strong>$actor</strong> estimated.' . "\n";
+$lang->action->desc->run             = '$date, by <strong>$actor</strong> executed.' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
 $lang->action->desc->createchildren     = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -231,6 +240,8 @@ $lang->action->label->logout                = "logout";
 $lang->action->label->deleteestimate        = "deleted ";
 $lang->action->label->linked2build          = "linked ";
 $lang->action->label->linked2bug            = "linked ";
+$lang->action->label->linked2testtask       = "linked";
+$lang->action->label->unlinkedfromtesttask  = "unlinked";
 $lang->action->label->linkchildtask         = "linked a child task";
 $lang->action->label->unlinkchildrentask    = "unlinked a child task";
 $lang->action->label->linkparenttask        = "linked a parent task";
@@ -238,6 +249,8 @@ $lang->action->label->unlinkparenttask      = "unlink from parent task";
 $lang->action->label->batchcreate           = "batch created tasks";
 $lang->action->label->createchildren        = "create child tasks";
 $lang->action->label->managed               = "managed";
+$lang->action->label->managedteam           = "managed";
+$lang->action->label->managedwhitelist      = "managed";
 $lang->action->label->deletechildrentask    = "delete children task";
 $lang->action->label->createchildrenstory   = "create child stories";
 $lang->action->label->linkchildstory        = "linked a child story";
@@ -247,6 +260,13 @@ $lang->action->label->unlinkparentstory     = "unlink from parent story";
 $lang->action->label->deletechildrenstory   = "delete children story";
 $lang->action->label->tracked               = 'tracked';
 $lang->action->label->hangup                = 'hangup';
+$lang->action->label->run                   = 'run';
+$lang->action->label->estimated             = 'estimated';
+$lang->action->label->reviewclosed          = 'Review Failed';
+$lang->action->label->passreviewed          = 'Pass';
+$lang->action->label->clarifyreviewed       = 'Clarify';
+$lang->action->label->commitsummary         = 'Commit Summary';
+$lang->action->label->updatetrainee         = 'Update Trainee';
 
 /* Dynamic information is grouped by object. */
 $lang->action->dynamicAction                    = new stdclass;
@@ -289,22 +309,25 @@ $lang->action->dynamicAction->release['changestatus'] = 'Change Release Status';
 $lang->action->dynamicAction->release['undeleted']    = 'Restore Release';
 $lang->action->dynamicAction->release['hidden']       = 'Hide Release';
 
-$lang->action->dynamicAction->story['opened']              = 'Create Story';
-$lang->action->dynamicAction->story['edited']              = 'Edit Story';
-$lang->action->dynamicAction->story['activated']           = 'Activate Story';
-$lang->action->dynamicAction->story['reviewed']            = 'Review Story';
-$lang->action->dynamicAction->story['closed']              = 'Close Story';
-$lang->action->dynamicAction->story['assigned']            = 'Assign Story';
-$lang->action->dynamicAction->story['changed']             = 'Change Story';
-$lang->action->dynamicAction->story['linked2plan']         = 'Link Story to Plan';
-$lang->action->dynamicAction->story['unlinkedfromplan']    = 'Unlink Story from Plan';
-$lang->action->dynamicAction->story['linked2release']      = 'Link Story to Release';
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'Unlink Story from Plan';
-$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['undeleted']           = 'Restore Story';
-$lang->action->dynamicAction->story['hidden']              = 'Hide Story';
+$lang->action->dynamicAction->story['opened']                = 'Create Story';
+$lang->action->dynamicAction->story['edited']                = 'Edit Story';
+$lang->action->dynamicAction->story['activated']             = 'Activate Story';
+$lang->action->dynamicAction->story['reviewed']              = 'Review Story';
+$lang->action->dynamicAction->story['closed']                = 'Close Story';
+$lang->action->dynamicAction->story['assigned']              = 'Assign Story';
+$lang->action->dynamicAction->story['changed']               = 'Change Story';
+$lang->action->dynamicAction->story['linked2plan']           = 'Link Story to Plan';
+$lang->action->dynamicAction->story['unlinkedfromplan']      = 'Unlink Story from Plan';
+$lang->action->dynamicAction->story['linked2release']        = 'Link Story to Release';
+$lang->action->dynamicAction->story['unlinkedfromrelease']   = 'Unlink Story from Plan';
+$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['undeleted']             = 'Restore Story';
+$lang->action->dynamicAction->story['hidden']                = 'Hide Story';
+$lang->action->dynamicAction->story['linked2execution']      = "Link Story";
+$lang->action->dynamicAction->story['unlinkedfromexecution'] = "Unlink Story";
+$lang->action->dynamicAction->story['estimated']             = "Estimate $lang->SRCommon";
 
 $lang->action->dynamicAction->execution['opened']    = 'Create ' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['edited']    = 'Edit ' . $lang->executionCommon;
@@ -319,6 +342,8 @@ $lang->action->dynamicAction->execution['undeleted'] = 'Restore ' . $lang->execu
 $lang->action->dynamicAction->execution['hidden']    = 'Hide ' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['moved']     = 'Improt Task';
 
+$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
+
 $lang->action->dynamicAction->task['opened']              = 'Create Task';
 $lang->action->dynamicAction->task['edited']              = 'Edit Task';
 $lang->action->dynamicAction->task['commented']           = 'Task Comment';
@@ -348,8 +373,9 @@ $lang->action->dynamicAction->task['hidden']              = 'Hide Task';
 $lang->action->dynamicAction->task['svncommited']         = 'SVN Commit';
 $lang->action->dynamicAction->task['gitcommited']         = 'GIT Commit';
 
-$lang->action->dynamicAction->build['opened'] = 'Create Build';
-$lang->action->dynamicAction->build['edited'] = 'Edit Build';
+$lang->action->dynamicAction->build['opened']  = 'Create Build';
+$lang->action->dynamicAction->build['edited']  = 'Edit Build';
+$lang->action->dynamicAction->build['deleted'] = 'Delete Build';
 
 $lang->action->dynamicAction->bug['opened']              = 'Report Bug';
 $lang->action->dynamicAction->bug['edited']              = 'Edit Bug';
@@ -407,6 +433,7 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Hide Case Lib';
 
 $lang->action->dynamicAction->doclib['created'] = 'Create Doc Library';
 $lang->action->dynamicAction->doclib['edited']  = 'Edit Doc Library';
+$lang->action->dynamicAction->doclib['deleted'] = 'Delete Doc Library';
 
 $lang->action->dynamicAction->doc['created']   = 'Create Document';
 $lang->action->dynamicAction->doc['edited']    = 'Edit Document';
@@ -427,12 +454,11 @@ $lang->action->dynamicAction->entry['created'] = 'Add Application';
 $lang->action->dynamicAction->entry['edited']  = 'Edit Application';
 
 /* Generate the corresponding object link. */
-global $config;
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $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->program     = "Program|program|product|programID=%s";
 $lang->action->label->project     = "Project|project|index|projectID=%s";
 if($config->systemMode == 'new')
 {
@@ -468,15 +494,15 @@ $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['execution']   = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution']   = 'Execution';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = 'Case';
 $lang->action->search->objectTypeList['caseresult']  = 'Case Result';
 $lang->action->search->objectTypeList['stepresult']  = 'Case Steps';
-$lang->action->search->objectTypeList['story']       = 'UR/SR';
-$lang->action->search->objectTypeList['task']        = 'Task'; 
-$lang->action->search->objectTypeList['testtask']    = 'Request';     
-$lang->action->search->objectTypeList['user']        = 'User'; 
+$lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
+$lang->action->search->objectTypeList['task']        = 'Task';
+$lang->action->search->objectTypeList['testtask']    = 'Request';
+$lang->action->search->objectTypeList['user']        = 'User';
 $lang->action->search->objectTypeList['doc']         = 'Doc';
 $lang->action->search->objectTypeList['doclib']      = 'Doc Lib';
 $lang->action->search->objectTypeList['todo']        = 'Todo';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 199b0e4c6c..7b4195db98 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -97,53 +97,58 @@ $lang->action->objectTypes['budget']      = 'Cost Estimate';
 $lang->action->objectTypes['entry']       = 'Entrée';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 $lang->action->objectTypes['job']         = 'Job';
+$lang->action->objectTypes['team']        = 'Team';
+$lang->action->objectTypes['whitelist']   = 'Whitelist';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
-$lang->action->desc->common         = '$date, <strong>$action</strong> par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->extra          = '$date, <strong>$action</strong> en tant que <strong>$extra</strong> par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->opened         = '$date, initié par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->openedbysystem = '$date, opened by system.' . "\n";
-$lang->action->desc->created        = '$date, créé par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->added          = '$date, ajouter par  <strong>$actor</strong> .' . "\n";
-$lang->action->desc->changed        = '$date, modifié par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->edited         = '$date, édité par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->assigned       = '$date, <strong>$actor</strong> affecté à <strong>$extra</strong>.' . "\n";
-$lang->action->desc->closed         = '$date, fermé par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->closedbysystem = '$date, closed by system.' . "\n";
-$lang->action->desc->deleted        = '$date, supprimé par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->deletedfile    = '$date, <strong>$actor</strong> a supprimé <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->editfile       = '$date, <strong>$actor</strong> a édité <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->erased         = '$date, supprimé par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->undeleted      = '$date, restauré par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->hidden         = '$date, masqué par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->commented      = '$date, ajouté par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->activated      = '$date, activé par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->blocked        = '$date, bloqué par <strong>$actor</strong> .' . "\n";
-$lang->action->desc->moved          = '$date, déplacé par <strong>$actor</strong> , qui était "$extra".' . "\n";
-$lang->action->desc->confirmed      = '$date, <strong>$actor</strong> a confirmé la modification de la story. Le dernier build est <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->caseconfirmed  = '$date, <strong>$actor</strong> a confirmé la modification du CasTest. Le dernier build est <strong>#$extra</strong>' . "\n";
-$lang->action->desc->bugconfirmed   = '$date, <strong>$actor</strong> a confirmé le Bug.' . "\n";
-$lang->action->desc->frombug        = '$date, converti par <strong>$actor</strong>. Son ID était <strong>$extra</strong>.';
-$lang->action->desc->started        = '$date, commencé par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->restarted      = '$date, reprise par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->delayed        = '$date, ajourné par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->suspended      = '$date, suspendu par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->recordestimate = '$date, enregistré par <strong>$actor</strong> et son coût est de <strong>$extra</strong> heures.';
-$lang->action->desc->editestimate   = '$date, <strong>$actor</strong> a édité son temps estimé.';
-$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> a supprimé son estimation de temps.';
-$lang->action->desc->canceled       = '$date, annulé par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->svncommited    = '$date, <strong>$actor</strong> a validé, le build est <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->gitcommited    = '$date, <strong>$actor</strong> a validé, le build est <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->finished       = '$date, terminé par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->paused         = '$date, mis en pause par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->verified       = '$date, verifié par <strong>$actor</strong>.' . "\n";
-$lang->action->desc->diff1          = '<strong><i>%s</i></strong> a changé. Il est passé de "%s" à "%s".<br />' . "\n";
-$lang->action->desc->diff2          = '<strong><i>%s</i></strong> a changé. La différence est ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
-$lang->action->desc->diff3          = 'Le nom du fichier %s a changé pour %s .' . "\n";
-$lang->action->desc->linked2bug     = '$date, affecté à <strong>$extra</strong> par <strong>$actor</strong>';
-$lang->action->desc->resolved       = '$date, resolved by <strong>$actor</strong> ' . "\n";
-$lang->action->desc->managed        = '$date, by <strong>$actor</strong> managed.' . "\n";
+$lang->action->desc->common          = '$date, <strong>$action</strong> par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->extra           = '$date, <strong>$action</strong> en tant que <strong>$extra</strong> par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->opened          = '$date, initié par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->openedbysystem  = '$date, opened by system.' . "\n";
+$lang->action->desc->created         = '$date, créé par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->added           = '$date, ajouter par  <strong>$actor</strong> .' . "\n";
+$lang->action->desc->changed         = '$date, modifié par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->edited          = '$date, édité par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->assigned        = '$date, <strong>$actor</strong> affecté à <strong>$extra</strong>.' . "\n";
+$lang->action->desc->closed          = '$date, fermé par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->closedbysystem  = '$date, closed by system.' . "\n";
+$lang->action->desc->deleted         = '$date, supprimé par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->deletedfile     = '$date, <strong>$actor</strong> a supprimé <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->editfile        = '$date, <strong>$actor</strong> a édité <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->erased          = '$date, supprimé par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->undeleted       = '$date, restauré par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->hidden          = '$date, masqué par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->commented       = '$date, ajouté par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->activated       = '$date, activé par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->blocked         = '$date, bloqué par <strong>$actor</strong> .' . "\n";
+$lang->action->desc->moved           = '$date, déplacé par <strong>$actor</strong> , qui était "$extra".' . "\n";
+$lang->action->desc->confirmed       = '$date, <strong>$actor</strong> a confirmé la modification de la story. Le dernier build est <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->caseconfirmed   = '$date, <strong>$actor</strong> a confirmé la modification du CasTest. Le dernier build est <strong>#$extra</strong>' . "\n";
+$lang->action->desc->bugconfirmed    = '$date, <strong>$actor</strong> a confirmé le Bug.' . "\n";
+$lang->action->desc->frombug         = '$date, converti par <strong>$actor</strong>. Son ID était <strong>$extra</strong>.';
+$lang->action->desc->started         = '$date, commencé par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->restarted       = '$date, reprise par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->delayed         = '$date, ajourné par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->suspended       = '$date, suspendu par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->recordestimate  = '$date, enregistré par <strong>$actor</strong> et son coût est de <strong>$extra</strong> heures.';
+$lang->action->desc->editestimate    = '$date, <strong>$actor</strong> a édité son temps estimé.';
+$lang->action->desc->deleteestimate  = '$date, <strong>$actor</strong> a supprimé son estimation de temps.';
+$lang->action->desc->canceled        = '$date, annulé par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->svncommited     = '$date, <strong>$actor</strong> a validé, le build est <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->gitcommited     = '$date, <strong>$actor</strong> a validé, le build est <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->finished        = '$date, terminé par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->paused          = '$date, mis en pause par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->verified        = '$date, verifié par <strong>$actor</strong>.' . "\n";
+$lang->action->desc->diff1           = '<strong><i>%s</i></strong> a changé. Il est passé de "%s" à "%s".<br />' . "\n";
+$lang->action->desc->diff2           = '<strong><i>%s</i></strong> a changé. La différence est ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
+$lang->action->desc->diff3           = 'Le nom du fichier %s a changé pour %s .' . "\n";
+$lang->action->desc->linked2bug      = '$date, affecté à <strong>$extra</strong> par <strong>$actor</strong>';
+$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->resolved        = '$date, resolved by <strong>$actor</strong> ' . "\n";
+$lang->action->desc->managed         = '$date, by <strong>$actor</strong> managed.' . "\n";
+$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->createchildren     = '$date, <strong>$actor</strong> a créé un sous-tâche <strong>$extra</strong>。' . "\n";
@@ -231,6 +236,8 @@ $lang->action->label->logout                = "s'est Déconnecté";
 $lang->action->label->deleteestimate        = "a remis à zéro ";
 $lang->action->label->linked2build          = "a ajouté au Build ";
 $lang->action->label->linked2bug            = "a lié au Bug ";
+$lang->action->label->linked2testtask       = "linked";
+$lang->action->label->unlinkedfromtesttask  = "unlinked";
 $lang->action->label->linkchildtask         = "a raccroché à une sous-tâche";
 $lang->action->label->unlinkchildrentask    = "a décroché la sous-tâche";
 $lang->action->label->linkparenttask        = "a raccroché à une tâche parent";
@@ -238,6 +245,8 @@ $lang->action->label->unlinkparenttask      = "a décroché de la tâche parent"
 $lang->action->label->batchcreate           = "a créé tâches par lot";
 $lang->action->label->createchildren        = "a créé sous-tâches par lot";
 $lang->action->label->managed               = "a managé";
+$lang->action->label->managedteam           = "managed";
+$lang->action->label->managedwhitelist      = "managed";
 $lang->action->label->deletechildrentask    = "a supprimé une sous-tâche";
 $lang->action->label->createchildrenstory   = "a créé une sous-story";
 $lang->action->label->linkchildstory        = "a raccroché à une sous-story";
@@ -247,6 +256,13 @@ $lang->action->label->unlinkparentstory     = "a décroché de la story parent";
 $lang->action->label->deletechildrenstory   = "a supprimé la sous-story";
 $lang->action->label->tracked               = 'tracked';
 $lang->action->label->hangup                = 'hangup';
+$lang->action->label->run                   = 'run';
+$lang->action->label->estimated             = 'estimated';
+$lang->action->label->reviewclosed          = 'Review Failed';
+$lang->action->label->passreviewed          = 'Pass';
+$lang->action->label->clarifyreviewed       = 'Clarify';
+$lang->action->label->commitsummary         = 'Commit Summary';
+$lang->action->label->updatetrainee         = 'Update Trainee';
 
 /* 动态信息按照对象分组 */
 $lang->action->dynamicAction                    = new stdclass();
@@ -289,22 +305,25 @@ $lang->action->dynamicAction->release['changestatus'] = 'Changer Statut Release'
 $lang->action->dynamicAction->release['undeleted']    = 'Restaurer Release';
 $lang->action->dynamicAction->release['hidden']       = 'Masquer Release';
 
-$lang->action->dynamicAction->story['opened']              = 'Créer Story';
-$lang->action->dynamicAction->story['edited']              = 'Editer Story';
-$lang->action->dynamicAction->story['activated']           = 'Activer Story';
-$lang->action->dynamicAction->story['reviewed']            = 'Consulter Story';
-$lang->action->dynamicAction->story['closed']              = 'Fermer Story';
-$lang->action->dynamicAction->story['assigned']            = 'Assigner Story';
-$lang->action->dynamicAction->story['changed']             = 'Changer Story';
-$lang->action->dynamicAction->story['linked2plan']         = 'Inclure Story au Plan';
-$lang->action->dynamicAction->story['unlinkedfromplan']    = 'Enlever Story du Plan';
-$lang->action->dynamicAction->story['linked2release']      = 'Inclure Story à la Release';
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'Enlever Story de la Release';
-$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['undeleted']           = 'Restaurer Story';
-$lang->action->dynamicAction->story['hidden']              = 'Masquer Story';
+$lang->action->dynamicAction->story['opened']                = 'Créer Story';
+$lang->action->dynamicAction->story['edited']                = 'Editer Story';
+$lang->action->dynamicAction->story['activated']             = 'Activer Story';
+$lang->action->dynamicAction->story['reviewed']              = 'Consulter Story';
+$lang->action->dynamicAction->story['closed']                = 'Fermer Story';
+$lang->action->dynamicAction->story['assigned']              = 'Assigner Story';
+$lang->action->dynamicAction->story['changed']               = 'Changer Story';
+$lang->action->dynamicAction->story['linked2plan']           = 'Inclure Story au Plan';
+$lang->action->dynamicAction->story['unlinkedfromplan']      = 'Enlever Story du Plan';
+$lang->action->dynamicAction->story['linked2release']        = 'Inclure Story à la Release';
+$lang->action->dynamicAction->story['unlinkedfromrelease']   = 'Enlever Story de la Release';
+$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['undeleted']             = 'Restaurer Story';
+$lang->action->dynamicAction->story['hidden']                = 'Masquer Story';
+$lang->action->dynamicAction->story['linked2execution']      = "Link Story";
+$lang->action->dynamicAction->story['unlinkedfromexecution'] = "Unlink Story";
+$lang->action->dynamicAction->story['estimated']             = "Estimate $lang->SRCommon";
 
 $lang->action->dynamicAction->project['opened']    = 'Créer ' . $lang->executionCommon;
 $lang->action->dynamicAction->project['edited']    = 'Editer ' . $lang->executionCommon;
@@ -319,6 +338,21 @@ $lang->action->dynamicAction->project['undeleted'] = 'Restaurer ' . $lang->execu
 $lang->action->dynamicAction->project['hidden']    = 'Masquer ' . $lang->executionCommon;
 $lang->action->dynamicAction->project['moved']     = 'Déplacer Tâche';
 
+$lang->action->dynamicAction->execution['opened']    = 'Create ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['edited']    = 'Edit ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['deleted']   = 'Delete ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['started']   = 'Start ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['delayed']   = 'Delay ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['suspended'] = 'Suspend ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['activated'] = 'Activate ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['closed']    = 'Close ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['managed']   = 'Manage ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['undeleted'] = 'Restore ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['hidden']    = 'Hide ' . $lang->executionCommon;
+$lang->action->dynamicAction->execution['moved']     = 'Improt Task';
+
+$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
+
 $lang->action->dynamicAction->task['opened']              = 'Créer Tâche';
 $lang->action->dynamicAction->task['edited']              = 'Editer Tâche';
 $lang->action->dynamicAction->task['commented']           = 'Commenter Tâche';
@@ -348,8 +382,9 @@ $lang->action->dynamicAction->task['hidden']              = 'Masquer Tâche';
 $lang->action->dynamicAction->task['svncommited']         = 'Committer SVN';
 $lang->action->dynamicAction->task['gitcommited']         = 'Committer GIT';
 
-$lang->action->dynamicAction->build['opened'] = 'Créer Build';
-$lang->action->dynamicAction->build['edited'] = 'Editer Build';
+$lang->action->dynamicAction->build['opened']  = 'Créer Build';
+$lang->action->dynamicAction->build['edited']  = 'Editer Build';
+$lang->action->dynamicAction->build['deleted'] = 'Delete Build';
 
 $lang->action->dynamicAction->bug['opened']              = 'Remonter Bug';
 $lang->action->dynamicAction->bug['edited']              = 'Editer Bug';
@@ -407,6 +442,7 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Masqué CasTest Lib';
 
 $lang->action->dynamicAction->doclib['created'] = 'Créer Doc Library';
 $lang->action->dynamicAction->doclib['edited']  = 'Editer Doc Library';
+$lang->action->dynamicAction->doclib['deleted'] = 'Delete Doc Library';
 
 $lang->action->dynamicAction->doc['created']   = 'Créer Document';
 $lang->action->dynamicAction->doc['edited']    = 'Editer Document';
@@ -467,15 +503,15 @@ $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['execution']   = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution']   = 'Execution';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
-$lang->action->search->objectTypeList['case']        = 'CasTest'; 
+$lang->action->search->objectTypeList['case']        = 'CasTest';
 $lang->action->search->objectTypeList['caseresult']  = 'CasTest Result';
 $lang->action->search->objectTypeList['stepresult']  = 'CasTest Steps';
-$lang->action->search->objectTypeList['story']       = 'UR/SR';
-$lang->action->search->objectTypeList['task']        = 'Tâche'; 
-$lang->action->search->objectTypeList['testtask']    = 'Recette';     
-$lang->action->search->objectTypeList['user']        = 'Utilisateur'; 
+$lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
+$lang->action->search->objectTypeList['task']        = 'Tâche';
+$lang->action->search->objectTypeList['testtask']    = 'Recette';
+$lang->action->search->objectTypeList['user']        = 'Utilisateur';
 $lang->action->search->objectTypeList['doc']         = 'Doc';
 $lang->action->search->objectTypeList['doclib']      = 'Doc Lib';
 $lang->action->search->objectTypeList['todo']        = 'Todo';
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 8f778e7d53..2abefe6569 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -97,53 +97,58 @@ $lang->action->objectTypes['budget']      = 'Cost Estimate';
 $lang->action->objectTypes['entry']       = 'Entry';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 $lang->action->objectTypes['job']         = 'Job';
+$lang->action->objectTypes['team']        = 'Team';
+$lang->action->objectTypes['whitelist']   = 'Whitelist';
 
 /* Used to describe operation history. */
 $lang->action->desc = new stdclass();
-$lang->action->desc->common         = '$date, <strong>$action</strong> bởi <strong>$actor</strong>.' . "\n";
-$lang->action->desc->extra          = '$date, <strong>$action</strong> như <strong>$extra</strong> bởi <strong>$actor</strong>.' . "\n";
-$lang->action->desc->opened         = '$date, được tạo bởi <strong>$actor</strong> .' . "\n";
-$lang->action->desc->openedbysystem = '$date, opened by system.' . "\n";
-$lang->action->desc->created        = '$date, được tạo bởi  <strong>$actor</strong> .' . "\n";
-$lang->action->desc->added          = '$date, thêm bởi  <strong>$actor</strong> .' . "\n";
-$lang->action->desc->changed        = '$date, changed by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->edited         = '$date, edited by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->assigned       = '$date, <strong>$actor</strong> assigned to <strong>$extra</strong>.' . "\n";
-$lang->action->desc->closed         = '$date, được đóng bởi <strong>$actor</strong> .' . "\n";
-$lang->action->desc->closedbysystem = '$date, closed by system.' . "\n";
-$lang->action->desc->deleted        = '$date, được xóa bởi <strong>$actor</strong> .' . "\n";
-$lang->action->desc->deletedfile    = '$date, <strong>$actor</strong> đã xóa <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->editfile       = '$date, <strong>$actor</strong> đã sửa <strong><i>$extra</i></strong>.' . "\n";
-$lang->action->desc->erased         = '$date, được xóa bởi <strong>$actor</strong> .' . "\n";
-$lang->action->desc->undeleted      = '$date, khôi phục bởi <strong>$actor</strong> .' . "\n";
-$lang->action->desc->hidden         = '$date, ẩn bởi <strong>$actor</strong> .' . "\n";
-$lang->action->desc->commented      = '$date, được thêm bởi <strong>$actor</strong>.' . "\n";
-$lang->action->desc->activated      = '$date, kích hoạt bởi <strong>$actor</strong> .' . "\n";
-$lang->action->desc->blocked        = '$date, blocked by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->moved          = '$date, chuyển bởi <strong>$actor</strong> , cái là "$extra".' . "\n";
-$lang->action->desc->confirmed      = '$date, <strong>$actor</strong> confirmed the story change. The latest build is <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->caseconfirmed  = '$date, <strong>$actor</strong> confirmed the case change. The latest build is <strong>#$extra</strong>' . "\n";
-$lang->action->desc->bugconfirmed   = '$date, <strong>$actor</strong> confirmed Bug.' . "\n";
-$lang->action->desc->frombug        = '$date, converted from <strong>$actor</strong>. Its ID was <strong>$extra</strong>.';
-$lang->action->desc->started        = '$date, started by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->restarted      = '$date, continued by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->delayed        = '$date, postponed by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->suspended      = '$date, suspended by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->recordestimate = '$date, ghi nhận bởi <strong>$actor</strong> and it cost <strong>$extra</strong> giờ.';
-$lang->action->desc->editestimate   = '$date, <strong>$actor</strong> edited Hour.';
-$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> deleted Hour.';
-$lang->action->desc->canceled       = '$date, cancelled by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->svncommited    = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->gitcommited    = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->finished       = '$date, finished by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->paused         = '$date, paused by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->verified       = '$date, verified by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->diff1          = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
-$lang->action->desc->diff2          = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
-$lang->action->desc->diff3          = 'File Name %s was changed to %s .' . "\n";
-$lang->action->desc->linked2bug     = '$date, liên kết tới <strong>$extra</strong> bởi <strong>$actor</strong>';
-$lang->action->desc->resolved       = '$date, resolved by <strong>$actor</strong> ' . "\n";
-$lang->action->desc->managed        = '$date, by <strong>$actor</strong> managed.' . "\n";
+$lang->action->desc->common          = '$date, <strong>$action</strong> bởi <strong>$actor</strong>.' . "\n";
+$lang->action->desc->extra           = '$date, <strong>$action</strong> như <strong>$extra</strong> bởi <strong>$actor</strong>.' . "\n";
+$lang->action->desc->opened          = '$date, được tạo bởi <strong>$actor</strong> .' . "\n";
+$lang->action->desc->openedbysystem  = '$date, opened by system.' . "\n";
+$lang->action->desc->created         = '$date, được tạo bởi  <strong>$actor</strong> .' . "\n";
+$lang->action->desc->added           = '$date, thêm bởi  <strong>$actor</strong> .' . "\n";
+$lang->action->desc->changed         = '$date, changed by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->edited          = '$date, edited by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->assigned        = '$date, <strong>$actor</strong> assigned to <strong>$extra</strong>.' . "\n";
+$lang->action->desc->closed          = '$date, được đóng bởi <strong>$actor</strong> .' . "\n";
+$lang->action->desc->closedbysystem  = '$date, closed by system.' . "\n";
+$lang->action->desc->deleted         = '$date, được xóa bởi <strong>$actor</strong> .' . "\n";
+$lang->action->desc->deletedfile     = '$date, <strong>$actor</strong> đã xóa <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->editfile        = '$date, <strong>$actor</strong> đã sửa <strong><i>$extra</i></strong>.' . "\n";
+$lang->action->desc->erased          = '$date, được xóa bởi <strong>$actor</strong> .' . "\n";
+$lang->action->desc->undeleted       = '$date, khôi phục bởi <strong>$actor</strong> .' . "\n";
+$lang->action->desc->hidden          = '$date, ẩn bởi <strong>$actor</strong> .' . "\n";
+$lang->action->desc->commented       = '$date, được thêm bởi <strong>$actor</strong>.' . "\n";
+$lang->action->desc->activated       = '$date, kích hoạt bởi <strong>$actor</strong> .' . "\n";
+$lang->action->desc->blocked         = '$date, blocked by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->moved           = '$date, chuyển bởi <strong>$actor</strong> , cái là "$extra".' . "\n";
+$lang->action->desc->confirmed       = '$date, <strong>$actor</strong> confirmed the story change. The latest build is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->caseconfirmed   = '$date, <strong>$actor</strong> confirmed the case change. The latest build is <strong>#$extra</strong>' . "\n";
+$lang->action->desc->bugconfirmed    = '$date, <strong>$actor</strong> confirmed Bug.' . "\n";
+$lang->action->desc->frombug         = '$date, converted from <strong>$actor</strong>. Its ID was <strong>$extra</strong>.';
+$lang->action->desc->started         = '$date, started by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->restarted       = '$date, continued by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->delayed         = '$date, postponed by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->suspended       = '$date, suspended by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->recordestimate  = '$date, ghi nhận bởi <strong>$actor</strong> and it cost <strong>$extra</strong> giờ.';
+$lang->action->desc->editestimate    = '$date, <strong>$actor</strong> edited Hour.';
+$lang->action->desc->deleteestimate  = '$date, <strong>$actor</strong> deleted Hour.';
+$lang->action->desc->canceled        = '$date, cancelled by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->svncommited     = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->gitcommited     = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->finished        = '$date, finished by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->paused          = '$date, paused by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->verified        = '$date, verified by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->diff1           = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
+$lang->action->desc->diff2           = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
+$lang->action->desc->diff3           = 'File Name %s was changed to %s .' . "\n";
+$lang->action->desc->linked2bug      = '$date, liên kết tới <strong>$extra</strong> bởi <strong>$actor</strong>';
+$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->resolved        = '$date, resolved by <strong>$actor</strong> ' . "\n";
+$lang->action->desc->managed         = '$date, by <strong>$actor</strong> managed.' . "\n";
+$lang->action->desc->estimated       = '$date, by <strong>$actor</strong> estimated.' . "\n";
+$lang->action->desc->run             = '$date, by <strong>$actor</strong> executed.' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
 $lang->action->desc->createchildren     = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -231,6 +236,8 @@ $lang->action->label->logout                = "logout";
 $lang->action->label->deleteestimate        = "deleted ";
 $lang->action->label->linked2build          = "linked ";
 $lang->action->label->linked2bug            = "linked ";
+$lang->action->label->linked2testtask       = "linked";
+$lang->action->label->unlinkedfromtesttask  = "unlinked";
 $lang->action->label->linkchildtask         = "linked a child task";
 $lang->action->label->unlinkchildrentask    = "hủy liên kết a child task";
 $lang->action->label->linkparenttask        = "linked a nhiệm vụ cha";
@@ -238,6 +245,8 @@ $lang->action->label->unlinkparenttask      = "unlink from nhiệm vụ cha";
 $lang->action->label->batchcreate           = "batch created tasks";
 $lang->action->label->createchildren        = "create child tasks";
 $lang->action->label->managed               = "managed";
+$lang->action->label->managedteam           = "managed";
+$lang->action->label->managedwhitelist      = "managed";
 $lang->action->label->deletechildrentask    = "delete children task";
 $lang->action->label->createchildrenstory   = "create child stories";
 $lang->action->label->linkchildstory        = "linked a child story";
@@ -247,6 +256,13 @@ $lang->action->label->unlinkparentstory     = "unlink from parent story";
 $lang->action->label->deletechildrenstory   = "delete children story";
 $lang->action->label->tracked               = 'tracked';
 $lang->action->label->hangup                = 'hangup';
+$lang->action->label->run                   = 'run';
+$lang->action->label->estimated             = 'estimated';
+$lang->action->label->reviewclosed          = 'Review Failed';
+$lang->action->label->passreviewed          = 'Pass';
+$lang->action->label->clarifyreviewed       = 'Clarify';
+$lang->action->label->commitsummary         = 'Commit Summary';
+$lang->action->label->updatetrainee         = 'Update Trainee';
 
 /* Dynamic information is grouped by object. */
 $lang->action->dynamicAction                    = new stdclass;
@@ -289,22 +305,25 @@ $lang->action->dynamicAction->release['changestatus'] = 'Thay đổi Tình trạ
 $lang->action->dynamicAction->release['undeleted']    = 'Khôi phục phát hành';
 $lang->action->dynamicAction->release['hidden']       = 'Ẩn phát hành';
 
-$lang->action->dynamicAction->story['opened']              = 'Tạo câu chuyện';
-$lang->action->dynamicAction->story['edited']              = 'Sửa câu chuyện';
-$lang->action->dynamicAction->story['activated']           = 'Kích hoạt câu chuyện';
-$lang->action->dynamicAction->story['reviewed']            = 'Duyệt câu chuyện';
-$lang->action->dynamicAction->story['closed']              = 'Đóng câu chuyện';
-$lang->action->dynamicAction->story['assigned']            = 'Bàn giao câu chuyện';
-$lang->action->dynamicAction->story['changed']             = 'Thay đổi câu chuyện';
-$lang->action->dynamicAction->story['linked2plan']         = 'Liên kết Story to kế hoạch';
-$lang->action->dynamicAction->story['unlinkedfromplan']    = 'Hủy liên kết Story from kế hoạch';
-$lang->action->dynamicAction->story['linked2release']      = 'Liên kết Story to phát hành';
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'Hủy liên kết Story from kế hoạch';
-$lang->action->dynamicAction->story['linked2build']        = 'Liên kết Story to bản dựng';
-$lang->action->dynamicAction->story['unlinkedfrombuild']   = 'Hủy liên kết Story from bản dựng';
-$lang->action->dynamicAction->story['unlinkedfromproject'] = 'Hủy liên kết Project';
-$lang->action->dynamicAction->story['undeleted']           = 'Khôi phục câu chuyện';
-$lang->action->dynamicAction->story['hidden']              = 'Ẩn câu chuyện';
+$lang->action->dynamicAction->story['opened']                = 'Tạo câu chuyện';
+$lang->action->dynamicAction->story['edited']                = 'Sửa câu chuyện';
+$lang->action->dynamicAction->story['activated']             = 'Kích hoạt câu chuyện';
+$lang->action->dynamicAction->story['reviewed']              = 'Duyệt câu chuyện';
+$lang->action->dynamicAction->story['closed']                = 'Đóng câu chuyện';
+$lang->action->dynamicAction->story['assigned']              = 'Bàn giao câu chuyện';
+$lang->action->dynamicAction->story['changed']               = 'Thay đổi câu chuyện';
+$lang->action->dynamicAction->story['linked2plan']           = 'Liên kết Story to kế hoạch';
+$lang->action->dynamicAction->story['unlinkedfromplan']      = 'Hủy liên kết Story from kế hoạch';
+$lang->action->dynamicAction->story['linked2release']        = 'Liên kết Story to phát hành';
+$lang->action->dynamicAction->story['unlinkedfromrelease']   = 'Hủy liên kết Story from kế hoạch';
+$lang->action->dynamicAction->story['linked2build']          = 'Liên kết Story to bản dựng';
+$lang->action->dynamicAction->story['unlinkedfrombuild']     = 'Hủy liên kết Story from bản dựng';
+$lang->action->dynamicAction->story['unlinkedfromproject']   = 'Hủy liên kết Project';
+$lang->action->dynamicAction->story['undeleted']             = 'Khôi phục câu chuyện';
+$lang->action->dynamicAction->story['hidden']                = 'Ẩn câu chuyện';
+$lang->action->dynamicAction->story['linked2execution']      = "Link Story";
+$lang->action->dynamicAction->story['unlinkedfromexecution'] = "Unlink Story";
+$lang->action->dynamicAction->story['estimated']             = "Estimate $lang->SRCommon";
 
 $lang->action->dynamicAction->execution['opened']    = 'Tạo ' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['edited']    = 'Sửa ' . $lang->executionCommon;
@@ -319,6 +338,8 @@ $lang->action->dynamicAction->execution['undeleted'] = 'Phục hổi ' . $lang->
 $lang->action->dynamicAction->execution['hidden']    = 'Ẩn ' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['moved']     = 'Nhập nhiệm vụ';
 
+$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
+
 $lang->action->dynamicAction->task['opened']              = 'Tạo nhiệm vụ';
 $lang->action->dynamicAction->task['edited']              = 'Sửa nhiệm vụ';
 $lang->action->dynamicAction->task['commented']           = 'Task nhận xét';
@@ -348,8 +369,9 @@ $lang->action->dynamicAction->task['hidden']              = 'Ẩn nhiệm vụ';
 $lang->action->dynamicAction->task['svncommited']         = 'SVN Commit';
 $lang->action->dynamicAction->task['gitcommited']         = 'GIT Commit';
 
-$lang->action->dynamicAction->build['opened'] = 'Tạo bản dựng';
-$lang->action->dynamicAction->build['edited'] = 'Sửa bản dựng';
+$lang->action->dynamicAction->build['opened']  = 'Tạo bản dựng';
+$lang->action->dynamicAction->build['edited']  = 'Sửa bản dựng';
+$lang->action->dynamicAction->build['deleted'] = 'Delete Build';
 
 $lang->action->dynamicAction->bug['opened']              = 'Báo cáo Bug';
 $lang->action->dynamicAction->bug['edited']              = 'Sửa Bug';
@@ -407,6 +429,7 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Ẩn Case Lib';
 
 $lang->action->dynamicAction->doclib['created'] = 'Tạo Doc thư viện';
 $lang->action->dynamicAction->doclib['edited']  = 'Sửa Doc thư viện';
+$lang->action->dynamicAction->doclib['deleted'] = 'Delete Doc Library';
 
 $lang->action->dynamicAction->doc['created']   = 'Tạo tài liệu';
 $lang->action->dynamicAction->doc['edited']    = 'Sửa tài liệu';
@@ -464,19 +487,19 @@ $lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
 
 /* Object type. */
 $lang->action->search = new stdclass();
-$lang->action->search->objectTypeList['']            = ''; 
+$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['execution']   = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution']   = 'Execution';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
-$lang->action->search->objectTypeList['case']        = 'Tình huống'; 
+$lang->action->search->objectTypeList['case']        = 'Tình huống';
 $lang->action->search->objectTypeList['caseresult']  = 'Kết quả tình huống';
 $lang->action->search->objectTypeList['stepresult']  = 'Các bước tình huống';
-$lang->action->search->objectTypeList['story']       = 'UR/SR';
-$lang->action->search->objectTypeList['task']        = 'Nhiệm vụ'; 
-$lang->action->search->objectTypeList['testtask']    = 'Yêu cầu';  
-$lang->action->search->objectTypeList['user']        = 'Người dùng'; 
+$lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
+$lang->action->search->objectTypeList['task']        = 'Nhiệm vụ';
+$lang->action->search->objectTypeList['testtask']    = 'Yêu cầu';
+$lang->action->search->objectTypeList['user']        = 'Người dùng';
 $lang->action->search->objectTypeList['doc']         = 'Tài liệu';
 $lang->action->search->objectTypeList['doclib']      = 'Doc Lib';
 $lang->action->search->objectTypeList['todo']        = 'Việc làm';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 87efe2916a..d94e60c869 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -9,6 +9,8 @@
  * @version     $Id: zh-cn.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+global $config;
+
 $lang->action->common     = '系统日志';
 $lang->action->product    = $lang->productCommon;
 $lang->action->project    = '项目';
@@ -30,6 +32,9 @@ $lang->action->editComment = '修改备注';
 $lang->action->create      = '添加备注';
 $lang->action->comment     = '备注';
 
+$lang->action->undeleteAction = '还原数据';
+$lang->action->hideOneAction  = '隐藏数据';
+
 $lang->action->trashTips      = '提示：为了保证系统的完整性，禅道系统的删除都是标记删除。';
 $lang->action->textDiff       = '文本格式';
 $lang->action->original       = '原始格式';
@@ -73,7 +78,7 @@ $lang->action->objectTypes['productplan'] = '计划';
 $lang->action->objectTypes['release']     = '发布';
 $lang->action->objectTypes['program']     = '项目集';
 $lang->action->objectTypes['project']     = '项目';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $config->systemMode == 'new' ? '执行' : $lang->executionCommon;
 $lang->action->objectTypes['task']        = '任务';
 $lang->action->objectTypes['build']       = '版本';
 $lang->action->objectTypes['job']         = '构建';
@@ -96,54 +101,58 @@ $lang->action->objectTypes['stakeholder'] = '干系人';
 $lang->action->objectTypes['budget']      = '费用估算';
 $lang->action->objectTypes['entry']       = '应用';
 $lang->action->objectTypes['webhook']     = 'Webhook';
-$lang->action->objectTypes['job']         = '构建';
+$lang->action->objectTypes['team']        = '团队';
+$lang->action->objectTypes['whitelist']   = '白名单';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
-$lang->action->desc->common         = '$date, <strong>$action</strong> by <strong>$actor</strong>。' . "\n";
-$lang->action->desc->extra          = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>。' . "\n";
-$lang->action->desc->opened         = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
-$lang->action->desc->openedbysystem = '$date, 由系统创建。' . "\n";
-$lang->action->desc->created        = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
-$lang->action->desc->added          = '$date, 由 <strong>$actor</strong> 添加。' . "\n";
-$lang->action->desc->changed        = '$date, 由 <strong>$actor</strong> 变更。' . "\n";
-$lang->action->desc->edited         = '$date, 由 <strong>$actor</strong> 编辑。' . "\n";
-$lang->action->desc->assigned       = '$date, 由 <strong>$actor</strong> 指派给 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->closed         = '$date, 由 <strong>$actor</strong> 关闭。' . "\n";
-$lang->action->desc->closedbysystem = '$date, 由系统关闭。' . "\n";
-$lang->action->desc->deleted        = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
-$lang->action->desc->deletedfile    = '$date, 由 <strong>$actor</strong> 删除了附件：<strong><i>$extra</i></strong>。' . "\n";
-$lang->action->desc->editfile       = '$date, 由 <strong>$actor</strong> 编辑了附件：<strong><i>$extra</i></strong>。' . "\n";
-$lang->action->desc->erased         = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
-$lang->action->desc->undeleted      = '$date, 由 <strong>$actor</strong> 还原。' . "\n";
-$lang->action->desc->hidden         = '$date, 由 <strong>$actor</strong> 隐藏。' . "\n";
-$lang->action->desc->commented      = '$date, 由 <strong>$actor</strong> 添加备注。' . "\n";
-$lang->action->desc->activated      = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
-$lang->action->desc->blocked        = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
-$lang->action->desc->moved          = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
-$lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 确认' . $lang->SRCommon . '变动，最新版本为<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->bugconfirmed   = '$date, 由 <strong>$actor</strong> 确认Bug。' . "\n";
-$lang->action->desc->frombug        = '$date, 由 <strong>$actor</strong> Bug转化而来，Bug编号为 <strong>$extra</strong>。';
-$lang->action->desc->started        = '$date, 由 <strong>$actor</strong> 启动。' . "\n";
-$lang->action->desc->restarted      = '$date, 由 <strong>$actor</strong> 继续。' . "\n";
-$lang->action->desc->delayed        = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
-$lang->action->desc->suspended      = '$date, 由 <strong>$actor</strong> 挂起。' . "\n";
-$lang->action->desc->recordestimate = '$date, 由 <strong>$actor</strong> 记录工时，消耗 <strong>$extra</strong> 小时。';
-$lang->action->desc->editestimate   = '$date, 由 <strong>$actor</strong> 编辑工时。';
-$lang->action->desc->deleteestimate = '$date, 由 <strong>$actor</strong> 删除工时。';
-$lang->action->desc->canceled       = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
-$lang->action->desc->svncommited    = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->gitcommited    = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->finished       = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
-$lang->action->desc->paused         = '$date, 由 <strong>$actor</strong> 暂停。' . "\n";
-$lang->action->desc->verified       = '$date, 由 <strong>$actor</strong> 验收。' . "\n";
-$lang->action->desc->diff1          = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />' . "\n";
-$lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
-$lang->action->desc->diff3          = '将文件名 %s 改为 %s 。' . "\n";
-$lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
-$lang->action->desc->resolved       = '$date, 由 <strong>$actor</strong> 解决。' . "\n";
-$lang->action->desc->managed        = '$date, 由 <strong>$actor</strong> 维护。' . "\n";
+$lang->action->desc->common          = '$date, <strong>$action</strong> by <strong>$actor</strong>。' . "\n";
+$lang->action->desc->extra           = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>。' . "\n";
+$lang->action->desc->opened          = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
+$lang->action->desc->openedbysystem  = '$date, 由系统创建。' . "\n";
+$lang->action->desc->created         = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
+$lang->action->desc->added           = '$date, 由 <strong>$actor</strong> 添加。' . "\n";
+$lang->action->desc->changed         = '$date, 由 <strong>$actor</strong> 变更。' . "\n";
+$lang->action->desc->edited          = '$date, 由 <strong>$actor</strong> 编辑。' . "\n";
+$lang->action->desc->assigned        = '$date, 由 <strong>$actor</strong> 指派给 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->closed          = '$date, 由 <strong>$actor</strong> 关闭。' . "\n";
+$lang->action->desc->closedbysystem  = '$date, 由系统关闭。' . "\n";
+$lang->action->desc->deleted         = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
+$lang->action->desc->deletedfile     = '$date, 由 <strong>$actor</strong> 删除了附件：<strong><i>$extra</i></strong>。' . "\n";
+$lang->action->desc->editfile        = '$date, 由 <strong>$actor</strong> 编辑了附件：<strong><i>$extra</i></strong>。' . "\n";
+$lang->action->desc->erased          = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
+$lang->action->desc->undeleted       = '$date, 由 <strong>$actor</strong> 还原。' . "\n";
+$lang->action->desc->hidden          = '$date, 由 <strong>$actor</strong> 隐藏。' . "\n";
+$lang->action->desc->commented       = '$date, 由 <strong>$actor</strong> 添加备注。' . "\n";
+$lang->action->desc->activated       = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
+$lang->action->desc->blocked         = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
+$lang->action->desc->moved           = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
+$lang->action->desc->confirmed       = '$date, 由 <strong>$actor</strong> 确认' . $lang->SRCommon . '变动，最新版本为<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->caseconfirmed   = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->bugconfirmed    = '$date, 由 <strong>$actor</strong> 确认Bug。' . "\n";
+$lang->action->desc->frombug         = '$date, 由 <strong>$actor</strong> Bug转化而来，Bug编号为 <strong>$extra</strong>。';
+$lang->action->desc->started         = '$date, 由 <strong>$actor</strong> 启动。' . "\n";
+$lang->action->desc->restarted       = '$date, 由 <strong>$actor</strong> 继续。' . "\n";
+$lang->action->desc->delayed         = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
+$lang->action->desc->suspended       = '$date, 由 <strong>$actor</strong> 挂起。' . "\n";
+$lang->action->desc->recordestimate  = '$date, 由 <strong>$actor</strong> 记录工时，消耗 <strong>$extra</strong> 小时。';
+$lang->action->desc->editestimate    = '$date, 由 <strong>$actor</strong> 编辑工时。';
+$lang->action->desc->deleteestimate  = '$date, 由 <strong>$actor</strong> 删除工时。';
+$lang->action->desc->canceled        = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
+$lang->action->desc->svncommited     = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->gitcommited     = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->finished        = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
+$lang->action->desc->paused          = '$date, 由 <strong>$actor</strong> 暂停。' . "\n";
+$lang->action->desc->verified        = '$date, 由 <strong>$actor</strong> 验收。' . "\n";
+$lang->action->desc->diff1           = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />' . "\n";
+$lang->action->desc->diff2           = '修改了 <strong><i>%s</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
+$lang->action->desc->diff3           = '将文件名 %s 改为 %s 。' . "\n";
+$lang->action->desc->linked2bug      = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
+$lang->action->desc->linked2testtask = '$date 由 <strong>$actor</strong> 关联到测试单 <strong>$extra</strong>';
+$lang->action->desc->resolved        = '$date, 由 <strong>$actor</strong> 解决。' . "\n";
+$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->createchildren     = '$date, 由 <strong>$actor</strong> 创建子任务 <strong>$extra</strong>。' . "\n";
@@ -231,6 +240,8 @@ $lang->action->label->logout                = "退出登录";
 $lang->action->label->deleteestimate        = "删除了工时";
 $lang->action->label->linked2build          = "关联了";
 $lang->action->label->linked2bug            = "关联了";
+$lang->action->label->linked2testtask       = "关联了";
+$lang->action->label->unlinkedfromtesttask  = "移除了";
 $lang->action->label->linkchildtask         = "关联子任务";
 $lang->action->label->unlinkchildrentask    = "取消关联子任务";
 $lang->action->label->linkparenttask        = "关联到父任务";
@@ -238,6 +249,8 @@ $lang->action->label->unlinkparenttask      = "从父任务取消关联";
 $lang->action->label->batchcreate           = "批量创建任务";
 $lang->action->label->createchildren        = "创建子任务";
 $lang->action->label->managed               = "维护";
+$lang->action->label->managedteam           = "维护了";
+$lang->action->label->managedwhitelist      = "维护了";
 $lang->action->label->deletechildrentask    = "删除子任务";
 $lang->action->label->createchildrenstory   = "创建子需求";
 $lang->action->label->linkchildstory        = "关联子需求";
@@ -247,6 +260,13 @@ $lang->action->label->unlinkparentstory     = "从父需求取消关联";
 $lang->action->label->deletechildrenstory   = "删除子需求";
 $lang->action->label->tracked               = '跟踪了';
 $lang->action->label->hangup                = '挂起了';
+$lang->action->label->run                   = '执行了';
+$lang->action->label->estimated             = '估算了';
+$lang->action->label->reviewclosed          = '评审失败';
+$lang->action->label->passreviewed          = '确认通过';
+$lang->action->label->clarifyreviewed       = '有待明确';
+$lang->action->label->commitsummary         = '提交培训总结';
+$lang->action->label->updatetrainee         = '更新培训人员';
 
 /* 动态信息按照对象分组 */
 $lang->action->dynamicAction                    = new stdclass();
@@ -289,22 +309,25 @@ $lang->action->dynamicAction->release['changestatus'] = '修改发布状态';
 $lang->action->dynamicAction->release['undeleted']    = '还原发布';
 $lang->action->dynamicAction->release['hidden']       = '隐藏发布';
 
-$lang->action->dynamicAction->story['opened']              = "创建{$lang->SRCommon}";
-$lang->action->dynamicAction->story['edited']              = "编辑{$lang->SRCommon}";
-$lang->action->dynamicAction->story['activated']           = "激活{$lang->SRCommon}";
-$lang->action->dynamicAction->story['reviewed']            = "评审{$lang->SRCommon}";
-$lang->action->dynamicAction->story['closed']              = "关闭{$lang->SRCommon}";
-$lang->action->dynamicAction->story['assigned']            = "指派{$lang->SRCommon}";
-$lang->action->dynamicAction->story['changed']             = "变更{$lang->SRCommon}";
-$lang->action->dynamicAction->story['linked2plan']         = "{$lang->SRCommon}关联计划";
-$lang->action->dynamicAction->story['unlinkedfromplan']    = "计划移除{$lang->SRCommon}";
-$lang->action->dynamicAction->story['linked2release']      = "{$lang->SRCommon}关联发布";
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = "发布移除{$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['undeleted']           = "还原{$lang->SRCommon}";
-$lang->action->dynamicAction->story['hidden']              = "隐藏{$lang->SRCommon}";
+$lang->action->dynamicAction->story['opened']                = "创建{$lang->SRCommon}";
+$lang->action->dynamicAction->story['edited']                = "编辑{$lang->SRCommon}";
+$lang->action->dynamicAction->story['activated']             = "激活{$lang->SRCommon}";
+$lang->action->dynamicAction->story['reviewed']              = "评审{$lang->SRCommon}";
+$lang->action->dynamicAction->story['closed']                = "关闭{$lang->SRCommon}";
+$lang->action->dynamicAction->story['assigned']              = "指派{$lang->SRCommon}";
+$lang->action->dynamicAction->story['changed']               = "变更{$lang->SRCommon}";
+$lang->action->dynamicAction->story['linked2plan']           = "{$lang->SRCommon}关联计划";
+$lang->action->dynamicAction->story['unlinkedfromplan']      = "计划移除{$lang->SRCommon}";
+$lang->action->dynamicAction->story['linked2release']        = "{$lang->SRCommon}关联发布";
+$lang->action->dynamicAction->story['unlinkedfromrelease']   = "发布移除{$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['undeleted']             = "还原{$lang->SRCommon}";
+$lang->action->dynamicAction->story['hidden']                = "隐藏{$lang->SRCommon}";
+$lang->action->dynamicAction->story['linked2execution']      = "关联$lang->SRCommon";
+$lang->action->dynamicAction->story['unlinkedfromexecution'] = "移除$lang->SRCommon";
+$lang->action->dynamicAction->story['estimated']             = "估算$lang->SRCommon";
 
 $lang->action->dynamicAction->execution['opened']    = '创建' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['edited']    = '编辑' . $lang->executionCommon;
@@ -319,6 +342,8 @@ $lang->action->dynamicAction->execution['undeleted'] = '还原' . $lang->executi
 $lang->action->dynamicAction->execution['hidden']    = '隐藏' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['moved']     = '导入任务';
 
+$lang->action->dynamicAction->team['managedTeam'] = '维护团队';
+
 $lang->action->dynamicAction->task['opened']              = '创建任务';
 $lang->action->dynamicAction->task['edited']              = '编辑任务';
 $lang->action->dynamicAction->task['commented']           = '备注任务';
@@ -348,8 +373,9 @@ $lang->action->dynamicAction->task['hidden']              = '隐藏任务';
 $lang->action->dynamicAction->task['svncommited']         = 'SVN提交';
 $lang->action->dynamicAction->task['gitcommited']         = 'GIT提交';
 
-$lang->action->dynamicAction->build['opened'] = '创建版本';
-$lang->action->dynamicAction->build['edited'] = '编辑版本';
+$lang->action->dynamicAction->build['opened']  = '创建版本';
+$lang->action->dynamicAction->build['edited']  = '编辑版本';
+$lang->action->dynamicAction->build['deleted'] = '删除版本';
 
 $lang->action->dynamicAction->bug['opened']              = '创建Bug';
 $lang->action->dynamicAction->bug['edited']              = '编辑Bug';
@@ -407,6 +433,7 @@ $lang->action->dynamicAction->caselib['hidden']    = '隐藏用例库';
 
 $lang->action->dynamicAction->doclib['created'] = '创建文档库';
 $lang->action->dynamicAction->doclib['edited']  = '编辑文档库';
+$lang->action->dynamicAction->doclib['deleted'] = '删除文档库';
 
 $lang->action->dynamicAction->doc['created']   = '创建文档';
 $lang->action->dynamicAction->doc['edited']    = '编辑文档';
@@ -427,12 +454,11 @@ $lang->action->dynamicAction->entry['created'] = '添加应用';
 $lang->action->dynamicAction->entry['edited']  = '编辑应用';
 
 /* 用来生成相应对象的链接。*/
-global $config;
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $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|pgmproduct|programID=%s";
+$lang->action->label->program     = "项目集|program|product|programID=%s";
 $lang->action->label->project     = "项目|project|index|projectID=%s";
 if($config->systemMode == 'new')
 {
@@ -450,7 +476,7 @@ $lang->action->label->testtask    = '测试单|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '测试套件|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = '用例库|caselib|view|libID=%s';
 $lang->action->label->todo        = '待办|todo|view|todoID=%s';
-$lang->action->label->doclib      = '文档库|doc|browse|libID=%s';
+$lang->action->label->doclib      = '文档库|doc|objectLibs|type=&objectID=&libID=%s';
 $lang->action->label->doc         = '文档|doc|view|docID=%s';
 $lang->action->label->user        = '用户|user|view|account=%s';
 $lang->action->label->testreport  = '报告|testreport|view|report=%s';
@@ -468,12 +494,12 @@ $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['execution']   = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution']   = '执行';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = '用例';
 $lang->action->search->objectTypeList['caseresult']  = '用例结果';
 $lang->action->search->objectTypeList['stepresult']  = '用例步骤';
-$lang->action->search->objectTypeList['story']       = '用需/软需';
+$lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
 $lang->action->search->objectTypeList['task']        = '任务';
 $lang->action->search->objectTypeList['testtask']    = '测试单';
 $lang->action->search->objectTypeList['user']        = '用户';
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 7cbd800655..21137aa604 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -9,6 +9,8 @@
  * @version     $Id: zh-tw.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+global $config;
+
 $lang->action->common     = '系統日誌';
 $lang->action->product    = $lang->productCommon;
 $lang->action->project    = '項目';
@@ -30,6 +32,9 @@ $lang->action->editComment = '修改備註';
 $lang->action->create      = '添加備註';
 $lang->action->comment     = '備註';
 
+$lang->action->undeleteAction = '還原數據';
+$lang->action->hideOneAction  = '隱藏數據';
+
 $lang->action->trashTips      = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。';
 $lang->action->textDiff       = '文本格式';
 $lang->action->original       = '原始格式';
@@ -73,7 +78,7 @@ $lang->action->objectTypes['productplan'] = '計劃';
 $lang->action->objectTypes['release']     = '發佈';
 $lang->action->objectTypes['program']     = '項目集';
 $lang->action->objectTypes['project']     = '項目';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $config->systemMode == 'new' ? '執行' : $lang->executionCommon;
 $lang->action->objectTypes['task']        = '任務';
 $lang->action->objectTypes['build']       = '版本';
 $lang->action->objectTypes['job']         = '構建';
@@ -96,54 +101,58 @@ $lang->action->objectTypes['stakeholder'] = '干係人';
 $lang->action->objectTypes['budget']      = '費用估算';
 $lang->action->objectTypes['entry']       = '應用';
 $lang->action->objectTypes['webhook']     = 'Webhook';
-$lang->action->objectTypes['job']         = '構建';
+$lang->action->objectTypes['team']        = '團隊';
+$lang->action->objectTypes['whitelist']   = '白名單';
 
 /* 用來描述操作歷史記錄。*/
 $lang->action->desc = new stdclass();
-$lang->action->desc->common         = '$date, <strong>$action</strong> by <strong>$actor</strong>。' . "\n";
-$lang->action->desc->extra          = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>。' . "\n";
-$lang->action->desc->opened         = '$date, 由 <strong>$actor</strong> 創建。' . "\n";
-$lang->action->desc->openedbysystem = '$date, 由系統創建。' . "\n";
-$lang->action->desc->created        = '$date, 由 <strong>$actor</strong> 創建。' . "\n";
-$lang->action->desc->added          = '$date, 由 <strong>$actor</strong> 添加。' . "\n";
-$lang->action->desc->changed        = '$date, 由 <strong>$actor</strong> 變更。' . "\n";
-$lang->action->desc->edited         = '$date, 由 <strong>$actor</strong> 編輯。' . "\n";
-$lang->action->desc->assigned       = '$date, 由 <strong>$actor</strong> 指派給 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->closed         = '$date, 由 <strong>$actor</strong> 關閉。' . "\n";
-$lang->action->desc->closedbysystem = '$date, 由系統關閉。' . "\n";
-$lang->action->desc->deleted        = '$date, 由 <strong>$actor</strong> 刪除。' . "\n";
-$lang->action->desc->deletedfile    = '$date, 由 <strong>$actor</strong> 刪除了附件：<strong><i>$extra</i></strong>。' . "\n";
-$lang->action->desc->editfile       = '$date, 由 <strong>$actor</strong> 編輯了附件：<strong><i>$extra</i></strong>。' . "\n";
-$lang->action->desc->erased         = '$date, 由 <strong>$actor</strong> 刪除。' . "\n";
-$lang->action->desc->undeleted      = '$date, 由 <strong>$actor</strong> 還原。' . "\n";
-$lang->action->desc->hidden         = '$date, 由 <strong>$actor</strong> 隱藏。' . "\n";
-$lang->action->desc->commented      = '$date, 由 <strong>$actor</strong> 添加備註。' . "\n";
-$lang->action->desc->activated      = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
-$lang->action->desc->blocked        = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
-$lang->action->desc->moved          = '$date, 由 <strong>$actor</strong> 移動，之前為 "$extra"。' . "\n";
-$lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 確認' . $lang->SRCommon . '變動，最新版本為<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 確認用例變動，最新版本為<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->bugconfirmed   = '$date, 由 <strong>$actor</strong> 確認Bug。' . "\n";
-$lang->action->desc->frombug        = '$date, 由 <strong>$actor</strong> Bug轉化而來，Bug編號為 <strong>$extra</strong>。';
-$lang->action->desc->started        = '$date, 由 <strong>$actor</strong> 啟動。' . "\n";
-$lang->action->desc->restarted      = '$date, 由 <strong>$actor</strong> 繼續。' . "\n";
-$lang->action->desc->delayed        = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
-$lang->action->desc->suspended      = '$date, 由 <strong>$actor</strong> 掛起。' . "\n";
-$lang->action->desc->recordestimate = '$date, 由 <strong>$actor</strong> 記錄工時，消耗 <strong>$extra</strong> 小時。';
-$lang->action->desc->editestimate   = '$date, 由 <strong>$actor</strong> 編輯工時。';
-$lang->action->desc->deleteestimate = '$date, 由 <strong>$actor</strong> 刪除工時。';
-$lang->action->desc->canceled       = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
-$lang->action->desc->svncommited    = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->gitcommited    = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
-$lang->action->desc->finished       = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
-$lang->action->desc->paused         = '$date, 由 <strong>$actor</strong> 暫停。' . "\n";
-$lang->action->desc->verified       = '$date, 由 <strong>$actor</strong> 驗收。' . "\n";
-$lang->action->desc->diff1          = '修改了 <strong><i>%s</i></strong>，舊值為 "%s"，新值為 "%s"。<br />' . "\n";
-$lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，區別為：' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
-$lang->action->desc->diff3          = '將檔案名 %s 改為 %s 。' . "\n";
-$lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 關聯到版本 <strong>$extra</strong>';
-$lang->action->desc->resolved       = '$date, 由 <strong>$actor</strong> 解決。' . "\n";
-$lang->action->desc->managed        = '$date, 由 <strong>$actor</strong> 維護。' . "\n";
+$lang->action->desc->common          = '$date, <strong>$action</strong> by <strong>$actor</strong>。' . "\n";
+$lang->action->desc->extra           = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>。' . "\n";
+$lang->action->desc->opened          = '$date, 由 <strong>$actor</strong> 創建。' . "\n";
+$lang->action->desc->openedbysystem  = '$date, 由系統創建。' . "\n";
+$lang->action->desc->created         = '$date, 由 <strong>$actor</strong> 創建。' . "\n";
+$lang->action->desc->added           = '$date, 由 <strong>$actor</strong> 添加。' . "\n";
+$lang->action->desc->changed         = '$date, 由 <strong>$actor</strong> 變更。' . "\n";
+$lang->action->desc->edited          = '$date, 由 <strong>$actor</strong> 編輯。' . "\n";
+$lang->action->desc->assigned        = '$date, 由 <strong>$actor</strong> 指派給 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->closed          = '$date, 由 <strong>$actor</strong> 關閉。' . "\n";
+$lang->action->desc->closedbysystem  = '$date, 由系統關閉。' . "\n";
+$lang->action->desc->deleted         = '$date, 由 <strong>$actor</strong> 刪除。' . "\n";
+$lang->action->desc->deletedfile     = '$date, 由 <strong>$actor</strong> 刪除了附件：<strong><i>$extra</i></strong>。' . "\n";
+$lang->action->desc->editfile        = '$date, 由 <strong>$actor</strong> 編輯了附件：<strong><i>$extra</i></strong>。' . "\n";
+$lang->action->desc->erased          = '$date, 由 <strong>$actor</strong> 刪除。' . "\n";
+$lang->action->desc->undeleted       = '$date, 由 <strong>$actor</strong> 還原。' . "\n";
+$lang->action->desc->hidden          = '$date, 由 <strong>$actor</strong> 隱藏。' . "\n";
+$lang->action->desc->commented       = '$date, 由 <strong>$actor</strong> 添加備註。' . "\n";
+$lang->action->desc->activated       = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
+$lang->action->desc->blocked         = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
+$lang->action->desc->moved           = '$date, 由 <strong>$actor</strong> 移動，之前為 "$extra"。' . "\n";
+$lang->action->desc->confirmed       = '$date, 由 <strong>$actor</strong> 確認' . $lang->SRCommon . '變動，最新版本為<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->caseconfirmed   = '$date, 由 <strong>$actor</strong> 確認用例變動，最新版本為<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->bugconfirmed    = '$date, 由 <strong>$actor</strong> 確認Bug。' . "\n";
+$lang->action->desc->frombug         = '$date, 由 <strong>$actor</strong> Bug轉化而來，Bug編號為 <strong>$extra</strong>。';
+$lang->action->desc->started         = '$date, 由 <strong>$actor</strong> 啟動。' . "\n";
+$lang->action->desc->restarted       = '$date, 由 <strong>$actor</strong> 繼續。' . "\n";
+$lang->action->desc->delayed         = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
+$lang->action->desc->suspended       = '$date, 由 <strong>$actor</strong> 掛起。' . "\n";
+$lang->action->desc->recordestimate  = '$date, 由 <strong>$actor</strong> 記錄工時，消耗 <strong>$extra</strong> 小時。';
+$lang->action->desc->editestimate    = '$date, 由 <strong>$actor</strong> 編輯工時。';
+$lang->action->desc->deleteestimate  = '$date, 由 <strong>$actor</strong> 刪除工時。';
+$lang->action->desc->canceled        = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
+$lang->action->desc->svncommited     = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->gitcommited     = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->finished        = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
+$lang->action->desc->paused          = '$date, 由 <strong>$actor</strong> 暫停。' . "\n";
+$lang->action->desc->verified        = '$date, 由 <strong>$actor</strong> 驗收。' . "\n";
+$lang->action->desc->diff1           = '修改了 <strong><i>%s</i></strong>，舊值為 "%s"，新值為 "%s"。<br />' . "\n";
+$lang->action->desc->diff2           = '修改了 <strong><i>%s</i></strong>，區別為：' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
+$lang->action->desc->diff3           = '將檔案名 %s 改為 %s 。' . "\n";
+$lang->action->desc->linked2bug      = '$date 由 <strong>$actor</strong> 關聯到版本 <strong>$extra</strong>';
+$lang->action->desc->linked2testtask = '$date 由 <strong>$actor</strong> 關聯到測試單 <strong>$extra</strong>';
+$lang->action->desc->resolved        = '$date, 由 <strong>$actor</strong> 解決。' . "\n";
+$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->createchildren     = '$date, 由 <strong>$actor</strong> 創建子任務 <strong>$extra</strong>。' . "\n";
@@ -231,6 +240,8 @@ $lang->action->label->logout                = "退出登錄";
 $lang->action->label->deleteestimate        = "刪除了工時";
 $lang->action->label->linked2build          = "關聯了";
 $lang->action->label->linked2bug            = "關聯了";
+$lang->action->label->linked2testtask       = "關聯了";
+$lang->action->label->unlinkedfromtesttask  = "移除了";
 $lang->action->label->linkchildtask         = "關聯子任務";
 $lang->action->label->unlinkchildrentask    = "取消關聯子任務";
 $lang->action->label->linkparenttask        = "關聯到父任務";
@@ -238,6 +249,8 @@ $lang->action->label->unlinkparenttask      = "從父任務取消關聯";
 $lang->action->label->batchcreate           = "批量創建任務";
 $lang->action->label->createchildren        = "創建子任務";
 $lang->action->label->managed               = "維護";
+$lang->action->label->managedteam           = "維護了";
+$lang->action->label->managedwhitelist      = "維護了";
 $lang->action->label->deletechildrentask    = "刪除子任務";
 $lang->action->label->createchildrenstory   = "創建子需求";
 $lang->action->label->linkchildstory        = "關聯子需求";
@@ -247,6 +260,8 @@ $lang->action->label->unlinkparentstory     = "從父需求取消關聯";
 $lang->action->label->deletechildrenstory   = "刪除子需求";
 $lang->action->label->tracked               = '跟蹤了';
 $lang->action->label->hangup                = '掛起了';
+$lang->action->label->run                   = '執行了';
+$lang->action->label->estimated             = '估算了';
 
 /* 動態信息按照對象分組 */
 $lang->action->dynamicAction                    = new stdclass();
@@ -289,22 +304,25 @@ $lang->action->dynamicAction->release['changestatus'] = '修改發佈狀態';
 $lang->action->dynamicAction->release['undeleted']    = '還原發佈';
 $lang->action->dynamicAction->release['hidden']       = '隱藏發佈';
 
-$lang->action->dynamicAction->story['opened']              = "創建{$lang->SRCommon}";
-$lang->action->dynamicAction->story['edited']              = "編輯{$lang->SRCommon}";
-$lang->action->dynamicAction->story['activated']           = "激活{$lang->SRCommon}";
-$lang->action->dynamicAction->story['reviewed']            = "評審{$lang->SRCommon}";
-$lang->action->dynamicAction->story['closed']              = "關閉{$lang->SRCommon}";
-$lang->action->dynamicAction->story['assigned']            = "指派{$lang->SRCommon}";
-$lang->action->dynamicAction->story['changed']             = "變更{$lang->SRCommon}";
-$lang->action->dynamicAction->story['linked2plan']         = "{$lang->SRCommon}關聯計劃";
-$lang->action->dynamicAction->story['unlinkedfromplan']    = "計劃移除{$lang->SRCommon}";
-$lang->action->dynamicAction->story['linked2release']      = "{$lang->SRCommon}關聯發佈";
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = "發佈移除{$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['undeleted']           = "還原{$lang->SRCommon}";
-$lang->action->dynamicAction->story['hidden']              = "隱藏{$lang->SRCommon}";
+$lang->action->dynamicAction->story['opened']                = "創建{$lang->SRCommon}";
+$lang->action->dynamicAction->story['edited']                = "編輯{$lang->SRCommon}";
+$lang->action->dynamicAction->story['activated']             = "激活{$lang->SRCommon}";
+$lang->action->dynamicAction->story['reviewed']              = "評審{$lang->SRCommon}";
+$lang->action->dynamicAction->story['closed']                = "關閉{$lang->SRCommon}";
+$lang->action->dynamicAction->story['assigned']              = "指派{$lang->SRCommon}";
+$lang->action->dynamicAction->story['changed']               = "變更{$lang->SRCommon}";
+$lang->action->dynamicAction->story['linked2plan']           = "{$lang->SRCommon}關聯計劃";
+$lang->action->dynamicAction->story['unlinkedfromplan']      = "計劃移除{$lang->SRCommon}";
+$lang->action->dynamicAction->story['linked2release']        = "{$lang->SRCommon}關聯發佈";
+$lang->action->dynamicAction->story['unlinkedfromrelease']   = "發佈移除{$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['undeleted']             = "還原{$lang->SRCommon}";
+$lang->action->dynamicAction->story['hidden']                = "隱藏{$lang->SRCommon}";
+$lang->action->dynamicAction->story['linked2execution']      = "關聯$lang->SRCommon";
+$lang->action->dynamicAction->story['unlinkedfromexecution'] = "移除$lang->SRCommon";
+$lang->action->dynamicAction->story['estimated']             = "估算$lang->SRCommon";
 
 $lang->action->dynamicAction->execution['opened']    = '創建' . $lang->executionCommon;
 $lang->action->dynamicAction->execution['edited']    = '編輯' . $lang->executionCommon;
@@ -348,8 +366,9 @@ $lang->action->dynamicAction->task['hidden']              = '隱藏任務';
 $lang->action->dynamicAction->task['svncommited']         = 'SVN提交';
 $lang->action->dynamicAction->task['gitcommited']         = 'GIT提交';
 
-$lang->action->dynamicAction->build['opened'] = '創建版本';
-$lang->action->dynamicAction->build['edited'] = '編輯版本';
+$lang->action->dynamicAction->build['opened']  = '創建版本';
+$lang->action->dynamicAction->build['edited']  = '編輯版本';
+$lang->action->dynamicAction->build['deleted'] = '刪除版本';
 
 $lang->action->dynamicAction->bug['opened']              = '創建Bug';
 $lang->action->dynamicAction->bug['edited']              = '編輯Bug';
@@ -407,6 +426,7 @@ $lang->action->dynamicAction->caselib['hidden']    = '隱藏用例庫';
 
 $lang->action->dynamicAction->doclib['created'] = '創建文檔庫';
 $lang->action->dynamicAction->doclib['edited']  = '編輯文檔庫';
+$lang->action->dynamicAction->doclib['deleted'] = '刪除文檔庫';
 
 $lang->action->dynamicAction->doc['created']   = '創建文檔';
 $lang->action->dynamicAction->doc['edited']    = '編輯文檔';
@@ -427,12 +447,11 @@ $lang->action->dynamicAction->entry['created'] = '添加應用';
 $lang->action->dynamicAction->entry['edited']  = '編輯應用';
 
 /* 用來生成相應對象的連結。*/
-global $config;
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $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|pgmproduct|programID=%s";
+$lang->action->label->program     = "項目集|program|product|programID=%s";
 $lang->action->label->project     = "項目|project|index|projectID=%s";
 if($config->systemMode == 'new')
 {
@@ -450,7 +469,7 @@ $lang->action->label->testtask    = '測試單|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '測試套件|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = '用例庫|caselib|view|libID=%s';
 $lang->action->label->todo        = '待辦|todo|view|todoID=%s';
-$lang->action->label->doclib      = '文檔庫|doc|browse|libID=%s';
+$lang->action->label->doclib      = '文檔庫|doc|objectLibs|type=&objectID=&libID=%s';
 $lang->action->label->doc         = '文檔|doc|view|docID=%s';
 $lang->action->label->user        = '用戶|user|view|account=%s';
 $lang->action->label->testreport  = '報告|testreport|view|report=%s';
@@ -468,12 +487,12 @@ $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['execution']   = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution']   = '執行';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = '用例';
 $lang->action->search->objectTypeList['caseresult']  = '用例結果';
 $lang->action->search->objectTypeList['stepresult']  = '用例步驟';
-$lang->action->search->objectTypeList['story']       = '用需/軟需';
+$lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
 $lang->action->search->objectTypeList['task']        = '任務';
 $lang->action->search->objectTypeList['testtask']    = '測試單';
 $lang->action->search->objectTypeList['user']        = '用戶';
diff --git a/module/action/model.php b/module/action/model.php
index ed30c6d03b..09eb78dbf3 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -36,6 +36,7 @@ class actionModel extends model
 
         $actor      = $actor ? $actor : $this->app->user->account;
         $actionType = strtolower($actionType);
+        $actor      = $actionType == 'openedbysystem' ? '' : $actor;
         if($actor == 'guest' and $actionType == 'logout') return false;
 
         $objectType = str_replace('`', '', $objectType);
@@ -48,6 +49,9 @@ class actionModel extends model
         $action->date       = helper::now();
         $action->extra      = $extra;
 
+        if($objectType == 'story' and $actionType !== 'reviewed' and strpos('reviewclosed,passreviewed,clarifyreviewed', $actionType) !== false) $action->actor = 'System';
+
+
         /* Use purifier to process comment. Fix bug #2683. */
         $action->comment = fixer::stripDataTags($comment);
 
@@ -58,10 +62,12 @@ class actionModel extends model
             if($autoDelete) $this->file->autoDelete($this->post->uid);
         }
 
-        /* Get product and project for this object. */
-        $productAndProject = $this->getProductAndProject($action->objectType, $objectID);
-        $action->product   = $productAndProject['product'];
-        $action->execution = $actionType == 'unlinkedfromproject' ? (int)$extra : (int)$productAndProject['project'];
+        /* Get product project and execution for this object. */
+        $relation          = $this->getRelatedFields($action->objectType, $objectID, $actionType, $extra);
+        $action->product   = (int)$relation['product'];
+        $action->project   = (int)$relation['project'];
+        $action->execution = (int)$relation['execution'];
+
 
         $this->dao->insert(TABLE_ACTION)->data($action)->autoCheck()->exec();
         $actionID = $this->dbh->lastInsertID();
@@ -136,43 +142,71 @@ class actionModel extends model
     }
 
     /**
-     * Get product and project of an object.
+     * Get product, project, execution of the object.
      *
      * @param  string $objectType
      * @param  int    $objectID
+     * @param  string $actionType
+     * @param  string $extra
      * @access public
      * @return array
      */
-    public function getProductAndProject($objectType, $objectID)
+    public function getRelatedFields($objectType, $objectID, $actionType = '', $extra = '')
     {
-        $emptyRecord = array('product' => ',0,', 'project' => 0);
+        $emptyRecord = array('product' => ',0,', 'project' => 0, 'execution' => 0);
 
-        /* If objectType is product or project, return the objectID. */
-        if($objectType == 'product') return array('product' => ",$objectID,", 'project' => 0);
-        if($objectType == 'program') return array('product' => "", 'project' => $objectID);
-        if($objectType == 'project')
+        /* If objectType is program, return empty record. */
+        if($objectType == 'program') return $emptyRecord;
+
+        /* If objectType is product or execution, return the objectID. */
+        if($objectType == 'product') return array('product' => ",$objectID,", 'project' => 0, 'execution' => 0);
+
+        /* If objectType is project or execution, return objectID products and project. */
+        if($objectType == 'project' or $objectType == 'execution')
         {
             $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($objectID)->fetchPairs('product');
             $productList = ',' . join(',', array_keys($products)) . ',';
-            return array('project' => $objectID, 'product' => $productList);
+
+            $relation = array($objectType => $objectID, 'product' => $productList);
+
+            if($objectType == 'execution')
+            {
+                $project = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($objectID)->fetch('project');
+                $relation['project'] = $project;
+            }
+            else
+            {
+                $relation['execution'] = 0;
+            }
+
+            return $relation;
         }
 
         /* Only process these object types. */
-        if(strpos(',story,productplan,release,task,build,bug,case,testtask,doc,', ",{$objectType},") !== false)
+        if(strpos($this->config->action->needGetRelateField, ",{$objectType},") !== false)
         {
             if(!isset($this->config->objectTables[$objectType])) return $emptyRecord;
 
             /* Set fields to fetch. */
+            $fields = '*';
             if(strpos('story, productplan, case',  $objectType) !== false) $fields = 'product';
-            if(strpos('build, bug, testtask, doc', $objectType) !== false) $fields = 'product, project';
+            if(strpos('build, bug, testtask, doc', $objectType) !== false) $fields = 'product, project, execution';
+            if(strpos('case, repo', $objectType) !== false) $fields = 'execution';
             if($objectType == 'release') $fields = 'product, build';
-            if($objectType == 'task')    $fields = 'project, story';
+            if($objectType == 'task')    $fields = 'project, execution, story';
 
-            $record = $this->dao->select($fields)->from($this->config->objectTables[$objectType])->where('id')->eq($objectID)->fetch();
+            if($objectType != 'team') $record = $this->dao->select($fields)->from($this->config->objectTables[$objectType])->where('id')->eq($objectID)->fetch();
 
             /* Process story, release and task. */
-            if($objectType == 'story')   $record->project = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($objectID)->orderBy('project_desc')->limit(1)->fetch('project');
+            if($objectType == 'story') $record->project = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($objectID)->orderBy('project_desc')->limit(1)->fetch('project');
             if($objectType == 'release') $record->project = $this->dao->select('project')->from(TABLE_BUILD)->where('id')->eq($record->build)->fetch('project');
+            if($objectType == 'team')
+            {
+                $team   = $this->dao->select('type')->from(TABLE_PROJECT)->where('id')->eq($objectID)->fetch();
+                $type   = $team->type == 'project' ? 'project' : 'execution';
+                $record = new stdclass();
+                $record->$type = $objectID;
+            }
             if($objectType == 'task')
             {
                 if($record->story != 0)
@@ -182,16 +216,43 @@ class actionModel extends model
                 }
                 else
                 {
-                    $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($record->project)->fetchPairs('product');
+                    $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($record->execution)->fetchPairs('product');
                     $record->product = join(',', array_keys($products));
                 }
             }
 
+            if($objectType == 'story' and ($actionType == 'linked2build' or $actionType == 'unlinkedfrombuild'))
+            {
+                $build = $this->dao->select('project,execution')->from(TABLE_BUILD)->where('id')->eq((int)$extra)->fetch();
+                $record->project   = $build->project;
+                $record->execution = $build->execution;
+            }
+
+            if($objectType == 'story' and $actionType == 'estimated')
+            {
+                $record->project   = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq((int)$extra)->fetch('project');
+                $record->execution = (int)$extra;
+            }
+
+            if($objectType == 'case' and (strpos(',linked2testtask,unlinkedfromtesttask,assigned,run,', ',' . $actionType . ',') !== false) and (int)$extra)
+            {
+                $testtask = $this->dao->select('project,execution')->from(TABLE_TESTTASK)->where('id')->eq((int)$extra)->fetch();
+                $record->project   = $testtask->project;
+                $record->execution = $testtask->execution;
+            }
+
+            if($objectType == 'whitelist' and $extra == 'product') $record->product = $objectID;
+            if($objectType == 'whitelist' and $extra == 'project') $record->project = $objectID;
+            if($objectType == 'whitelist' and ($extra == 'sprint' or $extra == 'stage')) $record->execution = $objectID;
+            if($actionType == 'unlinkedfromproject' or $actionType == 'linked2project') $record->project = (int)$extra ;
+            if($actionType == 'unlinkedfromexecution' or $actionType == 'linked2execution') $record->execution = (int)$extra;
+
             if($record)
             {
                 $record = (array)$record;
                 $record['product'] = isset($record['product']) ? ',' . $record['product'] . ',' : ',0,';
-                if(!isset($record['project'])) $record['project'] = 0;
+                if(empty($record['project']))   $record['project']   = 0;
+                if(empty($record['execution'])) $record['execution'] = 0;
                 return $record;
             }
 
@@ -214,7 +275,7 @@ class actionModel extends model
         $actions   = $this->dao->select('*')->from(TABLE_ACTION)
             ->beginIF($objectType == 'project')
             ->where("objectType IN('project', 'testtask', 'build')")
-            ->andWhere('execution')->eq((int)$objectID)
+            ->andWhere('project')->eq((int)$objectID)
             ->fi()
             ->beginIF($objectType != 'project')
             ->where('objectType')->eq($objectType)
@@ -247,13 +308,13 @@ class actionModel extends model
             elseif($actionName == 'linked2execution')
             {
                 $name = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($action->extra)->fetch('name');
-                if($name) $action->extra = common::hasPriv('project', 'story') ? html::a(helper::createLink('project', 'story', "projectID=$action->extra"), $name) : $name;
+                if($name) $action->extra = common::hasPriv('execution', 'view') ? html::a(helper::createLink('execution', 'view', "executionID=$action->execution"), $name) : $name;
             }
             elseif($actionName == 'linked2project')
             {
                 $name      = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($action->extra)->fetch('name');
                 $productID = trim($action->product, ',');
-                if($name) $action->extra = common::hasPriv('projectstory', 'story') ? html::a(helper::createLink('projectstory', 'story', "productID=$productID"), $name) : $name;
+                if($name) $action->extra = common::hasPriv('project', 'view') ? html::a(helper::createLink('project', 'view', "projectID=$action->project"), $name) : $name;
             }
             elseif($actionName == 'linked2plan')
             {
@@ -293,7 +354,7 @@ class actionModel extends model
             {
                 $name      = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($action->extra)->fetch('name');
                 $productID = trim($action->product, ',');
-                if($name) $action->extra = common::hasPriv('projectstory', 'story') ? html::a(helper::createLink('projectstory', 'story', "productID=$productID"), "#$action->extra " . $name) : "#$action->extra " . $name;
+                if($name) $action->extra = common::hasPriv('projectstory', 'story') ? html::a(helper::createLink('projectstory', 'story', "projectID=$action->execution&productID=$productID"), "#$action->extra " . $name) : "#$action->extra " . $name;
             }
             elseif($actionName == 'unlinkedfrombuild')
             {
@@ -396,7 +457,7 @@ class actionModel extends model
             }
             elseif(($actionName == 'opened' or $actionName == 'managed' or $actionName == 'edited') and ($objectType == 'execution' || $objectType == 'project'))
             {
-                $this->app->loadLang('executon');
+                $this->app->loadLang('execution');
                 $linkedProducts = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($action->extra)->fetchPairs('id', 'name');
                 $action->extra  = '';
                 if($linkedProducts)
@@ -501,7 +562,7 @@ class actionModel extends model
 
         foreach($typeTrashes as $objectType => $objectIds)
         {
-            if(!isset($this->config->objectTables[$objectType]))continue;
+            if(!isset($this->config->objectTables[$objectType])) continue;
 
             $objectIds = array_unique($objectIds);
             $table     = $this->config->objectTables[$objectType];
@@ -576,7 +637,11 @@ class actionModel extends model
          */
         if(empty($desc))
         {
-            if(isset($this->lang->$objectType) && isset($this->lang->$objectType->action->$actionType))
+            if($action->objectType == 'story' and $action->action == 'reviewed' and strpos($action->extra, ',') !== false)
+            {
+                $desc = $this->lang->$objectType->action->rejectreviewed;
+            }
+            elseif(isset($this->lang->$objectType) && isset($this->lang->$objectType->action->$actionType))
             {
                 $desc = $this->lang->$objectType->action->$actionType;
             }
@@ -617,14 +682,23 @@ class actionModel extends model
             /* Fix bug #741. */
             if(isset($desc['extra'])) $desc['extra'] = $this->lang->$objectType->{$desc['extra']};
 
+            $actionDesc = '';
             if(isset($desc['extra'][$extra]))
             {
-                echo str_replace('$extra', $desc['extra'][$extra], $desc['main']);
+                $actionDesc = str_replace('$extra', $desc['extra'][$extra], $desc['main']);
             }
             else
             {
-                echo str_replace('$extra', $action->extra, $desc['main']);
+                $actionDesc = str_replace('$extra', $action->extra, $desc['main']);
             }
+
+            if($action->objectType == 'story' and $action->action = 'reviewed' and strpos($action->extra, ',') !== false)
+            {
+                list($extra, $reason) = explode(',', $extra);
+                $desc['reason'] = $this->lang->$objectType->{$desc['reason']};
+                $actionDesc = str_replace(array('$extra', '$reason'), array($desc['extra'][$extra], $desc['reason'][$reason]), $desc['main']);
+            }
+            echo $actionDesc;
         }
         else
         {
@@ -640,13 +714,14 @@ class actionModel extends model
      * @param  string $orderBy
      * @param  object $pager
      * @param  string|int $productID   all|int(like 123)|notzero   all => include zero, notzero, greater than 0
-     * @param  string|int $projectID same as productID
+     * @param  string|int $projectID   same as productID
+     * @param  string|int $executionID same as productID
      * @param  string $date
      * @param  string $direction
      * @access public
      * @return array
      */
-    public function getDynamic($account = 'all', $period = 'all', $orderBy = 'date_desc', $pager = null, $productID = 'all', $projectID = 'all', $date = '', $direction = 'next')
+    public function getDynamic($account = 'all', $period = 'all', $orderBy = 'date_desc', $pager = null, $productID = 'all', $projectID = 'all', $executionID = 'all', $date = '', $direction = 'next')
     {
         /* Computer the begin and end date of a period. */
         $beginAndEnd = $this->computeBeginAndEnd($period);
@@ -654,32 +729,32 @@ class actionModel extends model
 
         /* Build has priv condition. */
         $condition = 1;
-        if($productID == 'all') $products = $this->app->user->view->products;
-        if($projectID == 'all') $projects = $this->app->user->view->projects;
+        if($productID == 'all')   $products   = $this->app->user->view->products;
+        if($projectID == 'all')   $projects   = $this->app->user->view->projects;
+        if($executionID == 'all') $executions = $this->app->user->view->sprints;
 
         if($productID == 'all' or $projectID == 'all')
         {
-            $projectCondition = $projectID == 'all' ? "execution " . helper::dbIN($projects) : '';
-            $productCondition = $productID == 'all' ? "INSTR('," . $products . ",', product) > 0" : '';
-            if(is_numeric($productID)) $productCondition = "product like'%,$productID,%' or product='$productID'";
-            if(is_numeric($projectID)) $projectCondition = "execution='$projectID'";
+            $productCondition   = $productID   == 'all' ? "INSTR('," . $products . ",', product) > 0" : '';
+            $projectCondition   = $projectID   == 'all' ? "project " . helper::dbIN($projects) : '';
+            $executionCondition = $executionID == 'all' ? "execution " . helper::dbIN($executions) : '';
+            if(is_numeric($productID))   $productCondition = "product like '%,$productID,%' or product = '$productID'";
+            if(is_numeric($projectID))   $projectCondition = "project = '$projectID'";
+            if(is_numeric($executionID)) $executionCondition = "execution = '$executionID'";
 
-            $condition = "(product =',0,' AND execution = '0')";
-            if($projectCondition) $condition .= ' OR ' . $projectCondition;
-            if($productCondition) $condition .= ' OR ' . $productCondition;
+            $condition = "(product =',0,' AND project = '0' AND execution = 0)";
+            if($productCondition)   $condition .= ' OR ' . $productCondition;
+            if($projectCondition)   $condition .= ' OR ' . $projectCondition;
+            if($executionCondition) $condition .= ' OR ' . $executionCondition;
             if($this->app->user->admin) $condition = 1;
         }
 
         /* If is project, select its related. */
         $executions = array();
-        if(is_numeric($projectID))
-        {
-            $project = $this->loadModel('project')->getByID($projectID);
-            if(isset($project->type) and $project->type == 'project') $executions = $this->loadModel('execution')->getPairs($projectID);
-        }
+        if(is_numeric($projectID)) $executions = $this->loadModel('execution')->getPairs($projectID);
 
         $this->loadModel('doc');
-        $libs = $this->doc->getLibs('all');
+        $libs = $this->doc->getLibs('includeDeleted');
         $docs = $this->doc->getPrivDocs(array_keys($libs), 0, 'all');
 
         $actionCondition = $this->getActionCondition();
@@ -695,12 +770,14 @@ class actionModel extends model
             ->andWhere()
             ->markLeft(1)
             ->where(1)
-            ->beginIF(is_numeric($projectID))->orWhere('execution')->eq($projectID)->fi()
+            ->beginIF(is_numeric($projectID))->andWhere('project')->eq($projectID)->fi()
             ->beginIF(!empty($executions))->orWhere('execution')->in(array_keys($executions))->fi()
+            ->beginIF(is_numeric($executionID))->andWhere('execution')->eq($executionID)->fi()
             ->markRight(1)
             ->beginIF($productID == 'notzero')->andWhere('product')->gt(0)->andWhere('product')->notlike('%,0,%')->fi()
-            ->beginIF($projectID == 'notzero')->andWhere('execution')->gt(0)->fi()
-            ->beginIF($projectID == 'all' or $productID == 'all')->andWhere("IF((objectType!= 'doc' && objectType!= 'doclib'), ($condition), '1=1')")->fi()
+            ->beginIF($projectID == 'notzero')->andWhere('project')->gt(0)->fi()
+            ->beginIF($executionID == 'notzero')->andWhere('execution')->gt(0)->fi()
+            ->beginIF($productID == 'all' or $projectID == 'all' or $executionID == 'all')->andWhere("IF((objectType!= 'doc' && objectType!= 'doclib'), ($condition), '1=1')")->fi()
             ->beginIF($docs and !$this->app->user->admin)->andWhere("IF(objectType != 'doc', '1=1', objectID " . helper::dbIN($docs) . ")")->fi()
             ->beginIF($libs and !$this->app->user->admin)->andWhere("IF(objectType != 'doclib', '1=1', objectID " . helper::dbIN(array_keys($libs)) . ') ')->fi()
             ->beginIF($actionCondition)->andWhere("($actionCondition)")->fi()
@@ -740,6 +817,7 @@ class actionModel extends model
      * Get dynamic by search.
      *
      * @param  array  $products
+     * @param  array  $projects
      * @param  array  $executions
      * @param  int    $queryID
      * @param  string $orderBy
@@ -749,7 +827,7 @@ class actionModel extends model
      * @access public
      * @return array
      */
-    public function getDynamicBySearch($products, $executions, $queryID, $orderBy = 'date_desc', $pager = null, $date = '', $direction = 'next')
+    public function getDynamicBySearch($products, $projects, $executions, $queryID, $orderBy = 'date_desc', $pager = null, $date = '', $direction = 'next')
     {
         $query = $queryID ? $this->loadModel('search')->getQuery($queryID) : '';
 
@@ -761,7 +839,8 @@ class actionModel extends model
         }
         if($this->session->actionQuery == false) $this->session->set('actionQuery', ' 1 = 1');
 
-        $allProduct    = "`product`   = 'all'";
+        $allProducts   = "`product`   = 'all'";
+        $allProjects   = "`project`   = 'all'";
         $allExecutions = "`execution` = 'all'";
         $actionQuery   = $this->session->actionQuery;
 
@@ -770,14 +849,25 @@ class actionModel extends model
         {
             $productID = $out[1];
         }
+
         /* If the sql not include 'product', add check purview for product. */
-        if(strpos($actionQuery, $allProduct) === false)
+        if(strpos($actionQuery, $allProducts) === false)
         {
             if(!in_array($productID, array_keys($products))) return array();
         }
         else
         {
-            $actionQuery = str_replace($allProduct, '1', $actionQuery);
+            $actionQuery = str_replace($allProducts, '1', $actionQuery);
+        }
+
+        /* If the sql not include 'project', add check purview for project. */
+        if(strpos($actionQuery, $allProjects) === false)
+        {
+            $actionQuery = $actionQuery . ' AND `project`' . helper::dbIN(array_keys($projects));
+        }
+        else
+        {
+            $actionQuery = str_replace($allProjects, '1', $actionQuery);
         }
 
         /* If the sql not include 'execution', add check purview for execution. */
@@ -831,6 +921,7 @@ class actionModel extends model
     public function transformActions($actions)
     {
         $this->app->loadLang('todo');
+        $requirements = array();
 
         /* Get commiters. */
         $commiters = $this->loadModel('user')->getCommiters();
@@ -839,10 +930,10 @@ class actionModel extends model
         foreach($actions as $object) $objectTypes[$object->objectType][] = $object->objectID;
         foreach($objectTypes as $objectType => $objectIds)
         {
-            if(!isset($this->config->objectTables[$objectType])) continue;    // If no defination for this type, omit it.
+            if(!isset($this->config->objectTables[$objectType]) and $objectType != 'makeup') continue;    // If no defination for this type, omit it.
 
             $objectIds = array_unique($objectIds);
-            $table     = $this->config->objectTables[$objectType];
+            $table     = $objectType == 'makeup' ? '`zt_overtime`' : $this->config->objectTables[$objectType];
             $field     = $this->config->action->objectNameFields[$objectType];
             if($table != TABLE_TODO)
             {
@@ -864,6 +955,29 @@ class actionModel extends model
                         $objectProject[$object->id] = $object->project > 0 ? $object->project : $object->id;
                     }
                 }
+                elseif($objectType == 'story')
+                {
+                    $objectInfo = $this->dao->select('id,title,type')->from($table)->where('id')->in($objectIds)->fetchAll();
+                    foreach($objectInfo as $object)
+                    {
+                        $objectName[$object->id] = $object->title;
+                        if($object->type == 'requirement') $requirements[$object->id] = $object->id;
+                    }
+                    $objectProject = array();
+                }
+                elseif($objectType == 'team')
+                {
+                    $objectInfo = $this->dao->select('id,team,type')->from(TABLE_PROJECT)
+                        ->where('id')->in($objectIds)
+                        ->fetchAll();
+
+                    $objectProject = array();
+                    foreach($objectInfo as $object)
+                    {
+                        $objectName[$object->id] = $object->team;
+                        if($object->type == 'project') $objectProject[$object->id] = $object->id;
+                    }
+                }
                 else
                 {
                     $objectName    = $this->dao->select("id, $field AS name")->from($table)->where('id')->in($objectIds)->fetchPairs();
@@ -909,6 +1023,10 @@ class actionModel extends model
             if(isset($this->lang->action->label->$objectType))
             {
                 $objectLabel = $this->lang->action->label->$objectType;
+
+                /* Replace story to requirement. */
+                if(in_array($action->objectID, $requirements)) $objectLabel = str_replace($this->lang->SRCommon, $this->lang->URCommon, $objectLabel);
+
                 if(!is_array($objectLabel)) $action->objectLabel = $objectLabel;
                 if(is_array($objectLabel) and isset($objectLabel[$actionType])) $action->objectLabel = $objectLabel[$actionType];
             }
@@ -937,6 +1055,13 @@ class actionModel extends model
                 $action->objectLink  = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID), '', '', $projectID);
                 $action->objectLabel = $objectLabel;
             }
+            elseif($action->objectType == 'team')
+            {
+                $action->objectLink = '';
+                if($action->project) $action->objectLink = helper::createLink('project', 'manageMembers', 'projectID=' . $action->project);
+                if($action->execution) $action->objectLink = helper::createLink('execution', 'team', 'executionID=' . $action->execution);
+                $action->objectLabel = zget($this->lang->action->objectTypes, $action->objectLabel);
+            }
             else
             {
                 $action->objectLink = '';
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 9f41580d6d..d29da838b8 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
   <div class='btn-toolbar pull-right'>
     <?php if($type == 'hidden') echo html::a(inLink('trash', "type=all"),    $lang->goback, '', "class='btn'");?>
     <?php if($type == 'all')    echo html::a(inLink('trash', "type=hidden"), "<i class='icon-eye-close'></i> " . $lang->action->dynamic->hidden, '', "class='btn btn-danger'");?>
@@ -36,10 +35,10 @@
       <thead>
         <tr class='colhead'>
           <th class='w-130px'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
-          <th class='w-id'>  <?php common::printOrderLink('objectID',   $orderBy, $vars, $lang->idAB);?></th>
+          <th class='w-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
-          <th class='w-100px'><?php common::printOrderLink('actor',     $orderBy, $vars, $lang->action->actor);?></th>
-          <th class='w-150px'><?php common::printOrderLink('date',      $orderBy, $vars, $lang->action->date);?></th>
+          <th class='w-100px'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
+          <th class='w-150px'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='w-100px'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
@@ -55,8 +54,8 @@
             $methodName = 'view';
             if($module == 'caselib')
             {
-                $methodName = 'libview';
-                $module     = 'testsuite';
+                $methodName = 'view';
+                $module     = 'caselib';
             }
             if(isset($config->action->customFlows[$action->objectType]))
             {
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index e954094be1..eb244aac68 100644
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -9,7 +9,6 @@
  * @version     $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->admin->common        = 'Admin';
 $lang->admin->index         = 'Admin Home';
 $lang->admin->checkDB       = 'Datenbank prüfen';
 $lang->admin->sso           = 'SSO';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 0d73574ab9..a416f743b0 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -9,7 +9,6 @@
  * @version     $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->admin->common        = 'Admin';
 $lang->admin->index         = 'Admin Home';
 $lang->admin->checkDB       = 'Check Database';
 $lang->admin->sso           = 'Zdoo';
@@ -80,7 +79,7 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as DOB';
 $lang->admin->safe->modifyPasswordList[1] = 'Yes';
 $lang->admin->safe->modifyPasswordList[0] = 'No';
 
-$lang->admin->safe->loginCaptchaList[1] = 'Yes'
+$lang->admin->safe->loginCaptchaList[1] = 'Yes';
 $lang->admin->safe->loginCaptchaList[0] = 'No';
 
 $lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added or edited.';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index f4068396aa..daba420ed0 100644
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -9,7 +9,6 @@
  * @version     $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
  * @link        https://www.zentao.pm
  */
-$lang->admin->common        = 'Admin';
 $lang->admin->index         = 'Admin Home';
 $lang->admin->checkDB       = 'Check Database';
 $lang->admin->sso           = 'Zdoo';
diff --git a/module/admin/lang/vi.php b/module/admin/lang/vi.php
index ba969114ba..7d0347cfde 100644
--- a/module/admin/lang/vi.php
+++ b/module/admin/lang/vi.php
@@ -9,7 +9,6 @@
  * @version  $Id: vi.php 4460 2013-02-26 02:28:02Z quocnho@gmail.com $
  * @link  http://www.zentao.net
  */
-$lang->admin->common        = 'Quản trị';
 $lang->admin->index         = 'Trang quản trị';
 $lang->admin->checkDB       = 'Kiểm tra CSDL';
 $lang->admin->sso           = 'Zdoo';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 1019b561a9..9c412d4b62 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -9,7 +9,6 @@
  * @version     $Id: zh-cn.php 4767 2013-05-05 06:10:13Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->admin->common        = '后台管理';
 $lang->admin->index         = '后台管理首页';
 $lang->admin->checkDB       = '检查数据库';
 $lang->admin->sso           = 'ZDOO集成';
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index b95dc6a627..ba17bccad6 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -9,7 +9,6 @@
  * @version     $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->admin->common        = '後台管理';
 $lang->admin->index         = '後台管理首頁';
 $lang->admin->checkDB       = '檢查資料庫';
 $lang->admin->sso           = 'ZDOO整合';
@@ -54,13 +53,14 @@ $lang->admin->bind->caption = '關聯社區帳號';
 $lang->admin->bind->success = "關聯賬戶成功";
 
 $lang->admin->safe = new stdclass();
-$lang->admin->safe->common     = '安全策略';
-$lang->admin->safe->set        = '密碼安全設置';
-$lang->admin->safe->password   = '密碼安全';
-$lang->admin->safe->weak       = '常用弱口令';
-$lang->admin->safe->reason     = '類型';
-$lang->admin->safe->checkWeak  = '弱口令掃瞄';
-$lang->admin->safe->changeWeak = '修改弱口令密碼';
+$lang->admin->safe->common       = '安全策略';
+$lang->admin->safe->set          = '密碼安全設置';
+$lang->admin->safe->password     = '密碼安全';
+$lang->admin->safe->weak         = '常用弱口令';
+$lang->admin->safe->reason       = '類型';
+$lang->admin->safe->checkWeak    = '弱口令掃瞄';
+$lang->admin->safe->changeWeak   = '修改弱口令密碼';
+$lang->admin->safe->loginCaptcha = '登錄使用驗證碼';
 $lang->admin->safe->modifyPasswordFirstLogin = '首次登錄修改密碼';
 
 $lang->admin->safe->modeList[0] = '不檢查';
@@ -79,5 +79,8 @@ $lang->admin->safe->reasonList['birthday'] = '與生日相同';
 $lang->admin->safe->modifyPasswordList[1] = '必須修改';
 $lang->admin->safe->modifyPasswordList[0] = '不強制';
 
+$lang->admin->safe->loginCaptchaList[1] = '是';
+$lang->admin->safe->loginCaptchaList[0] = '否';
+
 $lang->admin->safe->noticeMode   = '系統會在登錄、創建和修改用戶、修改密碼的時候檢查用戶口令。';
 $lang->admin->safe->noticeStrong = '密碼長度越長，含有大寫字母或數字或特殊符號越多，密碼字母越不重複，安全度越強！';
diff --git a/module/admin/model.php b/module/admin/model.php
index 2dfd7a04b2..fcb74b5bb7 100644
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -248,10 +248,10 @@ class adminModel extends model
         }
 
         if(isset($weaks[$user->password])) return true;
-        if($user->password and md5($user->account)) return true;
-        if($user->phone    and $user->password and md5($user->phone))    return true;
-        if($user->mobile   and $user->password and md5($user->mobile))   return true;
-        if($user->birthday and $user->password and md5($user->birthday)) return true;
+        if($user->password == md5($user->account)) return true;
+        if($user->phone    and $user->password == md5($user->phone))    return true;
+        if($user->mobile   and $user->password == md5($user->mobile))   return true;
+        if($user->birthday and $user->password == md5($user->birthday)) return true;
         return false;
     }
 }
diff --git a/module/admin/view/checkweak.html.php b/module/admin/view/checkweak.html.php
index 3f8456d442..bfe6962ddc 100644
--- a/module/admin/view/checkweak.html.php
+++ b/module/admin/view/checkweak.html.php
@@ -11,11 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'>
-    <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
-  </div>
-</div>
 <div class="main-row">
   <div class='side-col' id='sidebar'>
     <div class='cell'>
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index e020158c19..2868a02f65 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
+    <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
   </div>
 </div>
 <div class="main-row">
diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php
index d1c50a9596..5be91c71b6 100644
--- a/module/admin/view/sso.html.php
+++ b/module/admin/view/sso.html.php
@@ -11,9 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php'; ?>
-<div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('sso');?></div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/module/automation/config.php b/module/automation/config.php
index b3d9bbc7f3..f74910140d 100644
--- a/module/automation/config.php
+++ b/module/automation/config.php
@@ -1 +1,7 @@
 <?php
+$config->automation->ztfSite         = 'https://ztf.im';
+$config->automation->ztfDownload     = 'https://ztf.im/ztf.html';
+$config->automation->ztfManual       = 'https://ztf.im/book/ztf/ztf-about-26.html';
+$config->automation->zendataSite     = 'https://www.zendata.cn';
+$config->automation->zendataDownload = 'https://www.zendata.cn/download.html';
+$config->automation->zendataManual   = 'https://www.zendata.cn/book/zendata/why-zendata-115.html';
diff --git a/module/automation/control.php b/module/automation/control.php
index c81ec5bedf..8c7ad1eedf 100644
--- a/module/automation/control.php
+++ b/module/automation/control.php
@@ -11,14 +11,6 @@
  */
 class automation extends control
 {
-    /** 
-     * Project id.
-     *
-     * @var    int
-     * @access public
-     */
-    public $projectID = 0;
-
     /** 
      * Products.
      *
@@ -36,16 +28,7 @@ class automation extends control
     public function __construct($moduleName = '', $methodName = '')
     {
         parent::__construct($moduleName, $methodName);
-
-        /* Set testtask menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID)
-        {
-            $this->app->loadConfig('qa');
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-        }
-
-        $this->view->products = $this->products = $this->loadModel('product')->getProductPairsByProject($this->projectID);
+        $this->view->products = $this->products = $products = $this->loadModel('product')->getPairs();
     }
 
     /**
@@ -61,7 +44,7 @@ class automation extends control
         /* Set menu. */
         $productID = $this->product->saveState($productID, $this->products);
         if(empty($branch)) $branch = (int)$this->cookie->preBranch;
-        $this->automation->setMenu($this->products, $productID, $branch);
+        $this->loadModel('qa')->setMenu($this->products, $productID, $branch);
 
         $this->view->title      = $this->lang->automation->common;
         $this->view->position[] = $this->lang->automation->browse;
diff --git a/module/automation/css/browse.css b/module/automation/css/browse.css
new file mode 100644
index 0000000000..e49bb0b476
--- /dev/null
+++ b/module/automation/css/browse.css
@@ -0,0 +1,53 @@
+.ztf-block {width: 100%; margin-top: 22px; background: linear-gradient(to bottom, #deeaf8 , #f4f7fe); display: inline-flex; box-shadow: 2px 2px 5px #e2dede;}
+.ztf-logo {width: 40%; height: 190px; display: inline-block; line-height: 190px; text-align: right; padding-right: 65px;}
+.ztf-download {width: 45%; height: 190px; display: inline-block;}
+.ztf-download-trait {display: inline-block; width: 100%; margin: 45px 0px 6px 0px; font-weight:bold; font-size: 15px; color: #0c4678;}
+.ztf-download-trait div {width: 35%; float: left; padding: 8px 0px;}
+.ztf-download-button {width: 100%;}
+.ztf-download-button a {margin-right: 15px; font-weight:bold; font-size: 14px;}
+.dot-symbol{font-size: 12px; margin-right: 5px;}
+
+.block-content {width: 100%;}
+.block-details {width: 49%; display: inline-block; padding: 30px 140px; margin-top: 20px; box-shadow: 2px 2px 5px #e2dede;}
+.block-details-right {float: right;}
+.block-details p {font-size: 18px; font-weight:bold; margin: 0 0 10px 20px;}
+.block-details li {width: 40%; float: left; padding: 6px 0px; font-size: 14px; font-weight:bold; color: #666666; text-align: left; list-style:none;}
+.block-details-line li {width: 100%;}
+
+.zendata-block {width: 100%; margin-top: 40px; background: linear-gradient(to bottom, #deeaf8 , #f4f7fe); display: inline-flex; box-shadow: 2px 2px 5px #e2dede;}
+.zendata-logo {width: 40%; height: 170px; display: inline-block; line-height: 170px; text-align: right; padding-right: 90px;}
+.zendata-download {width: 45%; height: 170px; display: inline-block;}
+.zendata-download-trait {display: inline-block; width: 100%; margin: 60px 0px 6px 0px; font-weight:bold; font-size: 15px; color: #0c4678;}
+.zendata-download-trait div {margin-right: 35px; float: left; padding: 8px 0px;}
+.zendata-download-button {width: 100%;}
+.zendata-download-button a {margin-right: 15px; font-weight:bold; font-size: 14px;}
+
+.zentata-content {display: table; width: 100%; table-layout: fixed; margin-top: 20px;}
+.block-zendata-block {display: table-cell;}
+.block-zendata {width: 96%; display: inline-block; padding: 30px 40px; margin-top: 20px; box-shadow: 2px 2px 5px #e2dede;}
+.block-zendata p {font-size: 18px; font-weight:bold; margin: 0 0 10px 20px;}
+.block-zendata li {width: 100%; float: left; padding: 6px 0px; font-size: 14px; font-weight:bold; color: #666666; text-align: left; list-style:none;}
+.qr-code {margin-top: 20px; padding: 20px 0px 20px 58px; box-shadow: 2px 2px 5px #e2dede;}
+.qr-code-img {width: 90px; height: 90px; display: inline-block; float: left;}
+.qr-code-details {display: inline-block; margin: 10px 0px 0px 10px;}
+.qr-code-details div{margin: 5px 0px;}
+.qr-code-group {color: #898989;}
+@media screen and (max-height: 768px)
+{
+  .qr-code {padding: 20px 0px 20px 43px;}
+  .block-details li {width: 50%;}
+  .block-details-line li {width: 100%;}
+  .ztf-download-trait div {width: 47%;}
+  .block-details {padding: 30px 60px;}
+  .block-zendata {padding: 30px 25px;}
+}
+
+@media screen and (max-height: 720px)
+{
+  .zendata-download {width: 50%;}
+  .ztf-download-trait {margin: 35px 0px 6px 0px;}
+  .block-zendata {padding: 30px 14px;}
+  .ztf-download {width: 48%;}
+  .qr-code {padding: 20px 0px 20px 32px;}
+}
+.btn-automation {background: linear-gradient(to bottom, #0bb6fb, #0d67e1); border: 0px; padding: 8px 12px;}
diff --git a/module/automation/lang/en.php b/module/automation/lang/en.php
new file mode 100644
index 0000000000..9f68111386
--- /dev/null
+++ b/module/automation/lang/en.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * The automation module zh-cn file 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      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     automation
+ * @version     $Id: zh-cn.php 4767 2013-05-05 06:10:13Z wwccss $
+ * @link        http://www.zentao.net
+ */
+$lang->automation->common = 'Automated Testing';
+$lang->automation->browse = 'Home';
+
+$lang->automation->title = 'Test Automation Solutions';
+
+$lang->automation->ztfSite     = 'ZTF Website';
+$lang->automation->ztfDownload = 'ZTF Download';
+$lang->automation->ztfManual   = 'ZTF Manual';
+
+$lang->automation->ztfFeature1 = 'ZTF solves problems for you.';
+$lang->automation->ztfFeature2 = 'ZTF solves the following problems for you:';
+$lang->automation->ztfFeature3 = 'Management of use cases';
+$lang->automation->ztfFeature4 = 'Comparison of test results';
+$lang->automation->ztfFeature5 = 'Execution of test scripts';
+$lang->automation->ztfFeature6 = 'Bug reporting';
+
+$lang->automation->ztfFeature7  = 'ZTF is not depended on the environment';
+$lang->automation->ztfFeature8  = 'Written in Go';
+$lang->automation->ztfFeature9  = 'Deploy with no dependencies';
+$lang->automation->ztfFeature10 = 'Works on all platforms';
+$lang->automation->ztfFeature11 = 'Has only one executable';
+
+$lang->automation->ztfFeature12 = 'ZTF is for all automated testing types';
+$lang->automation->ztfFeature13 = 'Support for common development languages';
+$lang->automation->ztfFeature14 = 'Can be integrated with known testing frameworks';
+$lang->automation->ztfFeature15 = 'No specific script implementation requried';
+
+$lang->automation->ztfFeature16 = 'Export test cases to scripts in bulk';
+$lang->automation->ztfFeature17 = 'Submit execution results to ZenTao';
+$lang->automation->ztfFeature18 = 'Create bugs from execution results';
+$lang->automation->ztfFeature19 = 'Integrate ZenTao ALM';
+
+$lang->automation->zendataSite     = 'ZenData Website';
+$lang->automation->zendataDownload = 'ZenData Download';
+$lang->automation->zendataManual   = 'ZenData Manual';
+
+$lang->automation->zendata         = 'A generic data generation tool';
+$lang->automation->zendataFeature1 = 'Easy to get started with no coding knowledge required';
+$lang->automation->zendataFeature2 = 'Customizable data format with no restrictions';
+$lang->automation->zendataFeature3 = 'Generate a million pieces of data with one click';
+
+$lang->automation->zendataFeature4 = 'Cross-platform and cross-language';
+$lang->automation->zendataFeature5 = 'Only one executable is required to run it';
+$lang->automation->zendataFeature6 = 'For Windows, Linux, and MacOS';
+$lang->automation->zendataFeature7 = 'For various languages';
+
+$lang->automation->zendataFeature8  = 'All kinds of black tricks';
+$lang->automation->zendataFeature9  = 'Interval, Step Size, Random, Repeat, and Reference';
+$lang->automation->zendataFeature10 = 'Specify a list of files to be queried in Excel';
+$lang->automation->zendataFeature11 = 'Parallel generation, recursive generation, and reverse parsing';
+
+$lang->automation->groupTips        = 'Welcome to the automated testing QQ group';
+$lang->automation->groupTitle       = 'Software testing group:';
+$lang->automation->qqGroup          = '522506766';
+$lang->automation->groupDescription = 'Software testing community for software testers to share software testing tools and methods and improve software testing skills';
diff --git a/module/automation/lang/zh-cn.php b/module/automation/lang/zh-cn.php
index 246a9d540f..f128edee00 100644
--- a/module/automation/lang/zh-cn.php
+++ b/module/automation/lang/zh-cn.php
@@ -12,200 +12,55 @@
 $lang->automation->common = '自动化测试';
 $lang->automation->browse = '首页';
 
-$lang->automation->description = '自动化测试解决方案';
-$lang->automation->ztf         = 'ZTF自动化测试管理框架';
-$lang->automation->zendata     = 'ZenData数据生成工具';
+$lang->automation->title = '自动化测试解决方案';
 
-$lang->automation->details = <<<EOF
-<article class="article">
-  <header>
-    <h1 class="text-center">自动化测试解决方案</h1>
-    <div class="abstract">
-      <p>
-      摘要：欢迎使用禅道提供的自动化解决方案，本次为大家带来了两款工具。Zentao Testing Framework，简称ZTF，是一款开源自动化测试管理框架。
-      ZenData可以用于手工测试场景下面测试数据的准备，也可以用于自动化测试脚本里面的数据生成和解析。
-      </p>
-    </div>
-  </header>
+$lang->automation->ztfSite     = '禅道ZTF官网';
+$lang->automation->ztfDownload = 'ZTF框架下载';
+$lang->automation->ztfManual   = 'ZTF框架手册';
 
-  <section class="content">
-    <h2>ZTF自动化测试管理框架</h2>
-    <p>
-      Zentao Testing Framework，简称ZTF，是一款开源自动化测试管理框架。
-      和市面上已有的自动化测试框架相比，ZTF更聚焦于自动化测试的管理功能。
-      ZTF提供了自动化测试脚本的定义、管理、驱动、执行结果的回传、bug的创建以及和其他自动化测框架的集成。
-      ZTF使用go语言开发，可以支持各种平台。ZTF支持常见的编程语言，您可以选择您喜欢用的语言来开发自动化测试脚本。
-    </p>
-    <div class="section">
-      <div class="text-left" style="padding:25px 15px 10px 15px;">
-        <p>
-          <a href="https://ztf.im/index.html" class="btn btn-primary bg-primary btn-lg" target="_blank">禅道ZTF官网</a> &nbsp; &nbsp;
-          <a href="https://ztf.im/ztf.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZTF框架下载</a> &nbsp; &nbsp;
-          <a href="https://ztf.im/book/ztf/ztf-about-26.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZTF框架手册</a>
-        </p>
-        <div style="margin-top:15px;" class="text-muted">
-          <p>
-            我们还提供了QQ群和微信群的交流方式，官方QQ技术支持响应时间为：上午9:00—11:30，下午13:00—17:30（周六周日，节假日休息）
-          </p>
-          <p>
-            软件测试交流群： 522506766  (添加客服微信： easycorp666，可邀请您加入软件测试微信群)
-          </p>
-        </div>
-      </div>
-    </div>
-    <h2>ZenData数据生成工具</h2>
-    <p>
-      ZenData主要两大功能：数据生成和数据解析。通过一个配置文件，可以使用ZenData生成您想要的各种数据。
-      同样也可以对某一个数据文件，指定其数据类型定义的配置文件，完成到结构化数据的解析。
-      ZenData可以用于手工测试场景下面测试数据的准备，也可以用于自动化测试脚本里面的数据生成和解析。还可以一键生成海量数据用于性能和压力测试。
-    </p>
-    <div class="section">
-      <div class="text-left" style="padding:25px 15px 10px 15px;">
-        <p>
-          <a href="https://www.zendata.cn/index.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZenData官网</a> &nbsp; &nbsp;
-          <a href="https://www.zendata.cn/download.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZenData下载</a> &nbsp; &nbsp;
-          <a href="https://www.zendata.cn/book/zendata/why-zendata-115.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZenData手册</a>
-        </p>
-        <div style="margin-top:15px;" class="text-muted">
-          <p>
-            我们还提供了QQ群和微信群的交流方式，官方QQ技术支持响应时间为：上午9:00—11:30，下午13:00—17:30（周六周日，节假日休息）
-          </p>
-          <p>
-            软件测试交流群： 522506766  (添加客服微信： easycorp666，可邀请您加入软件测试微信群)
-          </p>
-        </div>
-      </div>
-    </div>
-  </section>
-</article>
-EOF;
-$lang->automation->ztfDetails = <<<EOF
-<article class="article">
-  <header>
-    <h1 class="text-center">ZTF自动化测试管理框架</h1>
-    <div class="abstract">
-      <p>
-        摘要：Zentao Testing Framework，简称ZTF，是一款开源自动化测试管理框架。
-      </p>
-    </div>
-  </header>
+$lang->automation->ztfFeature1 = 'ZTF为你解决各种问题';
+$lang->automation->ztfFeature2 = 'ZTF为你解决如下问题';
+$lang->automation->ztfFeature3 = '用例信息的管理';
+$lang->automation->ztfFeature4 = '测试结果的对比';
+$lang->automation->ztfFeature5 = '测试脚本的执行';
+$lang->automation->ztfFeature6 = '缺陷Bug的提交';
 
-  <section class="content">
-    <h4>一、ZTF是什么</h4>
-    <p>
-      Zentao Testing Framework，简称ZTF，是一款开源自动化测试管理框架。
-      和市面上已有的自动化测试框架相比，ZTF更聚焦于自动化测试的管理功能。
-      ZTF提供了自动化测试脚本的定义、管理、驱动、执行结果的回传、bug的创建以及和其他自动化测框架的集成。
-      ZTF使用go语言开发，可以支持各种平台。ZTF支持常见的编程语言，您可以选择您喜欢用的语言来开发自动化测试脚本。
-    </p>
-    <h4>二、为什么来做ZTF</h4>
-    <p>
-      市面上已经有很多自动化测试框架，我们为什么还要来做ZTF呢？ZTF主要是解决测试管理的问题。
-      目前市面上的自动化测试框架主要分为两大类，一类是单元测试框架，一类是某种领域的自动化测试框架。
-      单元测试框架是跟各个语言绑定的，比如cppunit, phpunit等。第二类框架以selenium为代表，可以用来做web的自动化测试。
-      也还有做GUI或者手机应用乃至游戏等场景的自动化测试的框架。
-    </p>
-    <p>
-      这就产生了一个问题，我们需要将这些自动化测试框架的测试脚本统一管理起来。
-      每一个脚本都可以和测试管理系统里面的一个用例进行关联，脚本里面的步骤信息和管理系统里面的用例信息可以互相同步。
-      测试执行的结果可以反映到测试管理系统中，失败的测试脚本可以创建bug。
-      为此我们开发了ZTF测试管理框架。
-    </p>
-    <h4>三、ZTF和其他自动化测试框架的关系</h4>
-    <p>
-      ZTF和其他的自动化测试框架是互相合作的关系。
-      您可以继续使用之前的自动化测试框架来进行脚本的开发，只需要通过注释的方式加入几个标签就可以转换成ztf的自动化测试脚本。
-    </p>
-    <h4>四、ZTF自动化测试框架的特点</h4>
-    <ol>
-      <li>简单：ZTF的语法标签和规则都很简单，一看就会，很容易上手。</li>
-      <li>跨平台：ZTF使用GO语言开发，跨平台，只有一个可执行文件，就可以运行。</li>
-      <li>跨语言：ZTF支持常见的编程语言，你喜欢用什么就用什么。</li>
-      <li>跨框架：ZTF可以和市面上常见的单元测试框架、常见的自动化测试框架都可以很好的集成。</li>
-      <li>工程化：使用ZTF可以真正达到工程化的自动化测试，可以大批量大规模的进行自动化测试的管理和执行。</li>
-      <li>跨场景：借助于其他框架，ZTF可以用来做单元测试、接口测试、web界面测试、GUI界面测试、APP测试等多种场景。</li>
-    </ol>
-    <div class="section">
-      <div class="text-left" style="padding:25px 15px 10px 15px;">
-        <p>
-          <a href="https://ztf.im/index.html" class="btn btn-primary bg-primary btn-lg" target="_blank">禅道ZTF官网</a> &nbsp; &nbsp;
-          <a href="https://ztf.im/ztf.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZTF框架下载</a> &nbsp; &nbsp;
-          <a href="https://ztf.im/book/ztf/ztf-about-26.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZTF框架手册</a>
-        </p>
-        <div style="margin-top:15px;" class="text-muted">
-          <p>
-            我们还提供了QQ群和微信群的交流方式，官方QQ技术支持响应时间为：上午9:00—11:30，下午13:00—17:30（周六周日，节假日休息）
-          </p>
-          <p>
-            软件测试交流群： 522506766  (添加客服微信： easycorp666，可邀请您加入软件测试微信群)
-          </p>
-        </div>
-      </div>
-    </div>
-  </section>
-</article>
-EOF;
+$lang->automation->ztfFeature7  = 'ZTF对环境无任何依赖';
+$lang->automation->ztfFeature8  = '使用Go语言开发';
+$lang->automation->ztfFeature9  = '部署无任何依赖';
+$lang->automation->ztfFeature10 = '所有平台均可运行';
+$lang->automation->ztfFeature11 = '只有一个可执行文件';
 
-$lang->automation->zendataDetails = <<<EOF
-<article class="article">
-  <header>
-    <h1 class="text-center">ZenData数据生成工具</h1>
-    <div class="abstract">
-      <p>
-        摘要：ZenData使用YAML来作为数据类型配置文件实现了数据的生成和解析。
-        ZenData可以用于手工测试场景下面测试数据的准备，也可以用于自动化测试脚本里面的数据生成和解析。
-        还可以一键生成海量数据用于性能和压力测试。
-      </p>
-    </div>
-  </header>
+$lang->automation->ztfFeature12 = 'ZTF对自动化测试方式无要求';
+$lang->automation->ztfFeature13 = '支持常见的各种开发语言';
+$lang->automation->ztfFeature14 = '可以和已知测试框架集成';
+$lang->automation->ztfFeature15 = '对脚本实现方式无要求';
 
-  <section class="content">
-    <h4>一、ZenData的实现原理</h4>
-    <p>
-      ZenData使用YAML来作为数据类型配置文件。对于每一种类型的数据来讲，我们都可以将其拆分成若干的字段。
-      比如我们要测试一个用户的订单表，会有订单的id，用户id或者账户名，订单的名称，订单的金额，订单的时间，订单状态等等字段。
-      我们可以针对每一个字段配置其取值的范围。比如订单id，我可以定义为从1到10000，用户id可以是1-100。
-      这样每一个字段都有了一个取值范围列表。当ZenData来生成数据的时候，从每一个字段里面依次取一个值，将其拼接在一起，就形成了一条记录。
-      大家可以想象成每个字段都是一个转盘，按照自己的频率进行旋转，每一次旋转都从中取出一个值，和其他的字段进行组合。
-    </p>
-    <p>上面说的是最基本的的工作原理，ZenData还提供了步长、随机、循环、引用等多种定义方式，我们会在接下来的手册里面展开讲。</p>
-    <h4>二、ZenData的用途</h4>
-    <p>
-      ZenData主要两大功能：数据生成和数据解析。通过一个配置文件，可以使用ZenData生成您想要的各种数据。
-      同样也可以对某一个数据文件，指定其数据类型定义的配置文件，完成到结构化数据的解析。
-      ZenData可以用于手工测试场景下面测试数据的准备，也可以用于自动化测试脚本里面的数据生成和解析。还可以一键生成海量数据用于性能和压力测试。
-    </p>
-    <h4>三、ZenData主要的特点</h4>
-    <ol>
-      <li>简单无依赖，只有一个可执行文件，即可满足命令行生成和HTTP接口两种数据生成服务。</li>
-      <li>使用配置文件来生成数据，使用人员不需要有开发知识，即可上手应用。</li>
-      <li>提供了功能强大的语法，分组、区间、步长、循环、随机、格式化和前后缀等，配置灵活性极强。</li>
-      <li>支持从文本文件中读取数据，方便用户对字段取值进行精确控制。</li>
-      <li>提供了Excel表格数据的标准SQL查询接口，使用更加灵活。</li>
-      <li>使用预制的序列（ranges）、实例（instances）、配置（config）对定义进行复用，以解决复杂数据格式的定义。</li>
-      <li>语法支持继承和扩展，为定义文件间的复用提供方便。</li>
-      <li>可以反向解析数据，可以对程序的输出进行解析，方便自动化测试脚本进行比对。</li>
-      <li>发行包內置了基础业务数据的定义文件（不断完善中）。</li>
-      <li>提供了HTTP接口数据生成服务，各种语言都可以方便调用。</li>
-    </ol>
-    <div class="section">
-      <div class="text-left" style="padding:25px 15px 10px 15px;">
-        <p>
-          <a href="https://www.zendata.cn/index.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZenData官网</a> &nbsp; &nbsp;
-          <a href="https://www.zendata.cn/download.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZenData下载</a> &nbsp; &nbsp;
-          <a href="https://www.zendata.cn/book/zendata/why-zendata-115.html" class="btn btn-primary bg-primary btn-lg" target="_blank">ZenData手册</a>
-        </p>
-        <div style="margin-top:15px;" class="text-muted">
-          <p>
-            我们还提供了QQ群和微信群的交流方式，官方QQ技术支持响应时间为：上午9:00—11:30，下午13:00—17:30（周六周日，节假日休息）
-          </p>
-          <p>
-            软件测试交流群： 522506766  (添加客服微信： easycorp666，可邀请您加入软件测试微信群)
-          </p>
-        </div>
-      </div>
-    </div>
-  </section>
-  </section>
-</article>
-EOF;
+$lang->automation->ztfFeature16 = '可批量将禅道测试用例导出为脚本';
+$lang->automation->ztfFeature17 = '可以将执行结果提交到禅道中';
+$lang->automation->ztfFeature18 = '可以将执行结果创建为Bug';
+$lang->automation->ztfFeature19 = 'ZTF和禅道深度集成';
+
+$lang->automation->zendataSite     = 'ZenData官网';
+$lang->automation->zendataDownload = 'ZenData下载';
+$lang->automation->zendataManual   = 'ZenData手册';
+
+$lang->automation->zendata         = '通用数据生成利器';
+$lang->automation->zendataFeature1 = '不懂代码也可以使用,轻松上手';
+$lang->automation->zendataFeature2 = '数据格式完全自定义,无任何限制';
+$lang->automation->zendataFeature3 = '一键生成百万条数据,毫无压力';
+
+$lang->automation->zendataFeature4 = '跨平台跨语言';
+$lang->automation->zendataFeature5 = '运行只需要一个可执行文件';
+$lang->automation->zendataFeature6 = 'Windows、Linux、MacOS都可以用';
+$lang->automation->zendataFeature7 = '各种语言都可以用';
+
+$lang->automation->zendataFeature8  = '各种黑技巧';
+$lang->automation->zendataFeature9  = '区间,步长,随机,重复,引用';
+$lang->automation->zendataFeature10 = '指定文件列表,从excel中查询';
+$lang->automation->zendataFeature11 = '平行生成、递归生成、反向解析';
+
+$lang->automation->groupTips        = '欢迎扫码加入自动化测试QQ交流群';
+$lang->automation->groupTitle       = '软件测试交流群:';
+$lang->automation->qqGroup          = '522506766';
+$lang->automation->groupDescription = '为软件测试从业者提供的软件测试技术交流社群，分享软件测试工具与方法，帮助大家提升软件测试技能水平。';
diff --git a/module/automation/lang/zh-tw.php b/module/automation/lang/zh-tw.php
new file mode 100644
index 0000000000..afc173fc3c
--- /dev/null
+++ b/module/automation/lang/zh-tw.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * The automation module zh-tw file 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      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     automation
+ * @version     $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
+ * @link        http://www.zentao.net
+ */
+$lang->automation->common = '自動化測試';
+$lang->automation->browse = '首頁';
+
+$lang->automation->title = '自動化測試解決方案';
+
+$lang->automation->ztfSite     = '禪道ZTF官網';
+$lang->automation->ztfDownload = 'ZTF框架下載';
+$lang->automation->ztfManual   = 'ZTF框架手冊';
+
+$lang->automation->ztfFeature1 = 'ZTF為你解決各種問題';
+$lang->automation->ztfFeature2 = 'ZTF為你解決如下問題';
+$lang->automation->ztfFeature3 = '用例信息的管理';
+$lang->automation->ztfFeature4 = '測試結果的對比';
+$lang->automation->ztfFeature5 = '測試腳本的執行';
+$lang->automation->ztfFeature6 = '缺陷Bug的提交';
+
+$lang->automation->ztfFeature7  = 'ZTF對環境無任何依賴';
+$lang->automation->ztfFeature8  = '使用Go語言開發';
+$lang->automation->ztfFeature9  = '部署無任何依賴';
+$lang->automation->ztfFeature10 = '所有平台均可運行';
+$lang->automation->ztfFeature11 = '只有一個執行檔';
+
+$lang->automation->ztfFeature12 = 'ZTF對自動化測試方式無要求';
+$lang->automation->ztfFeature13 = '支持常見的各種開發語言';
+$lang->automation->ztfFeature14 = '可以和已知測試框架整合';
+$lang->automation->ztfFeature15 = '對腳本實現方式無要求';
+
+$lang->automation->ztfFeature16 = '可批量將禪道測試用例導出為腳本';
+$lang->automation->ztfFeature17 = '可以將執行結果提交到禪道中';
+$lang->automation->ztfFeature18 = '可以將執行結果創建為Bug';
+$lang->automation->ztfFeature19 = 'ZTF和禪道深度整合';
+
+$lang->automation->zendataSite     = 'ZenData官網';
+$lang->automation->zendataDownload = 'ZenData下載';
+$lang->automation->zendataManual   = 'ZenData手冊';
+
+$lang->automation->zendata         = '通用數據生成利器';
+$lang->automation->zendataFeature1 = '不懂代碼也可以使用,輕鬆上手';
+$lang->automation->zendataFeature2 = '數據格式完全自定義,無任何限制';
+$lang->automation->zendataFeature3 = '一鍵生成百萬條數據,毫無壓力';
+
+$lang->automation->zendataFeature4 = '跨平台跨語言';
+$lang->automation->zendataFeature5 = '運行只需要一個執行檔';
+$lang->automation->zendataFeature6 = 'Windows、Linux、MacOS都可以用';
+$lang->automation->zendataFeature7 = '各種語言都可以用';
+
+$lang->automation->zendataFeature8  = '各種黑技巧';
+$lang->automation->zendataFeature9  = '區間,步長,隨機,重複,引用';
+$lang->automation->zendataFeature10 = '指定檔案列表,從excel中查詢';
+$lang->automation->zendataFeature11 = '平行生成、遞歸生成、反向解析';
+
+$lang->automation->groupTips        = '歡迎掃碼加入自動化測試QQ交流群';
+$lang->automation->groupTitle       = '軟件測試交流群:';
+$lang->automation->qqGroup          = '522506766';
+$lang->automation->groupDescription = '為軟件測試從業者提供的軟件測試技術交流社群，分享軟件測試工具與方法，幫助大家提升軟件測試技能水平。';
diff --git a/module/automation/model.php b/module/automation/model.php
index 9af5349169..720c9b4b80 100644
--- a/module/automation/model.php
+++ b/module/automation/model.php
@@ -13,34 +13,4 @@
 <?php
 class automationModel extends model
 {
-    /**
-     * Set the menu.
-     *
-     * @param  array $products
-     * @param  int   $productID
-     * @param  int   $branch
-     * @access public
-     * @return void
-     */
-    public function setMenu($products, $productID, $branch = 0)
-    {
-        $this->loadModel('product');
-        foreach($this->lang->testtask->menu as $key => $value)
-        {
-            if($this->lang->navGroup->testtask != 'qa') $this->loadModel('qa')->setSubMenu('automation', $key, $productID);
-            common::setMenuVars($this->lang->testtask->menu, $key, $productID);
-        }
-
-        if($this->lang->navGroup->automation == 'qa')
-        {
-            foreach($this->lang->qa->subMenu->automation as $key => $menu)
-            {
-                common::setMenuVars($this->lang->qa->subMenu->automation, $key, $productID);
-            }
-            $this->lang->qa->menu         = $this->lang->automation->menu;
-            $this->lang->automation->menu = $this->lang->qa->subMenu->automation;
-            $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
-        }
-    }
-
 }
diff --git a/module/automation/view/browse.html.php b/module/automation/view/browse.html.php
index 18e71b1472..b2ee1c9786 100644
--- a/module/automation/view/browse.html.php
+++ b/module/automation/view/browse.html.php
@@ -13,26 +13,130 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class="row">
-    <div class="col-xs-2">
-      <ul class="nav nav-tabs nav-stacked">
-        <li class="active"><a href="###" data-target="#tab3Content1" data-toggle="tab"><?php echo $lang->automation->description;?></a></li>
-        <li><a href="###" data-target="#tab3Content2" data-toggle="tab"><?php echo $lang->automation->ztf;?></a></li>
-        <li><a href="###" data-target="#tab3Content3" data-toggle="tab"><?php echo $lang->automation->zendata;?></a></li>
-      </ul>
-    </div>
+    <div class="col-xs-1"></div>
     <div class="col-xs-10">
-      <div class="tab-content col-xs-10">
-        <div class="tab-pane fade active in" id="tab3Content1">
-          <?php echo $lang->automation->details;?>
+      <div class='text-center'>
+        <h2 style='margin-top: 18px;'><?php echo $lang->automation->title;?></h1>
+      </div>
+      <div class='ztf-block'>
+        <div class='ztf-logo'>
+          <img src='<?php echo $config->webRoot . 'theme/default/images/main/ztf.png';?>' />
         </div>
-        <div class="tab-pane fade" id="tab3Content2">
-          <?php echo $lang->automation->ztfDetails;?>
+        <div class='ztf-download'>
+          <div class='ztf-download-trait'>
+            <div><span class='dot-symbol'>●</span><span><?php echo $lang->automation->ztfFeature1;?></span></div>
+            <div><span class='dot-symbol'>●</span><span><?php echo $lang->automation->ztfFeature19;?></span></div>
+            <div><span class='dot-symbol'>●</span><span><?php echo $lang->automation->ztfFeature7;?></span></div>
+            <div><span class='dot-symbol'>●</span><span><?php echo $lang->automation->ztfFeature12;?></span></div>
+          </div>
+          <div class="ztf-download-button">
+            <a href="<?php echo $config->automation->ztfSite;?>" target='_blank' class='btn btn-primary btn-automation'><?php echo $lang->automation->ztfSite;?></a>
+            <a href="<?php echo $config->automation->ztfDownload;?>" target='_blank' class='btn btn-primary btn-automation'><?php echo $lang->automation->ztfDownload;?></a>
+            <a href="<?php echo $config->automation->ztfManual;?>" target='_blank' class='btn btn-primary btn-automation'><?php echo $lang->automation->ztfManual;?></a>
+          </div>
         </div>
-        <div class="tab-pane fade" id="tab3Content3">
-          <?php echo $lang->automation->zendataDetails;?>
+      </div>
+
+      <div class='block-content'>
+        <div class='block-details'>
+          <p><?php echo $lang->automation->ztfFeature2;?></p>
+          <ul>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature3;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature4;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature5;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature6;?></li>
+          </ul>
+        </div>
+        <div class='block-details block-details-right'>
+          <p><?php echo $lang->automation->ztfFeature7;?></p>
+          <ul>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature8;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature9;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature10;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature11;?></li>
+          </ul>
+        </div>
+        <div class='block-details block-details-line'>
+          <p><?php echo $lang->automation->ztfFeature12;?></p>
+          <ul>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature13;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature14;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature15;?></li>
+          </ul>
+        </div>
+        <div class='block-details block-details-line block-details-right'>
+          <p><?php echo $lang->automation->ztfFeature12;?></p>
+          <ul>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature16;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature17;?></li>
+            <li><span class='dot-symbol'>●</span><?php echo $lang->automation->ztfFeature18;?></li>
+          </ul>
+        </div>
+      </div>
+
+      <div class='zendata-block'>
+        <div class='zendata-logo'>
+          <img src='<?php echo $config->webRoot . 'theme/default/images/main/zendata.png';?>' />
+        </div>
+        <div class='zendata-download'>
+          <div class='zendata-download-trait'>
+            <div><span class='dot-symbol'>●</span><?php echo $lang->automation->zendata;?></div>
+            <div><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature4;?></div>
+            <div><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature8;?></div>
+          </div>
+          <div class="zendata-download-button">
+            <a href="<?php echo $config->automation->zendataSite;?>" target='_blank' class='btn btn-primary btn-automation'><?php echo $lang->automation->zendataSite;?></a>
+            <a href="<?php echo $config->automation->zendataDownload;?>" target='_blank' class='btn btn-primary btn-automation'><?php echo $lang->automation->zendataDownload;?></a>
+            <a href="<?php echo $config->automation->zendataManual;?>" target='_blank' class='btn btn-primary btn-automation'><?php echo $lang->automation->zendataManual;?></a>
+          </div>
+        </div>
+      </div>
+
+      <div class='zentata-content'>
+        <div class='block-zendata-block'>
+          <div class='block-zendata'>
+            <p><?php echo $lang->automation->zendata;?></p>
+            <ul>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature1;?></li>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature2;?></li>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature3;?></li>
+            </ul>
+          </div>
+        </div>
+        <div class='block-zendata-block'>
+          <div class='block-zendata'>
+            <p><?php echo $lang->automation->zendataFeature4;?></p>
+            <ul>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature5;?></li>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature6;?></li>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature7;?></li>
+            </ul>
+          </div>
+        </div>
+        <div class='block-zendata-block'>
+          <div class='block-zendata' style='width: 100%;'>
+            <p><?php echo $lang->automation->zendataFeature8;?></p>
+            <ul>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature9;?></li>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature10;?></li>
+              <li><span class='dot-symbol'>●</span><?php echo $lang->automation->zendataFeature11;?></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+
+      <div class='qr-code'>
+        <div class='qr-code-img'>
+          <img src='<?php echo $config->webRoot . 'theme/default/images/main/qrcode.png';?>' />
+        </div>
+        <div class='qr-code-details'>
+          <div style='font-size: 16px; font-weight: bold;'><?php echo $lang->automation->groupTips;?></div>
+          <div class='qr-code-group'><span><?php echo $lang->automation->groupTitle;?></span> <span style='color: #1d7cf1;'><?php echo $lang->automation->qqGroup;?></span></div>
+          <div class='qr-code-group'><?php echo $lang->automation->groupDescription;?></div>
         </div>
       </div>
     </div>
+    <div class="col-xs-1"></div>
   </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php
index 230cf42c20..a0139051a0 100644
--- a/module/backup/lang/en.php
+++ b/module/backup/lang/en.php
@@ -8,6 +8,9 @@ $lang->backup->restore     = 'Restore';
 $lang->backup->change      = 'Edit Expiration';
 $lang->backup->changeAB    = 'Edit';
 $lang->backup->rmPHPHeader = 'Remove PHP header';
+$lang->backup->setting     = 'Setting';
+
+$lang->backup->settingAction = 'Backup Setting';
 
 $lang->backup->time     = 'Date';
 $lang->backup->files    = 'Files';
@@ -19,7 +22,6 @@ $lang->backup->status   = 'Status';
 $lang->backup->statusList['success'] = 'Success';
 $lang->backup->statusList['fail']    = 'Fail';
 
-$lang->backup->setting    = 'Settings';
 $lang->backup->settingDir = 'Backup Directory';
 $lang->backup->settingList['nofile'] = 'Do not back up files or codes.';
 $lang->backup->settingList['nosafe'] = 'Do not prevent downloading PHP file header.';
diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php
index 2b16e8cf41..f47c2a1137 100644
--- a/module/backup/lang/zh-cn.php
+++ b/module/backup/lang/zh-cn.php
@@ -1,5 +1,5 @@
 <?php
-$lang->backup->common      = '备份';
+$lang->backup->common      = '系统备份';
 $lang->backup->index       = '备份首页';
 $lang->backup->history     = '备份历史';
 $lang->backup->delete      = '删除备份';
@@ -8,6 +8,9 @@ $lang->backup->restore     = '还原';
 $lang->backup->change      = '保留时间';
 $lang->backup->changeAB    = '修改';
 $lang->backup->rmPHPHeader = '去除安全设置';
+$lang->backup->setting     = '设置';
+
+$lang->backup->settingAction = '备份设置';
 
 $lang->backup->time     = '备份时间';
 $lang->backup->files    = '备份文件';
@@ -19,7 +22,6 @@ $lang->backup->status   = '状态';
 $lang->backup->statusList['success'] = '成功';
 $lang->backup->statusList['fail']    = '失败';
 
-$lang->backup->setting    = '设置';
 $lang->backup->settingDir = '备份目录';
 $lang->backup->settingList['nofile'] = '不备份附件和代码';
 $lang->backup->settingList['nosafe'] = '不需要防下载PHP文件头';
diff --git a/module/backup/lang/zh-tw.php b/module/backup/lang/zh-tw.php
index 6eb3443ae3..64f8c5e89f 100644
--- a/module/backup/lang/zh-tw.php
+++ b/module/backup/lang/zh-tw.php
@@ -1,5 +1,5 @@
 <?php
-$lang->backup->common      = '備份';
+$lang->backup->common      = '系統備份';
 $lang->backup->index       = '備份首頁';
 $lang->backup->history     = '備份歷史';
 $lang->backup->delete      = '刪除備份';
@@ -8,6 +8,9 @@ $lang->backup->restore     = '還原';
 $lang->backup->change      = '保留時間';
 $lang->backup->changeAB    = '修改';
 $lang->backup->rmPHPHeader = '去除安全設置';
+$lang->backup->setting     = '設置';
+
+$lang->backup->settingAction = '備份設置';
 
 $lang->backup->time     = '備份時間';
 $lang->backup->files    = '備份檔案';
@@ -19,7 +22,6 @@ $lang->backup->status   = '狀態';
 $lang->backup->statusList['success'] = '成功';
 $lang->backup->statusList['fail']    = '失敗';
 
-$lang->backup->setting    = '設置';
 $lang->backup->settingDir = '備份目錄';
 $lang->backup->settingList['nofile'] = '不備份附件和代碼';
 $lang->backup->settingList['nosafe'] = '不需要防下載PHP檔案頭';
diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php
index 34d3759544..6d7bef3fd7 100644
--- a/module/backup/view/index.html.php
+++ b/module/backup/view/index.html.php
@@ -17,7 +17,7 @@
 </div>
 <?php endif;?>
 <div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class="main-row">
   <div class='side-col' id='sidebar'>
@@ -63,7 +63,7 @@
           <?php if($i == 0):?>
           <td <?php if($rowspan > 1) echo "rowspan='$rowspan'"?>><?php echo date(DT_DATETIME1, $backupFile->time);?></td>
           <?php endif;?>
-          <td class='text-left' style='padding-left:5px;'><?php echo $file;?></td>
+          <td title=<?php echo $file;?> class='text-left' style='padding-left:5px;'><?php echo $file;?></td>
           <td><?php echo zget($summary, 'allCount', '');?></td>
           <td><?php echo zget($summary, 'count', '');?></td>
           <td>
diff --git a/module/block/control.php b/module/block/control.php
index 8388eca3f7..304916c007 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -205,18 +205,19 @@ class block extends control
      *
      * @param  string    $module
      * @param  string    $type
+     * @param  int       $projectID
      * @access public
      * @return void
      */
-    public function dashboard($module, $type = '')
+    public function dashboard($module, $type = '', $projectID = 0)
     {
         if($this->loadModel('user')->isLogon()) $this->session->set('blockModule', $module);
         $blocks = $this->block->getBlockList($module, $type);
 
         $commonField = 'common';
-        if($module == 'project')
+        if($module == 'project' and $projectID)
         {
-            $project     = $this->loadModel('project')->getByID($this->session->PRJ);
+            $project     = $this->loadModel('project')->getByID($this->session->project);
             $commonField = $project->model . 'common';
         }
 
@@ -252,10 +253,18 @@ class block extends control
 
                 /* The list assigned to me jumps to the work page when click more button. */
                 $block->moreLink = $this->createLink($moduleName, $method, $vars);
-                if($moduleName = 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method))
+                if($moduleName == 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method))
                 {
                     $block->moreLink = $this->createLink($moduleName, 'work', 'mode=' . $method . '&' . $vars);
                 }
+                elseif($moduleName == 'project' and $method == 'dynamic')
+                {
+                    $block->moreLink = $this->createLink('project', 'dynamic', "projectID=$projectID&type=all");
+                }
+                elseif($moduleName == 'project' and $method == 'testtask')
+                {
+                    $block->moreLink = $this->createLink('project', 'testtask', "projectID=$projectID");
+                }
             }
             elseif($block->block == 'dynamic')
             {
@@ -431,7 +440,7 @@ class block extends control
             /* Create a project block. */
             if($dashboard == 'project')
             {
-                $project = $this->loadModel('project')->getByID($this->session->PRJ);
+                $project = $this->loadModel('project')->getByID($this->session->project);
                 $model   = $project->model;
             }
 
@@ -561,10 +570,12 @@ class block extends control
         $limit = $this->viewType == 'json' ? 0 : (int)$this->params->count;
         $todos = $this->loadModel('todo')->getList('all', $this->app->user->account, 'wait, doing', $limit, $pager = null, $orderBy = 'date, begin');
         $uri   = $this->app->getURI(true);
-        $this->session->set('todoList', $uri);
-        $this->session->set('bugList',  $uri);
-        $this->session->set('taskList', $uri);
-        $this->session->set('riskList', $uri);
+
+        $this->session->set('todoList',     $uri, 'my');
+        $this->session->set('bugList',      $uri, 'qa');
+        $this->session->set('taskList',     $uri, 'execution');
+        $this->session->set('storyList',    $uri, 'product');
+        $this->session->set('testtaskList', $uri, 'qa');
 
         foreach($todos as $key => $todo)
         {
@@ -582,13 +593,14 @@ class block extends control
      */
     public function printTaskBlock()
     {
-        $uri = $this->app->getURI(true);
-        $this->session->set('taskList',  $uri);
-        $this->session->set('storyList', $uri);
+        $this->session->set('taskList',  $this->app->getURI(true), 'execution');
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
 
-        $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
-        $this->view->tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy, $projectID);
+        $account = $this->app->user->account;
+        $type    = $this->params->type;
+
+        $this->app->loadLang('execution');
+        $this->view->tasks = $this->loadModel('task')->getUserTasks($account, $type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy);
     }
 
     /**
@@ -599,10 +611,10 @@ class block extends control
      */
     public function printBugBlock()
     {
-        $this->session->set('bugList', $this->app->getURI(true));
+        $this->session->set('bugList', $this->app->getURI(true), 'qa');
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
 
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
         $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
         $this->view->bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $this->params->type, $this->params->orderBy, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $projectID);
     }
@@ -615,11 +627,11 @@ class block extends control
      */
     public function printCaseBlock()
     {
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
         $this->app->loadLang('testcase');
         $this->app->loadLang('testtask');
 
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
         $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
 
         $cases = array();
@@ -660,20 +672,19 @@ class block extends control
     {
         $this->app->loadLang('testtask');
 
-        $this->session->set('testtaskList', $this->app->getURI(true));
+        $this->session->set('productList',  $this->app->getURI(true), 'product');
+        $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
+        $this->session->set('buildList',    $this->app->getURI(true), 'execution');
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
 
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->PRJ : 0;
-        $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
-
         $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
-            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id')
-            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.execution=t4.id')
+            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.execution=t5.project')
             ->where('t1.deleted')->eq('0')
-            ->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
             ->andWhere('t1.product = t5.product')
             ->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi()
             ->orderBy('t1.id desc')
@@ -689,15 +700,16 @@ class block extends control
      */
     public function printStoryBlock()
     {
-        $this->session->set('storyList', $this->app->getURI(true));
+        $this->session->set('storyList', $this->app->getURI(true), 'product');
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+
         $this->app->loadClass('pager', $static = true);
         $count   = isset($this->params->count) ? (int)$this->params->count : 0;
         $pager   = pager::init(0, $count , 1);
         $type    = isset($this->params->type) ? $this->params->type : 'assignedTo';
         $orderBy = isset($this->params->type) ? $this->params->orderBy : 'id_asc';
 
-        $this->view->stories  = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $orderBy, $this->viewType != 'json' ? $pager : '', 'story');
+        $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $orderBy, $this->viewType != 'json' ? $pager : '', 'story');
     }
 
     /**
@@ -708,7 +720,9 @@ class block extends control
      */
     public function printPlanBlock()
     {
-        $this->session->set('productPlanList', $this->app->getURI(true));
+        $this->session->set('productList', $this->app->getURI(true), 'product');
+        $this->session->set('productPlanList', $this->app->getURI(true), 'product');
+
         $this->app->loadLang('productplan');
         $this->view->plans = $this->dao->select('t1.*,t2.name as productName')->from(TABLE_PRODUCTPLAN)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
@@ -727,13 +741,15 @@ class block extends control
      */
     public function printReleaseBlock()
     {
-        $this->session->set('releaseList', $this->app->getURI(true));
+        $this->session->set('releaseList', $this->app->getURI(true), 'product');
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
+
         $this->app->loadLang('release');
         $this->view->releases = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName')->from(TABLE_RELEASE)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
             ->where('t1.deleted')->eq('0')
-            ->beginIF($this->view->block->module != 'my' and $this->session->PRJ)->andWhere('t1.project')->eq((int)$this->session->PRJ)->fi()
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.project')->eq((int)$this->session->project)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
             ->orderBy('t1.id desc')
             ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
@@ -748,14 +764,14 @@ class block extends control
      */
     public function printBuildBlock()
     {
-        $this->session->set('buildList', $this->app->getURI(true));
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
         $this->app->loadLang('build');
 
         $builds = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_BUILD)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->where('t1.deleted')->eq('0')
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi()
-            ->beginIF($this->view->block->module != 'my' and $this->session->PRJ)->andWhere('t1.project')->eq((int)$this->session->PRJ)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.project')->eq((int)$this->session->project)->fi()
             ->orderBy('t1.id desc')
             ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
             ->fetchAll();
@@ -837,6 +853,7 @@ class block extends control
         $this->loadModel('weekly');
         $this->app->loadLang('task');
         $this->app->loadLang('story');
+        $this->app->loadLang('bug');
 
         /* Set project status and count. */
         $status = isset($this->params->type)  ? $this->params->type       : 'all';
@@ -869,7 +886,7 @@ class block extends control
                 $this->app->loadClass('pager', $static = true);
                 $pager = pager::init(0, 3, 1);
                 $project->progress   = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
-                $project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_asc', $pager);
+                $project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_desc', $pager);
             }
             elseif($project->model == 'waterfall' and isset($this->config->maxVersion))
             {
@@ -959,34 +976,6 @@ class block extends control
             $plans[$product] = $plan;
         }
 
-        /* Get projects. */
-        $projects = $this->dao->select('t1.product, t2.status, t2.end')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
-            ->where('t1.product')->in($productIdList)
-            ->andWhere('t2.deleted')->eq(0)
-            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
-            ->fetchGroup('product');
-        foreach($projects as $product => $productProjects)
-        {
-            $undone= 0;
-            $done  = 0;
-            $delay = 0;
-
-            foreach($productProjects as $project)
-            {
-                ($project->status == 'done' or $project->status == 'closed') ? $done++ : $undone++;
-                if($project->status != 'done' && $project->status != 'closed' && $project->status != 'suspended' && $project->end < helper::today()) $delay++;
-            }
-
-            $project = array();
-            $project['undone'] = $undone;
-            $project['done']   = $done;
-            $project['delay']  = $delay;
-            $project['all']    = count($productProjects);
-
-            $projects[$product] = $project;
-        }
-
         /* Get releases. */
         $releases = $this->dao->select('product, status, COUNT(*) AS count')->from(TABLE_RELEASE)
             ->where('deleted')->eq(0)
@@ -1012,14 +1001,12 @@ class block extends control
         {
             $product->stories     = isset($stories[$productID])      ? $stories[$productID]      : 0;
             $product->plans       = isset($plans[$productID])        ? $plans[$productID]        : 0;
-            $product->projects    = isset($projects[$productID])     ? $projects[$productID]     : 0;
             $product->releases    = isset($releases[$productID])     ? $releases[$productID]     : 0;
             $product->lastRelease = isset($lastReleases[$productID]) ? $lastReleases[$productID] : 0;
         }
 
         $this->app->loadLang('story');
         $this->app->loadLang('productplan');
-        $this->app->loadLang('project');
         $this->app->loadLang('release');
 
         $this->view->products = $products;
@@ -1043,7 +1030,7 @@ class block extends control
         $count   = isset($this->params->count) ? (int)$this->params->count : 0;
 
         /* Get projects. */
-        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
+        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
         $executions = $this->loadModel('execution')->getOrderedExecutions($projectID, $status, $count);
         if(empty($executions))
         {
@@ -1107,7 +1094,7 @@ class block extends control
         }
 
         /* Get bugs. */
-        $bugs = $this->dao->select("project, status, count(status) as totalBugs, count(status = 'active' or null) as activeBugs, count(resolvedDate like '{$yesterday}%' or null) as yesterdayResolved")->from(TABLE_BUG)
+        $bugs = $this->dao->select("project, count(status) as totalBugs, count(status = 'active' or null) as activeBugs, count(resolvedDate like '{$yesterday}%' or null) as yesterdayResolved")->from(TABLE_BUG)
             ->where('project')->in($executionIdList)
             ->andWhere('deleted')->eq(0)
             ->groupBy('project')
@@ -1163,7 +1150,8 @@ class block extends control
      */
     public function printWaterfallReportBlock()
     {
-        $project = $this->loadModel('project')->getByID($this->session->PRJ);
+        $this->app->loadLang('programplan');
+        $project = $this->loadModel('project')->getByID($this->session->project);
         $today   = helper::today();
         $date    = date('Ymd', strtotime('this week Monday'));
         $begin   = $project->begin;
@@ -1173,19 +1161,19 @@ class block extends control
         $task = $this->dao->select("
             sum(consumed) as totalConsumed,
             sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft")
-            ->from(TABLE_TASK)->where('project')->eq($this->session->PRJ)
+            ->from(TABLE_TASK)->where('project')->eq($this->session->project)
             ->andWhere('deleted')->eq(0)
             ->andWhere('parent')->lt(1)
             ->fetch();
 
-        $this->view->pv = $this->weekly->getPV($this->session->PRJ, $today);
-        $this->view->ev = $this->weekly->getEV($this->session->PRJ, $today);
-        $this->view->ac = $this->weekly->getAC($this->session->PRJ, $today);
+        $this->view->pv = $this->weekly->getPV($this->session->project, $today);
+        $this->view->ev = $this->weekly->getEV($this->session->project, $today);
+        $this->view->ac = $this->weekly->getAC($this->session->project, $today);
         $this->view->sv = $this->weekly->getSV($this->view->ev, $this->view->pv);
         $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac);
 
         $this->view->current  = $current;
-        $this->view->progress = ($task->totalConsumed + $task->totalLeft) ? round($task->totalConsumed / ($task->totalConsumed + $task->totalLeft), 3) * 100 : 0;
+        $this->view->progress = ($task->totalConsumed + $task->totalLeft) ? floor($task->totalConsumed / ($task->totalConsumed + $task->totalLeft) * 1000) / 1000 * 100 : 0;
     }
 
     /**
@@ -1196,11 +1184,11 @@ class block extends control
      */
     public function printWaterfallGanttBlock()
     {
-        $products  = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $products  = $this->loadModel('product')->getProductPairsByProject($this->session->project);
         $productID = $this->session->product ? $this->session->product : 0;
         $productID = isset($products[$productID]) ? $productID : key($products);
 
-        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->PRJ, $productID, 0, 'task', false);
+        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->project, $productID, 0, 'task', false);
         $this->view->products  = $products;
         $this->view->productID = $productID;
     }
@@ -1214,10 +1202,10 @@ class block extends control
     public function printWaterfallIssueBlock()
     {
         $uri = $this->app->getURI(true);
-        $this->session->set('issueList',  $uri);
+        $this->session->set('issueList', $uri, 'project');
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
         $this->view->users  = $this->loadModel('user')->getPairs('noletter');
-        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->PRJ, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
     }
 
     /**
@@ -1229,9 +1217,9 @@ class block extends control
     public function printWaterfallRiskBlock()
     {
         $uri = $this->app->getURI(true);
-        $this->session->set('riskList',  $uri);
+        $this->session->set('riskList', $uri, 'project');
         $this->view->users = $this->loadModel('user')->getPairs('noletter');
-        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->PRJ, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
     }
 
     /**
@@ -1243,15 +1231,19 @@ class block extends control
     public function printWaterfallEstimateBlock()
     {
         $this->app->loadLang('durationestimation');
-        $projectID = $this->session->PRJ;
-        $members   = $this->loadModel('project')->getTeamMemberPairs($projectID);
+        $this->loadModel('project');
+
+        $projectID = $this->session->project;
+        $members   = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project');
         $budget    = $this->loadModel('workestimation')->getBudget($projectID);
+        $workhour  = $this->loadModel('project')->getWorkhour($projectID);
         if(empty($budget)) $budget = new stdclass();
 
-        $this->view->people   = $this->dao->select('sum(people) as people')->from(TABLE_DURATIONESTIMATION)->where('project')->eq($this->session->PRJ)->fetch('people');
-        $this->view->members  = count($members) ? count($members) - 1 : 0;
-        $this->view->consumed = $this->dao->select('sum(cast(consumed as decimal(10,2))) as consumed')->from(TABLE_TASK)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('parent')->lt(1)->fetch('consumed');
-        $this->view->budget   = $budget;
+        $this->view->people    = $this->dao->select('sum(people) as people')->from(TABLE_DURATIONESTIMATION)->where('project')->eq($this->session->project)->fetch('people');
+        $this->view->members   = count($members) ? count($members) - 1 : 0;
+        $this->view->consumed  = $this->dao->select('sum(cast(consumed as decimal(10,2))) as consumed')->from(TABLE_TASK)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('parent')->lt(1)->fetch('consumed');
+        $this->view->budget    = $budget;
+        $this->view->totalLeft = (float)$workhour->totalLeft;
     }
 
     /**
@@ -1264,7 +1256,9 @@ class block extends control
     {
         $this->loadModel('milestone');
         $this->loadModel('weekly');
-        $projectID = $this->session->PRJ;
+        $this->app->loadLang('execution');
+
+        $projectID = $this->session->project;
         $project   = $this->loadModel('project')->getByID($projectID);
 
         $begin = $project->begin;
@@ -1301,8 +1295,9 @@ class block extends control
      */
     public function printScrumOverviewBlock()
     {
-        $projectID = $this->session->PRJ;
+        $projectID = $this->session->project;
         $this->app->loadLang('execution');
+        $this->app->loadLang('bug');
         $totalData = $this->loadModel('project')->getOverviewList('byId', $projectID, 'id_desc', 1);
 
         $this->view->totalData = $totalData;
@@ -1319,12 +1314,12 @@ class block extends control
     {
         if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
         $count = isset($this->params->count) ? (int)$this->params->count : 15;
-        $type  = isset($this->params->type) ? $this->params->type : 'all';
+        $type  = isset($this->params->type) ? $this->params->type : 'undone';
 
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init(0, $count, 1);
         $this->app->loadLang('execution');
-        $this->view->executionStats = $this->loadModel('project')->getStats($this->session->PRJ, $type, 0, 0, 30, 'id_desc', $pager);
+        $this->view->executionStats = $this->loadModel('project')->getStats($this->session->project, $type, 0, 0, 30, 'id_desc', $pager);
     }
 
     /**
@@ -1367,7 +1362,7 @@ class block extends control
         $sprints = $this->dao->select('status, count(*) as sprints')->from(TABLE_EXECUTION)
             ->where('deleted')->eq(0)
             ->andWhere('type')->eq('sprint')
-            ->andWhere('parent')->eq($this->session->PRJ)
+            ->andWhere('parent')->eq($this->session->project)
             ->groupBy('status')
             ->fetchPairs();
 
@@ -1392,7 +1387,7 @@ class block extends control
      */
     public function printProjectDynamicBlock()
     {
-        $projectID = $this->session->PRJ;
+        $projectID = $this->session->project;
 
         $executions = $this->loadModel('execution')->getPairs($projectID);
         $products   = $this->loadModel('product')->getProductPairsByProject($projectID);
@@ -1421,10 +1416,10 @@ class block extends control
      */
     public function printScrumRoadMapBlock($productID = 0, $roadMapID = 0)
     {
-        $this->session->set('releaseList',     $this->app->getURI(true));
-        $this->session->set('productPlanList', $this->app->getURI(true));
+        $this->session->set('releaseList',     $this->app->getURI(true), 'product');
+        $this->session->set('productPlanList', $this->app->getURI(true), 'product');
 
-        $products  = $this->loadModel('product')->getPairs('', $this->session->PRJ);
+        $products  = $this->loadModel('product')->getPairs('', $this->session->project);
         if(!is_numeric($productID)) $productID = key($products);
 
         $this->view->roadmaps  = $this->product->getRoadmap($productID, 0, 6);
@@ -1448,7 +1443,10 @@ class block extends control
      */
     public function printScrumTestBlock()
     {
-        $this->session->set('testtaskList', $this->app->getURI(true));
+        $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
+        $this->session->set('productList',  $this->app->getURI(true), 'product');
+        $this->session->set('projectList',  $this->app->getURI(true), 'project');
+        $this->session->set('buildList',    $this->app->getURI(true), 'execution');
         $this->app->loadLang('testtask');
 
         $count  = zget($this->params, 'count', 10);
@@ -1461,7 +1459,7 @@ class block extends control
             ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id')
             ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project')
             ->where('t1.deleted')->eq('0')
-            ->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+            ->andWhere('t1.project')->eq($this->session->project)->fi()
             ->andWhere('t1.product = t5.product')
             ->beginIF($status != 'all')->andWhere('t1.status')->eq($status)->fi()
             ->orderBy('t1.id desc')
@@ -1483,7 +1481,7 @@ class block extends control
         $status = isset($this->params->type)  ? $this->params->type : '';
         $count  = isset($this->params->count) ? (int)$this->params->count : 0;
 
-        $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0;
         $products  = $this->loadModel('product')->getOrderedProducts($status, $count, $projectID);
         if(empty($products))
         {
@@ -1587,7 +1585,7 @@ class block extends control
      */
     public function printExecutionOverviewBlock()
     {
-        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
+        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
         $executions = $this->loadModel('execution')->getList($projectID);
 
         $total = 0;
@@ -1620,7 +1618,7 @@ class block extends control
     {
         $casePairs = $this->dao->select('lastRunResult, COUNT(*) AS count')->from(TABLE_CASE)
             ->where('1=1')
-            ->beginIF($this->view->block->module != 'my' and $this->session->PRJ)->andWhere('project')->eq((int)$this->session->PRJ)->fi()
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('project')->eq((int)$this->session->project)->fi()
             ->groupBy('lastRunResult')
             ->fetchPairs();
 
@@ -1657,7 +1655,7 @@ class block extends control
         $status = isset($this->params->type)  ? $this->params->type : 'all';
         $pager  = pager::init(0, $count, 1);
 
-        $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
+        $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
         $this->view->executionStats = $this->loadModel('project')->getStats($projectID, $status, 0, 0, 30, 'id_asc', $pager);
     }
 
@@ -1687,7 +1685,9 @@ class block extends control
             $stmt = $this->dao->select('*')->from(TABLE_TODO)
                 ->where("(assignedTo = '{$this->app->user->account}' or (account='{$this->app->user->account}'))")
                 ->andWhere('cycle')->eq(0)
-                ->orderBy('`date`');
+                ->andWhere('deleted')->eq(0)
+                ->andWhere('status')->eq('wait')
+                ->orderBy('`date` desc');
             if(isset($params->todoNum)) $stmt->limit($params->todoNum);
             $todos = $stmt->fetchAll();
 
diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css
index 4436a70bf2..fa091d4202 100644
--- a/module/block/css/dashboard.css
+++ b/module/block/css/dashboard.css
@@ -26,3 +26,8 @@ body {padding-bottom: 20px;}
 #dashboard .block-sm .hide-in-sm {display: none;}
 #dashboard .block-dynamic .panel-body {overflow-x: hidden;}
 .modal-body {padding: 10px 20px 20px 20px;}
+
+#dashboard .block-scrumoverview .table {margin-bottom: 12px;}
+#dashboard .block-scrumoverview .table thead tr th {padding-left: 0; text-align: right; border-bottom: unset;}
+#dashboard .block-scrumoverview .table tbody tr td {padding-left: 0;}
+#dashboard .block-scrumoverview .table tbody tr th {text-align: right;}
diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index 851ad0d95e..19c387d4c9 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -9,17 +9,32 @@ $(function()
         var title = $titleInput.val();
         var value = $(this).find('option:selected').text();
 
-        var lang = config.clientLang;
-        if(lang.indexOf('zh') >= 0)
+        if($blocksList.find('#moduleBlock').val() == 'scrumtest' && $('#paramstype').val() != 'all')
         {
-            blockTitle = blockTitle.replace(preValue, value);
-            $titleInput.val(blockTitle);
+            $titleInput.val(value);
         }
         else
         {
-            var preIndex = blockTitle.indexOf(of + preValue);
-            if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
-            $titleInput.val(blockTitle + of + value);
+            var lang   = config.clientLang;
+            blockTitle = $blockParams.find('#title').val();
+            if(lang.indexOf('zh') >= 0)
+            {
+                if(blockTitle.indexOf(preValue) >= 0)
+                {
+                    blockTitle = blockTitle.replace(preValue, value);
+                }
+                else
+                {
+                    if(blockTitle.indexOf(preValue) < 0)  blockTitle = value + of + title;;
+                }
+                $titleInput.val(blockTitle);
+            }
+            else
+            {
+                var preIndex = blockTitle.indexOf(of + preValue);
+                if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
+                $titleInput.val(blockTitle + of + value);
+            }
         }
 
         preValue = value;
@@ -51,8 +66,15 @@ $(function()
             var preIndex = blockTitle.indexOf(' - ' + preValue);
             if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
 
-            var lang = config.clientLang;
-            if(blockTitle.indexOf(of) < 0) lang.indexOf('zh') >= 0 ? $titleInput.val(preValue + of + blockTitle) : $titleInput.val(blockTitle + of + preValue);
+            if($blocksList.find('#moduleBlock').val() == 'scrumtest')
+            {
+                $titleInput.val(preValue);
+            }
+            else
+            {
+                var lang = config.clientLang;
+                if(!title && blockTitle.indexOf(of) < 0) lang.indexOf('zh') >= 0 ? $titleInput.val(preValue + of + blockTitle) : $titleInput.val(blockTitle + of + preValue);
+            }
         }
     };
 
diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index 3256690bbc..71cfd9d810 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -88,6 +88,7 @@ function refreshBlock($panel, afterRefresh)
         }
         $panel.find('.tablesorter').sortTable();
         $panel.find('.chosen').chosen();
+        $panel.children('.table-header-fixed').remove();
         initTableHeader($panel);
         $(".sparkline").sparkline();
     }).fail(function()
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 5c39927ddb..259a78712c 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -9,13 +9,18 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'InfoBlock';
-$lang->block->name   = 'Name';
-$lang->block->style  = 'Style';
-$lang->block->grid   = 'Gitter';
-$lang->block->color  = 'Farbe';
-$lang->block->reset  = 'Zurücksetzen';
+$lang->block->common     = 'InfoBlock';
+$lang->block->name       = 'Name';
+$lang->block->style      = 'Style';
+$lang->block->grid       = 'Gitter';
+$lang->block->color      = 'Farbe';
+$lang->block->reset      = 'Zurücksetzen';
+$lang->block->story      = 'Story';
+$lang->block->investment = 'Investment';
+$lang->block->estimate   = 'Estimate';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Konto';
 $lang->block->module  = 'Modul';
@@ -31,7 +36,7 @@ $lang->block->lblBlock     = 'InfoBlock';
 $lang->block->lblNum       = 'Nummer';
 $lang->block->lblHtml      = 'HTML';
 $lang->block->dynamic      = 'Verlauf';
-$lang->block->assignToMe   = 'Mir zugewiesen';
+$lang->block->assignToMe   = 'Todo';
 $lang->block->done         = 'Done';
 $lang->block->lblFlowchart = 'Workflow';
 $lang->block->welcome      = 'Willkommen';
@@ -46,7 +51,7 @@ $lang->block->myExecution         = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $lang->block->delayed             = 'Verspätet';
 $lang->block->noData              = 'Keine Daten für diesen Bericht.';
-$lang->block->emptyTip            = 'Keine Information';
+$lang->block->emptyTip            = 'No Data.';
 $lang->block->createdTodos        = 'Todos Created';
 $lang->block->createdRequirements = 'UR/Epics Created';
 $lang->block->createdStories      = 'SR/Stories Created';
@@ -68,6 +73,7 @@ $lang->block->time                = 'No';
 $lang->block->week                = 'Week';
 $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' von ';
+$lang->block->remain              = 'Left';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Name';
@@ -148,6 +154,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +285,14 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+    $lang->block->default['full']['my']['4']['block']           = 'statistic';
+    $lang->block->default['full']['my']['4']['source']          = 'project';
+    $lang->block->default['full']['my']['4']['grid']            = 8;
+    $lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
@@ -290,7 +304,7 @@ $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']  = 'AssignedToMe';
+$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']['grid']   = 8;
@@ -302,10 +316,13 @@ $lang->block->default['full']['my']['7']['params']['riskNum']  = '20';
 $lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
 $lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
 
-$lang->block->default['full']['my']['8']['title']  = 'Human Input';
-$lang->block->default['full']['my']['8']['block']  = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['8']['title']  = 'Human Input';
+    $lang->block->default['full']['my']['8']['block']  = 'projectteam';
+    $lang->block->default['full']['my']['8']['source'] = 'project';
+    $lang->block->default['full']['my']['8']['grid']   = 8;
+}
 
 $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
@@ -320,7 +337,7 @@ $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Order by';
 
 $lang->block->availableBlocks            = new stdclass();
-$lang->block->availableBlocks->todo      = 'Meine Todos';
+$lang->block->availableBlocks->todo      = 'Meine Zeitplan';
 $lang->block->availableBlocks->task      = 'Meine Aufgaben';
 $lang->block->availableBlocks->bug       = 'Meine Bugs';
 $lang->block->availableBlocks->case      = 'Meine Fälle';
@@ -334,9 +351,9 @@ $lang->block->availableBlocks->testtask  = 'Testaufgaben';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-$lang->block->moduleList['project']   = 'Project';
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['execution'] = $lang->executionCommon;
+$lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = 'QA';
 $lang->block->moduleList['todo']      = 'Todos';
 
@@ -376,9 +393,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Release';
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
-$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' Statistik';
-$lang->block->modules['execution']->availableBlocks->overview  = $lang->executionCommon . ' Übersicht';
-$lang->block->modules['execution']->availableBlocks->list      = $lang->executionCommon . ' Liste';
+$lang->block->modules['execution']->availableBlocks->statistic = $lang->execution->common . ' Statistik';
+$lang->block->modules['execution']->availableBlocks->overview  = $lang->execution->common . ' Übersicht';
+$lang->block->modules['execution']->availableBlocks->list      = $lang->execution->common . ' Liste';
 $lang->block->modules['execution']->availableBlocks->task      = 'Aufgaben';
 $lang->block->modules['execution']->availableBlocks->build     = 'Build';
 
@@ -494,7 +511,7 @@ $lang->block->typeList->execution['all']      = 'All';
 $lang->block->typeList->execution['involved'] = 'Involved';
 
 $lang->block->typeList->scrum['undone']   = 'Unfinished';
-$lang->block->typeList->scrum['doing']    = 'Ongoing中';
+$lang->block->typeList->scrum['doing']    = 'Ongoing';
 $lang->block->typeList->scrum['all']      = 'All';
 $lang->block->typeList->scrum['involved'] = 'Involved';
 
@@ -512,11 +529,11 @@ $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|all|';
+$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         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|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 6e00d17080..16fe4b6f69 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -9,13 +9,18 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'Block';
-$lang->block->name   = 'Name';
-$lang->block->style  = 'Style';
-$lang->block->grid   = 'Position';
-$lang->block->color  = 'Color';
-$lang->block->reset  = 'Reset Layout';
+$lang->block->common     = 'Block';
+$lang->block->name       = 'Name';
+$lang->block->style      = 'Style';
+$lang->block->grid       = 'Position';
+$lang->block->color      = 'Color';
+$lang->block->reset      = 'Reset Layout';
+$lang->block->story      = 'Story';
+$lang->block->investment = 'Investment';
+$lang->block->estimate   = 'Estimate';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Account';
 $lang->block->module  = 'Module';
@@ -31,7 +36,7 @@ $lang->block->lblBlock     = 'Block';
 $lang->block->lblNum       = 'Number';
 $lang->block->lblHtml      = 'HTML';
 $lang->block->dynamic      = 'Dynamics';
-$lang->block->assignToMe   = 'Assigned To Me';
+$lang->block->assignToMe   = 'Todo';
 $lang->block->done         = 'Done';
 $lang->block->lblFlowchart = 'Flowchart';
 $lang->block->welcome      = 'Welcome';
@@ -68,6 +73,7 @@ $lang->block->time                = 'No';
 $lang->block->week                = 'Week';
 $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' of ';
+$lang->block->remain              = 'Left';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Name';
@@ -148,6 +154,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +285,14 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+    $lang->block->default['full']['my']['4']['block']           = 'statistic';
+    $lang->block->default['full']['my']['4']['source']          = 'project';
+    $lang->block->default['full']['my']['4']['grid']            = 8;
+    $lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
@@ -290,7 +304,7 @@ $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']  = 'Assigned To Me';
+$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']['grid']   = 8;
@@ -302,15 +316,23 @@ $lang->block->default['full']['my']['7']['params']['riskNum']  = '20';
 $lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
 $lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
 
-$lang->block->default['full']['my']['8']['title']  = 'Human Input';
-$lang->block->default['full']['my']['8']['block']  = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['8']['title']  = 'Human Input';
+    $lang->block->default['full']['my']['8']['block']  = 'projectteam';
+    $lang->block->default['full']['my']['8']['source'] = 'project';
+    $lang->block->default['full']['my']['8']['grid']   = 8;
+}
 
 $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']['grid']   = 8;
+if($config->systemMode == 'classic')
+{
+    $lang->block->default['full']['my']['9']['block']  = 'execution';
+    $lang->block->default['full']['my']['9']['source'] = 'execution';
+}
 
 $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
 $lang->block->default['full']['my']['9']['params']['count']   = '15';
@@ -320,7 +342,7 @@ $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Order by';
 
 $lang->block->availableBlocks            = new stdclass();
-$lang->block->availableBlocks->todo      = 'My Todos';
+$lang->block->availableBlocks->todo      = 'My schedule';
 $lang->block->availableBlocks->task      = 'My Tasks';
 $lang->block->availableBlocks->bug       = 'My Bugs';
 $lang->block->availableBlocks->case      = 'My Cases';
@@ -334,9 +356,9 @@ $lang->block->availableBlocks->testtask  = 'Requests';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-$lang->block->moduleList['project']   = 'Project';
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['execution'] = $lang->executionCommon;
+$lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = 'Test';
 $lang->block->moduleList['todo']      = 'Todo';
 
@@ -376,9 +398,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Release';
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
-$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' Statistics';
-$lang->block->modules['execution']->availableBlocks->overview  = $lang->executionCommon . ' Overview';
-$lang->block->modules['execution']->availableBlocks->list      = $lang->executionCommon . ' List';
+$lang->block->modules['execution']->availableBlocks->statistic = $lang->execution->common . ' Statistics';
+$lang->block->modules['execution']->availableBlocks->overview  = $lang->execution->common . ' Overview';
+$lang->block->modules['execution']->availableBlocks->list      = $lang->execution->common . ' List';
 $lang->block->modules['execution']->availableBlocks->task      = 'Task';
 $lang->block->modules['execution']->availableBlocks->build     = 'Build';
 
@@ -494,7 +516,7 @@ $lang->block->typeList->execution['all']      = 'All';
 $lang->block->typeList->execution['involved'] = 'Involved';
 
 $lang->block->typeList->scrum['undone']   = 'Unfinished';
-$lang->block->typeList->scrum['doing']    = 'Ongoing中';
+$lang->block->typeList->scrum['doing']    = 'Ongoing';
 $lang->block->typeList->scrum['all']      = 'All';
 $lang->block->typeList->scrum['involved'] = 'Involved';
 
@@ -512,11 +534,11 @@ $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|all|';
+$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         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|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 b642f4e270..ba2bbddf2a 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -9,13 +9,18 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'Bloc';
-$lang->block->name   = 'Nom';
-$lang->block->style  = 'Style';
-$lang->block->grid   = 'Position';
-$lang->block->color  = 'Couleur';
-$lang->block->reset  = 'Réinit';
+$lang->block->common     = 'Bloc';
+$lang->block->name       = 'Nom';
+$lang->block->style      = 'Style';
+$lang->block->grid       = 'Position';
+$lang->block->color      = 'Couleur';
+$lang->block->reset      = 'Réinit';
+$lang->block->story      = 'Story';
+$lang->block->investment = 'Investment';
+$lang->block->estimate   = 'Estimate';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Compte';
 $lang->block->module  = 'Module';
@@ -31,7 +36,7 @@ $lang->block->lblBlock     = 'Bloc';
 $lang->block->lblNum       = 'Numéro';
 $lang->block->lblHtml      = 'HTML';
 $lang->block->dynamic      = 'Historique';
-$lang->block->assignToMe   = 'Assigné à moi';
+$lang->block->assignToMe   = 'Todo';
 $lang->block->done         = 'Done';
 $lang->block->lblFlowchart = 'Organigramme';
 $lang->block->welcome      = 'Bienvenue';
@@ -68,6 +73,7 @@ $lang->block->time                = 'No';
 $lang->block->week                = 'Week';
 $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' di ';
+$lang->block->remain              = 'Left';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Nom';
@@ -148,6 +154,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +285,14 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+    $lang->block->default['full']['my']['4']['block']           = 'statistic';
+    $lang->block->default['full']['my']['4']['source']          = 'project';
+    $lang->block->default['full']['my']['4']['grid']            = 8;
+    $lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
@@ -290,7 +304,7 @@ $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']  = 'AssignedToMe';
+$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']['grid']   = 8;
@@ -302,10 +316,13 @@ $lang->block->default['full']['my']['7']['params']['riskNum']  = '20';
 $lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
 $lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
 
-$lang->block->default['full']['my']['8']['title']  = 'Human Input';
-$lang->block->default['full']['my']['8']['block']  = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['8']['title']  = 'Human Input';
+    $lang->block->default['full']['my']['8']['block']  = 'projectteam';
+    $lang->block->default['full']['my']['8']['source'] = 'project';
+    $lang->block->default['full']['my']['8']['grid']   = 8;
+}
 
 $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
@@ -320,7 +337,7 @@ $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Trié par';
 
 $lang->block->availableBlocks            = new stdclass();
-$lang->block->availableBlocks->todo      = 'Ma Todo List';
+$lang->block->availableBlocks->todo      = 'Mon emploi du temps';
 $lang->block->availableBlocks->task      = 'Mes Tâches';
 $lang->block->availableBlocks->bug       = 'Mes Bugs';
 $lang->block->availableBlocks->case      = 'Mes CasTests';
@@ -334,9 +351,9 @@ $lang->block->availableBlocks->testtask  = 'Recettes';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-$lang->block->moduleList['project']   = 'Project';
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['execution'] = $lang->executionCommon;
+$lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = 'Test';
 $lang->block->moduleList['todo']      = 'Todo';
 
@@ -376,9 +393,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Release';
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
-$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' Statistiques';
-$lang->block->modules['execution']->availableBlocks->overview  = $lang->executionCommon . " Vue d'ensemble";
-$lang->block->modules['execution']->availableBlocks->list      = $lang->executionCommon . ' Liste';
+$lang->block->modules['execution']->availableBlocks->statistic = $lang->execution->common . ' Statistiques';
+$lang->block->modules['execution']->availableBlocks->overview  = $lang->execution->common . " Vue d'ensemble";
+$lang->block->modules['execution']->availableBlocks->list      = $lang->execution->common . ' Liste';
 $lang->block->modules['execution']->availableBlocks->task      = 'Tâches';
 $lang->block->modules['execution']->availableBlocks->build     = 'Build';
 
@@ -494,7 +511,7 @@ $lang->block->typeList->execution['all']      = 'All';
 $lang->block->typeList->execution['involved'] = 'Involved';
 
 $lang->block->typeList->scrum['undone']   = 'Unfinished';
-$lang->block->typeList->scrum['doing']    = 'Ongoing中';
+$lang->block->typeList->scrum['doing']    = 'Ongoing';
 $lang->block->typeList->scrum['all']      = 'All';
 $lang->block->typeList->scrum['involved'] = 'Involved';
 
@@ -512,11 +529,11 @@ $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|all|';
+$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         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|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/vi.php b/module/block/lang/vi.php
index 3d43c28aac..dcef71c28a 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -9,13 +9,18 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'Block';
-$lang->block->name   = 'Tên';
-$lang->block->style  = 'Kiểu';
-$lang->block->grid   = 'Vị trí';
-$lang->block->color  = 'Màu';
-$lang->block->reset  = 'Thiết lập lại giao diện';
+$lang->block->common     = 'Block';
+$lang->block->name       = 'Tên';
+$lang->block->style      = 'Kiểu';
+$lang->block->grid       = 'Vị trí';
+$lang->block->color      = 'Màu';
+$lang->block->reset      = 'Thiết lập lại giao diện';
+$lang->block->story      = 'Story';
+$lang->block->investment = 'Investment';
+$lang->block->estimate   = 'Estimate';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Tài khoản';
 $lang->block->module  = 'Module';
@@ -31,7 +36,7 @@ $lang->block->lblBlock     = 'Block';
 $lang->block->lblNum       = 'Số';
 $lang->block->lblHtml      = 'HTML';
 $lang->block->dynamic      = 'Lịch sử';
-$lang->block->assignToMe   = 'Giao cho bạn';
+$lang->block->assignToMe   = 'Todo';
 $lang->block->done         = 'Done';
 $lang->block->lblFlowchart = 'Biểu đồ';
 $lang->block->welcome      = 'Welcome';
@@ -46,7 +51,7 @@ $lang->block->myExecution         = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $lang->block->delayed             = 'Tạm ngưng';
 $lang->block->noData              = 'Không có dữ liệu trên loại báo cáo này.';
-$lang->block->emptyTip            = 'Không có dữ liệu.';
+$lang->block->emptyTip            = 'No Data.';
 $lang->block->createdTodos        = 'Todos Created';
 $lang->block->createdRequirements = 'UR/Epics Created';
 $lang->block->createdStories      = 'SR/Stories Created';
@@ -68,6 +73,7 @@ $lang->block->time                = 'No';
 $lang->block->week                = 'Week';
 $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' thực ';
+$lang->block->remain              = 'Left';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Tên';
@@ -148,6 +154,10 @@ $lang->block->default['scrum']['project']['2']['title'] = 'Project List';
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +285,14 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+    $lang->block->default['full']['my']['4']['block']           = 'statistic';
+    $lang->block->default['full']['my']['4']['source']          = 'project';
+    $lang->block->default['full']['my']['4']['grid']            = 8;
+    $lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
@@ -290,7 +304,7 @@ $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']  = 'AssignedToMe';
+$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']['grid']   = 8;
@@ -302,10 +316,13 @@ $lang->block->default['full']['my']['7']['params']['riskNum']  = '20';
 $lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
 $lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
 
-$lang->block->default['full']['my']['8']['title']  = 'Human Input';
-$lang->block->default['full']['my']['8']['block']  = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['8']['title']  = 'Human Input';
+    $lang->block->default['full']['my']['8']['block']  = 'projectteam';
+    $lang->block->default['full']['my']['8']['source'] = 'project';
+    $lang->block->default['full']['my']['8']['grid']   = 8;
+}
 
 $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
@@ -320,7 +337,7 @@ $lang->block->type    = 'Loại';
 $lang->block->orderBy = 'Order by';
 
 $lang->block->availableBlocks            = new stdclass();
-$lang->block->availableBlocks->todo      = 'Việc của bạn';
+$lang->block->availableBlocks->todo      = 'Lịch của tôi';
 $lang->block->availableBlocks->task      = 'Nhiệm vụ';
 $lang->block->availableBlocks->bug       = 'Bugs của bạn';
 $lang->block->availableBlocks->case      = 'Tình huống của bạn';
@@ -334,9 +351,9 @@ $lang->block->availableBlocks->testtask  = 'Yêu cầu';
 $lang->block->availableBlocks->risk      = 'My Risks';
 $lang->block->availableBlocks->issue     = 'My Issues';
 
-$lang->block->moduleList['project']   = 'Project';
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['execution'] = $lang->executionCommon;
+$lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = 'QA';
 $lang->block->moduleList['todo']      = 'Việc làm';
 
@@ -376,9 +393,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Phát hành';
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
-$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' thống';
-$lang->block->modules['execution']->availableBlocks->overview  = $lang->executionCommon . ' xem';
-$lang->block->modules['execution']->availableBlocks->list      = $lang->executionCommon . ' danh sách';
+$lang->block->modules['execution']->availableBlocks->statistic = $lang->execution->common . ' thống';
+$lang->block->modules['execution']->availableBlocks->overview  = $lang->execution->common . ' xem';
+$lang->block->modules['execution']->availableBlocks->list      = $lang->execution->common . ' danh sách';
 $lang->block->modules['execution']->availableBlocks->task      = 'Nhiệm vụ';
 $lang->block->modules['execution']->availableBlocks->build     = 'Bản dựng';
 
@@ -494,7 +511,7 @@ $lang->block->typeList->execution['all']      = 'Tất cả';
 $lang->block->typeList->execution['involved'] = 'Liên đới';
 
 $lang->block->typeList->scrum['undone']   = 'Unfinished';
-$lang->block->typeList->scrum['doing']    = 'Ongoing中';
+$lang->block->typeList->scrum['doing']    = 'Ongoing';
 $lang->block->typeList->scrum['all']      = 'All';
 $lang->block->typeList->scrum['involved'] = 'Involved';
 
@@ -512,11 +529,11 @@ $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|all|';
+$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         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|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/zh-cn.php b/module/block/lang/zh-cn.php
index f9baf0f45e..2543dd7bc4 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -9,13 +9,18 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+global $config;
 $lang->block = new stdclass();
-$lang->block->common = '区块';
-$lang->block->name   = '区块名称';
-$lang->block->style  = '外观';
-$lang->block->grid   = '位置';
-$lang->block->color  = '颜色';
-$lang->block->reset  = '恢复默认';
+$lang->block->common     = '区块';
+$lang->block->name       = '区块名称';
+$lang->block->style      = '外观';
+$lang->block->grid       = '位置';
+$lang->block->color      = '颜色';
+$lang->block->reset      = '恢复默认';
+$lang->block->story      = '需求';
+$lang->block->investment = '投入';
+$lang->block->estimate   = '预计工时';
+$lang->block->last       = '近期';
 
 $lang->block->account = '所属用户';
 $lang->block->module  = '所属模块';
@@ -31,7 +36,7 @@ $lang->block->lblBlock     = '区块';
 $lang->block->lblNum       = '条数';
 $lang->block->lblHtml      = 'HTML内容';
 $lang->block->dynamic      = '最新动态';
-$lang->block->assignToMe   = '指派给我';
+$lang->block->assignToMe   = '待处理';
 $lang->block->done         = '已完成';
 $lang->block->lblFlowchart = '流程图';
 $lang->block->welcome      = '欢迎总览';
@@ -46,7 +51,7 @@ $lang->block->myExecution         = '未关闭的' . $lang->executionCommon;
 $lang->block->myProduct           = '未关闭的' . $lang->productCommon;
 $lang->block->delayed             = '已延期';
 $lang->block->noData              = '当前统计类型下暂无数据';
-$lang->block->emptyTip            = '暂无信息';
+$lang->block->emptyTip            = '暂无数据';
 $lang->block->createdTodos        = '创建的待办数';
 $lang->block->createdRequirements = '创建的' . $lang->URCommon . '数';
 $lang->block->createdStories      = '创建的' . $lang->SRCommon . '数';
@@ -68,6 +73,7 @@ $lang->block->time                = '第';
 $lang->block->week                = '周';
 $lang->block->selectProduct       = '选择产品';
 $lang->block->of                  = '的';
+$lang->block->remain              = '剩余工时';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = '参数名称';
@@ -140,7 +146,7 @@ $lang->block->default['waterfall']['project']['7']['params']['type']    = 'all';
 $lang->block->default['waterfall']['project']['7']['params']['count']   = '15';
 $lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['project']['1']['title'] =  '项目整体情况';
+$lang->block->default['scrum']['project']['1']['title'] =  '项目概况';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
 
@@ -148,6 +154,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = '待测版本';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +285,14 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = '项目统计';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['4']['title']           = '项目统计';
+    $lang->block->default['full']['my']['4']['block']           = 'statistic';
+    $lang->block->default['full']['my']['4']['source']          = 'project';
+    $lang->block->default['full']['my']['4']['grid']            = 8;
+    $lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
 
 $lang->block->default['full']['my']['5']['title']  = '我的贡献';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
@@ -290,7 +304,7 @@ $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']  = '指派给我';
+$lang->block->default['full']['my']['7']['title']  = '待处理';
 $lang->block->default['full']['my']['7']['block']  = 'assigntome';
 $lang->block->default['full']['my']['7']['source'] = '';
 $lang->block->default['full']['my']['7']['grid']   = 8;
@@ -302,15 +316,23 @@ $lang->block->default['full']['my']['7']['params']['riskNum']  = '20';
 $lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
 $lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
 
-$lang->block->default['full']['my']['8']['title']  = '项目人力投入';
-$lang->block->default['full']['my']['8']['block']  = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['8']['title']  = '项目人力投入';
+    $lang->block->default['full']['my']['8']['block']  = 'projectteam';
+    $lang->block->default['full']['my']['8']['source'] = 'project';
+    $lang->block->default['full']['my']['8']['grid']   = 8;
+}
 
 $lang->block->default['full']['my']['9']['title']  = '项目列表';
 $lang->block->default['full']['my']['9']['block']  = 'project';
 $lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
+if($config->systemMode == 'classic')
+{
+    $lang->block->default['full']['my']['9']['block']  = 'execution';
+    $lang->block->default['full']['my']['9']['source'] = 'execution';
+}
 
 $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
 $lang->block->default['full']['my']['9']['params']['count']   = '15';
@@ -320,7 +342,7 @@ $lang->block->type    = '类型';
 $lang->block->orderBy = '排序';
 
 $lang->block->availableBlocks            = new stdclass();
-$lang->block->availableBlocks->todo      = '我的待办';
+$lang->block->availableBlocks->todo      = '我的日程';
 $lang->block->availableBlocks->task      = '我的任务';
 $lang->block->availableBlocks->bug       = '我的Bug';
 $lang->block->availableBlocks->case      = '我的用例';
@@ -334,9 +356,9 @@ $lang->block->availableBlocks->testtask  = '测试版本列表';
 $lang->block->availableBlocks->risk      = '我的风险';
 $lang->block->availableBlocks->issue     = '我的问题';
 
-$lang->block->moduleList['project']   = '项目';
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = '项目';
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['execution'] = $lang->executionCommon;
+$lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = '测试';
 $lang->block->moduleList['todo']      = '待办';
 
@@ -345,11 +367,11 @@ $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   = '项目人力投入';
+if($config->systemMode == 'new') $lang->block->modules['project']->availableBlocks->projectteam = '项目人力投入';
 
 $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->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . '列表';
 $lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . '总览';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = '待测版本';
@@ -376,9 +398,9 @@ $lang->block->modules['product']->availableBlocks->release   = '发布列表';
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
-$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . '统计';
-$lang->block->modules['execution']->availableBlocks->overview  = $lang->executionCommon . '总览';
-$lang->block->modules['execution']->availableBlocks->list      = $lang->executionCommon . '列表';
+$lang->block->modules['execution']->availableBlocks->statistic = $lang->execution->common . '统计';
+$lang->block->modules['execution']->availableBlocks->overview  = $lang->execution->common . '总览';
+$lang->block->modules['execution']->availableBlocks->list      = $lang->execution->common . '列表';
 $lang->block->modules['execution']->availableBlocks->task      = '任务列表';
 $lang->block->modules['execution']->availableBlocks->build     = '版本列表';
 
@@ -512,11 +534,11 @@ $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|all|';
-$lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->scrumtest      = 'project|testtask|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|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/zh-tw.php b/module/block/lang/zh-tw.php
index 470331f5cc..6b1a5ccb0e 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -9,13 +9,18 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+global $config;
 $lang->block = new stdclass();
-$lang->block->common = '區塊';
-$lang->block->name   = '區塊名稱';
-$lang->block->style  = '外觀';
-$lang->block->grid   = '位置';
-$lang->block->color  = '顏色';
-$lang->block->reset  = '恢復預設';
+$lang->block->common     = '區塊';
+$lang->block->name       = '區塊名稱';
+$lang->block->style      = '外觀';
+$lang->block->grid       = '位置';
+$lang->block->color      = '顏色';
+$lang->block->reset      = '恢復預設';
+$lang->block->story      = '需求';
+$lang->block->investment = '投入';
+$lang->block->estimate   = '預計工時';
+$lang->block->last       = '近期';
 
 $lang->block->account = '所屬用戶';
 $lang->block->module  = '所屬模組';
@@ -31,7 +36,7 @@ $lang->block->lblBlock     = '區塊';
 $lang->block->lblNum       = '條數';
 $lang->block->lblHtml      = 'HTML內容';
 $lang->block->dynamic      = '最新動態';
-$lang->block->assignToMe   = '指派給我';
+$lang->block->assignToMe   = '待處理';
 $lang->block->done         = '已完成';
 $lang->block->lblFlowchart = '流程圖';
 $lang->block->welcome      = '歡迎總覽';
@@ -46,7 +51,7 @@ $lang->block->myExecution         = '未關閉的' . $lang->executionCommon;
 $lang->block->myProduct           = '未關閉的' . $lang->productCommon;
 $lang->block->delayed             = '已延期';
 $lang->block->noData              = '當前統計類型下暫無數據';
-$lang->block->emptyTip            = '暫無信息';
+$lang->block->emptyTip            = '暫無數據';
 $lang->block->createdTodos        = '創建的待辦數';
 $lang->block->createdRequirements = '創建的' . $lang->URCommon . '數';
 $lang->block->createdStories      = '創建的' . $lang->SRCommon . '數';
@@ -68,6 +73,7 @@ $lang->block->time                = '第';
 $lang->block->week                = '周';
 $lang->block->selectProduct       = '選擇產品';
 $lang->block->of                  = '的';
+$lang->block->remain              = '剩餘工時';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = '參數名稱';
@@ -140,7 +146,7 @@ $lang->block->default['waterfall']['project']['7']['params']['type']    = 'all';
 $lang->block->default['waterfall']['project']['7']['params']['count']   = '15';
 $lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['project']['1']['title'] =  '項目整體情況';
+$lang->block->default['scrum']['project']['1']['title'] =  '項目概況';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
 
@@ -148,6 +154,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = '待測版本';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +285,14 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = '項目統計';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['4']['title']           = '項目統計';
+    $lang->block->default['full']['my']['4']['block']           = 'statistic';
+    $lang->block->default['full']['my']['4']['source']          = 'project';
+    $lang->block->default['full']['my']['4']['grid']            = 8;
+    $lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
 
 $lang->block->default['full']['my']['5']['title']  = '我的貢獻';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
@@ -290,7 +304,7 @@ $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']  = '指派給我';
+$lang->block->default['full']['my']['7']['title']  = '待處理';
 $lang->block->default['full']['my']['7']['block']  = 'assigntome';
 $lang->block->default['full']['my']['7']['source'] = '';
 $lang->block->default['full']['my']['7']['grid']   = 8;
@@ -302,15 +316,23 @@ $lang->block->default['full']['my']['7']['params']['riskNum']  = '20';
 $lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
 $lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
 
-$lang->block->default['full']['my']['8']['title']  = '項目人力投入';
-$lang->block->default['full']['my']['8']['block']  = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['8']['title']  = '項目人力投入';
+    $lang->block->default['full']['my']['8']['block']  = 'projectteam';
+    $lang->block->default['full']['my']['8']['source'] = 'project';
+    $lang->block->default['full']['my']['8']['grid']   = 8;
+}
 
 $lang->block->default['full']['my']['9']['title']  = '項目列表';
 $lang->block->default['full']['my']['9']['block']  = 'project';
 $lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
+if($config->systemMode == 'classic')
+{
+    $lang->block->default['full']['my']['9']['block']  = 'execution';
+    $lang->block->default['full']['my']['9']['source'] = 'execution';
+}
 
 $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
 $lang->block->default['full']['my']['9']['params']['count']   = '15';
@@ -320,7 +342,7 @@ $lang->block->type    = '類型';
 $lang->block->orderBy = '排序';
 
 $lang->block->availableBlocks            = new stdclass();
-$lang->block->availableBlocks->todo      = '我的待辦';
+$lang->block->availableBlocks->todo      = '我的日程';
 $lang->block->availableBlocks->task      = '我的任務';
 $lang->block->availableBlocks->bug       = '我的Bug';
 $lang->block->availableBlocks->case      = '我的用例';
@@ -334,9 +356,9 @@ $lang->block->availableBlocks->testtask  = '測試版本列表';
 $lang->block->availableBlocks->risk      = '我的風險';
 $lang->block->availableBlocks->issue     = '我的問題';
 
-$lang->block->moduleList['project']   = '項目';
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = '項目';
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['execution'] = $lang->executionCommon;
+$lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = '測試';
 $lang->block->moduleList['todo']      = '待辦';
 
@@ -345,11 +367,11 @@ $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   = '項目人力投入';
+if($config->systemMode == 'new') $lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入';
 
 $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->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . '列表';
 $lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . '總覽';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = '待測版本';
@@ -376,9 +398,9 @@ $lang->block->modules['product']->availableBlocks->release   = '發佈列表';
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
-$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . '統計';
-$lang->block->modules['execution']->availableBlocks->overview  = $lang->executionCommon . '總覽';
-$lang->block->modules['execution']->availableBlocks->list      = $lang->executionCommon . '列表';
+$lang->block->modules['execution']->availableBlocks->statistic = $lang->execution->common . '統計';
+$lang->block->modules['execution']->availableBlocks->overview  = $lang->execution->common . '總覽';
+$lang->block->modules['execution']->availableBlocks->list      = $lang->execution->common . '列表';
 $lang->block->modules['execution']->availableBlocks->task      = '任務列表';
 $lang->block->modules['execution']->availableBlocks->build     = '版本列表';
 
@@ -512,11 +534,11 @@ $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|all|';
-$lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->scrumtest      = 'project|testtask|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|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/model.php b/module/block/model.php
index e36a954795..a7fadaf260 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -173,9 +173,9 @@ class blockModel extends model
             ->andWhere('deleted')->eq(0)
             ->fetch('count');
         $data['stories']    = (int)$this->dao->select('count(*) AS count')->from(TABLE_STORY)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->andWhere('type')->eq('story')->fetch('count');
-        $data['executions'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_PROJECT)
+        $data['executions'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_EXECUTION)
             ->where('status')->notIN('done,closed')
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
             ->andWhere('deleted')->eq(0)
             ->fetch('count');
         $data['products']   = (int)$this->dao->select('count(*) AS count')->from(TABLE_PRODUCT)
@@ -201,7 +201,7 @@ class blockModel extends model
             ->fetch('count');
         $data['delayProject'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_PROJECT)
             ->where('status')->in('wait,doing')
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
             ->andWhere('end')->lt($today)
             ->andWhere('deleted')->eq(0)
             ->fetch('count');
diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php
index c29ae1392f..5c46b3f9ff 100644
--- a/module/block/view/admin.html.php
+++ b/module/block/view/admin.html.php
@@ -42,5 +42,6 @@ include '../../common/view/chosen.html.php';
 </form>
 <?php js::set('blockID', $blockID);?>
 <?php js::set('of', $lang->block->of);?>
+<?php js::set('title', isset($block->title) ? $block->title : '');?>
 <?php if(!empty($module)) js::set('module', $module);?>
 <?php if(isset($pageJS)) js::execute($pageJS);?>
diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index 4756d776a9..afdab88b10 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -30,7 +30,7 @@
         <?php if($longBlock):?>
         <th class='c-level'><?php echo $lang->bug->severityAB?></th>
         <th class='c-pri'><?php echo $lang->priAB?></th>
-        <th class='c-date'><?php echo $lang->bug->openedDate;?></th>
+        <th class='c-date'><?php echo $lang->bug->deadline;?></th>
         <?php endif;?>
         <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
       </tr>
@@ -53,7 +53,7 @@
       ?>
       <tr>
         <td class='c-id-xs'><?php echo sprintf('%03d', $bug->id);?></td>
-        <td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', '', $bug->project), $bug->title)?></td>
+        <td class='c-name' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', "style='color: $bug->color'")?></td>
         <?php if($longBlock):?>
         <td class='c-severity'>
           <?php if($hasCustomSeverity):?>
@@ -63,7 +63,7 @@
           <?php endif;?>
         </td>
         <td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
-        <td class='c-date'><?php echo $bug->openedDate;?></td>
+        <td class='c-date'><?php echo helper::isZeroDate($bug->deadline) ? '' : $bug->deadline;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('bug', $bug);?>
         <td class='c-status' title='<?php echo $status;?>'>
diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php
index ed71ec61a2..c304755ddd 100644
--- a/module/block/view/buildblock.html.php
+++ b/module/block/view/buildblock.html.php
@@ -28,15 +28,16 @@
     <tbody>
       <?php foreach($builds as $build):?>
       <?php
-      $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
-      $viewLink = $this->createLink('build', 'view', "buildID={$build->id}");
+      $appid           = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $buildViewLink   = $this->createLink('build', 'view', "buildID={$build->id}");
+      $productViewLink = $this->createLink('product', 'browse', "productID={$build->product}");
       ?>
-      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+      <tr <?php echo $appid?>>
         <td class='text-center'><?php echo sprintf('%03d', $build->id);?></td>
         <?php if($longBlock):?>
-        <td title='<?php echo $build->productName?>'><?php echo $build->productName?></td>
+        <td title='<?php echo $build->productName?>'><?php echo html::a($productViewLink, $build->productName);?></td>
         <?php endif;?>
-        <td title='<?php echo $build->name?>'><?php echo $build->name?></td>
+        <td title='<?php echo $build->name?>'><?php echo html::a($buildViewLink, $build->name);?></td>
         <td><?php echo $build->date?></td>
       </tr>
       <?php endforeach;?>
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php
index cf9299d997..e794f2e14e 100644
--- a/module/block/view/caseblock.html.php
+++ b/module/block/view/caseblock.html.php
@@ -25,16 +25,14 @@
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-cases <?php if(!$longBlock) echo 'block-sm';?>'>
     <thead>
       <tr class='text-center'>
-        <?php if($longBlock):?>
         <th class='c-id-xs'><?php echo $lang->idAB?></th>
-        <?php endif;?>
         <th class='c-pri'><?php echo $lang->priAB?></th>
         <th class='c-title text-left'><?php echo $lang->case->title;?></th>
         <?php if($longBlock):?>
         <th class='c-runtime'><?php echo $lang->testtask->lastRunTime;?></th>
         <th class='c-result'><?php echo $lang->testtask->lastRunResult;?></th>
-        <?php endif;?>
         <th class='c-status'><?php echo $lang->statusAB;?></th> 
+        <?php endif;?>
       </tr>
     </thead>
     <tbody>
@@ -43,22 +41,20 @@
       $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
       $viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}");
       ?>
-      <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-        <?php if($longBlock):?>
+      <tr class='text-center' <?php echo $appid?>>
         <td class='c-id-xs'><?php echo sprintf('%03d', $case->id);?></td>
-        <?php endif;?>
         <td class='c-pri'><span class='label-pri label-pri-<?php echo $case->pri?>' title='<?php echo zget($lang->case->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></span></td>
         <td class='c-title text-left' style='color: <?php echo $case->color?>' title='<?php echo $case->title?>'><?php echo $case->title?></td>
         <?php if($longBlock):?>
         <td class='c-runtime'><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
         <td class='c-result'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-        <?php endif;?>
         <?php $status = $this->processStatus('testcase', $case);?>
         <td class='c-status' title='<?php echo $status;?>'>
           <span class="case-status-<?php echo $case->status?>">
             <span class='status-text'><?php echo $status;?></span>
           </span>
         </td>
+        <?php endif;?>
       </tr>
       <?php endforeach;?>
     </tbody>
diff --git a/module/block/view/contribute.html.php b/module/block/view/contribute.html.php
index 97858ccb15..9e2260c17a 100644
--- a/module/block/view/contribute.html.php
+++ b/module/block/view/contribute.html.php
@@ -6,10 +6,12 @@
         <div class="tile-title"><?php echo $lang->block->createdTodos;?></div>
         <div class="tile-amount"><?php echo empty($data['createdTodos']) ? 0 : html::a($this->createLink('my', 'todo', 'type=all'), (int)$data['createdTodos']);?></div>
       </div>
+      <?php if($config->URAndSR):?>
       <div class="col-xs-4 tile">
         <div class="tile-title"><?php echo $lang->block->createdRequirements;?></div>
         <div class="tile-amount"><?php echo empty($data['createdRequirements']) ? 0 : (int)$data['createdRequirements'];?></div>
       </div>
+      <?php endif;?>
       <div class="col-xs-4 tile">
         <div class="tile-title"><?php echo $lang->block->createdStories;?></div>
         <div class="tile-amount"><?php echo empty($data['createdStories']) ? 0 : (int)$data['createdStories'];?></div>
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index 39fe632196..6a80927b69 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -22,7 +22,7 @@ $useGuest = $this->app->user->account == 'guest';
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->block->noData;?></span>
-      <?php echo html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus'></i> {$lang->block->createBlock}", '', "data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}' class='btn btn-info'")?> 
+      <?php echo html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus'></i> {$lang->block->createBlock}", '', "data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}' class='btn btn-info'")?>
       <?php echo html::a($this->createLink("block", "ajaxReset", "module=$module"), "<i class='icon icon-refresh'></i> {$lang->block->reset}", 'hiddenwin', 'class="btn btn-info"')?>
     </p>
   </div>
@@ -105,21 +105,6 @@ config.ordersSaved = '<?php echo $lang->block->ordersSaved; ?>';
 config.confirmRemoveBlock = '<?php echo $lang->block->confirmRemoveBlock; ?>';
 var module   = '<?php echo $module?>';
 var useGuest = <?php echo $useGuest ? 'true' : 'false';?>;
-<?php if(!$useGuest):?>
-<?php if(!isset($config->$module->block->initVersion) or $config->$module->block->initVersion < '2'):?>
-$(function()
-{
-    if(confirm('<?php echo $lang->block->noticeNewBlock;?>'))
-    {
-        $('#hiddenwin').attr('src', '<?php echo $this->createLink('block', 'ajaxUseNew', "module=$module&confirm=yes");?>');
-    }
-    else
-    {
-        $('#hiddenwin').attr('src', '<?php echo $this->createLink('block', 'ajaxUseNew', "module=$module&confirm=no");?>');
-    }
-})
-<?php endif;?>
-<?php endif;?>
 <?php $remind = $this->loadModel('misc')->getRemind();?>
 <?php if(!empty($remind)):?>
 var myModalTrigger = new $.zui.ModalTrigger({title:'<?php echo $lang->misc->remind;?>', custom: function(){return <?php echo json_encode($remind);?>}, width:'600px'});
diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index 05b98b0f15..2447f62507 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -2,7 +2,7 @@
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <style>
-.block-dynamic .timeline > li .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; max-height: 20px; display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; }
+.block-dynamic .timeline > li .timeline-text {display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-height: 20px;}
 .block-dynamic .panel-body {padding-top: 0;}
 </style>
 <div class='panel-body scrollbar-hover'>
diff --git a/module/block/view/executionblock.html.php b/module/block/view/executionblock.html.php
index e6d36bc492..90872be781 100644
--- a/module/block/view/executionblock.html.php
+++ b/module/block/view/executionblock.html.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
+<style>.table .c-progress {width: 60px;}</style>
 <?php if(empty($executionStats)): ?>
 <div class='empty-tip'><?php common::printLink('execution', 'create', '', "<i class='icon-plus'></i> " . $lang->execution->create, '', "class='btn btn-primary'")?></div>
 <?php else:?>
@@ -39,8 +40,8 @@
       $appid    = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'";
       $viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id);
       ?>
-      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-        <td class='c-name text-left' title='<?php echo $execution->name;?>'><nobr><?php echo html::a($this->createLink('execution', 'task', 'executionID=' . $execution->id), $execution->name, '', "title='$execution->name'");?></nobr></td>
+      <tr <?php echo $appid?>>
+        <td class='c-name text-left' title='<?php echo $execution->name;?>'><nobr><?php echo html::a($viewLink, $execution->name, '', "title='$execution->name'");?></nobr></td>
         <td class="c-date"><?php echo $execution->end;?></td>
         <?php if($longBlock):?>
         <td class="w-70px">
@@ -51,15 +52,13 @@
           <span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
           <?php endif;?>
         </td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft     . $lang->execution->workHourUnit;?></td>
         <?php endif;?>
         <td class="c-progress">
-          <div class="progress progress-text-left">
-            <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
-            <span class="progress-text"><?php echo $execution->hours->progress;?>%</span>
-            </div>
+          <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+            <div class='progress-info'><?php echo $execution->hours->progress;?></div>
           </div>
         </td>
         <?php if($longBlock):?>
diff --git a/module/block/view/issueblock.html.php b/module/block/view/issueblock.html.php
index 4a558146ea..995bcad94c 100644
--- a/module/block/view/issueblock.html.php
+++ b/module/block/view/issueblock.html.php
@@ -4,7 +4,7 @@
 <style>
 .block-issues .c-id {width: 50px;}
 .block-issues .c-pri {width: 50px;text-align: center;}
-.block-issues .c-createdDate {width: 95px;}
+.block-issues .c-deadline {width: 95px;}
 .block-issues .c-severity {width: 80px;}
 .block-issues .c-status {width: 80px;}
 .block-issues.block-sm .c-status {text-align: center;}
@@ -18,7 +18,7 @@
         <?php if($longBlock):?>
         <th class='c-pri'><?php echo $lang->priAB?></th>
         <th class='c-category'><?php echo $lang->issue->severity;?></th>
-        <th class='c-identifiedDate'><?php echo $lang->issue->createdDate;?></th>
+        <th class='c-identifiedDate'><?php echo $lang->issue->deadline;?></th>
         <?php endif;?>
         <th class='c-status'><?php echo $lang->issue->status;?></th>
       </tr>
@@ -30,11 +30,11 @@
       ?>
       <tr>
         <td class='c-id-xs'><?php echo sprintf('%03d', $issue->id);?></td>
-        <td class='c-name' title='<?php echo $issue->title?>'><?php echo html::a($this->createLink('issue', 'view', "issueID=$issue->id", '', '', $issue->PRJ), $issue->title)?></td>
+        <td class='c-name' title='<?php echo $issue->title?>'><?php echo html::a($this->createLink('issue', 'view', "issueID=$issue->id", '', '', $issue->project), $issue->title)?></td>
         <?php if($longBlock):?>
         <td class='c-pri'><?php echo zget($lang->issue->priList, $issue->pri)?></td>
         <td class='c-severity'><?php echo zget($lang->issue->severityList, $issue->severity)?></td>
-        <td class='c-createdDate'><?php echo $issue->createdDate == '0000-00-00' ? '' : $issue->createdDate;?></td>
+        <td class='c-deadline'><?php echo $issue->deadline == '0000-00-00' ? '' : $issue->deadline;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('issue', $issue);?>
         <td class='c-status' title='<?php echo $status;?>'>
diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php
index cbae6c89f4..646a6bd57c 100644
--- a/module/block/view/planblock.html.php
+++ b/module/block/view/planblock.html.php
@@ -30,14 +30,15 @@
       <?php foreach($plans as $plan):?>
       <?php
       $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
-      $viewLink = $this->createLink('productplan', 'view', "planID={$plan->id}");
+      $planViewLink    = $this->createLink('productplan', 'view', "planID={$plan->id}");
+      $productViewLink = $this->createLink('product', 'view', "productID={$plan->product}");
       ?>
-      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+      <tr <?php echo $appid?>>
         <?php if($longBlock):?>
         <td class='text-center'><?php echo $plan->id;?></td>
-        <td title='<?php echo $plan->productName?>'><?php echo $plan->productName?></td>
+        <td title='<?php echo $plan->productName?>'><?php echo html::a($productViewLink, $plan->productName);?></td>
         <?php endif;?>
-        <td title='<?php echo $plan->title?>'><?php echo $plan->title?></td>
+        <td title='<?php echo $plan->title?>'><?php echo html::a($planViewLink, $plan->title);?></td>
         <td class='text-center'><?php echo $plan->begin?></td>
         <td class='text-center'><?php echo $plan->end?></td>
       </tr>
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index 1e447f6469..148eb41cd0 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -14,7 +14,7 @@
 <div class='empty-tip'><?php common::printLink('product', 'create', '', "<i class='icon-plus'></i> " . $lang->product->create, '', "class='btn btn-primary'") ?></div>
 <?php else:?>
 <style>
-.block-products.block-sm .c-project {display: none;}
+.block-products.block-sm .c-execution {display: none;}
 </style>
 <div class="panel-body has-table scrollbar-hover block-products">
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter table-fixed'>
@@ -22,7 +22,7 @@
       <tr>
         <th class='c-name'><?php echo $lang->product->name;?></th>
         <?php if($longBlock):?>
-        <th class='c-name c-project'><?php echo $lang->product->currentExecution;?></th>
+        <th class='c-name c-execution'><?php echo $lang->product->currentExecution;?></th>
         <?php endif;?>
         <th title='<?php echo $lang->product->plans?>' class='c-num w-120px'><?php echo $lang->product->plans;?></th>
         <th title='<?php echo $lang->product->releases?>' class='c-num w-100px'><?php echo $lang->product->releases;?></th>
@@ -36,11 +36,11 @@
       $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : "";
       $viewLink = $this->createLink('product', 'browse', 'productID=' . $product->id);
       ?>
-      <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-        <td class='c-name text-left' title='<?php echo $product->name?>'><?php echo $product->name?></td>
+      <tr class='text-center' <?php echo $appid?>>
+        <td class='c-name text-left' title='<?php echo $product->name?>'><?php echo html::a($viewLink, $product->name);?></td>
         <?php if($longBlock):?>
-        <?php $projectName = zget($executions, $product->id, '');?>
-        <td class='c-name c-project text-left' title='<?php echo $projectName;?>'><?php echo $projectName;?></td>
+        <?php $executionName = zget($executions, $product->id, '');?>
+        <td class='c-name c-execution text-left' title='<?php echo $executionName;?>'><?php echo $executionName;?></td>
         <?php endif;?>
         <td class="c-num"><?php echo $product->plans?></td>
         <td class="c-num"><?php echo $product->releases?></td>
diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index a18907cc85..40f7d58547 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -175,10 +175,6 @@ $(function()
                 </div>
               </div>
             </div>
-            <?php $totalProject  = $product->projects ? zget($product->projects, 'all', 0) : 0;?>
-            <?php $undoneProject = $product->projects ? zget($product->projects, 'undone', 0) : 0;?>
-            <?php $delayProject  = $product->projects ? zget($product->projects, 'delay', 0) : 0;?>
-            <?php $undoneRate    = $totalProject ? round($undoneProject / $totalProject * 100, 2) : 0;?>
             <div class="product-info">
               <?php $totalRelease  = $product->releases ? array_sum($product->releases) : 0;?>
               <?php $normalRelease = $product->releases ? zget($product->releases, 'normal', 0) : 0;?>
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index 5af4c1331f..6f79a93be2 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -10,12 +10,12 @@
     <thead>
       <tr>
         <th class='c-name w-100px'><?php echo $lang->project->name;?></th>
-        <th class='w-100px'><?php echo $lang->program->PM;?></th>
-        <th class='w-80px'><?php echo $lang->program->status;?></th>
+        <th class='w-80px'><?php echo $lang->project->PM;?></th>
+        <th class='w-60px'><?php echo $lang->project->status;?></th>
         <?php if($longBlock):?>
-        <th class='w-60px'><?php echo $lang->program->teamCount;?></th>
+        <th class='w-60px'><?php echo $lang->project->teamCount;?></th>
         <th class='w-90px text-right'><?php echo $lang->task->consumed;?></th>
-        <th class='w-80px text-right'><?php echo $lang->program->budget;?></th>
+        <th class='w-80px text-right'><?php echo $lang->project->budget;?></th>
         <th class='w-80px'><?php echo $lang->project->leftStories;?></th>
         <th class='w-80px'><?php echo $lang->project->leftTasks;?></th>
         <th class='w-80px'><?php echo $lang->project->leftBugs;?></th>
@@ -24,9 +24,7 @@
     </thead>
     <tbody>
       <?php foreach($projects as $project):?>
-      <?php
-      $viewLink = $this->createLink('program', 'index', "programID={$project->id}");
-      ?>
+      <?php $viewLink = $this->createLink('project', 'index', "programID={$project->id}");?>
       <tr>
         <td title='<?php echo $project->name?>'><?php echo html::a($viewLink, $project->name);?></td>
         <td><?php echo zget($users, $project->PM, $project->PM)?></td>
@@ -35,8 +33,8 @@
         </td>
         <?php if($longBlock):?>
         <td class='text-center'><?php echo $project->teamCount;?></td>
-        <td class='text-right' title="<?php echo $project->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $project->consumed . ' ' . $lang->execution->workHourUnit;?></td>
-        <?php $programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->program->tenThousand : number_format((float)$project->budget, 1);?>
+        <td class='text-right' title="<?php echo $project->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $project->consumed . $lang->execution->workHourUnit;?></td>
+        <?php $programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?>
         <td class='text-right'><?php echo $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->project->future;?></td>
         <td class='text-center'><?php echo $project->leftStories;?></td>
         <td class='text-center'><?php echo $project->leftTasks;?></td>
diff --git a/module/block/view/projectdynamicblock.html.php b/module/block/view/projectdynamicblock.html.php
index e89f1118ce..f60048f555 100644
--- a/module/block/view/projectdynamicblock.html.php
+++ b/module/block/view/projectdynamicblock.html.php
@@ -1,6 +1,10 @@
 <?php if(empty($actions)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
+<style>
+.timeline > li .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; max-height: 20px; display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; }
+.panel-body {padding-top: 0;}
+</style>
 <div class='panel-body scrollbar-hover'>
   <ul class="timeline timeline-tag-left no-margin">
     <?php
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index a4818339b8..fdf17551bb 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -22,7 +22,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic .tile {margin-bottom: 30px;}
 .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
 .block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 260px; padding: 0;}
+.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 210px; padding: 0;}
 .block-statistic .nav-secondary > li {position: relative;}
 .block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
 .block-statistic .nav-secondary > li > a:first-child {padding-right: 36px;}
@@ -60,16 +60,32 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic .project-info .col-xs-5, .block-statistic .project-info .col-xs-7 {margin-top: 8px;}
 .block-statistic .project-info .col-xs-5 {padding-left: 0;}
 
+.block-statistic .data {width: 40%; text-align: left; padding: 10px 0px; font-size: 14px; font-weight: 700;}
+.block-statistic .dataTitle {width: 60%; text-align: right; padding: 10px 0px; font-size: 14px;}
+.block-statistic .executionName {padding: 2px 10px; font-size: 14px; text-overflow: ellipsis; overflow: hidden;}
+.block-statistic .lastIteration {padding-top: 6px;}
+.block-statistic .progress-text-left {margin-right: 90px}
+.block-statistic .progress-text-left .progress-text {padding-top: 2px; font-size: 14px; padding-right:5px; left: -45px;}
+
 .status-count {margin: auto;}
 .status-count tr:first-child td:last-child {color: #000; font-weight: bold;}
 
-.block-statistic .progress-group {margin-top: 20px; margin-bottom: 10px; height: 65px;}
-.block-statistic .weekly-title {font-weight: bold; font-size:14px; color: #3C4253;}
+.block-statistic .project-info {margin-left: 3px;}
+.block-statistic .project-budget {white-space: nowrap;}
+.block-statistic .progress-group {margin-top: 10px;}
+.block-statistic .progress-group .col {padding-left: 0;}
+.block-statistic .progress-percent {margin-top: 4px;}
+.block-statistic .weekly-title {font-weight: bold; color: #3C4253;}
 .block-statistic .weekly-small {font-size:12px; color: #838A9D;}
 .block-statistic .weekly-progress {font-weight: bold; font-size:24px;}
 .block-statistic .weekly-name {font-size: 14px; color: #838A9D;}
 .block-statistic .weekly-value {font-size: 14px;}
-.block-statistic .col-6 .stage {margin-left: 10px;}
+.block-statistic .col-12 .stage {margin-left: 10px;}
+.block-statistic .col-12 .waterfall-title {padding-top: 3px;}
+.block-statistic .col-12 .waterfall-value {padding-top: 10px; font-size: 18px; font-weight: 600;}
+.block-statistic .col-12 .waterfall-title .col {padding-right: 0px; padding-left: 0px;}
+
+.forty-percent {width: 40%;}
 </style>
 <script>
 <?php $blockNavId = 'nav-' . uniqid(); ?>
@@ -98,7 +114,7 @@ $(function()
   <div class="table-row">
     <?php if(empty($projects)):?>
     <div class="table-empty-tip">
-      <p><span class="text-muted"><?php echo $lang->block->noData;?></span></p>
+      <p><span class="text-muted"><?php echo $lang->block->emptyTip;?></span></p>
     </div>
     <?php else:?>
     <div class="col col-nav">
@@ -118,124 +134,116 @@ $(function()
       <?php foreach($projects as $project):?>
       <div class="tab-pane fade<?php if($project->id == $selected) echo ' active in';?>" id="tab3Content<?php echo $project->id;?>">
         <div class="table-row">
-        <?php if($project->model == 'scrum'):?>
-          <div class="col-5 text-middle text-center">
-            <div class="progress-pie inline-block space" data-value="<?php echo $project->progress;?>" data-doughnut-size="84">
-              <canvas width="120" height="120"></canvas>
-              <div class="progress-info">
-                <small><?php echo $lang->story->common . $lang->project->doneStories;?></small>
-                <strong><?php echo $project->doneStories;?></strong>
+          <?php if($project->model == 'scrum'):?>
+          <div class='table-row'>
+            <div class="col-4 text-center">
+              <div><h4><?php echo $lang->block->story;?></h4></div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->project->allStories . "：";?></div>
+                <div class="col data"><?php echo $project->allStories;?></div>
+              </div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->project->doneStories . "：";?></div>
+                <div class="col data"><?php echo $project->doneStories;?></div>
+              </div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->project->surplus . "：";?></div>
+                <div class="col data"><?php echo $project->leftStories;?></div>
               </div>
             </div>
-            <div class="table-row text-center small text-muted with-padding">
-              <div class="col-4 text-bottom">
-                <div><?php echo $lang->project->allStories;?></div>
-                <div><?php echo $project->allStories;?></div>
+            <div class="col-4 text-center">
+              <div><h4><?php echo $lang->block->investment;?></h4></div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->block->totalPeople . "：";?></div>
+                <div class="col data"><?php echo $project->teamCount;?></div>
               </div>
-              <div class="col-4">
-                <span class="label label-dot label-primary"></span>
-                <div><?php echo $lang->project->doneStories;?></div>
-                <div><?php echo $project->doneStories;?></div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->block->estimate . "：";?></div>
+                <div class="col data"><?php echo $project->estimate;?></div>
               </div>
-              <div class="col-4">
-                <span class="label label-dot label-pale"></span>
-                <div><?php echo $lang->project->leftStories;?></div>
-                <div><?php echo $project->leftStories;?></div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->block->consumedHours . "：";?></div>
+                <div class="col data"><?php echo $project->consumed;?></div>
+              </div>
+            </div>
+            <div class="col-4 text-center">
+              <div><h4><?php echo $lang->bug->common;?></h4></div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->block->totalBug . "：";?></div>
+                <div class="col data"><?php echo $project->allBugs;?></div>
+              </div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->bug->statusList['resolved'] . "：";?></div>
+                <div class="col data"><?php echo $project->doneBugs;?></div>
+              </div>
+              <div>
+                <div class="col dataTitle"><?php echo $lang->bug->unResolved . "：";?></div>
+                <div class="col data"><?php echo $project->leftBugs;?></div>
               </div>
             </div>
           </div>
-          <div class="col-7">
-            <div class="project-info">
-              <h4><?php echo $lang->project->allInput;?></h4>
-              <div class='info'>
-                <span><i class='icon icon-group'></i> <?php echo sprintf($lang->project->membersUnit, $project->teamCount);?></span>
-                <span><i class='icon icon-clock'></i> <?php echo sprintf($lang->project->hoursUnit, $project->estimate);?></span>
-                <span><i class='icon icon-cost'></i> <?php echo $project->budget . ' ' . zget($lang->project->unitList, $project->budgetUnit);?></span>
-              </div>
-            </div>
-            <div class="project-info">
-              <?php $i = 0;?>
-              <h4><?php echo $lang->project->lastIteration;?></h4>
-              <?php foreach($project->executions as $execution):?>
-              <?php $i ++;?>
-              <?php if($i > 3) break;?>
-              <div class='col-xs-5'><?php echo $execution->name;?></div>
-              <div class='col-xs-7'>
+          <?php if(!empty($project->executions)):?>
+          <div class="table-row project-info">
+            <div class="col-2 text-right"><h4><?php echo $lang->block->last;?></h4></div>
+            <div class="table-row lastIteration">
+              <div class='col-5 text-center executionName'><?php echo html::a($this->createLink('execution', 'task', "executionID={$project->executions[0]->id}"), $project->executions[0]->name);?></div>
+              <div class='col-7'>
                 <div class='progress progress-text-left'>
-                  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
-                    <span class='progress-text'><?php echo $execution->hours->progress . '%';?></span>
+                  <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>
                   </div>
                 </div>
               </div>
-              <?php endforeach;?>
             </div>
           </div>
-        <?php else:?>
-          <div class="col-6">
+          <?php endif;?>
+          <?php else:?>
+          <div class="col-12">
             <div class='table-row text-left weekly-row with-padding'>
               <span class='weekly-title'><?php echo $lang->project->weekly;?></span>
               <span class='stage text-muted'><?php echo $project->current;?></span>
             </div>
-            <div class='progress-group col-10 center-block'>
-              <div class='progress-num text-center'>
-                <div class='weekly-title'><?php echo $lang->project->progress;?></div>
-                <div class='weekly-progress'><?php echo $project->progress . '%';?></div>
+            <div class='table-row text-center progress-group col-12 with-padding center-block'>
+              <div class='forty-percent col'>
+                <div class='progress-num col'>
+                  <span><?php echo $lang->project->progress . ':';?></span>
+                  <span class='project-info'><?php echo $project->progress . '%';?></span>
+                </div>
+                <div class='progress progress-percent col-1-8'>
+                  <div class="progress-bar" role="progressbar" aria-valuenow="82" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->progress;?>%"></div>
+                </div>
               </div>
-              <div class='progress'>
-                <div class="progress-bar" role="progressbar" aria-valuenow="82" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->progress;?>%"></div>
+              <div class="col-1-5">
+                <span><?php echo $lang->project->teamCount . ':';?></span>
+                <span class='project-info'><?php echo $project->teamCount;?></span>
               </div>
+              <div class="col-1-5 project-budget">
+                <span><?php echo $lang->project->budget . ':';?></span>
+                <span class='project-info'>
+                <?php
+                $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);
+                echo $project->budget != 0 ? $projectBudget : $this->lang->project->future;
+                ?>
+                </span>
+              </div>
+              <div class="col-1-5"></div>
             </div>
-            <div class="table-row text-center small with-padding col-10 center-block">
-              <div class="col-4 text-bottom">
-                <div class='weekly-name'><?php echo $lang->project->pv;?></div>
-                <div class='weekly-value'><?php echo $project->pv;?></div>
-              </div>
-              <div class="col-4">
-                <div class='weekly-name'><?php echo $lang->project->ev;?></div>
-                <div class='weekly-value'><?php echo $project->ev;?></div>
-              </div>
-              <div class="col-4">
-                <div class='weekly-name'><?php echo $lang->project->sv;?></div>
-                <div class='weekly-value'><?php echo $project->sv;?></div>
-              </div>
+            <div class="table-row text-center waterfall-title small col-12 center-block">
+              <?php $isChineseLang = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']);?>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->pv . '(' . $lang->project->pvTitle . ')' : $lang->project->pv; ?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->ev . '(' . $lang->project->evTitle . ')' : $lang->project->ev;?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->ac . '(' . $lang->project->acTitle . ')' : $lang->project->ac;?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->sv . '(' . $lang->project->svTitle . ')' : $lang->project->sv;?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->cv . '(' . $lang->project->cvTitle . ')' : $lang->project->cv;?></div>
+            </div>
+            <div class="table-row text-center waterfall-value small col-12 center-block">
+              <div class="col-1-5"><?php echo $project->pv;?></div>
+              <div class="col-1-5"><?php echo $project->ev;?></div>
+              <div class="col-1-5"><?php echo $project->ac;?></div>
+              <div class="col-1-5"><?php echo $project->sv;?></div>
+              <div class="col-1-5"><?php echo $project->cv;?></div>
             </div>
           </div>
-          <div class='col-6'>
-            <div class='table-row weekly-row with-padding'>
-              <div class='col-4 text-center'>
-                <span class='weekly-title'><?php echo $lang->project->allInput;?></span>
-              </div>
-              <div class='col-8'></div>
-            </div>
-            <div class='progress-group'>
-              <div class="table-row text-center small with-padding">
-                <div class="col-4 text-bottom">
-                  <div class='weekly-name'><?php echo $lang->project->PM;?></div>
-                  <div class='weekly-value'><?php echo $project->PM ? zget($users, $project->PM) : $lang->project->emptyPM;?></div>
-                </div>
-                <div class="col-4">
-                  <div class='weekly-name'><?php echo $lang->project->teamCount;?></div>
-                  <div class='weekly-value'><?php echo $project->teamCount;?></div>
-                </div>
-                <div class="col-4">
-                  <div class='weekly-name'><?php echo $lang->project->budget;?></div>
-                  <div class='weekly-value'><?php echo $project->budget;?></div>
-                </div>
-              </div>
-            </div>
-            <div class="table-row text-center small with-padding">
-                <div class="col-4 text-bottom">
-                  <div class='weekly-name'><?php echo $lang->project->ac;?></div>
-                  <div class='weekly-value'><?php echo $project->ac;?></div>
-                </div>
-                <div class="col-4">
-                  <div class='weekly-name'><?php echo $lang->project->cv;?></div>
-                  <div class='weekly-value'><?php echo $project->cv;?></div>
-                </div>
-                <div>
-                </div>
-              </div>
-            </div>
         <?php endif;?>
         </div>
       </div>
diff --git a/module/block/view/projectteamblock.html.php b/module/block/view/projectteamblock.html.php
index 7e4fff2426..b11cf897bc 100644
--- a/module/block/view/projectteamblock.html.php
+++ b/module/block/view/projectteamblock.html.php
@@ -8,7 +8,6 @@ $maxConsumed  = 0;
 <div class='panel-body'>
   <div class='table-row'>
     <div class='table-col chart-titles'>
-      <div class='chart-col-title strong'><span><?php echo $lang->project->name;?></span></div>
       <?php foreach($projects as $project):?>
       <?php
       $maxTeamCount = max($maxTeamCount, $project->teamCount);
@@ -48,24 +47,22 @@ $maxConsumed  = 0;
   </div>
   <style>
   .block-projectteam .panel-body {margin-top: -10px}
-  .chart-titles {width: 110px; padding-right: 10px; position: relative; z-index: 1}
+  .chart-titles {top: 30px; width: 150px; padding-right: 10px; position: relative; z-index: 1}
   .chart-rows {position: relative; z-index: 0}
   .chart-title {width: 100px; line-height: 20px; padding: 5px 0; height: 30px}
   .chart-title > span {background: #fff}
   .chart-col-title {line-height: 20px; margin-bottom: 10px; padding: 0 10px}
-  .project-team, .project-consumed {padding: 0}
-  .project-team {border-right: 1px solid #e5e8ec}
-  .project-team > .chart-col-title {text-align: right}
+  .project-team, .project-consumed {padding: 0; border-left: 1px solid #e5e8ec}
   .chart-col-item {height: 30px; padding: 5px 0}
   .chart-col-text {width: 50px; position: absolute; top: 5px; line-height: 20px; left: 0}
-  .project-team .chart-col-item {padding-left: 50px}
+  .project-team .chart-col-item {padding-right: 50px}
   .project-team .chart-col-item:before {content: ' '; z-index: 0; left: -100px; top: 14px; right: 0; border-top: 1px dotted #e5e8ec}
   .project-consumed .chart-col-item {padding-right: 50px}
   .chart-col-item .progress {background: none; border-radius: 0; overflow: visible; margin: 6px 0 0 0; position: relative; z-index: 1}
   .chart-col-item .progress > .progress-bar {border-radius: 0; position: relative; min-width: 1px}
-  .project-team .chart-col-item .progress > .progress-bar {float: right; background-color: #39cfff}
+  .project-team .chart-col-item .progress > .progress-bar {background-color: #39cfff}
   .chart-col-item .progress .progress-text {position: absolute; top: -6px; color: #333; width: 50px; line-height: 20px; white-space: nowrap; overflow: visible}
-  .project-team .progress .progress-text {text-align: right; left: -50px; padding-right: 5px}
+  .project-team .progress .progress-text {text-align: left; right: -55px; padding-right: 5px}
   .project-consumed .progress .progress-text {text-align: left; right: -50px; padding-left: 5px}
   </style>
 </div>
diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php
index e21038f0ad..b0fa93205c 100644
--- a/module/block/view/recentprojectblock.html.php
+++ b/module/block/view/recentprojectblock.html.php
@@ -6,8 +6,8 @@
 #cards {margin: 0; padding: 0 10px 10px 10px;}
 #cards > .col {width: 33.33%;}
 .col-side #cards > .col {width: 100%;}
-#cards .panel {margin: 10px 0; border: 1px solid #DCDCDC; border-radius: 2px; box-shadow: none; height: 146px; cursor: pointer;}
-#cards .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);}
+#cards .panel-content {margin: 10px 0; border: 1px solid #DCDCDC; border-radius: 2px; box-shadow: none; height: 146px; cursor: pointer;}
+#cards .panel-content:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);}
 #cards .panel-heading {padding: 12px 24px 10px 16px;}
 #cards .panel-body {padding: 0 16px 16px;}
 #cards .panel-actions {padding: 7px 0; z-index: 0}
@@ -22,7 +22,7 @@
 #cards .project-detail .progress {height: 4px;}
 #cards .project-detail .progress-text-left .progress-text {width: 50px; left: -50px;}
 #cards .panel-heading {cursor: pointer;}
-#cards .project-stages-container {margin: 0 -16px -16px -16px; padding: 0 4px; height: 46px; overflow-x: auto; position: relative;}
+#cards .project-stages-container {margin: 0 0 -16px 0; padding: 0 4px; height: 46px; overflow-x: auto; position: relative;}
 #cards .project-stages:after {content: ' '; width: 30px; display: block; right: -16px; top: 16px; bottom: -6px; z-index: 1; background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); position: absolute;}
 #cards .project-stages-row {position: relative; height: 30px; z-index: 0;}
 #cards .project-stage-item {white-space: nowrap; position: absolute; top: 0; min-width: 48px; padding-top: 13px; color: #838A9D;}
@@ -32,31 +32,37 @@
 #cards .project-stage-item.is-going {color: #333;}
 #cards .project-stage-item.is-going::before {background-color: #0C64EB;}
 #dashboard .block-recentproject .panel-body {padding: 0;}
+.execution-name {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 </style>
 <div class="panel-body">
+  <?php if(empty($projects)):?>
+    <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
+  <?php else:?>
   <div class='row' id='cards'>
     <?php foreach ($projects as $projectID => $project):?>
-    <div class='col' data-id='<?php echo $projectID?>'>
-      <div class='panel' data-url='<?php echo $this->createLink('project', 'index', "projectID=$project->id");?>'>
+    <?php $viewLink = $config->systemMode == 'new' ? $this->createLink('project', 'index', "projectID=$project->id") : $this->createLink('execution', 'task', "projectID=$project->id");?>
+    <div class='col'>
+      <div class='panel-content'>
         <div class='panel-heading not-move-handler'>
-          <strong class='project-name' title='<?php echo $project->name;?>'> <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name);?> </strong>
+          <?php if(isset($config->maxVersion)):?>
           <?php if($project->model === 'waterfall'): ?>
           <span class='project-type-label label label-warning label-outline'><?php echo $lang->project->waterfall; ?></span>
           <?php else: ?>
           <span class='project-type-label label label-info label-outline'><?php echo $lang->project->scrum; ?></span>
           <?php endif; ?>
+          <?php endif; ?>
+          <strong class='project-name' title='<?php echo $project->name;?>'> <?php echo html::a($viewLink, $project->name);?> </strong>
           <nav class='panel-actions nav nav-default'>
             <li class='dropdown'>
-              <a href='javascript:;' data-toggle='context-dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
               <ul class='dropdown-menu pull-right cards-menu'>
-                <li><?php common::printIcon('program', 'PRJGroup', "projectID=$project->id", $project, 'button', 'group', '', '', '', '', '', $project->id);?></li>
-                <li><?php common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'button', 'persons', '', '', '', '', '', $project->id);?></li>
-                <li><?php common::printicon('program', 'PRJActivate', "projectid=$project->id", $project, 'button', '', '', 'iframe', true);?></li>
-                <li><?php common::printIcon('program', 'PRJEdit',    "projectID=$project->id", $project, 'button', ' icon-edit', '', '', '', '', '', $project->id);?></li>
-                <li><?php common::printIcon('program', 'PRJStart',   "projectID=$project->id", $project, 'button', ' icon-play', '', 'iframe', true);?></li>
-                <li><?php common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'button', ' icon-pause', '', 'iframe', true);?></li>
-                <li><?php common::printIcon('program', 'PRJClose',   "projectID=$project->id", $project, 'button', ' icon-off', '', 'iframe', true);?></li>
-                <li><?php common::printIcon('program', 'PRJDelete',  "projectID=$project->id", $project, 'button', ' icon-trash', 'hiddenwin');?></li>
+                <li><?php common::printIcon('project', 'group', "projectID=$project->id", $project, 'button', 'group', '', '', '', '', '', $project->id);?></li>
+                <li><?php common::printIcon('project', 'manageMembers', "projectID=$project->id", $project, 'button', 'persons', '', '', '', '', '', $project->id);?></li>
+                <li><?php common::printicon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);?></li>
+                <li><?php if(common::hasPriv('project', 'edit')) echo html::a($this->createLink('project', 'edit', "projectID=$project->id"), "<i class='icon-edit'></i> " . $lang->project->edit, '', "data-app='{$app->openApp}'");?></li>
+                <li><?php common::printIcon('project', 'start',   "projectID=$project->id", $project, 'button', ' icon-play', '', 'iframe', true);?></li>
+                <li><?php common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', ' icon-pause', '', 'iframe', true);?></li>
+                <li><?php common::printIcon('project', 'close',   "projectID=$project->id", $project, 'button', ' icon-off', '', 'iframe', true);?></li>
+                <li><?php if(common::hasPriv('project', 'delete')) echo html::a($this->createLink('project', 'delete', "projectID=$project->id"), "<i class='icon-trash'></i> " . $lang->project->delete, 'hiddenwin', "data-app='{$app->openApp}'");?></li>
               </ul>
             </li>
           </nav>
@@ -66,9 +72,9 @@
             <span><i class='icon icon-group'></i> <?php printf($lang->project->membersUnit, $project->teamCount); ?></span>
             <span><i class='icon icon-clock'></i> <?php printf($lang->project->hoursUnit, $project->estimate); ?></span>
           </div>
+          <?php if($config->systemMode == 'new'):?>
           <?php if($project->model === 'waterfall'): ?>
           <div class='project-detail project-stages'>
-            <p class='text-muted'><?php echo $lang->project->ongoingStage;?></p>
             <?php
             $projectProjects = array();
             foreach($project->executions as $project)
@@ -79,6 +85,7 @@
             <?php if(empty($projectProjects)): ?>
             <div class='label label-outline'><?php echo zget($lang->project->statusList, $project->status);?></div>
             <?php else: ?>
+            <p class='text-muted'><?php echo $lang->project->ongoingStage;?></p>
             <div class='project-stages-container scrollbar-hover'>
               <div class='project-stages-row'>
                 <?php foreach ($projectProjects as $project): ?>
@@ -96,11 +103,11 @@
             <p class='text-muted'><?php echo $lang->project->lastIteration; ?></p>
             <?php if($project):?>
             <div class='row'>
-              <div class='col-xs-5'><?php echo $project->name;?></div>
+              <div class='col-xs-5 execution-name' title="<?php echo $project->name;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID={$project->id}"), $project->name);?></div>
               <div class='col-xs-7'>
-              <div class="progress progress-text-left">
-                <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
-                <span class="progress-text"><?php echo $project->hours->progress;?>%</span>
+                <div class="progress progress-text-left">
+                  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
+                  <span class="progress-text"><?php echo $project->hours->progress;?>%</span>
                 </div>
               </div>
               </div>
@@ -108,11 +115,13 @@
             <?php endif; ?>
           </div>
           <?php endif; ?>
+          <?php endif; ?>
         </div>
       </div>
     </div>
     <?php endforeach;?>
   </div>
+  <?php endif;?>
 </div>
 <script>
 /* Auto resize stages */
diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php
index d492a787bc..f8e37278d5 100644
--- a/module/block/view/releaseblock.html.php
+++ b/module/block/view/releaseblock.html.php
@@ -32,17 +32,19 @@
     <tbody>
       <?php foreach($releases as $release):?>
       <?php
-      $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
-      $viewLink = $this->createLink('release', 'view', "releaseID={$release->id}");
+      $appid           = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $productViewLink = $this->createLink('product', 'browse', "productID={$release->product}");
+      $buildViewLink   = $this->createLink('build', 'view', "buildID={$release->build}");
+      $releaseViewLink = $this->createLink('release', 'view', "releaseID={$release->id}");
       ?>
-      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+      <tr <?php echo $appid?>>
         <?php if($longBlock):?>
         <td class='text-center'><?php echo sprintf('%03d', $release->id);?></td>
-        <td title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
+        <td title='<?php echo $release->productName?>'><?php echo html::a($productViewLink, $release->productName);?></td>
         <?php endif;?>
-        <td title='<?php echo $release->name?>'><?php echo $release->name?></td>
+        <td title='<?php echo $release->name?>'><?php echo html::a($releaseViewLink, $release->name);?></td>
         <?php if($longBlock):?>
-        <td title='<?php echo $release->buildName?>'><?php echo $release->buildName?></td>
+        <td title='<?php echo $release->buildName?>'><?php echo html::a($buildViewLink, $release->buildName);?></td>
         <?php endif;?>
         <td class='text-center'><?php echo $release->date?></td>
         <td class='c-status' title='<?php echo zget($lang->release->statusList, $release->status);?>'>
diff --git a/module/block/view/riskblock.html.php b/module/block/view/riskblock.html.php
index 3f0cbcc58a..1a9a4e0fb2 100644
--- a/module/block/view/riskblock.html.php
+++ b/module/block/view/riskblock.html.php
@@ -4,7 +4,7 @@
 <style>
 .block-risks .c-id {width: 50px;}
 .block-risks .c-pri {width: 50px;text-align: center;}
-.block-risks .c-identifiedDate {width: 95px;}
+.block-risks .c-plannedClosedDate {width: 100px;}
 .block-risks .c-category {width: 80px;}
 .block-risks .c-status {width: 80px;}
 .block-risks.block-sm .c-status {text-align: center;}
@@ -21,7 +21,7 @@
         <?php if($longBlock):?>
         <th class='c-pri'><?php echo $lang->priAB?></th>
         <th class='c-category'><?php echo $lang->risk->category;?></th>
-        <th class='c-identifiedDate'><?php echo $lang->risk->identifiedDate;?></th>
+        <th class='c-plannedClosedDate'><?php echo $lang->risk->plannedClosedDate;?></th>
         <?php endif;?>
         <th class='c-status'><?php echo $lang->risk->status;?></th>
       </tr>
@@ -33,11 +33,11 @@
       ?>
       <tr>
         <td class='c-id-xs'><?php echo sprintf('%03d', $risk->id);?></td>
-        <td class='c-name' title='<?php echo $risk->name?>'><?php echo html::a($this->createLink('risk', 'view', "riskID=$risk->id", '', '', $risk->PRJ), $risk->name)?></td>
+        <td class='c-name' title='<?php echo $risk->name?>'><?php echo html::a($this->createLink('risk', 'view', "riskID=$risk->id", '', '', $risk->project), $risk->name)?></td>
         <?php if($longBlock):?>
         <td class='c-pri'><?php echo "<span class='pri-{$risk->pri}'>" . zget($lang->risk->priList, $risk->pri) . "</span>";?></td>
         <td class='c-category'><?php echo zget($lang->risk->categoryList, $risk->category)?></td>
-        <td class='c-identifiedDate'><?php echo $risk->identifiedDate == '0000-00-00' ? '' : $risk->identifiedDate;?></td>
+        <td class='c-plannedClosedDate'><?php echo $risk->plannedClosedDate == '0000-00-00' ? '' : $risk->plannedClosedDate;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('risk', $risk);?>
         <td class='c-status' title='<?php echo $status;?>'>
diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php
index f3710d44a8..aaa9cd6499 100644
--- a/module/block/view/scrumlistblock.html.php
+++ b/module/block/view/scrumlistblock.html.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
+<style>.table .c-progress {width: 60px;}</style>
 <?php if(empty($executionStats)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
@@ -39,7 +40,7 @@
       $appid    = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'";
       $viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id);
       ?>
-      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+      <tr <?php echo $appid?>>
         <td class='c-name text-left' title='<?php echo $execution->name;?>'><nobr><?php echo html::a($viewLink, $execution->name, '', "title='$execution->name'");?></nobr></td>
         <td class="c-date"><?php echo $execution->end;?></td>
         <?php if($longBlock):?>
@@ -51,15 +52,13 @@
           <span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
           <?php endif;?>
         </td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft     . $lang->execution->workHourUnit;?></td>
         <?php endif;?>
         <td class="c-progress">
-          <div class="progress progress-text-left">
-            <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
-            <span class="progress-text"><?php echo $execution->hours->progress;?>%</span>
-            </div>
+          <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+            <div class='progress-info'><?php echo $execution->hours->progress;?></div>
           </div>
         </td>
         <?php if($longBlock):?>
diff --git a/module/block/view/scrumoverviewblock.html.php b/module/block/view/scrumoverviewblock.html.php
index 463859cfb8..f643149823 100644
--- a/module/block/view/scrumoverviewblock.html.php
+++ b/module/block/view/scrumoverviewblock.html.php
@@ -13,81 +13,52 @@
 <?php if(empty($totalData)): ?>
 <div class='empty-tip'><?php common::printLink('project', 'create', '', "<i class='icon-plus'></i> " . $lang->project->create, '', "class='btn btn-primary'")?></div>
 <?php else:?>
-<style>
-#totalInvestment {padding-bottom: 5px;}
-.overview-title {font-size: 14px; color: #838a9d;}
-.extra-tips {font-size: 12px; color: #a1a7b7;}
-.progress {margin-bottom: 8px;}
-.total-block {padding: 0px 25px;}
-.hours-statistics {position: relative; padding: 0px 5px 5px; display: table-cell;text-align: center;}
-.hours-statistics > small {display: block; color: #A6AAB8;}
-.hours-statistics > span {display: block; color: #3c4353; font-weight: bold;}
-.tile-amount {font-size: 20px;}
-</style>
-<div class="panel-body conatiner-fluid">
-  <div class="table-row">
-    <div class="col-6 tile">
-      <div class="text-left" id="totalInvestment"><strong><?php echo $lang->block->totalInvestment;?></strong></div>
-      <div class="table-row">
-        <div class="col-4 tile">
-          <div class="overview-title"><i class="icon-program-group icon-group"></i> <?php echo $lang->block->totalPeople;?></div>
-          <div class="tile-amount">
-          <?php echo $totalData[$projectID]->teamCount ? html::a($this->createLink('program', 'prjmanageMembers', 'projectID=' . $projectID), $totalData[$projectID]->teamCount) : 0;?>
-          </div>
-        </div>
-        <div class="col-4 tile">
-          <div class="overview-title"><i class="icon icon-clock"></i> <?php echo $lang->block->consumedHours;?></div>
-          <div class="tile-amount" title="<?php echo $totalData[$projectID]->consumed . $lang->execution->workHour;?>">
-          <?php echo $totalData[$projectID]->consumed ? html::a($this->createLink('project', 'index', 'locate=no'), $totalData[$projectID]->consumed . $lang->execution->workHourUnit) : 0;?>
-          </div>
-          <div class="tile-info">
-          <span class="extra-tips"><?php echo $lang->block->estimatedHours . ' ' . $totalData[$projectID]->estimate . $lang->execution->workHour;?></span>
-          </div>
-        </div>
-        <div class="col-4 tile">
-          <div class="overview-title"><i class="icon icon-cost"></i> <?php echo $lang->block->spent;?></div>
-          <div class="tile-amount">￥0</div>
-          <div class="tile-info">
-            <?php $budget = $totalData[$projectID]->budget != 0 ? zget($lang->project->currencySymbol, $totalData[$projectID]->budgetUnit) . number_format($totalData[$projectID]->budget, 2) : $lang->project->future;?>
-            <span class="extra-tips"><?php echo $lang->block->budget . ' ' . $budget;?></span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col-3 total-block hide-in-sm">
-      <div><strong><?php echo $lang->block->totalStory;?></strong></div>
-      <div class="tile-amount">
-      <?php echo $totalData[$projectID]->allStories;?>
-      </div>
-      <div class="progress">
-        <div class="progress-bar" role="progressbar" aria-valuenow="<?php echo $totalData[$projectID]->doneStories;?>" aria-valuemin="0" aria-valuemax="<?php echo $totalData[$projectID]->allStories;?>" style="width: <?php echo floor(($totalData[$projectID]->doneStories/$totalData[$projectID]->allStories)*100).'%';?>"></div>
-      </div>
-      <div class="hours-statistics">
-        <small><?php echo $lang->block->done;?></small>
-        <span><?php echo $totalData[$projectID]->doneStories;?></span>
-      </div>
-      <div class="hours-statistics">
-        <small><?php echo $lang->block->left;?></small>
-        <span><?php echo $totalData[$projectID]->leftStories;?></span>
-      </div>
-    </div>
-    <div class="col-3 total-block hide-in-sm">
-      <div><strong><?php echo $lang->block->totalBug;?></strong></div>
-      <div class="tile-amount">
-      <?php echo $totalData[$projectID]->allBugs;?>
-      </div>
-      <div class="progress">
-        <div class="progress-bar" role="progressbar" aria-valuenow="<?php echo $totalData[$projectID]->doneBugs;?>" aria-valuemin="0" aria-valuemax="<?php echo $totalData[$projectID]->allBugs;?>" style="width: <?php echo floor(($totalData[$projectID]->doneBugs/$totalData[$projectID]->allBugs)*100).'%';?>"></div>
-      </div>
-      <div class="hours-statistics">
-        <small><?php echo $lang->block->done;?></small>
-        <span><?php echo $totalData[$projectID]->doneBugs;?></span>
-      </div>
-      <div class="hours-statistics">
-        <small><?php echo $lang->block->left;?></small>
-        <span><?php echo $totalData[$projectID]->leftBugs;?></span>
-      </div>
-    </div>
-  </div>
-</div>
+<table class="table table-data">
+  <thead>
+    <tr>
+      <th><?php echo $lang->block->storyNum;?></th>
+      <th></th>
+      <th><?php echo $lang->personnel->invest;?></th>
+      <th></th>
+      <th><?php echo $lang->workingHour;?></th>
+      <th></th>
+      <th><?php echo $lang->block->bugNum;?></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th><?php echo $lang->block->totalStory . ':';?></th>
+      <td><?php echo $totalData[$projectID]->allStories;?></td>
+      <th><?php echo $lang->block->totalPeople . ':';?></th>
+      <td><?php echo  $totalData[$projectID]->teamCount ? html::a($this->createLink('project', 'manageMembers', 'projectID=' . $projectID), $totalData[$projectID]->teamCount) : 0;?></td>
+      <th><?php echo $lang->block->estimatedHours . ':';?></th>
+      <td><?php echo $totalData[$projectID]->estimate . $lang->execution->workHour;?></td>
+      <th><?php echo $lang->block->totalBug. ':';?></th>
+      <td><?php echo $totalData[$projectID]->allBugs;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->block->done . ':';?></th>
+      <td><?php echo $totalData[$projectID]->doneStories;?></td>
+      <th></th>
+      <td></td>
+      <th><?php echo $lang->block->consumedHours . ':';?></th>
+      <td><?php echo $totalData[$projectID]->consumed . $lang->execution->workHour;?></td>
+      <th><?php echo $lang->bug->statusList['resolved'] . ':';?></th>
+      <td><?php echo $totalData[$projectID]->doneBugs;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->block->left . ':';?></th>
+      <td><?php echo $totalData[$projectID]->leftStories;?></td>
+      <th></th>
+      <td></td>
+      <th></th>
+      <td></td>
+      <th><?php echo $lang->bug->unResolved . ':';?></th>
+      <td><?php echo $totalData[$projectID]->leftBugs;?></td>
+    </tr>
+
+  </tbody>
+</table>
+
 <?php endif;?>
diff --git a/module/block/view/scrumproductblock.html.php b/module/block/view/scrumproductblock.html.php
index 850648e266..5140e8146b 100644
--- a/module/block/view/scrumproductblock.html.php
+++ b/module/block/view/scrumproductblock.html.php
@@ -30,8 +30,8 @@
       $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : "";
       $viewLink = $this->createLink('product', 'browse', 'productID=' . $id);
       ?>
-        <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-          <td class="c-num text-ellipsis" title="<?php echo $name;?>"><?php echo $name;?></td>
+        <tr class='text-center' <?php echo $appid?>>
+          <td class="c-num text-ellipsis" title="<?php echo $name;?>"><?php echo html::a($viewLink, $name);?></td>
           <td class="c-num"><?php echo empty($stories[$id]) ? 0: $stories[$id];?></td>
           <td class="c-num"><?php echo empty($bugs[$id]) ? 0: $bugs[$id];?></td>
           <td class="c-num"><?php echo empty($releases[$id]) ? 0: $releases[$id];?></td>
diff --git a/module/block/view/scrumtestblock.html.php b/module/block/view/scrumtestblock.html.php
index 6b86a25809..09a283bba1 100644
--- a/module/block/view/scrumtestblock.html.php
+++ b/module/block/view/scrumtestblock.html.php
@@ -31,18 +31,21 @@
     <tbody>
       <?php foreach($testtasks as $testtask):?>
       <?php
-      $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
-      $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}");
+      $appid            = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $productViewLink  = $this->createLink('product', 'browse', "productID={$testtask->product}");
+      $projectViewLink  = $this->createLink('project', 'view', "projectID={$testtask->project}");
+      $testtaskViewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}");
+      $buildViewLink    = $this->createLink('build', 'view', "buildID={$testtask->build}");
       ?>
-      <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-        <td class='text-left text-ellipsis' title='<?php echo $testtask->name?>'><?php echo $testtask->name?></td>
+      <tr class='text-center' <?php echo $appid?>>
+        <td class='text-left text-ellipsis' title='<?php echo $testtask->name?>'><?php echo html::a($testtaskViewLink, $testtask->name);?></td>
         <?php if($longBlock):?>
-        <td class='text-left text-ellipsis' title='<?php echo $testtask->productName?>'><?php echo $testtask->productName?></td>
+        <td class='text-left text-ellipsis' title='<?php echo $testtask->productName?>'><?php echo html::a($productViewLink, $testtask->productName);?></td>
         <?php endif;?>
         <?php if($longBlock):?>
-        <td class='text-left text-ellipsis' title='<?php echo $testtask->projectName?>'><?php echo $testtask->projectName?></td>
+        <td class='text-left text-ellipsis' title='<?php echo $testtask->projectName?>'><?php echo html::a($projectViewLink, $testtask->projectName);?></td>
         <?php endif;?>
-        <td class='text-left text-ellipsis' title='<?php echo $testtask->buildName?>'><?php echo $testtask->buildName?></td>
+        <td class='text-left text-ellipsis' title='<?php echo $testtask->buildName?>'><?php echo html::a($buildViewLink, $testtask->buildName);?></td>
         <td><?php echo zget($lang->testtask->statusList, $testtask->status)?></td>
       </tr>
       <?php endforeach;?>
diff --git a/module/block/view/sprintblock.html.php b/module/block/view/sprintblock.html.php
index 017b1abf7d..791f75d836 100644
--- a/module/block/view/sprintblock.html.php
+++ b/module/block/view/sprintblock.html.php
@@ -20,7 +20,7 @@
   <div class="col-4 text-middle text-center">
     <div class="tile">
       <div class="tile-title"><?php echo $lang->block->allExecutions;?></div>
-      <?php $projectLink = $this->createLink('project', 'all', 'status=all')?>
+      <?php $projectLink = $this->createLink('project', 'execution')?>
       <div class="tile-amount"><?php echo $summary->total ? html::a($projectLink, $summary->total) : 0;?></div>
     </div>
   </div>
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index c26ecfef5e..c8822ffa87 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -27,16 +27,12 @@
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-stories <?php if(!$longBlock) echo 'block-sm'?>'>
     <thead>
       <tr>
-        <?php if($longBlock):?>
         <th class="c-id"><?php echo $lang->idAB?></th>
-        <?php endif;?>
         <th class="c-pri"><?php echo $lang->priAB?></th>
         <th class="c-name"><?php echo $lang->SRCommon;?></th>
         <?php if($longBlock):?>
         <th class='c-estimate'><?php echo $lang->story->estimateAB;?></th>
-        <?php endif;?>
         <th class="c-status"><?php echo $lang->statusAB;?></th>
-        <?php if($longBlock):?>
         <th class='c-stage'><?php echo $lang->story->stageAB;?></th>
         <?php endif;?>
       </tr>
@@ -47,20 +43,16 @@
       $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
       $viewLink = $this->createLink('story', 'view', "storyID={$story->id}");
       ?>
-      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-        <?php if($longBlock):?>
+      <tr <?php echo $appid?>>
         <td class="c-id-xs"><?php echo sprintf('%03d', $story->id);?></td>
-        <?php endif;?>
         <td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>" title="<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
-        <td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
+        <td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo html::a($viewLink, $story->title);?></td>
         <?php if($longBlock):?>
-        <td class='c-estimate text-center' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit?></td>
-        <?php endif;?>
+        <td class='c-estimate text-center' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit?></td>
         <?php $status = $this->processStatus('story', $story);?>
         <td class='c-status' title='<?php echo $status;?>'>
           <span class="status-story status-<?php echo $story->status?>"><?php echo $status;?></span>
         </td>
-        <?php if($longBlock):?>
         <td class='c-stage'>
           <span class='story-stage-<?php echo $story->stage?>'>
             <?php echo zget($lang->story->stageList, $story->stage, $story->stage);?>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 376df8196d..0b513de61b 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -46,7 +46,7 @@
         <td class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
         <td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name)?></td>
         <?php if($longBlock):?>
-        <td class='c-estimate text-center' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
+        <td class='c-estimate text-center' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
         <td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('task', $task);?>
diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php
index a4748ced96..96abd3848b 100644
--- a/module/block/view/testtaskblock.html.php
+++ b/module/block/view/testtaskblock.html.php
@@ -32,17 +32,19 @@
     <tbody>
       <?php foreach($testtasks as $testtask):?>
       <?php
-      $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
-      $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}");
+      $appid            = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $productViewLink  = $this->createLink('product', 'browse', "productID={$testtask->product}");
+      $buildViewLink    = $this->createLink('build', 'view', "buildID={$testtask->build}");
+      $testtaskViewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}");
       ?>
-      <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+      <tr class='text-center' <?php echo $appid?>>
         <?php if($longBlock):?>
         <td><?php echo sprintf('%03d', $testtask->id);?></td>
-        <td class='text-left' title='<?php echo $testtask->productName?>'><?php echo $testtask->productName?></td>
+        <td class='text-left' title='<?php echo $testtask->productName?>'><?php echo html::a($productViewLink, $testtask->productName);?></td>
         <?php endif;?>
-        <td class='text-left' title='<?php echo $testtask->name?>'><?php echo $testtask->name?></td>
+        <td class='text-left' title='<?php echo $testtask->name?>'><?php echo html::a($testtaskViewLink, $testtask->name);?></td>
         <?php if($longBlock):?>
-        <td class='text-left' title='<?php echo $testtask->projectName . '/' . $testtask->buildName?>'><?php echo $testtask->projectName . '/' . $testtask->buildName?></td>
+        <td class='text-left' title='<?php echo $testtask->projectName . '/' . $testtask->buildName?>'><?php echo html::a($buildViewLink, $testtask->projectName . '/' . $testtask->buildName);?></td>
         <?php endif;?>
         <td><?php echo $testtask->begin?></td>
         <td><?php echo $testtask->end?></td>
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index a438b40e4e..55cb05f1c3 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -19,7 +19,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
 .block-todoes .todoes-input .form-control:-ms-input-placeholder {font-size: 12px; line-height: 20px;color: #a4a8b6;}
 .block-todoes .todoes-input .form-control::placeholder {font-size: 12px; line-height: 20px; color: #a4a8b6;}
 .block-todoes .todoes {padding: 0 10px 10px 10px; margin: 0 -20px; max-height: 350px; overflow: auto; overflow-x:hidden}
-.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden; width: 410px;}
+.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;}
 .block-todoes .todoes > li:hover {background-color: #e9f2fb;}
 .block-todoes .todo-title {padding: 5px 15px 5px 5px;}
 .block-todoes .todo-pri {margin: 0 5px;}
@@ -96,7 +96,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
       ?>
       <li data-id='<?php echo $todo->id?>'>
         <span class="todo-check icon icon-check-circle"></span>
-        <a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe' <?php echo $appid?>>
+        <a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe' data-toggle='modal' <?php echo $appid?>>
           <?php if ($todo->date == '2030-01-01') :?>
           <span class="todo-time"><?php echo $lang->todo->periods['future'] ?></span>
           <?php else:?>
diff --git a/module/block/view/todolist.html.php b/module/block/view/todolist.html.php
index 4738582b66..90238ebbb7 100644
--- a/module/block/view/todolist.html.php
+++ b/module/block/view/todolist.html.php
@@ -28,10 +28,10 @@
     <tbody>
       <?php foreach($todos as $todo):?>
       <?php
-      $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
       $viewLink = $this->createLink('todo', 'view', "todo={$todo->id}");
       ?>
-      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+      <tr <?php echo $appid?>>
         <td class='c-date'>
           <?php if ($todo->date == '2030-01-01') :?>
           <?php echo $lang->todo->periods['future'];?>
@@ -40,7 +40,7 @@
           <?php endif;?>
         </td>
         <td class="c-pri"><span class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></span></td>
-        <td class="c-name" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></td>
+        <td class="c-name" title='<?php echo $todo->name;?>'><?php echo html::a($viewLink, $todo->name);?></td>
         <td class='c-status'><?php echo zget($lang->todo->statusList, $todo->status);?></td>
       </tr>
       <?php endforeach;?>
diff --git a/module/block/view/waterfallestimateblock.html.php b/module/block/view/waterfallestimateblock.html.php
index 7b2b8c1e8e..40058eefb5 100644
--- a/module/block/view/waterfallestimateblock.html.php
+++ b/module/block/view/waterfallestimateblock.html.php
@@ -3,17 +3,19 @@
   <tr>
     <th class='w-100px'><?php echo $lang->durationestimation->people;?></th>
     <td><?php echo $people ? $people : 0;?></td>
-    <th class='w-80px'><?php echo $lang->durationestimation->members;?></th>
-    <td><?php echo $members;?></td>
+    <th class='w-100px'><?php echo $lang->workestimation->duration;?></th>
+    <td><?php echo zget($budget, 'duration', 0);?></td>
   </tr>
   <tr>
-    <th><?php echo $lang->workestimation->duration;?></th>
-    <td><?php echo zget($budget, 'duration', 0);?></td>
-    <th><?php echo $lang->workestimation->consumed;?></th>
+    <th class='w-100px'><?php echo $lang->durationestimation->members;?></th>
+    <td><?php echo $members;?></td>
+    <th class='w-100px'><?php echo $lang->workestimation->consumed;?></th>
     <td><?php echo $consumed ? $consumed : 0;?></td>
   </tr>
   <tr>
-    <th><?php echo $lang->workestimation->totalLaborCost;?></th>
+    <th class='w-100px'><?php echo $lang->workestimation->totalLaborCost;?></th>
     <td><?php echo '￥' . zget($budget, 'totalLaborCost', 0);?></td>
+    <th class='w-100px'><?php echo $lang->block->remain;?></th>
+    <td><?php echo $totalLeft ? $totalLeft : 0;?></td>
   </tr>
 </table>
diff --git a/module/block/view/waterfallissueblock.html.php b/module/block/view/waterfallissueblock.html.php
index bc5f5ee000..21df7207e9 100644
--- a/module/block/view/waterfallissueblock.html.php
+++ b/module/block/view/waterfallissueblock.html.php
@@ -19,8 +19,8 @@
         <?php if($longBlock):?>
         <th class='w-80px'><?php echo $lang->issue->severity;?></th>
         <th class='w-80px'><?php echo $lang->issue->pri;?></th>
-        <th class='w-120px'><?php echo $lang->issue->owner;?></th>
-        <th class='w-120px'><?php echo $lang->issue->assignedTo;?></th>
+        <th class='w-80px'><?php echo $lang->issue->owner;?></th>
+        <th class='w-80px'><?php echo $lang->issue->assignedTo;?></th>
         <?php endif;?>
         <th class='w-80px'><?php echo $lang->issue->status;?></th>
       </tr>
diff --git a/module/block/view/waterfallprogressblock.html.php b/module/block/view/waterfallprogressblock.html.php
index 39441b481a..de21679535 100644
--- a/module/block/view/waterfallprogressblock.html.php
+++ b/module/block/view/waterfallprogressblock.html.php
@@ -12,7 +12,7 @@
         <canvas width='400' height='120' data-responsive='true'></canvas>
       </div>
     </div>
-    <div class='chart-unit'><?php echo "({$lang->project->workHour})";?></div>
+    <div class='chart-unit'><?php echo "({$lang->execution->workHour})";?></div>
     <div class='chart-legend'>
       <span class="barline line-pv">PV</span>
       <span class="barline line-ev">EV</span>
@@ -112,7 +112,7 @@
               scaleFontColor: '#838A9D',
               tooltipXPadding: 10,
               tooltipYPadding: 10,
-              multiTooltipTitleTemplate: '<%= label %> <?php echo $lang->project->workHour;?> /h',
+              multiTooltipTitleTemplate: '<%= label %> <?php echo $lang->execution->workHour;?> /h',
               multiTooltipTemplate: '<%if (datasetLabel){%><%=datasetLabel%>: <%}%><%= value %>',
           });
       }
diff --git a/module/block/view/waterfallreportblock.html.php b/module/block/view/waterfallreportblock.html.php
index 3b08e3bc4b..577228719c 100644
--- a/module/block/view/waterfallreportblock.html.php
+++ b/module/block/view/waterfallreportblock.html.php
@@ -1,6 +1,6 @@
 <style>
 .block-waterfallreport .col-left {width: 25%; text-align: center;}
-.block-waterfallreport .col-right {width: 75%;}
+.block-waterfallreport .col-right {width: 87%;}
 .block-waterfallreport .panel-body {padding-top: 0;}
 .block-waterfallreport .table-row {margin-bottom: 20px;}
 .block-waterfallreport .stage {position: absolute; top: 14px; left: 90px;}
@@ -16,7 +16,7 @@
 <div class="panel-body conatiner-fluid">
   <div class='table-row'>
     <div class="col col-left hide-in-sm">
-      <h4><?php echo $lang->program->PGMProgress;?></h4>
+      <h4><?php echo $lang->project->progress;?></h4>
       <span class='progress-num'><?php echo $progress . '%';?></span>
       <div class="progress">
         <div class="progress-bar" role="progressbar" aria-valuenow="<?php echo $progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $progress;?>%">
@@ -26,23 +26,23 @@
     <div class='col-right'>
       <div class='row tiles'>
         <div class="col tile">
-          <div class="tile-title">PV</div>
+          <div class="tile-title"><?php echo 'PV(' . $lang->programplan->end . ')';?></div>
           <div class="tile-amount"><?php echo $pv == 0 ? 0 : $pv;?></div>
         </div>
         <div class="col tile">
-          <div class="tile-title">EV</div>
+          <div class="tile-title"><?php echo 'EV(' . $lang->programplan->realEnd . ')';?></div>
           <div class="tile-amount"><?php echo $ev == 0 ? 0 : $ev;?></div>
         </div>
         <div class="col tile">
-          <div class="tile-title">AC</div>
+          <div class="tile-title"><?php echo 'AC(' . $lang->programplan->ac . ')';?></div>
           <div class="tile-amount"><?php echo $ac == 0 ? 0 : $ac;?></div>
         </div>
         <div class="col tile">
-          <div class="tile-title">SV%</div>
+          <div class="tile-title"><?php echo 'SV(' . $lang->programplan->sv . ')';?></div>
           <div class="tile-amount"><?php echo $sv . '%';?></div>
         </div>
         <div class="col tile">
-          <div class="tile-title">CV%</div>
+          <div class="tile-title"><?php echo 'CV(' . $lang->programplan->cv . ')';?></div>
           <div class="tile-amount"><?php echo $cv . '%';?></div>
         </div>
       </div>
diff --git a/module/block/view/waterfallriskblock.html.php b/module/block/view/waterfallriskblock.html.php
index a10fc30cab..55466aee6b 100644
--- a/module/block/view/waterfallriskblock.html.php
+++ b/module/block/view/waterfallriskblock.html.php
@@ -15,14 +15,14 @@
         <th class='c-id w-50px'><?php echo $lang->idAB;?></th>
         <th class='c-name'><?php echo $lang->risk->name;?></th>
         <?php if($longBlock):?>
-        <th class='w-80px'> <?php echo $lang->risk->strategy;?></th>
+        <th class='w-60px'> <?php echo $lang->risk->strategy;?></th>
         <?php endif;?>
-        <th class='w-80px'><?php echo $lang->risk->status;?></th>
+        <th class='w-60px'><?php echo $lang->risk->status;?></th>
         <?php if($longBlock):?>
         <th class='w-80px'><?php echo $lang->risk->rate;?></th>
         <th class='w-80px'><?php echo $lang->risk->pri;?></th>
-        <th class='w-120px'><?php echo $lang->risk->assignedTo;?></th>
-        <th class='w-120px'><?php echo $lang->risk->category;?></th>
+        <th class='w-80px'><?php echo $lang->risk->assignedTo;?></th>
+        <th class='w-80px'><?php echo $lang->risk->category;?></th>
         <?php endif;?>
       </tr>
     </thead>
diff --git a/module/branch/control.php b/module/branch/control.php
index ab315b59f7..9e39d84210 100644
--- a/module/branch/control.php
+++ b/module/branch/control.php
@@ -12,30 +12,24 @@
 class branch extends control
 {
     /**
-     * Manage branch 
-     * 
-     * @param  int    $productID 
+     * Manage branch
+     *
+     * @param  int    $productID
      * @access public
      * @return void
      */
     public function manage($productID)
     {
-        $this->lang->product->menu = $this->lang->product->setMenu;
-        $this->lang->product->switcherMenu = $this->loadModel('product')->getSwitcher($productID);
-
-        $moduleIndex = array_search('branch', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-        $this->lang->branch->menu = $this->lang->product->setMenu;
+        $this->loadModel('product')->setMenu($productID);
 
         if($_POST)
         {
-            $this->branch->manage($productID);
+            $newBranches = $this->branch->manage($productID);
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $newBranches));
             die(js::reload('parent'));
         }
 
         $products = $this->loadModel('product')->getPairs('nocode');
-        $this->product->setMenu($products, $productID);
-
         $position[] = html::a($this->createLink('product', 'browse', "productID=$productID"), zget($products, $productID));
         $position[] = $this->lang->branch->manage;
 
@@ -47,7 +41,7 @@ class branch extends control
 
     /**
      * Sort branch.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -58,34 +52,36 @@ class branch extends control
 
     /**
      * Ajax get drop menu.
-     * 
-     * @param  int    $productID 
-     * @param  string $module 
-     * @param  string $method 
-     * @param  string $extra 
+     *
+     * @param  int    $productID
+     * @param  int    $branch
+     * @param  string $module
+     * @param  string $method
+     * @param  string $extra
      * @access public
      * @return void
      */
-    public function ajaxGetDropMenu($productID, $module, $method, $extra)
+    public function ajaxGetDropMenu($productID, $branch = 0, $module, $method, $extra = '')
     {
         $this->view->link      = $this->loadModel('product')->getProductLink($module, $method, $extra, true);
         $this->view->productID = $productID;
-        $this->view->projectID = $this->session->PRJ;
+        $this->view->projectID = $this->session->project;
         $this->view->module    = $module;
         $this->view->method    = $method;
         $this->view->extra     = $extra;
 
         $branches = $this->branch->getPairs($productID);
-        $this->view->branches       = $branches;
-        $this->view->branchesPinyin = common::convert2Pinyin($branches);
+        $this->view->branches        = $branches;
+        $this->view->currentBranchID = $branch;
+        $this->view->branchesPinyin  = common::convert2Pinyin($branches);
         $this->display();
     }
 
     /**
-     * Delete branch 
-     * 
-     * @param  int    $branchID 
-     * @param  string $confirm 
+     * Delete branch
+     *
+     * @param  int    $branchID
+     * @param  string $confirm
      * @access public
      * @return void
      */
@@ -105,9 +101,9 @@ class branch extends control
 
     /**
      * Ajax get branches.
-     * 
-     * @param  int    $productID 
-     * @param  int    $oldBranch 
+     *
+     * @param  int    $productID
+     * @param  int    $oldBranch
      * @access public
      * @return void
      */
diff --git a/module/branch/model.php b/module/branch/model.php
index 67274e61c2..6cfd20c981 100644
--- a/module/branch/model.php
+++ b/module/branch/model.php
@@ -98,7 +98,8 @@ class branchModel extends model
     public function manage($productID)
     {
         $oldBranches = $this->getPairs($productID, 'noempty');
-        $data = fixer::input('post')->get();
+        $data        = fixer::input('post')->get();
+
         if(isset($data->branch))
         {
             foreach($data->branch as $branchID => $branch)
@@ -106,13 +107,17 @@ class branchModel extends model
                 if($oldBranches[$branchID] != $branch) $this->dao->update(TABLE_BRANCH)->set('name')->eq($branch)->where('id')->eq($branchID)->exec();
             }
         }
+
+        $branches = array();
         foreach($data->newbranch as $i => $branch)
         {
             if(empty($branch)) continue;
             $this->dao->insert(TABLE_BRANCH)->set('name')->eq($branch)->set('product')->eq($productID)->set('`order`')->eq(count($data->branch) + $i + 1)->exec();
+            $branches[] = $this->dao->lastInsertId();
         }
 
-        return dao::isError();
+        if(dao::isError()) return false;
+        return $branches;
     }
 
     /**
diff --git a/module/branch/view/ajaxgetdropmenu.html.php b/module/branch/view/ajaxgetdropmenu.html.php
index 044e941a5c..c1bdde63cd 100644
--- a/module/branch/view/ajaxgetdropmenu.html.php
+++ b/module/branch/view/ajaxgetdropmenu.html.php
@@ -6,8 +6,9 @@
   <?php
   foreach($branches as $branchID => $branch)
   {
+      $selected = $branchID == $currentBranchID ? 'selected' : '';
       $linkHtml = $this->branch->setParamsForLink($module, $link, $projectID, $productID, $branchID);
-      echo html::a($linkHtml, "<i class='icon-cube'></i> " . $branch, '', "data-key='{$branchesPinyin[$branch]}'");
+      echo html::a($linkHtml, $branch, '', "class='$selected' data-key='{$branchesPinyin[$branch]}'");
   }
   ?>
 </div>
diff --git a/module/bug/config.php b/module/bug/config.php
index 51ff86cd7c..ab1efb6707 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -56,6 +56,8 @@ $config->bug->editor->resolve    = array('id' => 'comment', 'tools' => 'bugTools
 $config->bug->editor->close      = array('id' => 'comment', 'tools' => 'bugTools');
 $config->bug->editor->activate   = array('id' => 'comment', 'tools' => 'bugTools');
 
+$config->bug->discardedTypes = array('interface', 'designchange', 'newfeature', 'trackthings');
+
 global $lang;
 $config->bug->search['module']                   = 'bug';
 $config->bug->search['fields']['title']          = $lang->bug->title;
@@ -172,6 +174,7 @@ $config->bug->datatable->fieldList['title']['title']    = 'title';
 $config->bug->datatable->fieldList['title']['fixed']    = 'left';
 $config->bug->datatable->fieldList['title']['width']    = 'auto';
 $config->bug->datatable->fieldList['title']['required'] = 'yes';
+$config->bug->datatable->fieldList['title']['minWidth'] = '200';
 
 $config->bug->datatable->fieldList['branch']['title']    = 'branch';
 $config->bug->datatable->fieldList['branch']['fixed']    = 'left';
diff --git a/module/bug/control.php b/module/bug/control.php
index 39eed6253e..0dabb253a3 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -45,23 +45,28 @@ class bug extends control
         $this->loadModel('action');
         $this->loadModel('story');
         $this->loadModel('task');
+        $this->loadModel('qa');
 
-        /* Set bug menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID)
+        /* Get product data. */
+        $objectID = 0;
+        if($this->app->openApp == 'project')
         {
-            $this->app->loadConfig('qa');
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-            $this->lang->noMenuModule[] = $this->app->rawModule;
+            $objectID = $this->session->project;
+            $products  = $this->loadModel('project')->getProducts($objectID, false);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $objectID = $this->session->execution;
+            $products = $this->loadModel('execution')->getProducts($objectID, false);
         }
         else
         {
-            $this->lang->bug->menu    = $this->lang->projectQa->menu;
-            $this->lang->bug->subMenu = $this->lang->projectQa->subMenu;
+            $products = $this->product->getPairs('', 0, 'program_asc');
         }
 
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->projectID);
-        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=bug&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=bug')));
+        $this->view->products = $this->products = $products;
+        $openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
+        if(empty($this->products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=bug&objectID=$objectID")));
     }
 
     /**
@@ -93,41 +98,44 @@ class bug extends control
     {
         $this->loadModel('datatable');
 
+        $products = $this->loadModel('product')->getPairs('noclosed');
+        $productID = $this->product->saveState($productID, $products);
+        $this->qa->setMenu($products, $productID);
+
         /* Set browse type. */
         $browseType = strtolower($browseType);
 
         /* Set productID, moduleID, queryID and branch. */
         if(!$this->projectID) $productID = $this->product->saveState($productID, $this->products);
-        $branch    = ($branch == '') ? (int)$this->cookie->preBranch  : (int)$branch;
-        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        $branch = ($branch == '') ? (int)$this->cookie->preBranch : (int)$branch;
+        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch or $browseType == 'bybranch')
         {
             $_COOKIE['bugModule'] = 0;
-            setcookie('bugModule', 0, 0, $this->config->webRoot, '', false, false);
+            setcookie('bugModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
         }
         if($browseType == 'bymodule' or $browseType == '')
         {
-            setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', false, false);
+            setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $_COOKIE['bugBranch'] = 0;
-            setcookie('bugBranch', 0, 0, $this->config->webRoot, '', false, false);
-            if($browseType == '') setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
+            setcookie('bugBranch', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            if($browseType == '') setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
         }
-        if($browseType == 'bybranch') setcookie('bugBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
+        if($browseType == 'bybranch') setcookie('bugBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
         if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('bugBrowseType', $browseType);
 
         $moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
-        /* Set menu and save session. */
-        $this->bug->setMenu($this->products, $productID, $branch, $moduleID, $browseType, $orderBy);
-        $this->session->set('bugList', $this->app->getURI(true));
+        /* Set session. */
+        $this->session->set('bugList', $this->app->getURI(true), 'qa');
 
         /* Set moduleTree. */
         if($browseType == '')
         {
-            setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
+            setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $browseType = 'unclosed';
         }
 
@@ -145,7 +153,7 @@ class bug extends control
 
         /* Process the order by field. */
         if(!$orderBy) $orderBy = $this->cookie->qaBugOrder ? $this->cookie->qaBugOrder : 'id_desc';
-        setcookie('qaBugOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
+        setcookie('qaBugOrder', $orderBy, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
@@ -256,7 +264,7 @@ class bug extends control
             }
         }
 
-        $this->bug->setMenu($this->products, $productID, $branchID);
+        $this->qa->setMenu($this->products, $productID, $branchID);
         $this->view->title         = $this->products[$productID] . $this->lang->colon . $this->lang->bug->common . $this->lang->colon . $this->lang->bug->reportChart;
         $this->view->position[]    = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
         $this->view->position[]    = $this->lang->bug->reportChart;
@@ -282,9 +290,33 @@ class bug extends control
     {
         if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
 
+        /* Unset discarded types. */
+        foreach($this->config->bug->discardedTypes as $type) unset($this->lang->bug->typeList[$type]);
+
         /* Whether there is a object to transfer bug, for example feedback. */
         $extras = str_replace(array(',', ' '), array('&', ''), $extras);
         parse_str($extras, $output);
+
+        if($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($output['executionID']);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($output['projectID']);
+
+            /* Replace language. */
+            $project = $this->project->getByID($output['projectID']);
+            if(!empty($project->model) and $project->model == 'waterfall')
+            {
+                $this->lang->bug->execution = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->bug->execution);
+            }
+        }
+        else
+        {
+            $this->qa->setMenu($this->products, $productID);
+        }
+
         foreach($output as $paramKey => $paramValue)
         {
             if(isset($this->config->bug->fromObjects[$paramKey]))
@@ -316,7 +348,7 @@ class bug extends control
             $response['message'] = $this->lang->saveSuccess;
 
             /* Set from param if there is a object to transfer bug. */
-            setcookie('lastBugModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
+            setcookie('lastBugModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $bugResult = $this->bug->create($from = isset($fromObjectIDKey) ? $fromObjectIDKey : '');
             if(!$bugResult or dao::isError())
             {
@@ -353,19 +385,26 @@ class bug extends control
 
             $this->executeHooks($bugID);
 
+            /* Return bug id when call the API. */
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $bugID));
+
             /* If link from no head then reload. */
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
 
             if(defined('RUN_MODE') && RUN_MODE == 'api') $this->send(array('status' => 'success', 'data' => $bugID));
 
-            if(isset($output['executionID']))
+            if($this->app->openApp == 'execution')
             {
                 $location = $this->createLink('execution', 'bug', "executionID={$output['executionID']}");
             }
+            elseif($this->app->openApp == 'project')
+            {
+                $location = $this->createLink('project', 'bug', "projectID={$output['projectID']}");
+            }
             else
             {
-                setcookie('bugModule', 0, 0, $this->config->webRoot, '', false, false);
-                $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&browseType=unclosed&param=0&orderBy=id_desc");
+                setcookie('bugModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+                $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&browseType=byModule&param={$this->post->module}&orderBy=id_desc");
             }
             if($this->app->getViewType() == 'xhtml') $location = $this->createLink('bug', 'view', "bugID=$bugID");
             $response['locate'] = $location;
@@ -376,10 +415,9 @@ class bug extends control
         $productID = $this->product->saveState($productID, $this->products);
         if($branch === '') $branch = (int)$this->cookie->preBranch;
         $branches  = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID);
-        $this->bug->setMenu($this->products, $productID, $branch);
 
         /* Init vars. */
-        $projectID   = $this->lang->navGroup->bug == 'project' ? $this->session->PRJ : 0;
+        $projectID   = 0;
         $moduleID    = 0;
         $executionID = 0;
         $taskID      = 0;
@@ -409,11 +447,6 @@ class bug extends control
 
         if($runID and $resultID) extract($this->bug->getBugInfoFromResult($resultID, 0, 0, isset($stepIdList) ? $stepIdList : ''));// If set runID and resultID, get the result info by resultID as template.
         if(!$runID and $caseID)  extract($this->bug->getBugInfoFromResult($resultID, $caseID, $version, isset($stepIdList) ? $stepIdList : ''));// If not set runID but set caseID, get the result info by resultID and case info.
-        if($testtask)
-        {
-            $testtask = $this->loadModel('testtask')->getById($testtask);
-            $buildID  = $testtask->build;
-        }
 
         /* If bugID setted, use this bug as template. */
         if(isset($bugID))
@@ -430,7 +463,15 @@ class bug extends control
             $assignedTo  = $bug->assignedTo;
             $deadline    = $bug->deadline;
             $color       = $bug->color;
+            $testtask    = $bug->testtask;
         }
+
+        if($testtask)
+        {
+            $testtask = $this->loadModel('testtask')->getById($testtask);
+            $buildID  = $testtask->build;
+        }
+
         if(isset($todoID))
         {
             $todo  = $this->loadModel('todo')->getById($todoID);
@@ -452,6 +493,7 @@ class bug extends control
         {
             $builds  = $this->loadModel('build')->getExecutionBuildPairs($executionID, $productID, $branch, 'noempty,noterminate,nodone');
             $stories = $this->story->getExecutionStoryPairs($executionID);
+            if(!$projectID) $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
         }
         else
         {
@@ -463,26 +505,52 @@ class bug extends control
         $moduleOwner = $this->bug->getModuleOwner($moduleID, $productID);
 
         /* Set team members of the latest execution as assignedTo list. */
-        $latestExecution  = $this->product->getLatestProject($productID);
-        $executionMembers = array();
-        if(!empty($latestExecution)) $executionMembers = $this->loadModel('execution')->getTeamMemberPairs($latestExecution->id, 'nodeleted', $moduleOwner);
-        if(empty($executionMembers)) $executionMembers = $this->view->users;
-        if($assignedTo and !isset($executionMembers[$assignedTo]))
+        $productMembers = $this->bug->getProductMemberPairs($productID);
+        if(empty($productMembers)) $productMembers = $this->view->users;
+        if($assignedTo and !isset($productMembers[$assignedTo]))
         {
             $user = $this->loadModel('user')->getById($assignedTo);
-            if($user) $executionMembers[$assignedTo] = $user->realname;
+            if($user) $productMembers[$assignedTo] = $user->realname;
         }
 
         $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
         if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
 
-        $products = $this->products;
+        /* Get products and projects. */
+        $products = $this->config->CRProduct ? $this->products : $this->product->getPairs('noclosed', 0, 'program_asc');
+        $projects = array(0 => '');
         if($projectID)
         {
             $products    = array();
-            $productList = $this->product->getOrderedProducts('all', 40, $projectID);
+            $productList = $this->config->CRProduct ? $this->product->getOrderedProducts('all', 40, $projectID) : $this->product->getOrderedProducts('normal', 40, $projectID);
             foreach($productList as $product) $products[$product->id] = $product->name;
+
+            $project   = $this->loadModel('project')->getByID($projectID);
+            $projects += array($projectID => $project->name);
+
+            /* Set project menu. */
+            if($this->app->openApp == 'project') $this->project->setMenu($projectID);
         }
+        else
+        {
+            $projects += $this->product->getProjectPairsByProduct($productID, $branch);
+        }
+
+        /* Get block id of assinge to me. */
+        $blockID = 0;
+        if(isonlybody())
+        {
+            $blockID = $this->dao->select('id')->from(TABLE_BLOCK)
+                ->where('block')->eq('assingtome')
+                ->andWhere('module')->eq('my')
+                ->andWhere('account')->eq($this->app->user->account)
+                ->orderBy('order_desc')
+                ->fetch('id');
+        }
+
+        /* Get executions. */
+        $executions = array(0 => '');
+        if(isset($projects[$projectID]) or $this->config->systemMode == 'classic') $executions += $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID);
 
         /* Set custom. */
         foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field;
@@ -498,9 +566,11 @@ class bug extends control
         $this->view->productName      = $this->products[$productID];
         $this->view->moduleOptionMenu = $moduleOptionMenu;
         $this->view->stories          = $stories;
-        $this->view->executions       = $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID);
+        $this->view->projects         = $projects;
+        $this->view->executions       = $executions;
         $this->view->builds           = $builds;
         $this->view->moduleID         = (int)$moduleID;
+        $this->view->projectID        = $projectID;
         $this->view->executionID      = $executionID;
         $this->view->taskID           = $taskID;
         $this->view->storyID          = $storyID;
@@ -514,7 +584,7 @@ class bug extends control
         $this->view->steps            = htmlspecialchars($steps);
         $this->view->os               = $os;
         $this->view->browser          = $browser;
-        $this->view->executionMembers = $executionMembers;
+        $this->view->productMembers   = $productMembers;
         $this->view->assignedTo       = $assignedTo;
         $this->view->deadline         = $deadline;
         $this->view->mailto           = $mailto;
@@ -523,6 +593,7 @@ class bug extends control
         $this->view->type             = $type;
         $this->view->branch           = $branch;
         $this->view->branches         = $branches;
+        $this->view->blockID          = $blockID;
         $this->view->color            = $color;
         $this->view->stepsRequired    = strpos($this->config->bug->create->requiredFields, 'steps');
         $this->view->isStepsTemplate  = $steps == $this->lang->bug->tplStep . $this->lang->bug->tplResult . $this->lang->bug->tplExpect ? true : false;
@@ -545,14 +616,21 @@ class bug extends control
         {
             $actions = $this->bug->batchCreate($productID, $branch);
 
-            setcookie('bugModule', 0, 0, $this->config->webRoot, '', false, false);
+            /* Return bug id list when call the API. */
+            if($this->viewType == 'json')
+            {
+                $bugIDList = array_keys($actions);
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $bugIDList));
+            }
+
+            setcookie('bugModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             die(js::locate($this->createLink('bug', 'browse', "productID={$productID}&branch=$branch&browseType=unclosed&param=0&orderBy=id_desc"), 'parent'));
         }
 
         /* Get product, then set menu. */
         $productID = $this->product->saveState($productID, $this->products);
         if($branch === '') $branch = (int)$this->cookie->preBranch;
-        $this->bug->setMenu($this->products, $productID, $branch);
+        $this->qa->setMenu($this->products, $productID, $branch);
 
         /* If executionID is setted, get builds and stories of this execution. */
         if($executionID)
@@ -591,7 +669,7 @@ class bug extends control
             $showFields = trim($showFields, ',');
         }
 
-        $projectID = $this->lang->navGroup->bug == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->bug == 'project' ? $this->session->project : 0;
 
         $this->view->customFields = $customFields;
         $this->view->showFields   = $showFields;
@@ -605,7 +683,7 @@ class bug extends control
         $this->view->stories          = $stories;
         $this->view->builds           = $builds;
         $this->view->users            = $this->user->getPairs('devfirst|nodeleted');
-        $this->view->executions       = $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID);
+        $this->view->executions       = array('' => '') + $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID);
         $this->view->executionID      = $executionID;
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
         $this->view->moduleID         = $moduleID;
@@ -625,56 +703,56 @@ class bug extends control
     public function view($bugID, $from = 'bug')
     {
         /* Judge bug exits or not. */
-        $bug = $this->bug->getById($bugID, true);
+        $bugID = (int)$bugID;
+        $bug   = $this->bug->getById($bugID, true);
         if(!$bug) die(js::error($this->lang->notFound) . js::locate('back'));
-        if($bug->project) $this->session->PRJ = $bug->project;
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
 
+        $this->session->set('storyList', '', 'product');
         $this->bug->checkBugExecutionPriv($bug);
 
         /* Update action. */
         if($bug->assignedTo == $this->app->user->account) $this->loadModel('action')->read('bug', $bugID);
 
         /* Set menu. */
-        if($from == 'bug')
+        if(!isonlybody())
         {
-            $this->bug->setMenu($this->products, $bug->product, $bug->branch);
-        }
-        elseif($from == 'repo')
-        {
-            session_write_close();
-            $this->lang->set('menugroup.bug', 'repo');
-            $repos = $this->loadModel('repo')->getRepoPairs($this->session->PRJ);
-            $this->repo->setMenu($repos);
-            $this->lang->bug->menu = $this->lang->repo->menu;
+            if($this->app->openApp == 'project')   $this->loadModel('project')->setMenu($bug->project);
+            if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($bug->execution);
+            if($this->app->openApp == 'qa')        $this->qa->setMenu($this->products, $bug->product, $bug->branch);
+            if($this->app->openApp == 'devops')
+            {
+                session_write_close();
+                $repos = $this->loadModel('repo')->getRepoPairs($bug->project);
+                $this->repo->setMenu($repos);
+                $this->lang->navGroup->bug = 'devops';
+            }
         }
 
         /* Get product info. */
         $productID   = $bug->product;
-        $productName = isset($this->products[$productID]) ? $this->products[$productID] : '';
-        $branches    = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
+        $product     = $this->loadModel('product')->getByID($productID);
+        $branches    = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
 
         $this->executeHooks($bugID);
 
         /* Header and positon. */
-        $this->view->title      = "BUG #$bug->id $bug->title - " . $productName;
-        $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $productName);
+        $this->view->title      = "BUG #$bug->id $bug->title - " . $product->name;
+        $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $product->name);
         $this->view->position[] = $this->lang->bug->view;
 
         /* Assign. */
         $this->view->productID   = $productID;
-        $this->view->productName = $productName;
         $this->view->branches    = $branches;
         $this->view->modulePath  = $this->tree->getParents($bug->module);
         $this->view->bugModule   = empty($bug->module) ? '' : $this->tree->getById($bug->module);
         $this->view->bug         = $bug;
         $this->view->from        = $from;
-        $this->view->branchName  = $this->session->currentProductType == 'normal' ? '' : zget($branches, $bug->branch, '');
+        $this->view->branchName  = $product->type == 'normal' ? '' : zget($branches, $bug->branch, '');
         $this->view->users       = $this->user->getPairs('noletter');
         $this->view->actions     = $this->action->getList('bug', $bugID);
         $this->view->builds      = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, $params = '');
         $this->view->preAndNext  = $this->loadModel('common')->getPreAndNextObject('bug', $bugID);
-        $this->view->product     = $this->loadModel('product')->getByID( $productID);
+        $this->view->product     = $product;
 
         $this->display();
     }
@@ -744,7 +822,34 @@ class bug extends control
         $this->bug->checkBugExecutionPriv($bug);
 
         /* Set the menu. */
-        $this->bug->setMenu($this->products, $productID, $bug->branch);
+        if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($bug->project);
+        if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($bug->execution);
+        if($this->app->openApp == 'qa') $this->qa->setMenu($this->products, $productID, $bug->branch);
+        if($this->app->openApp == 'devops')
+        {
+            session_write_close();
+            $repos = $this->loadModel('repo')->getRepoPairs($bug->project);
+            $this->repo->setMenu($repos);
+            $this->lang->navGroup->bug = 'devops';
+        }
+
+        /* Unset discarded types. */
+        foreach($this->config->bug->discardedTypes as $type)
+        {
+            if($bug->type != $type) unset($this->lang->bug->typeList[$type]);
+        }
+
+        if($this->app->openApp == 'qa')
+        {
+            $this->view->products = $this->config->CRProduct ? $this->products : $this->product->getPairs('noclosed');
+        }
+        if($this->app->openApp == 'project')
+        {
+            $products = array();
+            $productList = $this->config->CRProduct ? $this->product->getOrderedProducts('all', 40, $bug->project) : $this->product->getOrderedProducts('normal', 40, $bug->project);
+            foreach($productList as $product) $products[$product->id] = $product->name;
+            $this->view->products = $products;
+        }
 
         /* Set header and position. */
         $this->view->title      = $this->lang->bug->edit . "BUG #$bug->id $bug->title - " . $this->products[$productID];
@@ -752,6 +857,7 @@ class bug extends control
         $this->view->position[] = $this->lang->bug->edit;
 
         /* Assign. */
+        $product   = $this->loadModel('product')->getByID($productID);
         $allBuilds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, 'noempty');
         if($executionID)
         {
@@ -775,17 +881,19 @@ class bug extends control
         $oldResolvedBuild = array();
         if(($bug->resolvedBuild) and isset($allBuilds[$bug->resolvedBuild])) $oldResolvedBuild[$bug->resolvedBuild] = $allBuilds[$bug->resolvedBuild];
 
-        $projectID = $this->lang->navGroup->bug == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->bug == 'project' ? $this->session->project : 0;
 
         $this->view->bug              = $bug;
         $this->view->productID        = $productID;
+        $this->view->product          = $product;
         $this->view->productName      = $this->products[$productID];
         $this->view->plans            = $this->loadModel('productplan')->getPairs($productID, $bug->branch);
+        $this->view->projects         = array(0 => '') + $this->product->getProjectPairsByProduct($productID, $bug->branch);
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $bug->branch);
         $this->view->currentModuleID  = $currentModuleID;
-        $this->view->executions       = $this->product->getExecutionPairsByProduct($bug->product, $bug->branch ? "0,{$bug->branch}" : 0, 'id_desc', $projectID);
+        $this->view->executions       = array(0 => '') + $this->product->getExecutionPairsByProduct($bug->product, $bug->branch ? "0,{$bug->branch}" : 0, 'id_desc', $projectID);
         $this->view->stories          = $bug->execution ? $this->story->getExecutionStoryPairs($bug->execution) : $this->story->getProductStoryPairs($bug->product, $bug->branch);
-        $this->view->branches         = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
+        $this->view->branches         = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
         $this->view->tasks            = $this->task->getExecutionTaskPairs($bug->execution);
         $this->view->testtasks        = $this->loadModel('testtask')->getPairs($bug->product, $bug->execution, $bug->testtask);
         $this->view->users            = $this->user->getPairs('nodeleted', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
@@ -849,7 +957,7 @@ class bug extends control
             $plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
 
             /* Set product menu. */
-            $this->bug->setMenu($this->products, $productID, $branch);
+            $this->qa->setMenu($this->products, $productID, $branch);
             $this->view->title      = $product->name . $this->lang->colon . "BUG" . $this->lang->bug->batchEdit;
             $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]);
             $this->view->plans      = $plans;
@@ -871,11 +979,10 @@ class bug extends control
                 }
             }
 
-            $this->lang->navGroup->bug  = 'my';
-            $this->lang->noMenuModule[] = 'bug';
-            $this->lang->bug->menu      = $this->lang->my->menu;
-            $this->lang->bug->menuOrder = $this->lang->my->menuOrder;
             $this->loadModel('my')->setMenu();
+            $this->lang->task->menu = $this->lang->my->menu->work;
+            $this->lang->my->menu->work['subModule'] = 'bug';
+
             $this->view->position[] = html::a($this->createLink('my', 'bug'), $this->lang->my->bug);
             $this->view->title      = "BUG" . $this->lang->bug->batchEdit;
         }
@@ -932,7 +1039,7 @@ class bug extends control
         $this->bug->checkBugExecutionPriv($bug);
 
         /* Set menu. */
-        $this->bug->setMenu($this->products, $bug->product, $bug->branch);
+        $this->qa->setMenu($this->products, $bug->product, $bug->branch);
 
         if(!empty($_POST))
         {
@@ -948,10 +1055,23 @@ class bug extends control
             die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
         }
 
+        if($this->app->openApp == 'project')
+        {
+            $users = $this->user->getTeamMemberPairs($bug->project, 'project', 'nodeleted', $bug->assignedTo);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $users = $this->user->getTeamMemberPairs($bug->execution, 'execution', 'nodeleted', $bug->assignedTo);
+        }
+        else
+        {
+            $users = $this->user->getPairs('nodeleted|nofeedback', $bug->assignedTo);
+        }
+
         $this->view->title      = $this->products[$bug->product] . $this->lang->colon . $this->lang->bug->assignedTo;
         $this->view->position[] = $this->lang->bug->assignedTo;
 
-        $this->view->users   = $this->user->getPairs('nodeleted|nofeedback', $bug->assignedTo);
+        $this->view->users   = $users;
         $this->view->bug     = $bug;
         $this->view->bugID   = $bugID;
         $this->view->actions = $this->action->getList('bug', $bugID);
@@ -1015,11 +1135,12 @@ class bug extends control
     /**
      * Batch update assign of bug.
      *
-     * @param  int    $executionID
+     * @param  int     $objectID  projectID|executionID
+     * @param  string  $type      execution|project|product|my
      * @access public
      * @return void
      */
-    public function batchAssignTo($executionID, $type = 'execution')
+    public function batchAssignTo($objectID, $type = 'execution')
     {
         if(!empty($_POST) && isset($_POST['bugIDList']))
         {
@@ -1036,8 +1157,10 @@ class bug extends control
             }
             $this->loadModel('score')->create('ajax', 'batchOther');
         }
+
         if($type == 'product' || $type == 'my') die(js::locate($this->session->bugList, 'parent'));
-        die(js::locate($this->createLink('execution', 'bug', "executionID=$executionID")));
+        if($type == 'execution') die(js::locate($this->createLink('execution', 'bug', "executionID=$objectID")));
+        if($type == 'project')   die(js::locate($this->createLink('project', 'bug', "projectID=$objectID")));
     }
 
     /**
@@ -1065,7 +1188,7 @@ class bug extends control
         $bug       = $this->bug->getById($bugID);
         $productID = $bug->product;
         $this->bug->checkBugExecutionPriv($bug);
-        $this->bug->setMenu($this->products, $productID, $bug->branch);
+        $this->qa->setMenu($this->products, $productID, $bug->branch);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->confirmBug;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -1140,7 +1263,7 @@ class bug extends control
             }
         }
 
-        $projectID  = $this->lang->navGroup->bug == 'project' ? $this->session->PRJ : 0;
+        $projectID  = $this->lang->navGroup->bug == 'project' ? $this->session->project : 0;
         $bug        = $this->bug->getById($bugID);
         $productID  = $bug->product;
         $users      = $this->user->getPairs('noclosed');
@@ -1149,7 +1272,7 @@ class bug extends control
         unset($this->lang->bug->resolutionList['tostory']);
 
         $this->bug->checkBugExecutionPriv($bug);
-        $this->bug->setMenu($this->products, $productID, $bug->branch);
+        $this->qa->setMenu($this->products, $productID, $bug->branch);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -1218,7 +1341,7 @@ class bug extends control
         $bug       = $this->bug->getById($bugID);
         $productID = $bug->product;
         $this->bug->checkBugExecutionPriv($bug);
-        $this->bug->setMenu($this->products, $productID, $bug->branch);
+        $this->qa->setMenu($this->products, $productID, $bug->branch);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->activate;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -1265,7 +1388,7 @@ class bug extends control
         $bug       = $this->bug->getById($bugID);
         $productID = $bug->product;
         $this->bug->checkBugExecutionPriv($bug);
-        $this->bug->setMenu($this->products, $productID, $bug->branch);
+        $this->qa->setMenu($this->products, $productID, $bug->branch);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->close;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -1294,7 +1417,7 @@ class bug extends control
         $this->bug->checkBugExecutionPriv($bug);
 
         /* Set the menu. */
-        $this->bug->setMenu($this->products, $bug->product, $bug->branch);
+        $this->qa->setMenu($this->products, $bug->product, $bug->branch);
 
         /* Build the search form. */
         $actionURL = $this->createLink('bug', 'linkBugs', "bugID=$bugID&browseType=bySearch&queryID=myQueryID", '', true);
@@ -1371,7 +1494,7 @@ class bug extends control
         $bugIDList = array_unique($bugIDList);
         $bugs = $this->dao->select('id, title, status, resolvedBy, openedBuild')->from(TABLE_BUG)->where('id')->in($bugIDList)->fetchAll('id');
 
-        $this->bug->setMenu($this->products, $productID, $branch);
+        $this->qa->setMenu($this->products, $productID, $branch);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->batchActivate;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -1487,7 +1610,7 @@ class bug extends control
      */
     public function ajaxLoadAssignedTo($executionID, $selectedUser = '')
     {
-        $executionMembers = $this->loadModel('execution')->getTeamMemberPairs($executionID, '', $selectedUser);
+        $executionMembers = $this->user->getTeamMemberPairs($executionID, 'execution', '', $selectedUser);
 
         die(html::select('assignedTo', $executionMembers, $selectedUser, 'class="form-control"'));
     }
@@ -1502,17 +1625,9 @@ class bug extends control
      */
     public function ajaxLoadExecutionTeamMembers($productID, $selectedUser = '')
     {
-        $latestExecution = $this->product->getLatestProject($productID);
-        if(!empty($latestExecution))
-        {
-            $executionMembers = $this->loadModel('execution')->getTeamMemberPairs($latestExecution->id, 'nodeleted', $selectedUser);
-        }
-        else
-        {
-            $executionMembers = $this->loadModel('user')->getPairs('devfirst|noclosed|nodeleted');
-        }
+        $productMembers = $this->bug->getProductMemberPairs($productID);
 
-        die(html::select('assignedTo', $executionMembers, $selectedUser, 'class="form-control"'));
+        die(html::select('assignedTo', $productMembers, $selectedUser, 'class="form-control"'));
     }
 
     /**
@@ -1788,15 +1903,10 @@ class bug extends control
      * @access public
      * @return void
      */
-    public function ajaxGetDropMenu($productID, $module, $method, $extra = '', $from = '')
+    public function ajaxGetDropMenu($productID, $module, $method, $extra = '')
     {
-        if($from == 'qa')
-        {
-            $this->app->loadConfig('qa');
-            foreach($this->config->qa->menuList as $menu) $this->lang->navGroup->$menu = 'qa';
-        }
-
-        $products = $this->product->getProducts($this->session->PRJ, $this->config->CRProduct ? 'all' : 'noclosed', 'program desc, line desc, ');
+        $products = array();
+        if(!empty($extra)) $products = $this->product->getProducts($extra, $this->config->CRProduct ? 'all' : 'noclosed', 'program desc, line desc, ');
 
         $this->view->link      = $this->product->getProductLink($module, $method, $extra);
         $this->view->productID = $productID;
@@ -1804,7 +1914,7 @@ class bug extends control
         $this->view->method    = $method;
         $this->view->extra     = $extra;
         $this->view->products  = $products;
-        $this->view->projectID = $this->session->PRJ;
+        $this->view->projectID = $this->session->project;
         $this->view->programs  = $this->loadModel('program')->getPairs(true);
         $this->view->lines     = $this->product->getLinePairs();
         $this->display();
diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 750aea0dd8..554b1268aa 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -9,7 +9,6 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;}
 .bootbox-prompt .modal-dialog {width: 500px; margin-top: 10%;}
 
 #buildBoxActions {padding-left: 15px;}
-#executionIdBox {display: block;}
 
 #module + .chosen-container-single .chosen-single,
 #task + .chosen-container-single .chosen-single,
diff --git a/module/bug/css/m.browse.css b/module/bug/css/m.browse.css
index 64349f4136..55fe95f277 100644
--- a/module/bug/css/m.browse.css
+++ b/module/bug/css/m.browse.css
@@ -1,2 +1,2 @@
-.confirm0 {color: gray;  font-size: 9px;}
-.confirm1 {color: green; font-size: 9px;}
+.confirm0 {color:gray;  font-size:9px}
+.confirm1 {color:green; font-size:9px}
diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index 2c7f66e6a1..41834f78d2 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -27,7 +27,7 @@ function setBranchRelated(branchID, productID, num)
         $("#modules" + num).chosen();
     });
 
-    executionLink = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&executionID=0&branch=' + branchID + '&num=' + num);
+    executionLink = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=0&branch=' + branchID + '&num=' + num);
     $.get(executionLink, function(executions)
     {
         if(!executions) executions = '<select id="executions' + num + '" name="executions[' + num + ']" class="form-control"></select>';
diff --git a/module/bug/js/batchedit.js b/module/bug/js/batchedit.js
index 5d2884a08d..26a3876963 100644
--- a/module/bug/js/batchedit.js
+++ b/module/bug/js/batchedit.js
@@ -1,7 +1,7 @@
 /**
  * Set duplicate field.
- * 
- * @param  string $resolution 
+ *
+ * @param  string $resolution
  * @access public
  * @return void
  */
@@ -68,3 +68,8 @@ $(document).on('change', 'select', function()
         $(this).trigger("change");
     }
 })
+
+$(function()
+{
+    $('#subNavbar li[data-id="bug"]').addClass('active');
+});
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 6a303863be..f44f92dd95 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -2,6 +2,7 @@ $(function()
 {
     var page = window.page || '';
     var flow = window.flow;
+    if(typeof(systemMode) == undefined) var systemMode = '';
 
     $('#subNavbar a[data-toggle=dropdown]').parent().addClass('dropdown dropdown-hover');
 
@@ -55,11 +56,11 @@ function loadAll(productID)
         $('#task').chosen();
         loadProductBranches(productID)
         loadProductModules(productID);
-        loadProductExecutions(productID);
+        loadProductProjects(productID);
         loadProductBuilds(productID);
         loadProductplans(productID);
         loadProductStories(productID);
-        loadTestTasks(productID);
+        //loadTestTasks(productID);
     }
 }
 
@@ -75,7 +76,7 @@ function loadBranch()
     $('#task').chosen();
     productID = $('#product').val();
     loadProductModules(productID);
-    loadProductExecutions(productID);
+    loadProductProjects(productID);
     loadProductBuilds(productID);
     loadProductplans(productID);
     loadProductStories(productID);
@@ -208,7 +209,8 @@ function loadProductModules(productID)
 {
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
-    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
+    if(typeof(moduleID) == 'undefined') moduleID = 0;
+    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=&currentModuleID=' + moduleID);
     $('#moduleIdBox').load(link, function()
     {
         $(this).find('select').chosen()
@@ -227,27 +229,58 @@ function loadProductStories(productID)
 {
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
+    if(typeof(oldStoryID) == 'undefined') oldStoryID = 0;
     link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleId=0&storyID=' + oldStoryID);
     $('#storyIdBox').load(link, function(){$('#story').chosen();});
 }
 
+/**
+ * Load projects of product.
+ *
+ * @param  int    $productID
+ * @access public
+ * @return void
+ */
+function loadProductProjects(productID)
+{
+    if(systemMode == 'classic')
+    {
+        var projectID = $('#execution').find("option:selected").val();
+        loadProductExecutions(productID, projectID);
+        return true;
+    }
+
+    branch = $('#branch').val();
+    if(typeof(branch) == 'undefined') branch = 0;
+
+    link = createLink('product', 'ajaxGetProjects', 'productID=' + productID + '&branch=' + branch + '&projectID=' + oldProjectID);
+    $('#projectBox').load(link, function()
+    {
+        $(this).find('select').chosen();
+        var projectID = $('#project').find("option:selected").val();
+        loadProductExecutions(productID, projectID);
+    });
+}
+
 /**
  * Load executions of product.
  *
  * @param  int    $productID
+ * @param  int    $projectID
  * @access public
  * @return void
  */
-function loadProductExecutions(productID)
+function loadProductExecutions(productID, projectID = 0)
 {
     required = $('#execution_chosen').hasClass('required');
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
 
-    link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&executionID=' + oldExecutionID + '&branch=' + branch);
+    link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID + '&branch=' + branch);
     $('#executionIdBox').load(link, function()
     {
         $(this).find('select').chosen();
+        if(typeof(bugExecution) == 'string' && systemMode != 'classic') $('#executionIdBox').prepend("<span class='input-group-addon' style='border-left-width: 0px;'>" + bugExecution + "</span>");
         if(required) $(this).addClass('required');
     });
 }
@@ -278,6 +311,7 @@ function loadProductBuilds(productID)
 {
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
+    if(typeof(oldOpenedBuild) == 'undefined') oldOpenedBuild = 0;
     link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch);
 
     if(page == 'create')
@@ -357,6 +391,7 @@ function loadExecutionStories(executionID)
 {
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
+    if(typeof(oldStoryID) == 'undefined') oldStoryID = 0;
     link = createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=' + $('#product').val() + '&branch=' + branch + '&moduleID=0&storyID=' + oldStoryID);
     $('#storyIdBox').load(link, function(){$('#story').chosen();});
 }
@@ -510,19 +545,23 @@ function notice()
     if($('#openedBuild').find('option').length <= 1)
     {
         var html = '';
-        if($('#execution').length == 0 || $('#execution').val() == '')
+        if($('#execution').length == 0 || $('#execution').val() == 0)
         {
             var branch = $('#branch').val();
             if(typeof(branch) == 'undefined') branch = 0;
             var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch);
-            link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
+            if(config.onlybody != 'yes') link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
             html += '<a href="' + link + '" data-toggle="modal" data-type="iframe" style="padding-right:5px">' + createBuild + '</a> ';
             html += '<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>';
         }
         else
         {
             executionID = $('#execution').val();
-            html += '<a href="' + createLink('build', 'create','executionID=' + executionID) + '" target="_blank" style="padding-right:5px">' + createBuild + '</a> ';
+            productID   = $('#product').val();
+            projectID   = $('#project').val();
+            link = createLink('build', 'create','executionID=' + executionID + '&productID=' + productID + '&projectID=' + projectID);
+            link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
+            html += '<a href="' + link + '" data-toggle="modal" data-type="iframe" style="padding-right:5px">' + createBuild + '</a> ';
             html += '<a href="javascript:loadExecutionBuilds(' + executionID + ')">' + refresh + '</a>';
         }
         var $bba = $('#buildBoxActions');
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index 61cb44b8d7..b602586a0a 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -14,7 +14,9 @@ function loadAllUsers()
             var moduleID  = $('#module').val();
             var productID = $('#product').val();
             setAssignedTo(moduleID, productID);
-            $('#assignedTo').empty().append($(data).find('option')).trigger('chosen:updated').trigger('chosen:activate');
+            $('#assignedTo').replaceWith(data);
+            $('#assignedTo_chosen').remove();
+            $('#assignedTo').chosen();
         }
     });
 }
@@ -29,7 +31,12 @@ function loadAllUsers()
 function loadExecutionTeamMembers(productID)
 {
     var link = createLink('bug', 'ajaxLoadExecutionTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val());
-    $('#assignedToBox').load(link, function(){$('#assignedTo').chosen();});
+    $.post(link, function(data)
+    {
+        $('#assignedTo').replaceWith(data);
+        $('#assignedTo_chosen').remove();
+        $('#assignedTo').chosen();
+    })
 }
 
 /**
@@ -92,7 +99,7 @@ $(function()
     var assignedto = $('#assignedTo').val();
     changeProductConfirmed = true;
     oldStoryID             = $('#story').val() || 0;
-    oldExecutionID           = 0;
+    oldExecutionID         = 0;
     oldOpenedBuild         = '';
     oldTaskID              = $('#oldTaskID').val() || 0;
 
@@ -144,3 +151,7 @@ $(function()
         }
     });
 });
+
+$(window).unload(function(){
+    if(blockID) window.parent.refreshBlock($('#block' + blockID));
+});
diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js
index b5895c0e65..2669cde048 100644
--- a/module/bug/js/edit.js
+++ b/module/bug/js/edit.js
@@ -1,6 +1,24 @@
 $(function()
 {
     loadModuleRelated();
+
+    resolution = $('#resolution').val();
+    if(resolution == 'fixed')
+    {
+        $('#resolvedBuildBox').change(function()
+        {
+            if($('#resolvedBuild').val() != oldResolvedBuild)
+            {
+                confirmResult = confirm(confirmUnlinkBuild);
+                if(!confirmResult)
+                {
+                    $('#resolvedBuild').val(oldResolvedBuild);
+                    $('#resolvedBuild').trigger("chosen:updated");
+                    $('#resolvedBuild').chosen();
+                }
+            }
+        });
+    }
 });
 
 /**
diff --git a/module/bug/js/x.view.js b/module/bug/js/x.view.js
index d57019c9b3..9c48ea0651 100644
--- a/module/bug/js/x.view.js
+++ b/module/bug/js/x.view.js
@@ -1,7 +1,7 @@
 $(function()
 {
     $('.main-actions-holder').css('height', '0px');
-    var $xuanAction = "<div class='xuancard-actions fixed'>";
+    var xuanAction = "<div class='xuancard-actions fixed'>";
     $('.main-col div.main-actions .btn-toolbar a').each(function(){
         var $that    = $(this);
 
@@ -14,7 +14,7 @@ $(function()
 
         if(href.indexOf('createCase') >= 0 || href.indexOf('toStory') >= 0 || href.indexOf('create') >= 0 || href.indexOf('delete') >= 0) return true;
 
-        if($that.hasClass('iframe')) 
+        if($that.hasClass('iframe'))
         {
             url = href;
             target = '';
@@ -25,10 +25,11 @@ $(function()
            target = " target='_blank'";
         }
 
-        $xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
+        xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
     });
 
-    $xuanAction += '</div>';
-    $('#footer').replaceWith($xuanAction);
+    xuanAction += '</div>';
+
+    $('body').append(xuanAction);
     $('.xuancard-actions a.iframe').modalTrigger();
 })
diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index 0744daaa44..117da8e767 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -17,7 +17,8 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Modul';
 $lang->bug->moduleAB         = 'Modul';
-$lang->bug->execution        = $lang->executionCommon;
+$lang->bug->project          = 'Project';
+$lang->bug->execution        = $lang->execution->common;
 $lang->bug->story            = 'Story';
 $lang->bug->storyVersion     = 'Story Version';
 $lang->bug->color            = 'Farbe des Titels';
@@ -159,6 +160,7 @@ $lang->bug->createBuild   = 'Neu';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = 'Basis Info';
 $lang->bug->legendAttatch               = 'Anlagen';
+$lang->bug->legendPRJExecStoryTask      = 'Project/' . $lang->executionCommon . '/Story/Task';
 $lang->bug->legendExecStoryTask         = $lang->executionCommon . '/Story/Task';
 $lang->bug->lblTypeAndSeverity          = 'Typ/Schwere';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
@@ -179,6 +181,7 @@ $lang->bug->remindTask            = 'This Bug has been converted to Task. Do you
 $lang->bug->skipClose             = 'Bug %s is not resolved. You cannot close it.';
 $lang->bug->executionAccessDenied = "You access to the {$lang->executionCommon} to which this bug belongs is denied!";
 $lang->bug->stepsNotEmpty         = "The reproduction step cannot be empty.";
+$lang->bug->confirmUnlinkBuild    = "Replacing the solution version will disassociate the bug from the old version. Are you sure you want to disassociate the bug from %s?";
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[Steps]</p><br/>";
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index b08abe34f3..584b1c7d59 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -17,7 +17,8 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->execution        = $lang->executionCommon;
+$lang->bug->project          = 'Project';
+$lang->bug->execution        = $lang->execution->common;
 $lang->bug->story            = 'Story';
 $lang->bug->storyVersion     = 'Story Version';
 $lang->bug->color            = 'Color';
@@ -159,6 +160,7 @@ $lang->bug->createBuild   = 'New';
 /* Legend list。*/
 $lang->bug->legendBasicInfo             = 'Basic Info';
 $lang->bug->legendAttatch               = 'Files';
+$lang->bug->legendPRJExecStoryTask      = 'Project/' . $lang->executionCommon . '/Story/Task';
 $lang->bug->legendExecStoryTask         = $lang->executionCommon . '/Story/Task';
 $lang->bug->lblTypeAndSeverity          = 'Type/Severity';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
@@ -179,6 +181,7 @@ $lang->bug->remindTask            = 'This bug has been converted to a task. Do y
 $lang->bug->skipClose             = 'Bug %s is active. You cannot close it.';
 $lang->bug->executionAccessDenied = "You access to the {$lang->executionCommon} to which this bug belongs is denied!";
 $lang->bug->stepsNotEmpty         = "The reproduction step cannot be empty.";
+$lang->bug->confirmUnlinkBuild    = "Replacing the solution version will disassociate the bug from the old version. Are you sure you want to disassociate the bug from %s?";
 
 /* Template. */
 $lang->bug->tplStep   = "<p>[Steps]</p><br/>";
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index 7df0054af5..569a6f9480 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -17,7 +17,8 @@ $lang->bug->branch           = 'Branche/Plateforme';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->execution        = $lang->executionCommon;
+$lang->bug->project          = 'Project';
+$lang->bug->execution        = $lang->execution->common;
 $lang->bug->story            = 'Story';
 $lang->bug->storyVersion     = 'Version Story';
 $lang->bug->color            = 'Couleur';
@@ -159,6 +160,7 @@ $lang->bug->createBuild   = 'Nouveau';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = 'Infos de Base';
 $lang->bug->legendAttatch               = 'Fichiers';
+$lang->bug->legendPRJExecStoryTask      = 'Project/' . $lang->executionCommon . '/Story/Task';
 $lang->bug->legendExecStoryTask         = $lang->executionCommon . '/Story/Tâche';
 $lang->bug->lblTypeAndSeverity          = 'Type/Severité';
 $lang->bug->lblSystemBrowserAndHardware = 'Système/Browser';
@@ -179,6 +181,7 @@ $lang->bug->remindTask            = 'Ce bug a été converti en tâche. Voulez-v
 $lang->bug->skipClose             = 'Bug %s est actif. Vous ne pouvez pas le fermer.';
 $lang->bug->executionAccessDenied = "Votre accès à {$lang->executionCommon} auquel ce bug appartient est refusé !";
 $lang->bug->stepsNotEmpty         = "The reproduction step cannot be empty.";
+$lang->bug->confirmUnlinkBuild    = "Replacing the solution version will disassociate the bug from the old version. Are you sure you want to disassociate the bug from %s?";
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[Etape]</p><br/>";
diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php
index 389b4f6cab..d2eeefbe24 100644
--- a/module/bug/lang/vi.php
+++ b/module/bug/lang/vi.php
@@ -17,7 +17,8 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Kế hoạch';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->execution        = $lang->executionCommon;
+$lang->bug->project          = 'Project';
+$lang->bug->execution        = $lang->execution->common;
 $lang->bug->story            = 'Câu chuyện';
 $lang->bug->storyVersion     = 'Phiên bản câu chuyện';
 $lang->bug->color            = 'Màu';
@@ -159,6 +160,7 @@ $lang->bug->createBuild   = 'Mới';
 /* Legend list。*/
 $lang->bug->legendBasicInfo             = 'Thông tin cơ bản';
 $lang->bug->legendAttatch               = 'Files';
+$lang->bug->legendPRJExecStoryTask      = 'Project/' . $lang->executionCommon . '/Story/Task';
 $lang->bug->legendExecStoryTask         = $lang->executionCommon . '/Câu chuyện/Nhiệm vụ';
 $lang->bug->lblTypeAndSeverity          = 'Loại/Mức độ';
 $lang->bug->lblSystemBrowserAndHardware = 'Hệ thống/Trình duyệt';
@@ -179,6 +181,7 @@ $lang->bug->remindTask            = 'Bug này đã chuyển thành một nhiệm
 $lang->bug->skipClose             = 'Bug %s được kích hoạt. Bạn không thể đóng nó.';
 $lang->bug->executionAccessDenied = "Truy cập của bạn tới {$lang->executionCommon} mà Bug này sở hữu bị từ chối!";
 $lang->bug->stepsNotEmpty         = "The reproduction step cannot be empty.";
+$lang->bug->confirmUnlinkBuild    = "Replacing the solution version will disassociate the bug from the old version. Are you sure you want to disassociate the bug from %s?";
 
 /* Template. */
 $lang->bug->tplStep   = "<p>[Các bước]</p><br/>";
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 5372b4d835..65fc2086d9 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -17,8 +17,9 @@ $lang->bug->branch           = '分支/平台';
 $lang->bug->productplan      = '所属' . '计划';
 $lang->bug->module           = '所属模块';
 $lang->bug->moduleAB         = '模块';
-$lang->bug->execution        = '所属' . $lang->executionCommon;
-$lang->bug->story            = "相关{$lang->SRCommon}";
+$lang->bug->project          = '所属项目';
+$lang->bug->execution        = '所属' . $lang->execution->common;
+$lang->bug->story            = "相关需求";
 $lang->bug->storyVersion     = "{$lang->SRCommon}版本";
 $lang->bug->color            = '标题颜色';
 $lang->bug->task             = '相关任务';
@@ -159,6 +160,7 @@ $lang->bug->createBuild   = '创建';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
+$lang->bug->legendPRJExecStoryTask      = "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务";
 $lang->bug->legendExecStoryTask         = $lang->executionCommon . "/{$lang->SRCommon}/任务";
 $lang->bug->lblTypeAndSeverity          = '类型/严重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器';
@@ -179,6 +181,7 @@ $lang->bug->remindTask            = '该Bug已经转化为任务，是否更新
 $lang->bug->skipClose             = 'Bug %s 不是已解决状态，不能关闭。';
 $lang->bug->executionAccessDenied = "您无权访问该Bug所属的{$lang->executionCommon}！";
 $lang->bug->stepsNotEmpty         = "重现步骤不能为空。";
+$lang->bug->confirmUnlinkBuild    = "更换解决版本将取消与旧版本的关联，您确定取消该bug与%s的关联吗？";
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步骤]</p><br/>";
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index a4470fef2f..e84542e49d 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -17,8 +17,9 @@ $lang->bug->branch           = '分支/平台';
 $lang->bug->productplan      = '所屬' . '計劃';
 $lang->bug->module           = '所屬模組';
 $lang->bug->moduleAB         = '模組';
+$lang->bug->project          = '所屬項目';
 $lang->bug->execution        = '所屬' . $lang->executionCommon;
-$lang->bug->story            = "相關{$lang->SRCommon}";
+$lang->bug->story            = "相關需求";
 $lang->bug->storyVersion     = "{$lang->SRCommon}版本";
 $lang->bug->color            = '標題顏色';
 $lang->bug->task             = '相關任務';
@@ -159,6 +160,7 @@ $lang->bug->createBuild   = '創建';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
+$lang->bug->legendPRJExecStoryTask      = "項目/" . $lang->executionCommon . "/{$lang->SRCommon}/任務";
 $lang->bug->legendExecStoryTask         = $lang->executionCommon . "/{$lang->SRCommon}/任務";
 $lang->bug->lblTypeAndSeverity          = '類型/嚴重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系統/瀏覽器';
@@ -179,6 +181,7 @@ $lang->bug->remindTask            = '該Bug已經轉化為任務，是否更新
 $lang->bug->skipClose             = 'Bug %s 不是已解決狀態，不能關閉。';
 $lang->bug->executionAccessDenied = "您無權訪問該Bug所屬的{$lang->executionCommon}！";
 $lang->bug->stepsNotEmpty         = "重現步驟不能為空。";
+$lang->bug->confirmUnlinkBuild    = "更換解决版本將取消與舊版本的關聯，您確定取消該bug與%s的關聯嗎？";
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步驟]</p><br/>";
diff --git a/module/bug/model.php b/module/bug/model.php
index 1c14c60f5d..b9e9f11ef5 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -27,7 +27,7 @@ class bugModel extends model
      */
     public function setMenu($products, $productID, $branch = 0, $moduleID = 0, $browseType = 'unclosed', $orderBy = '')
     {
-        $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'bug');
+        $this->loadModel('product')->setMenu($productID, $branch, $moduleID, 'bug');
         if($this->lang->navGroup->testcase == 'project' and $this->app->methodName == 'browse') $products = array(0 => $this->lang->bug->allProduct) + $products;
         $selectHtml = $this->product->select($products, $productID, 'bug', 'browse', '', $branch, $moduleID, 'bug');
 
@@ -43,19 +43,6 @@ class bugModel extends model
 
         $this->lang->modulePageNav = $pageNav;
         $this->lang->TRActions     = $pageActions;
-        foreach($this->lang->bug->menu as $key => $menu)
-        {
-            if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('bug', $key, $productID);
-            $replace = $productID;
-            if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->bug->menu, $key, $replace);
-        }
-
-        if($this->lang->navGroup->bug == 'qa')
-        {
-            $this->lang->qa->menu         = $this->lang->bug->menu;
-            $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
-        }
     }
 
     /**
@@ -71,10 +58,10 @@ class bugModel extends model
         $bug = fixer::input('post')
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', $now)
-            ->setDefault('execution,story,task', 0)
+            ->setDefault('project,execution,story,task', 0)
             ->setDefault('openedBuild', '')
             ->setDefault('deadline', '0000-00-00')
-            ->setIF($this->config->systemMode == 'new' && $this->lang->navGroup->bug != 'qa', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new' && $this->lang->navGroup->bug != 'qa', 'project', $this->session->project)
             ->setIF(strpos($this->config->bug->create->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
             ->setIF($this->post->assignedTo != '', 'assignedDate', $now)
             ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
@@ -94,6 +81,9 @@ class bugModel extends model
 
         $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->create['id'], $this->post->uid);
 
+        /* Use classic mode to replace required project. */
+        if($this->config->systemMode == 'classic' and strpos($this->config->bug->create->requiredFields, 'project') !== false) $this->config->bug->create->requiredFields = str_replace('project', 'execution', $this->config->bug->create->requiredFields);
+
         $this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
         if(!dao::isError())
         {
@@ -171,7 +161,7 @@ class bugModel extends model
             $bug->openedBy    = $this->app->user->account;
             $bug->openedDate  = $now;
             $bug->product     = (int)$productID;
-            $bug->branch      = (int)$data->branches[$i];
+            $bug->branch      = isset($data->branches) ? (int)$data->branches[$i] : 0;
             $bug->module      = (int)$data->modules[$i];
             $bug->execution   = (int)$data->executions[$i];
             $bug->openedBuild = implode(',', $data->openedBuilds[$i]);
@@ -240,7 +230,7 @@ class bugModel extends model
                 }
             }
 
-            if($this->config->systemMode == 'new' && $this->lang->navGroup->bug != 'qa') $bug->project = $this->session->PRJ;
+            if($this->config->systemMode == 'new' && $this->lang->navGroup->bug != 'qa') $bug->project = $this->session->project;
             $this->dao->insert(TABLE_BUG)->data($bug)
                 ->autoCheck()
                 ->batchCheck($this->config->bug->create->requiredFields, 'notempty')
@@ -450,6 +440,8 @@ class bugModel extends model
             ->where('t1.id')->eq((int)$bugID)->fetch();
         if(!$bug) return false;
 
+        if(!empty($bug->project)) $bug->projectName = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($bug->project)->fetch('name');
+
         $bug = $this->loadModel('file')->replaceImgURL($bug, 'steps');
         if($setImgSize) $bug->steps = $this->file->setImgSize($bug->steps);
         foreach($bug as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $bug->$key = '';
@@ -635,11 +627,19 @@ class bugModel extends model
             ->checkIF($bug->resolvedBy, 'resolution', 'notempty')
             ->checkIF($bug->closedBy,   'resolution', 'notempty')
             ->checkIF($bug->resolution == 'duplicate', 'duplicateBug', 'notempty')
+            ->checkIF($bug->resolution == 'fixed',     'resolvedBuild','notempty')
             ->where('id')->eq((int)$bugID)
             ->exec();
 
         if(!dao::isError())
         {
+            /* Link bug to build and release. */
+            if($bug->resolution == 'fixed' and !empty($bug->resolvedBuild) and $oldBug->resolvedBuild != $bug->resolvedBuild)
+            {
+                if(!empty($oldBug->resolvedBuild)) $this->loadModel('build')->unlinkBug((int)$oldBug->resolvedBuild, (int)$bugID);
+                $this->linkBugToBuild($bugID, $bug->resolvedBuild);
+            }
+
             if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID);
             $this->file->updateObjectID($this->post->uid, $bugID, 'bug');
             return common::createChanges($oldBug, $bug);
@@ -958,6 +958,7 @@ class bugModel extends model
             $buildData = new stdclass();
             $buildData->product   = (int)$oldBug->product;
             $buildData->branch    = (int)$oldBug->branch;
+            $buildData->project   = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($bug->buildExecution)->fetch('project');
             $buildData->execution = $bug->buildExecution;
             $buildData->name      = $bug->buildName;
             $buildData->date      = date('Y-m-d');
@@ -971,7 +972,11 @@ class bugModel extends model
             $bug->resolvedBuild = $buildID;
         }
 
-        if($bug->resolvedBuild and $bug->resolvedBuild != 'trunk') $bug->testtask = (int) $this->dao->select('id')->from(TABLE_TESTTASK)->where('build')->eq($bug->resolvedBuild)->orderBy('id_desc')->limit(1)->fetch('id');
+        if($bug->resolvedBuild and $bug->resolvedBuild != 'trunk')
+        {
+            $testtaskID = (int) $this->dao->select('id')->from(TABLE_TESTTASK)->where('build')->eq($bug->resolvedBuild)->orderBy('id_desc')->limit(1)->fetch('id');
+            if($testtaskID and empty($oldBug->testtask)) $bug->testtask = $testtask;
+        }
 
         $this->dao->update(TABLE_BUG)->data($bug, 'buildName,createBuild,buildExecution,comment')
             ->autoCheck()
@@ -1163,9 +1168,10 @@ class bugModel extends model
         $openedBuilds = $this->post->openedBuild;
         if($openedBuilds)
         {
+            $this->loadModel('build');
             foreach($openedBuilds as $openedBuild)
             {
-                $build = $this->getByID($openedBuild);
+                $build = $this->build->getByID($openedBuild);
                 $build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
                 $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$openedBuild)->exec();
             }
@@ -1243,7 +1249,7 @@ class bugModel extends model
      */
     public function buildSearchForm($productID, $products, $queryID, $actionURL)
     {
-        $projectID     = $this->lang->navGroup->bug == 'qa' ? 0 : $this->session->PRJ;
+        $projectID     = $this->lang->navGroup->bug == 'qa' ? 0 : $this->session->project;
         $productParams = $productID ? array($productID => $products[$productID]) : $products;
         $productParams = $productParams + array('all' => $this->lang->bug->allProduct);
 
@@ -1261,7 +1267,7 @@ class bugModel extends model
         $this->config->bug->search['params']['product']['values']       = $productParams;
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getPairs($productID);
         $this->config->bug->search['params']['module']['values']        = $modules;
-        $this->config->bug->search['params']['execution']['values']     = $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
+        $this->config->bug->search['params']['execution']['values']     = $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
         $this->config->bug->search['params']['severity']['values']      = array(0 => '') + $this->lang->bug->severityList; //Fix bug #939.
         $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($productID, 0, $params = '');
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
@@ -1410,9 +1416,10 @@ class bugModel extends model
     }
 
     /**
-     * Get bugs of a execution.
+     * Get bugs of a project.
      *
-     * @param  int    $executionID
+     * @param  int    $projectID
+     * @param  int    $productID
      * @param  int    $build
      * @param  string $type
      * @param  int    $param
@@ -1422,14 +1429,77 @@ class bugModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionBugs($executionID, $build = 0, $type = '', $param = 0, $orderBy = 'id_desc', $excludeBugs = '', $pager = null)
+    public function getProjectBugs($projectID, $productID = 0, $build = 0, $type = '', $param = 0, $orderBy = 'id_desc', $excludeBugs = '', $pager = null)
     {
         $type = strtolower($type);
         if($type == 'bysearch')
         {
-            $queryID  = (int)$param;
-            $products = $this->loadModel('execution')->getProducts($executionID);
+            $queryID = (int)$param;
+            if($this->session->projectBugQuery == false) $this->session->set('projectBugQuery', ' 1 = 1');
+            if($queryID)
+            {
+                $query = $this->loadModel('search')->getQuery($queryID);
+                if($query)
+                {
+                    $this->session->set('projectBugQuery', $query->sql);
+                    $this->session->set('projectBugForm', $query->form);
+                }
+            }
 
+            $allProduct = "`product` = 'all'";
+            $bugQuery   = $this->session->projectBugQuery;
+            if(strpos($this->session->projectBugQuery, $allProduct) !== false)
+            {
+                $bugQuery = str_replace($allProduct, '1', $this->session->projectBugQuery);
+            }
+
+            $bugs = $this->dao->select('*')->from(TABLE_BUG)
+                ->where($bugQuery)
+                ->andWhere('project')->eq((int)$projectID)
+                ->andWhere('deleted')->eq(0)
+                ->beginIF($excludeBugs)->andWhere('id')->notIN($excludeBugs)->fi()
+                ->orderBy($orderBy)
+                ->page($pager)
+                ->fetchAll('id');
+        }
+        else
+        {
+            $bugs = $this->dao->select('*')->from(TABLE_BUG)
+                ->where('deleted')->eq(0)
+                ->beginIF(empty($build))->andWhere('project')->eq($projectID)->fi()
+                ->beginIF(!empty($productID))->andWhere('product')->eq($productID)->fi()
+                ->beginIF($type == 'unresolved')->andWhere('status')->eq('active')->fi()
+                ->beginIF($type == 'noclosed')->andWhere('status')->ne('closed')->fi()
+                ->beginIF($build)->andWhere("CONCAT(',', openedBuild, ',') like '%,$build,%'")->fi()
+                ->beginIF($excludeBugs)->andWhere('id')->notIN($excludeBugs)->fi()
+                ->orderBy($orderBy)->page($pager)->fetchAll();
+        }
+
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
+
+        return $bugs;
+    }
+
+    /**
+     * Get bugs of a execution.
+     *
+     * @param  int    $executionID
+     * @param  int    $productID
+     * @param  int    $build
+     * @param  string $type
+     * @param  int    $param
+     * @param  string $orderBy
+     * @param  string $excludeBugs
+     * @param  object $pager
+     * @access public
+     * @return array
+     */
+    public function getExecutionBugs($executionID, $productID = 0, $build = 0, $type = '', $param = 0, $orderBy = 'id_desc', $excludeBugs = '', $pager = null)
+    {
+        $type = strtolower($type);
+        if($type == 'bysearch')
+        {
+            $queryID = (int)$param;
             if($this->session->executionBugQuery == false) $this->session->set('executionBugQuery', ' 1 = 1');
             if($queryID)
             {
@@ -1462,6 +1532,7 @@ class bugModel extends model
             $bugs = $this->dao->select('*')->from(TABLE_BUG)
                 ->where('deleted')->eq(0)
                 ->beginIF(empty($build))->andWhere('execution')->eq($executionID)->fi()
+                ->beginIF(!empty($productID))->andWhere('product')->eq($productID)->fi()
                 ->beginIF($type == 'unresolved')->andWhere('status')->eq('active')->fi()
                 ->beginIF($type == 'noclosed')->andWhere('status')->ne('closed')->fi()
                 ->beginIF($build)->andWhere("CONCAT(',', openedBuild, ',') like '%,$build,%'")->fi()
@@ -1492,7 +1563,7 @@ class bugModel extends model
 
         $execution    = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->eq($build->execution)->fetch();
         $beforeBuilds = $this->dao->select('t1.id')->from(TABLE_BUILD)->alias('t1')
-            ->leftJoin(TABLE_EXECTUION)->alias('t2')->on('t1.execution=t2.id')
+            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
             ->where('t1.product')->eq($productID)
             ->andWhere('t2.status')->ne('done')
             ->andWhere('t2.deleted')->eq(0)
@@ -1538,6 +1609,29 @@ class bugModel extends model
         return $bugs;
     }
 
+    public function getProductMemberPairs($productID)
+    {
+        $projects = $this->loadModel('product')->getProjectPairsByProduct($productID);
+
+        $users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
+            ->where('t1.root')->in(array_keys($projects))
+            ->andWhere('t1.type')->eq('project')
+            ->andWhere('t2.deleted')->eq(0)
+            ->fi()
+            ->fetchAll('account');
+
+        if(!$users) return array('' => '');
+
+        foreach($users as $account => $user)
+        {
+            $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
+            if(!empty($this->config->isINT)) $firstLetter = '';
+            $users[$account] =  $firstLetter . ($user->realname ? $user->realname : $user->account);
+        }
+        return array('' => '') + $users;
+    }
+
     /**
      * Get bugs according to buildID and productID.
      *
@@ -1701,7 +1795,7 @@ class bugModel extends model
     {
         $datas = $this->dao->select('execution as name, count(execution) as value')->from(TABLE_BUG)->where($this->reportCondition())->groupBy('execution')->orderBy('value DESC')->fetchAll('name');
         if(!$datas) return array();
-        $executions = $this->loadModel('execution')->getPairs($this->session->PRJ);
+        $executions = $this->loadModel('execution')->getPairs($this->session->project);
 
         $maxLength = 12;
         if(common::checkNotCN()) $maxLength = 22;
@@ -2322,7 +2416,7 @@ class bugModel extends model
      * @access public
      * @return array
      */
-    public function getBySearch($productIDList, $branch = 0, $queryID, $orderBy, $excludeBugs = '', $pager = null, $projectID)
+    public function getBySearch($productIDList, $branch = 0, $queryID, $orderBy, $excludeBugs = '', $pager = null, $projectID = 0)
     {
         if($queryID)
         {
@@ -2560,7 +2654,7 @@ class bugModel extends model
                 $class .= ' c-user';
                 $title  = "title='" . zget($users, $bug->resolvedBy) . "'";
             }
-            if($id == 'deadline' && isset($bug->delay)) $class .= ' delayed';
+            if($id == 'deadline' && isset($bug->delay) && $bug->status == 'active') $class .= ' delayed';
             if(strpos(',type,execution,story,plan,task,openedBuild,', ",{$id},") !== false) $class .= ' text-ellipsis';
 
             echo "<td class='" . $class . "' $title>";
diff --git a/module/bug/view/ajaxgetdropmenu.html.php b/module/bug/view/ajaxgetdropmenu.html.php
index 0d846113f9..885f778050 100644
--- a/module/bug/view/ajaxgetdropmenu.html.php
+++ b/module/bug/view/ajaxgetdropmenu.html.php
@@ -17,21 +17,21 @@ foreach($products as $product)
 }
 $productsPinYin = common::convert2Pinyin($productNames);
 $linkHtml       = $this->product->setParamsForLink($module, $link, $projectID, 0);
-$productsHtml   = html::a($linkHtml, $this->lang->bug->allProduct, '', "class='text-important' title='{$this->lang->bug->allProduct}' data-key='" . zget($productsPinYin, $this->lang->bug->allProduct, '') . "' data-group='project'");
+$productsHtml   = html::a($linkHtml, $this->lang->bug->allProduct, '', "class='text-important' title='{$this->lang->bug->allProduct}' data-key='" . zget($productsPinYin, $this->lang->bug->allProduct, '') . "' data-app='{$this->app->openApp}'");
 
 foreach($products as $product)
 {
+    $selected     = $product->id == $productID ? 'selected' : '';
     $productName  = $product->program ? zget($programs, $product->program, '') . '/' : '';
     $productName .= $product->line ? zget($lines, $product->line, '') . '/' . $product->name : $product->name;
     $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
     $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
-    $productsHtml .= html::a($linkHtml, $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='project'");
+    $productsHtml .= html::a($linkHtml, $productName, '', "class='text-important $selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='{$this->app->openApp}'");
 }
 ?>
 <div class="table-row">
   <div class="table-col col-left">
-    <div class='list-group'>
-    <?php echo $productsHtml; ?>
-    </div>
+    <div class='list-group'><?php echo $productsHtml;?></div>
   </div>
 </div>
+<script>scrollToSelected();</script>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 6950477e3e..0cd8db28cf 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -49,7 +49,7 @@
           <tr>
             <th class='w-50px'><?php echo $lang->idAB;?></th>
             <th class='w-110px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->bug->type;?></th>
-            <th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severityAB;?></th>
+            <th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
             <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
             <th class="required <?php if(count($visibleFields) >= 10) echo ' w-150px';?>"><?php echo $lang->bug->title;?></th>
             <?php if($branchProduct):?>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index c5611f056c..2eb9bc2557 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -21,6 +21,13 @@ js::set('productID',     $productID);
 js::set('branch',        $branch);
 $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($browseType, array_keys($lang->bug->mySelects)) ? $browseType : '';
 ?>
+<style>
+#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text {color: #fff;}
+#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text:after {border-bottom: unset;}
+.btn-group a i.icon-plus {font-size: 16px;}
+.btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.3);}
+.btn-group button.dropdown-toggle.btn-primary {padding:6px;}
+</style>
 <?php if($config->global->flow == 'full'):?>
 <div id="mainMenu" class="clearfix">
   <div id="sidebarHeader">
@@ -111,17 +118,43 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
     <?php if(common::canModify('product', $product)):?>
     <?php if(!common::checkNotCN()):?>
     <?php
-    common::printLink('bug', 'batchCreate', "productID=$productID&branch=$branch&executionID=0&moduleID=$moduleID", "<i class='icon icon-plus'></i>" . $lang->bug->batchCreate, '', "class='btn btn-secondary'");
-    if(commonModel::isTutorialMode())
-    {
-        $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
-        echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), "<i class='icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary btn-bug-create'");
-    }
-    else
-    {
-        common::printLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", "<i class='icon icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary'");
-    }
+      $createBugLink   = '';
+      $batchCreateLink = '';
+      if(commonModel::isTutorialMode())
+      {
+          $wizardParams  = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
+          $createBugLink = $this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams");
+      }
+      else
+      {
+          $createBugLink = $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID");
+      }
+      $batchCreateLink = $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&executionID=0&moduleID=$moduleID");
+
+      $buttonLink  = '';
+      $buttonTitle = '';
+      if(common::hasPriv('bug', 'batchCreate'))
+      {
+          $buttonLink = $batchCreateLink;
+          $buttonTitle = $lang->bug->batchCreate;
+      }
+      if(common::hasPriv('bug', 'create'))
+      {
+          $buttonLink = $createBugLink;
+          $buttonTitle = $lang->bug->create;
+      }
+      $hidden = empty($buttonLink) ? 'hidden' : '';
     ?>
+    <div class='btn-group dropdown'>
+      <?php echo html::a($buttonLink, "<i class='icon-plus'></i> $buttonTitle", '', "class='btn btn-primary $hidden'");?>
+      <?php if(common::hasPriv('bug', 'batchCreate') and common::hasPriv('bug', 'create')):?>
+      <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+      <ul class='dropdown-menu'>
+        <li><?php echo html::a($createBugLink, $lang->bug->create);?></li>
+        <li><?php echo html::a($batchCreateLink, $lang->bug->batchCreate);?></li>
+      </ul>
+      <?php endif;?>
+    </div>
     <?php else:?>
     <div class='btn-group dropdown-hover'>
       <?php
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index b85d580372..a742898300 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -23,6 +23,9 @@ js::set('flow', $config->global->flow);
 js::set('stepsRequired', $stepsRequired);
 js::set('stepsNotEmpty', $lang->bug->stepsNotEmpty);
 js::set('isStepsTemplate', $isStepsTemplate);
+js::set('oldProjectID', $projectID);
+js::set('blockID', $blockID);
+js::set('moduleID', $moduleID);
 ?>
 <div id="mainContent" class="main-content fade">
   <div class="center-block">
@@ -71,7 +74,10 @@ js::set('isStepsTemplate', $isStepsTemplate);
           </tr>
           <?php $showExecution = (strpos(",$showFields,", ',execution,') !== false);?>
           <tr>
-            <th><?php echo ($showExecution) ? $lang->bug->execution : $lang->bug->type;?></th>
+            <th>
+              <?php if($config->systemMode == 'classic') $lang->bug->project = $lang->bug->execution;?>
+              <?php echo ($showExecution) ? $lang->bug->project : $lang->bug->type;?>
+            </th>
 
             <?php if(!$showExecution):?>
             <?php $showOS      = strpos(",$showFields,", ',os,')      !== false;?>
@@ -91,7 +97,25 @@ js::set('isStepsTemplate', $isStepsTemplate);
             </td>
             <?php endif;?>
             <?php if($showExecution):?>
-            <td><span id='executionIdBox'><?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?></span></td>
+            <td>
+              <?php if($config->systemMode == 'new'):?>
+              <div class='table-row'>
+                <div class='table-col' id='projectBox'>
+                  <?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProductExecutions({$productID}, this.value)'");?>
+                </div>
+                <div class='table-col'>
+                  <div class='input-group' id='executionIdBox'>
+                    <span class='input-group-addon fix-border'><?php echo $lang->bug->execution;?></span>
+                    <?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?>
+                  </div>
+                </div>
+              </div>
+              <?php else:?>
+              <div class='input-group' id='executionIdBox'>
+                <?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?>
+              </div>
+              <?php endif;?>
+            </td>
             <?php endif;?>
             <td>
               <div class='input-group' id='buildBox'>
@@ -106,7 +130,7 @@ js::set('isStepsTemplate', $isStepsTemplate);
             <th><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
             <td>
               <div class='input-group'>
-                <?php echo html::select('assignedTo', $executionMembers, $assignedTo, "class='form-control chosen'");?>
+                <?php echo html::select('assignedTo', $productMembers, $assignedTo, "class='form-control chosen'");?>
                 <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
               </div>
             </td>
@@ -302,9 +326,9 @@ js::set('isStepsTemplate', $isStepsTemplate);
           <tr>
             <td colspan="3" class="text-center form-actions">
               <?php echo html::submitButton();?>
-              <?php if($caseID == 0) echo html::backButton();?>
+              <?php echo html::backButton();?>
               <?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
-              <?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', $testtask ? (int)$testtask->id : 0);?>
+              <?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', empty($testtask) ? 0 : $testtask->id);?>
             </td>
           </tr>
         </tfoot>
@@ -313,6 +337,8 @@ js::set('isStepsTemplate', $isStepsTemplate);
   </div>
 </div>
 <?php js::set('bugModule', $lang->bug->module);?>
+<?php js::set('bugExecution', $lang->bug->execution);?>
+<?php js::set('systemMode', $config->systemMode);?>
 <script>
 $(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
 </script>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 4ac0df6807..d32e64309d 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -24,6 +24,8 @@ js::set('oldStoryID'             , $bug->story);
 js::set('oldTaskID'              , $bug->task);
 js::set('oldOpenedBuild'         , $bug->openedBuild);
 js::set('oldResolvedBuild'       , $bug->resolvedBuild);
+js::set('systemMode'             , $config->systemMode);
+js::set('confirmUnlinkBuild'     , sprintf($lang->bug->confirmUnlinkBuild, zget($resolvedBuilds, $bug->resolvedBuild)));
 ?>
 
 <div class='main-content' id='mainContent'>
@@ -90,7 +92,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                   <td>
                     <div class='input-group'>
                       <?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value)' class='form-control chosen'");?>
-                      <?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $bug->branch, "onchange='loadBranch();' class='form-control'");?>
+                      <?php if($product->type != 'normal') echo html::select('branch', $branches, $bug->branch, "onchange='loadBranch();' class='form-control'");?>
                     </div>
                   </td>
                 </tr>
@@ -171,9 +173,15 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
             </table>
           </div>
           <div class='detail'>
-            <div class='detail-title'><?php echo $lang->bug->legendExecStoryTask;?></div>
+            <div class='detail-title'><?php echo $config->systemMode == 'class' ? $lang->bug->legendExecStoryTask : $lang->bug->legendPRJExecStoryTask;?></div>
             <table class='table table-form'>
               <tbody>
+                <?php if($config->systemMode == 'new'):?>
+                <tr>
+                  <th class='w-85px'><?php echo $lang->bug->project;?></th>
+                  <td><span id='projectBox'><?php echo html::select('project', $projects, $bug->project, "class='form-control chosen' onchange='loadProductExecutions($bug->product, this.value)'");?></span></td>
+                </tr>
+                <?php endif;?>
                 <tr>
                   <th class='w-85px'><?php echo $lang->bug->execution;?></th>
                   <td><span id='executionIdBox'><?php echo html::select('execution', $executions, $bug->execution, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?></span></td>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index a1c00d5491..6c0bf203ad 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('sysurl', common::getSysUrl());?>
-<?php $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
+<?php $browseLink = $app->session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php if(!isonlybody()):?>
@@ -31,7 +31,8 @@
   <?php if(!isonlybody()):?>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('product', $product)):?>
-    <?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module}", "<i class='icon icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary'"); ?>
+    <?php $openApp = strpos('|execution|project|qa|', $this->app->openApp) !== false ? $this->app->openApp : 'qa';?>
+    <?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module},projectID={$bug->project},executionID={$bug->execution}", "<i class='icon icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
     <?php endif;?>
   </div>
   <?php endif;?>
@@ -67,7 +68,10 @@
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <?php
     $params        = "bugID=$bug->id";
-    $copyParams    = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
+    $extraParams   = "extras=bugID=$bug->id";
+    if($this->app->openApp == 'project')   $extraParams .= ",projectID={$bug->project}";
+    if($this->app->openApp == 'execution') $extraParams .= ",executionID={$bug->execution}";
+    $copyParams    = "productID=$productID&branch=$bug->branch&$extraParams";
     $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
     ?>
     <div class='main-actions'>
@@ -76,20 +80,20 @@
         <?php if(!$bug->deleted):?>
         <div class='divider'></div>
         <?php
-        common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'search', '', 'iframe', true);
+        common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'ok', '', 'iframe', true);
         common::printIcon('bug', 'assignTo',   $params, $bug, 'button', '', '', 'iframe', true);
         common::printIcon('bug', 'resolve',    $params, $bug, 'button', 'checked', '', 'iframe showinonlybody', true);
         common::printIcon('bug', 'close',      $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true);
         common::printIcon('bug', 'activate',   $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true);
 
-        common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', '', $lang->bug->toStory);
+        common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='" . ($this->app->openApp == 'project' ? 'project' : 'product') . "'", $lang->bug->toStory);
         common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
 
         echo $this->buildOperateMenu($bug, 'view');
 
         echo "<div class='divider'></div>";
         common::printIcon('bug', 'edit', $params, $bug);
-        common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
+        common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy', '', '', false, "data-app='qa'");
         common::printIcon('bug', 'delete', $params, $bug, 'button', 'trash', 'hiddenwin');
         ?>
         <?php endif;?>
@@ -101,7 +105,7 @@
       <div class='tabs'>
         <ul class='nav nav-tabs'>
           <li class='active'><a href='#legendBasicInfo' data-toggle='tab'><?php echo $lang->bug->legendBasicInfo;?></a></li>
-          <li><a href='#legendExecStoryTask' data-toggle='tab'><?php echo $lang->bug->legendExecStoryTask;?></a></li>
+          <li><a href='#legendExecStoryTask' data-toggle='tab'><?php echo $config->systemMode == 'new' ? $lang->bug->legendPRJExecStoryTask : $lang->bug->legendExecStoryTask;?></a></li>
         </ul>
         <div class='tab-content'>
           <div class='tab-pane active' id='legendBasicInfo'>
@@ -109,11 +113,11 @@
               <tbody>
                 <tr valign='middle'>
                   <th class='thWidth'><?php echo $lang->bug->product;?></th>
-                  <td><?php if(!common::printLink('product', 'browse', "productID=$bug->product", $productName)) echo $productName;?></td>
+                  <td><?php if(!common::printLink('product', 'browse', "productID=$bug->product", $product->name)) echo $product->name;?></td>
                 </tr>
-                <?php if($this->session->currentProductType != 'normal'):?>
+                <?php if($product->type != 'normal'):?>
                 <tr>
-                  <th><?php echo $lang->product->branch;?></th>
+                  <th><?php echo sprintf($lang->product->branch, $lang->product->branchName[$product->type]);?></th>
                   <td><?php if(!common::printLink('bug', 'browse', "productID=$bug->product&branch=$bug->branch", $branchName)) echo $branchName;?></td>
                 </tr>
                 <?php endif;?>
@@ -235,9 +239,15 @@
           <div class='tab-pane' id='legendExecStoryTask'>
             <table class='table table-data'>
               <tbody>
+                <?php if($config->systemMode == 'new'):?>
                 <tr>
-                  <th class='w-60px'><?php echo $lang->bug->execution;?></th>
-                  <td><?php if($bug->execution) echo html::a($this->createLink('execution', 'browse', "executionid=$bug->execution"), $bug->executionName);?></td>
+                  <th class='w-70px'><?php echo $lang->bug->project;?></th>
+                  <td><?php if($bug->project) echo html::a($this->createLink('project', 'view', "projectID=$bug->project"), $bug->projectName);?></td>
+                </tr>
+                <?php endif;?>
+                <tr>
+                  <th class='w-70px'><?php echo $lang->bug->execution;?></th>
+                  <td><?php if($bug->execution) echo html::a($this->createLink('execution', 'browse', "executionID=$bug->execution"), $bug->executionName);?></td>
                 </tr>
                 <tr class='nofixed'>
                   <th><?php echo $lang->bug->story;?></th>
diff --git a/module/build/config.php b/module/build/config.php
index 31d0a54b6f..c2522ab8cb 100644
--- a/module/build/config.php
+++ b/module/build/config.php
@@ -2,7 +2,7 @@
 $config->build = new stdclass();
 $config->build->create = new stdclass();
 $config->build->edit   = new stdclass();
-$config->build->create->requiredFields = 'product,name,builder,date';
+$config->build->create->requiredFields = 'product,execution,name,builder,date';
 $config->build->edit->requiredFields   = 'product,execution,name,builder,date';
 
 $config->build->editor = new stdclass();
diff --git a/module/build/control.php b/module/build/control.php
index f5b8eecad5..818f5998e5 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -19,48 +19,65 @@ class build extends control
      * @access public
      * @return void
      */
-    public function create($executionID, $productID = 0)
+    public function create($executionID = 0, $productID = 0, $projectID = 0)
     {
-        /* Create execution if no execution. */
-        if($executionID == 0) die(js::locate($this->createLink('execution', 'create'), 'parent'));
+        /* Load these models. */
+        $this->loadModel('execution');
+        $this->loadModel('user');
 
         if(!empty($_POST))
         {
+            $executionID = empty($executionID) ? $this->post->execution : $executionID;
+            if(empty($executionID)) dao::$errors['execution'] = $this->lang->build->emptyExecution;
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
             $buildID = $this->build->create($executionID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('build', $buildID, 'opened');
 
             $this->executeHooks($buildID);
 
-            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProjectBuilds($executionID)")); // Code for task #5126.
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $buildID));
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadExecutionBuilds($executionID)")); // Code for task #5126.
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID")));
         }
 
-        /* Load these models. */
-        $this->loadModel('execution');
-        $this->loadModel('user');
-
-        /* Set session and get execution by id. */
-        $this->session->set('buildCreate', $this->app->getURI(true));
-        $execution = $this->execution->getByID($executionID);
-
         /* Set menu. */
-        $executions = $this->execution->getPairs($execution->project);
-        $this->execution->setMenu($executions, $executionID);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($projectID);
+            $executions  = $this->execution->getPairs($projectID);
+            $executionID = empty($executionID) ? key($executions) : $executionID;
+            $this->session->set('project', $projectID);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $execution  = $this->execution->getByID($executionID);
+            $executions = $this->execution->getPairs($execution->project);
+            $this->execution->setMenu($executionID);
+            $this->session->set('project', $execution->project);
+        }
+        elseif($this->app->openApp == 'qa')
+        {
+            $execution  = $this->execution->getByID($executionID);
+            $executions = $this->execution->getPairs($execution->project);
+        }
 
         $productGroups = $this->execution->getProducts($executionID);
         $productID     = $productID ? $productID : key($productGroups);
         $products      = array();
         foreach($productGroups as $product) $products[$product->id] = $product->name;
 
-        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->build->create;
-        $this->view->position[] = html::a($this->createLink('execution', 'task', "executionID=$executionID"), $execution->name);
+        $this->view->title      = $this->lang->build->create;
         $this->view->position[] = $this->lang->build->create;
 
         $this->view->product       = isset($productGroups[$productID]) ? $productGroups[$productID] : '';
         $this->view->branches      = (isset($productGroups[$productID]) and $productGroups[$productID]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID);
         $this->view->executionID   = $executionID;
         $this->view->products      = $products;
+        $this->view->projectID     = $projectID;
+        $this->view->executions    = $executions;
+        $this->view->openApp       = $this->app->openApp;
         $this->view->lastBuild     = $this->build->getLast($executionID);
         $this->view->productGroups = $productGroups;
         $this->view->users         = $this->user->getPairs('nodeleted|noclosed');
@@ -100,7 +117,14 @@ class build extends control
         $build = $this->build->getById((int)$buildID);
 
         /* Set menu. */
-        $this->execution->setMenu($this->execution->getPairs($this->session->PRJ), $build->execution);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($build->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->execution->setMenu($build->execution);
+        }
 
         /* Get stories and bugs. */
         $orderBy = 'status_asc, stage_asc, id_desc';
@@ -113,7 +137,7 @@ class build extends control
             $execution->name = '';
         }
 
-        $executions = $this->product->getExecutionPairsByProduct($build->product, $build->branch, 'id_desc', $this->session->PRJ);
+        $executions = $this->product->getExecutionPairsByProduct($build->product, $build->branch, 'id_desc', $this->session->project);
         if(!isset($executions[$build->execution])) $executions[$build->execution] = $execution->name;
 
         $productGroups = $this->execution->getProducts($build->execution);
@@ -160,13 +184,10 @@ class build extends control
      */
     public function view($buildID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $build = $this->build->getByID((int)$buildID, true);
+        $buildID = (int)$buildID;
+        $build   = $this->build->getByID($buildID, true);
         if(!$build) die(js::error($this->lang->notFound) . js::locate('back'));
-        $this->session->PRJ = $build->project;
-
-        /* Set session and load modules. */
-        if($type == 'story')$this->session->set('storyList', $this->app->getURI(true));
-        if($type == 'bug')  $this->session->set('bugList', $this->app->getURI(true));
+        $this->session->project = $build->project;
 
         $this->loadModel('story');
         $this->loadModel('bug');
@@ -191,12 +212,21 @@ class build extends control
             ->beginIF($type == 'story')->orderBy($orderBy)->fi()
             ->page($storyPager)
             ->fetchAll('id');
-        $stages  = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($build->stories)->andWhere('branch')->eq($build->branch)->fetchPairs('story', 'stage');
-        foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage;
+
+        $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($build->stories)->andWhere('branch')->eq($build->branch)->fetchPairs('story', 'stage');
+        foreach($stages as $storyID => $stage) $stories[$storyID]->stage = $stage;
 
         /* Set menu. */
-        $this->loadModel('execution')->setMenu($this->execution->getPairs($this->session->PRJ), $build->execution, $buildID);
-        $executions = $this->execution->getPairs($this->session->PRJ, 'all', 'empty');
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($build->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($build->execution);
+        }
+
+        $executions = $this->loadModel('execution')->getPairs($this->session->project, 'all', 'empty');
 
         $this->view->title         = "BUILD #$build->id $build->name - " . $executions[$build->execution];
         $this->view->position[]    = html::a($this->createLink('execution', 'task', "executionID=$build->execution"), $executions[$build->execution]);
@@ -205,7 +235,7 @@ class build extends control
         $this->view->storyPager    = $storyPager;
 
         $generatedBugPager = new pager($type == 'generatedBug' ? $recTotal : 0, $recPerPage, $type == 'generatedBug' ? $pageID : 1);
-        $this->view->generatedBugs     = $this->bug->getExecutionBugs($build->execution, $build->id, '', 0, $type == 'generatedBug' ? $orderBy : 'status_desc,id_desc', '', $generatedBugPager);
+        $this->view->generatedBugs     = $this->bug->getExecutionBugs($build->execution, $build->product, $build->id, $type, $type == 'generatedBug' ? $orderBy : 'status_desc,id_desc', '', $generatedBugPager);
         $this->view->generatedBugPager = $generatedBugPager;
 
         $this->executeHooks($buildID);
@@ -223,6 +253,14 @@ class build extends control
         $this->view->type         = $type;
         $this->view->bugPager     = $bugPager;
         $this->view->branchName   = $build->productType == 'normal' ? '' : $this->loadModel('branch')->getById($build->branch);
+
+        if($this->app->getViewType() == 'json')
+        {
+            unset($this->view->storyPager);
+            unset($this->view->generatedBugPager);
+            unset($this->view->bugPager);
+        }
+
         $this->display();
     }
 
@@ -261,7 +299,8 @@ class build extends control
                 $this->send($response);
             }
 
-            die(js::locate($this->createLink('execution', 'build', "executionID=$build->execution"), 'parent'));
+            $link = $this->app->openApp == 'project' ? $this->createLink('project', 'build', "projectID=$build->project") : $this->createLink('execution', 'build', "executionID=$build->execution");
+            die(js::locate($link, 'parent'));
         }
     }
 
@@ -304,7 +343,7 @@ class build extends control
     }
 
     /**
-     * AJAX: get builds of a execution in html select.
+     * AJAX: get builds of an execution in html select.
      *
      * @param  int    $executionID
      * @param  string $varName      the name of the select object to create
@@ -347,12 +386,14 @@ class build extends control
 
             if(empty($builds))
             {
-                $html  = html::a($this->createLink('build', 'create', "executionID=$executionID&productID=$productID", '', $onlybody = true), $this->lang->build->create, '', "data-toggle='modal' data-type='iframe'");
+                $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
+
+                $html  = html::a($this->createLink('build', 'create', "executionID=$executionID&productID=$productID&projectID=$projectID", '', $onlybody = true), $this->lang->build->create, '', "data-toggle='modal' data-type='iframe'");
                 $html .= '&nbsp; ';
-                $html .= html::a("javascript:loadProjectBuilds($executionID)", $this->lang->refresh);
+                $html .= html::a("javascript:loadExecutionBuilds($executionID)", $this->lang->refresh);
                 die($html);
             }
-            die(html::select('build', $builds, $build, "class='form-control'"));
+            die(html::select('build', array('') + $builds, $build, "class='form-control' onchange='loadTestReports(this.value)'"));
         }
         if($varName == 'dropdownList')
         {
@@ -368,7 +409,7 @@ class build extends control
     }
 
     /**
-     * Link stories
+     * Link stories.
      *
      * @param  int    $buildID
      * @param  string $browseType
@@ -387,10 +428,12 @@ class build extends control
             die(js::locate(inlink('view', "buildID=$buildID&type=story"), 'parent'));
         }
 
-        $this->session->set('storyList', inlink('view', "buildID=$buildID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('storyList', inlink('view', "buildID=$buildID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), $this->app->openApp);
+
         $build   = $this->build->getById($buildID);
         $product = $this->loadModel('product')->getById($build->product);
-        $this->loadModel('execution')->setMenu($this->execution->getPairs($this->session->PRJ), $build->execution);
+
+        $this->loadModel('execution')->setMenu($build->execution);
         $this->loadModel('story');
         $this->loadModel('tree');
         $this->loadModel('product');
@@ -406,9 +449,10 @@ class build extends control
         $this->config->product->search['actionURL'] = $this->createLink('build', 'view', "buildID=$buildID&type=story&link=true&param=" . helper::safe64Encode("&browseType=bySearch&queryID=myQueryID"));
         $this->config->product->search['queryID']   = $queryID;
         $this->config->product->search['style']     = 'simple';
-        $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
-        $this->config->product->search['params']['module']['values']  = $this->tree->getOptionMenu($build->product, $viewType = 'story', $startModuleID = 0);
+        $this->config->product->search['params']['plan']['values']   = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
+        $this->config->product->search['params']['module']['values'] = $this->tree->getOptionMenu($build->product, 'story', 0);
         $this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
+
         if($product->type == 'normal')
         {
             unset($this->config->product->search['fields']['branch']);
@@ -505,11 +549,11 @@ class build extends control
             die(js::locate(inlink('view', "buildID=$buildID&type=bug"), 'parent'));
         }
 
-        $this->session->set('bugList', inlink('view', "buildID=$buildID&type=bug&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('bugList', inlink('view', "buildID=$buildID&type=bug&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa');
         /* Set menu. */
         $build   = $this->build->getByID($buildID);
         $product = $this->loadModel('product')->getByID($build->product);
-        $this->loadModel('execution')->setMenu($this->execution->getPairs($this->session->PRJ), $build->execution);
+        $this->loadModel('execution')->setMenu($this->execution->getPairs($build->project), $build->execution);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -524,7 +568,7 @@ class build extends control
         $this->config->bug->search['style']     = 'simple';
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
         $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($build->product, $viewType = 'bug', $startModuleID = 0);
-        $this->config->bug->search['params']['execution']['values']     = $this->loadModel('product')->getExecutionPairsByProduct($build->product, 0, 'id_desc', $this->session->PRJ);
+        $this->config->bug->search['params']['execution']['values']     = $this->loadModel('product')->getExecutionPairsByProduct($build->product, 0, 'id_desc', $this->session->project);
         $this->config->bug->search['params']['openedBuild']['values']   = $this->build->getProductBuildPairs($build->product, $branch = 0, $params = '');
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
 
@@ -546,11 +590,11 @@ class build extends control
 
         if($browseType == 'bySearch')
         {
-            $allBugs = $this->bug->getBySearch($build->product, $build->branch, $queryID, 'id_desc', $build->bugs, $pager);
+            $allBugs = $this->bug->getBySearch($build->product, $build->branch, $queryID, 'id_desc', $build->bugs, $pager, $build->project);
         }
         else
         {
-            $allBugs = $this->bug->getExecutionBugs($build->execution, 0, 'noclosed', 0, 'status_desc,id_desc', $build->bugs, $pager);
+            $allBugs = $this->bug->getExecutionBugs($build->execution, 0, $buildID, 'noclosed', 0, 'status_desc,id_desc', $build->bugs, $pager);
         }
 
         $this->view->allBugs    = $allBugs;
diff --git a/module/build/js/common.js b/module/build/js/common.js
index 6e672a87da..96d639687b 100644
--- a/module/build/js/common.js
+++ b/module/build/js/common.js
@@ -1,7 +1,7 @@
 /**
- * Load branches 
- * 
- * @param  int $productID 
+ * Load branches
+ *
+ * @param  int $productID
  * @access public
  * @return void
  */
@@ -9,7 +9,13 @@ function loadBranches(productID)
 {
     $('#branch').remove();
     $('#branch_chosen').remove();
-    $.get(createLink('branch', 'ajaxGetBranches', 'productID=' + productID + '&oldBranch=' + productGroups[productID]['branch']), function(data)
+    var oldBranch = 0;
+    if(typeof(productGroups[productID]) != "undefined")
+    {
+        oldBranch = productGroups[productID]['branch'];
+    }
+
+    $.get(createLink('branch', 'ajaxGetBranches', 'productID=' + productID + '&oldBranch=' + oldBranch), function(data)
     {
         if(data)
         {
diff --git a/module/build/js/create.js b/module/build/js/create.js
index 3f64da6a53..53335a587f 100644
--- a/module/build/js/create.js
+++ b/module/build/js/create.js
@@ -4,4 +4,37 @@ $().ready(function()
     {
         $('#name').val($(this).text()).focus();
     });
+
 });
+/**
+ * Load products.
+ *
+ * @param  int $executionID
+ * @access public
+ * @return void
+ */
+function loadProducts(executionID)
+{
+    $('#product').remove();
+    $('#product_chosen').remove();
+    $('#branch').remove();
+    $('#branch_chosen').remove();
+    $('#noProduct').remove();
+    $.get(createLink('product', 'ajaxGetProducts', 'executionID=' + executionID), function(data)
+    {
+        if(data)
+        {
+            if(data.indexOf("required") != -1)
+            {
+                $('#productBox').addClass('required');
+            }
+            else
+            {
+                $('#productBox').removeClass('required');
+            }
+
+            $('#productBox').append(data);
+            $('#product').chosen();
+        }
+    });
+}
diff --git a/module/build/js/edit.js b/module/build/js/edit.js
index 3e58d95168..9c4a7505b0 100644
--- a/module/build/js/edit.js
+++ b/module/build/js/edit.js
@@ -1,9 +1,10 @@
-var executionID = $('#execution').val();
+var oldExecutionID = $('#execution').val();
+
 function loadExecutions()
 {
     var productID = $('#product').val();
     var branchID  = $('#branch').length > 0 ? $('#branch').val() : 0;
-    $('#executionsBox').load(createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&executionID=' + executionID + '&branch=' + branchID), function()
+    $('#executionsBox').load(createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=0&branch=' + branchID + '&number=&executionID=' + oldExecutionID), function()
     {
         $('#executionsBox #execution').chosen().removeAttr('onchange');
     });
diff --git a/module/build/js/view.js b/module/build/js/view.js
index 9112ee4883..234d532735 100644
--- a/module/build/js/view.js
+++ b/module/build/js/view.js
@@ -1,7 +1,7 @@
 function showLink(buildID, type, param)
 {
     var method = type == 'story' ? 'linkStory' : 'linkBug';
-    loadURL(createLink('build', method, 'buildID=' + buildID + param), type);
+    loadURL(createLink('build', method, 'buildID=' + buildID), type);
 
     $('.actions').find("a[href*='" + type + "']").addClass('hidden');
 }
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index aa5bd24bea..8f68f4650b 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -45,7 +45,7 @@ $lang->build->unlinkBug     = 'Bug Verknüpgung aufheben';
 $lang->build->stories       = "Abgeschlossene {$lang->SRCommon}";
 $lang->build->bugs          = 'Gelöster Bug';
 $lang->build->generatedBugs = 'Left Bug';
-$lang->build->noProduct     = " <span style='color:red'>Dieses {$lang->executionCommon} ist nicht mit einem {$lang->productCommon} verknüpft, daher kann das Build nicht erstellt werden. Bitte erst <a href='%s'> {$lang->productCommon} verknüpfen.</a></span>";
+$lang->build->noProduct     = " <span id='noProduct' style='color:red'>Dieses {$lang->executionCommon} ist nicht mit einem {$lang->productCommon} verknüpft, daher kann das Build nicht erstellt werden. Bitte erst <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'> {$lang->productCommon} verknüpfen.</a></span>";
 $lang->build->noBuild       = 'Keine Builds. ';
 
 $lang->build->notice = new stdclass();
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 7fb98b5162..15111b6574 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -27,26 +27,27 @@ $lang->build->confirmUnlinkBug   = "Do you want to unlink this Bug?";
 
 $lang->build->basicInfo = 'Basic Info';
 
-$lang->build->id            = 'ID';
-$lang->build->product       = $lang->productCommon;
-$lang->build->branch        = 'Platform/Branch';
-$lang->build->execution     = $lang->executionCommon;
-$lang->build->name          = 'Name';
-$lang->build->date          = 'Date';
-$lang->build->builder       = 'Builder';
-$lang->build->scmPath       = 'SCM Path';
-$lang->build->filePath      = 'File Path';
-$lang->build->desc          = 'Description';
-$lang->build->files         = 'Files';
-$lang->build->last          = 'Last Build';
-$lang->build->packageType   = 'Package Type';
-$lang->build->unlinkStory   = "Unlink {$lang->SRCommon}";
-$lang->build->unlinkBug     = 'Unlink Bug';
-$lang->build->stories       = "Finished {$lang->SRCommon}";
-$lang->build->bugs          = 'Resolved Bugs';
-$lang->build->generatedBugs = 'Reported Bugs';
-$lang->build->noProduct     = " <span style='color:red'>This {$lang->executionCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
-$lang->build->noBuild       = 'No builds yet.';
+$lang->build->id             = 'ID';
+$lang->build->product        = $lang->productCommon;
+$lang->build->branch         = 'Platform/Branch';
+$lang->build->execution      = $lang->executionCommon;
+$lang->build->name           = 'Name';
+$lang->build->date           = 'Date';
+$lang->build->builder        = 'Builder';
+$lang->build->scmPath        = 'SCM Path';
+$lang->build->filePath       = 'File Path';
+$lang->build->desc           = 'Description';
+$lang->build->files          = 'Files';
+$lang->build->last           = 'Last Build';
+$lang->build->packageType    = 'Package Type';
+$lang->build->unlinkStory    = "Unlink {$lang->SRCommon}";
+$lang->build->unlinkBug      = 'Unlink Bug';
+$lang->build->stories        = "Finished {$lang->SRCommon}";
+$lang->build->bugs           = 'Resolved Bugs';
+$lang->build->generatedBugs  = 'Reported Bugs';
+$lang->build->noProduct      = " <span id='noProduct' style='color:red'>This {$lang->executionCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'> link {$lang->productCommon}</a></span>";
+$lang->build->noBuild        = 'No builds yet.';
+$lang->build->emptyExecution =  $lang->executionCommon . 'should be not empty.';
 
 $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";
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 79936e924d..c8bc850f73 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -45,7 +45,7 @@ $lang->build->unlinkBug     = 'Retirer Bug';
 $lang->build->stories       = 'Stories terminées';
 $lang->build->bugs          = 'Bugs Résolus';
 $lang->build->generatedBugs = 'Bugs signalés';
-$lang->build->noProduct     = " <span style='color:red'>Ce {$lang->executionCommon} n'est pas associé à un {$lang->productCommon}, le Build ne peut pas être créé. Commencez par <a href='%s'>rattacher le projet à un {$lang->productCommon}</a></span>";
+$lang->build->noProduct     = " <span id='noProduct' style='color:red'>Ce {$lang->executionCommon} n'est pas associé à un {$lang->productCommon}, le Build ne peut pas être créé. Commencez par <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'>rattacher le projet à un {$lang->productCommon}</a></span>";
 $lang->build->noBuild       = 'Aucun builds.';
 
 $lang->build->notice = new stdclass();
diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php
index 1328c257ce..adf75db272 100644
--- a/module/build/lang/vi.php
+++ b/module/build/lang/vi.php
@@ -45,7 +45,7 @@ $lang->build->unlinkBug     = 'Hủy liên kết Bug';
 $lang->build->stories       = "{$lang->SRCommon} đã kết thúc";
 $lang->build->bugs          = 'Bugs đã giải quyết';
 $lang->build->generatedBugs = 'Bugs đã báo cáo';
-$lang->build->noProduct     = " <span style='color:red'>{$lang->executionCommon} này chưa liên kết tới {$lang->productCommon}, bởi vậy Bản dựng này không thể tạo. Vui lòng liên kết <a href='%s'> {$lang->productCommon} trước</a></span>";
+$lang->build->noProduct     = " <span id='noProduct' style='color:red'>{$lang->executionCommon} này chưa liên kết tới {$lang->productCommon}, bởi vậy Bản dựng này không thể tạo. Vui lòng liên kết <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'> {$lang->productCommon} trước</a></span>";
 $lang->build->noBuild       = 'Không có bản dựng nào';
 
 $lang->build->notice = new stdclass();
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index a30e340da5..193473d840 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -27,26 +27,27 @@ $lang->build->confirmUnlinkBug   = "您确认移除该Bug吗？";
 
 $lang->build->basicInfo = '基本信息';
 
-$lang->build->id            = 'ID';
-$lang->build->product       = $lang->productCommon;
-$lang->build->branch        = '平台/分支';
-$lang->build->execution     = '所属' . $lang->executionCommon;
-$lang->build->name          = '名称编号';
-$lang->build->date          = '打包日期';
-$lang->build->builder       = '构建者';
-$lang->build->scmPath       = '源代码地址';
-$lang->build->filePath      = '下载地址';
-$lang->build->desc          = '描述';
-$lang->build->files         = '上传发行包';
-$lang->build->last          = '上个版本';
-$lang->build->packageType   = '包类型';
-$lang->build->unlinkStory   = "移除{$lang->SRCommon}";
-$lang->build->unlinkBug     = '移除Bug';
-$lang->build->stories       = "完成的{$lang->SRCommon}";
-$lang->build->bugs          = '解决的Bug';
-$lang->build->generatedBugs = '产生的Bug';
-$lang->build->noProduct     = " <span style='color:red'>该{$lang->executionCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s'>关联{$lang->productCommon}</a></span>";
-$lang->build->noBuild       = '暂时没有版本。';
+$lang->build->id             = 'ID';
+$lang->build->product        = $lang->productCommon;
+$lang->build->branch         = '平台/分支';
+$lang->build->execution      = '所属' . $lang->executionCommon;
+$lang->build->name           = '名称编号';
+$lang->build->date           = '打包日期';
+$lang->build->builder        = '构建者';
+$lang->build->scmPath        = '源代码地址';
+$lang->build->filePath       = '下载地址';
+$lang->build->desc           = '描述';
+$lang->build->files          = '上传发行包';
+$lang->build->last           = '上个版本';
+$lang->build->packageType    = '包类型';
+$lang->build->unlinkStory    = "移除{$lang->SRCommon}";
+$lang->build->unlinkBug      = '移除Bug';
+$lang->build->stories        = "完成的{$lang->SRCommon}";
+$lang->build->bugs           = '解决的Bug';
+$lang->build->generatedBugs  = '产生的Bug';
+$lang->build->noProduct      = " <span id='noProduct' style='color:red'>该{$lang->executionCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'>关联{$lang->productCommon}</a></span>";
+$lang->build->noBuild        = '暂时没有版本。';
+$lang->build->emptyExecution =  $lang->executionCommon . '不能为空。';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "已经关联{$lang->SRCommon}、Bug或提交测试单的版本，不能修改其所属{$lang->productCommon}";
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 5ad1d9389c..9d04267975 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -27,26 +27,27 @@ $lang->build->confirmUnlinkBug   = "您確認移除該Bug嗎？";
 
 $lang->build->basicInfo = '基本信息';
 
-$lang->build->id            = 'ID';
-$lang->build->product       = $lang->productCommon;
-$lang->build->branch        = '平台/分支';
-$lang->build->execution     = '所屬' . $lang->executionCommon;
-$lang->build->name          = '名稱編號';
-$lang->build->date          = '打包日期';
-$lang->build->builder       = '構建者';
-$lang->build->scmPath       = '原始碼地址';
-$lang->build->filePath      = '下載地址';
-$lang->build->desc          = '描述';
-$lang->build->files         = '上傳發行包';
-$lang->build->last          = '上個版本';
-$lang->build->packageType   = '包類型';
-$lang->build->unlinkStory   = "移除{$lang->SRCommon}";
-$lang->build->unlinkBug     = '移除Bug';
-$lang->build->stories       = "完成的{$lang->SRCommon}";
-$lang->build->bugs          = '解決的Bug';
-$lang->build->generatedBugs = '產生的Bug';
-$lang->build->noProduct     = " <span style='color:red'>該{$lang->executionCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s'>關聯{$lang->productCommon}</a></span>";
-$lang->build->noBuild       = '暫時沒有版本。';
+$lang->build->id             = 'ID';
+$lang->build->product        = $lang->productCommon;
+$lang->build->branch         = '平台/分支';
+$lang->build->execution      = '所屬' . $lang->executionCommon;
+$lang->build->name           = '名稱編號';
+$lang->build->date           = '打包日期';
+$lang->build->builder        = '構建者';
+$lang->build->scmPath        = '原始碼地址';
+$lang->build->filePath       = '下載地址';
+$lang->build->desc           = '描述';
+$lang->build->files          = '上傳發行包';
+$lang->build->last           = '上個版本';
+$lang->build->packageType    = '包類型';
+$lang->build->unlinkStory    = "移除{$lang->SRCommon}";
+$lang->build->unlinkBug      = '移除Bug';
+$lang->build->stories        = "完成的{$lang->SRCommon}";
+$lang->build->bugs           = '解決的Bug';
+$lang->build->generatedBugs  = '產生的Bug';
+$lang->build->noProduct      = " <span id='noProduct' style='color:red'>該{$lang->executionCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'>關聯{$lang->productCommon}</a></span>";
+$lang->build->noBuild        = '暫時沒有版本。';
+$lang->build->emptyExecution =  $lang->executionCommon . '不能為空。';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "已經關聯{$lang->SRCommon}、Bug或提交測試單的版本，不能修改其所屬{$lang->productCommon}";
diff --git a/module/build/model.php b/module/build/model.php
index c3b06200cb..294f92c285 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -60,9 +60,9 @@ class buildModel extends model
      */
     public function getProjectBuilds($projectID = 0, $type = 'all', $param = 0)
     {
-        return $this->dao->select('t1.*, t2.name as projectName, t2.id as projectID, t3.name as productName, t4.name as branchName')
+        return $this->dao->select('t1.*, t2.name as executionName, t2.id as executionID, t3.name as productName, t4.name as branchName')
             ->from(TABLE_BUILD)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product = t3.id')
             ->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
             ->where('t1.project')->eq((int)$projectID)
@@ -144,21 +144,21 @@ class buildModel extends model
                 $this->session->set('projectBuildForm', $query->form);
             }
         }
-        if($this->session->PRJBuildQuery == false) $this->session->set('projectBuildQuery', ' 1 = 1');
+        if($this->session->projectBuildQuery == false) $this->session->set('projectBuildQuery', ' 1 = 1');
 
-        $buildQuery = $this->session->PRJBuildQuery;
+        $buildQuery = $this->session->projectBuildQuery;
 
         /* Distinguish between repeated fields. */
         $fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`', 'desc' => '`desc`', 'project' => '`project`');
         foreach($fields as $field)
         {
-            if(strpos($this->session->PRJBuildQuery, $field) !== false)
+            if(strpos($this->session->projectBuildQuery, $field) !== false)
             {
                 $buildQuery = str_replace($field, "t1." . $field, $buildQuery);
             }
         }
 
-        return $this->getExecutionBuilds($executionID, 'bysearch', $buildQuery);
+        return $this->getProjectBuilds($projectID, 'bysearch', $buildQuery);
     }
 
     /**
@@ -293,7 +293,6 @@ class buildModel extends model
             ->leftJoin(TABLE_RELEASE)->alias('t3')->on('t1.id = t3.build')
             ->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
             ->where('t1.product')->in($products)
-            ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
             ->beginIF($branch)->andWhere('t1.branch')->in("0,$branch")->fi()
             ->andWhere('t1.deleted')->eq(0)
             ->orderBy('t1.date desc, t1.id desc')->fetchAll('id');
@@ -353,8 +352,10 @@ class buildModel extends model
         $build->stories = '';
         $build->bugs    = '';
 
+        $execution = $this->loadModel('execution')->getByID($executionID);
+
         $build = fixer::input('post')
-            ->setDefault('project', $this->session->PRJ)
+            ->setDefault('project', $execution->project)
             ->setDefault('product', 0)
             ->setDefault('branch', 0)
             ->cleanInt('product,branch')
@@ -369,6 +370,7 @@ class buildModel extends model
             ->batchCheck($this->config->build->create->requiredFields, 'notempty')
             ->check('name', 'unique', "product = {$build->product} AND branch = {$build->branch} AND deleted = '0'")
             ->exec();
+
         if(!dao::isError())
         {
             $buildID = $this->dao->lastInsertID();
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index cbd885034e..983bb82691 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -19,11 +19,17 @@
     </div>
     <form class='load-indicator main-form form-ajax' id='dataform' method='post' enctype='multipart/form-data'>
       <table class='table table-form'>
+        <?php if($openApp == 'project'):?>
+        <tr>
+          <th><?php echo $lang->executionCommon;?></th>
+          <td><?php echo html::select('execution', $executions, $executionID, "onchange='loadProducts(this.value);' class='form-control chosen' required");?></td>
+        </tr>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->build->product;?></th>
           <?php if(!empty($products)):?>
           <td>
-            <div class='input-group'>
+            <div class='input-group' id='productBox'>
               <?php echo html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required");?>
               <?php
               if(!empty($product) and $product->type != 'normal' and isset($branches[$product->branch]))
@@ -34,10 +40,14 @@
               ?>
             </div>
           </td>
-          <td></td>
           <?php else:?>
-          <td class='text-muted' colspan='2'><?php printf($lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate"));?></td>
+          <td>
+            <div class='input-group' id='productBox'>
+              <?php printf($lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), $openApp);?>
+            </div>
+          </td>
           <?php endif;?>
+          <td></td>
         </tr>
         <tr>
           <th><?php echo $lang->build->name;?></th>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index e0726ab0bf..6366cbf545 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -89,4 +89,5 @@
   </div>
 </div>
 <?php js::set('productGroups', $productGroups)?>
+<?php js::set('projectID', $build->project)?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 24c338886c..0e28c95bf0 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -38,6 +38,7 @@
       </thead>
       <tbody class='text-center'>
         <?php $unlinkedCount = 0;?>
+        <?php $objectID = $this->app->openApp == 'execution' ? $build->execution : $build->project;?>
         <?php foreach($allStories as $story):?>
         <tr>
           <td class='c-id text-left'>
@@ -47,12 +48,12 @@
           <td class='text-left nobr' title='<?php echo $story->title?>'>
             <?php
             if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
-            echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
+            echo html::a($this->createLink('story', 'view', "storyID=$story->id&version=0&param=$objectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
             ?>
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td class='w-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='w-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td>
             <span class='status-story status-<?php echo $story->status?>'>
               <?php echo $this->processStatus('story', $story);?>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 9a25ab65ad..03ddaeda2c 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -53,8 +53,8 @@ tbody tr td:first-child input {display: none;}
     {
         echo $this->buildOperateMenu($build, 'view');
 
-        if(common::hasPriv('build', 'edit'))   echo html::a($this->createLink('build', 'edit',   "buildID=$build->id"), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
-        if(common::hasPriv('build', 'delete')) echo html::a($this->createLink('build', 'delete', "buildID=$build->id"), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
+        if(common::hasPriv('build', 'edit'))   echo html::a($this->createLink('build', 'edit',   "buildID=$build->id"), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}' data-app='{$app->openApp}'");
+        if(common::hasPriv('build', 'delete')) echo html::a($this->createLink('build', 'delete', "buildID=$build->id"), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin' data-app='{$app->openApp}'");
     }
     ?>
   </div>
@@ -99,8 +99,9 @@ tbody tr td:first-child input {display: none;}
               </tr>
             </thead>
             <tbody class='text-center'>
+              <?php $objectID = $this->app->openApp == 'execution' ? $build->execution : $build->project;?>
               <?php foreach($stories as $storyID => $story):?>
-              <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
+              <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id&version=0&param=$objectID", '', true);?>
               <tr>
                 <td class='c-id text-left'>
                   <?php if($canBatchUnlink):?>
@@ -117,7 +118,7 @@ tbody tr td:first-child input {display: none;}
                   ?>
                 </td>
                 <td><?php echo zget($users, $story->openedBy);?></td>
-                <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status;?>'>
                     <?php echo $this->processStatus('story', $story);?>
@@ -129,7 +130,7 @@ tbody tr td:first-child input {display: none;}
                   if($canBeChanged and common::hasPriv('build', 'unlinkStory'))
                   {
                       $unlinkURL = inlink('unlinkStory', "buildID=$build->id&story=$story->id");
-                      echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"storyList\", confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn btn-icon' title='{$lang->build->unlinkStory}'");
+                      echo html::a("###", '<i class="icon-unlink"></i>', '', "onclick='ajaxDelete(\"$unlinkURL\", \"storyList\", confirmUnlinkStory)' class='btn' title='{$lang->build->unlinkStory}'");
                   }
                   ?>
                 </td>
@@ -210,7 +211,7 @@ tbody tr td:first-child input {display: none;}
                   if($canBeChanged and common::hasPriv('build', 'unlinkBug'))
                   {
                       $unlinkURL = inlink('unlinkBug', "buildID=$build->id&bug=$bug->id");
-                      echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"bugList\", confirmUnlinkBug)", '<i class="icon-unlink"></i>', '', "class='btn btn-icon' title='{$lang->build->unlinkBug}'");
+                      echo html::a("###", '<i class="icon-unlink"></i>', '', "onclick='ajaxDelete(\"$unlinkURL\", \"bugList\", confirmUnlinkBug)' class='btn' title='{$lang->build->unlinkBug}'");
                   }
                   ?>
                 </td>
diff --git a/module/caselib/control.php b/module/caselib/control.php
index a9f43d5ad3..01030be398 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -11,36 +11,6 @@
  */
 class caselib extends control
 {
-    /**
-     * All products.
-     *
-     * @var    array
-     * @access public
-     */
-    public $products = array();
-
-    /**
-     * Construct function.
-     *
-     * @param  string $moduleName
-     * @param  string $methodName
-     * @access public
-     * @return void
-     */
-    public function __construct($moduleName = '', $methodName = '')
-    {
-        parent::__construct($moduleName, $methodName);
-
-        /* Set testtask menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID)
-        {
-            $this->app->loadConfig('qa');
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-        }
-    }
-
-
     /**
      * Index page, header to browse.
      *
@@ -72,6 +42,14 @@ class caselib extends control
                 $this->send($response);
             }
             $this->loadModel('action')->create('caselib', $libID, 'opened');
+
+            /* Return lib id when call the API. */
+            if($this->viewType == 'json')
+            {
+                $response['id'] = $libID;
+                $this->send($response);
+            }
+
             $response['locate']  = $this->createLink('caselib', 'browse', "libID=$libID");
             $this->send($response);
         }
@@ -195,24 +173,25 @@ class caselib extends control
         if(empty($libraries)) $this->locate(inlink('create'));
 
         /* Save session. */
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
+        $this->session->set('caselibList', $this->app->getURI(true), 'qa');
 
         /* Set menu. */
         $libID = $this->caselib->saveLibState($libID, $libraries);
-        setcookie('preCaseLibID', $libID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie('preCaseLibID', $libID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
         if($this->cookie->preCaseLibID != $libID)
         {
             $_COOKIE['libCaseModule'] = 0;
-            setcookie('libCaseModule', 0, 0, $this->config->webRoot, '', false, true);
+            setcookie('libCaseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
         }
 
-        if($browseType == 'bymodule') setcookie('libCaseModule', (int)$param, 0, $this->config->webRoot, '', false, true);
+        if($browseType == 'bymodule') setcookie('libCaseModule', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
         if($browseType != 'bymodule') $this->session->set('libBrowseType', $browseType);
         $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->libCaseModule ? $this->cookie->libCaseModule : 0));
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set lib menu. */
-        $this->caselib->setLibMenu($libraries, $libID, $moduleID);
+        $this->caselib->setLibMenu($libraries, $libID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -270,7 +249,7 @@ class caselib extends control
         {
             $this->loadModel('testcase');
             $this->config->testcase->create->requiredFields = $this->config->caselib->createcase->requiredFields;
-            setcookie('lastLibCaseModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
+            setcookie('lastLibCaseModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $caseResult = $this->testcase->create($bugID = 0);
             if(!$caseResult or dao::isError()) die(js::error(dao::getError()));
 
@@ -396,7 +375,8 @@ class caselib extends control
      */
     public function view($libID)
     {
-        $lib = $this->caselib->getById($libID, true);
+        $libID = (int)$libID;
+        $lib   = $this->caselib->getById($libID, true);
         if(!isset($lib->id)) die(js::error($this->lang->notFound) . js::locate('back'));
 
         /* Set lib menu. */
diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php
index a05ac03614..1bf494ff34 100644
--- a/module/caselib/lang/en.php
+++ b/module/caselib/lang/en.php
@@ -24,9 +24,13 @@ $lang->caselib->deleted          = 'Deleted';
 $lang->caselib->exportTemplet    = 'Export Template';
 $lang->caselib->batchCreateCase  = 'Batch Create';
 $lang->caselib->import           = 'Import';
-$lang->caselib->importAction     = 'Import Case';
 $lang->caselib->showImport       = 'Imported Data';
 
+$lang->caselib->browseAction     = 'Caselib List';
+$lang->caselib->deleteAction     = "Delete Caselib";
+$lang->caselib->importAction     = 'Import Case';
+$lang->caselib->linkVersion      = "Version";
+
 $lang->caselib->id             = 'ID';
 $lang->caselib->name           = 'Name';
 $lang->caselib->desc           = 'Description';
diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php
index b3fe557eb8..90cc8b069e 100644
--- a/module/caselib/lang/zh-cn.php
+++ b/module/caselib/lang/zh-cn.php
@@ -15,7 +15,7 @@ $lang->caselib->all    = '所有用例库';
 $lang->caselib->index            = "用例库首页";
 $lang->caselib->create           = "创建用例库";
 $lang->caselib->edit             = '编辑用例库';
-$lang->caselib->browse           = '浏览库用例';
+$lang->caselib->browse           = '浏览用例库';
 $lang->caselib->view             = '查看库概况';
 $lang->caselib->createCase       = '创建用例';
 $lang->caselib->delete           = "删除";
@@ -24,9 +24,13 @@ $lang->caselib->deleted          = '已删除';
 $lang->caselib->exportTemplet    = '导出模板';
 $lang->caselib->batchCreateCase  = '批量创建用例';
 $lang->caselib->import           = '导入';
-$lang->caselib->importAction     = '导入用例';
 $lang->caselib->showImport       = '显示导入数据';
 
+$lang->caselib->browseAction     = '用例库列表';
+$lang->caselib->deleteAction     = "删除用例库";
+$lang->caselib->importAction     = '导入用例';
+$lang->caselib->linkVersion      = "版本";
+
 $lang->caselib->id             = '编号';
 $lang->caselib->name           = '名称';
 $lang->caselib->desc           = '描述';
diff --git a/module/caselib/lang/zh-tw.php b/module/caselib/lang/zh-tw.php
index fb48f10d7c..dcdeee7314 100644
--- a/module/caselib/lang/zh-tw.php
+++ b/module/caselib/lang/zh-tw.php
@@ -15,7 +15,7 @@ $lang->caselib->all    = '所有用例庫';
 $lang->caselib->index            = "用例庫首頁";
 $lang->caselib->create           = "創建用例庫";
 $lang->caselib->edit             = '編輯用例庫';
-$lang->caselib->browse           = '瀏覽庫用例';
+$lang->caselib->browse           = '瀏覽用例庫';
 $lang->caselib->view             = '查看庫概況';
 $lang->caselib->createCase       = '創建用例';
 $lang->caselib->delete           = "刪除";
@@ -24,9 +24,13 @@ $lang->caselib->deleted          = '已刪除';
 $lang->caselib->exportTemplet    = '導出模板';
 $lang->caselib->batchCreateCase  = '批量創建用例';
 $lang->caselib->import           = '導入';
-$lang->caselib->importAction     = '導入用例';
 $lang->caselib->showImport       = '顯示導入數據';
 
+$lang->caselib->browseAction     = '用例庫列表';
+$lang->caselib->deleteAction     = "刪除用例庫";
+$lang->caselib->importAction     = '導入用例';
+$lang->caselib->linkVersion      = "版本";
+
 $lang->caselib->id             = '編號';
 $lang->caselib->name           = '名稱';
 $lang->caselib->desc           = '描述';
diff --git a/module/caselib/model.php b/module/caselib/model.php
index 2a5398c576..8b49db9f48 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -21,112 +21,27 @@ class caselibModel extends model
      * @access public
      * @return void
      */
-    public function setLibMenu($libraries, $libID, $moduleID = 0)
+    public function setLibMenu($libraries, $libID)
     {
-        $currentLibName = zget($libraries, $libID, '');
+        /* Set case lib menu. */
+        $products = $this->loadModel('product')->getPairs();
+        if(!empty($products) and $this->session->product) $this->loadModel('qa')->setMenu($products, $this->session->product);
+        if(empty($products)) $this->loadModel('qa')->setMenu(array(0 => ''), 0);
 
-        $isMobile       = $this->app->viewType == 'mhtml';
-        $selectHtml     = '';
-        if(!empty($libraries))
+        if($libraries)
         {
-            if($isMobile)
-            {
-                $selectHtml = "<a id='currentItem' href=\"javascript:showSearchMenu('caselib', '$libID', 'caselib', 'browse', '')\"><span class='text'>{$currentLibName}</span> <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
-            }
-            else
-            {
-                $dropMenuLink = helper::createLink('caselib', 'ajaxGetDropMenu', "objectID=$libID&module=caselib&method=browse");
-                $selectHtml  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem'><span class='text'>{$currentLibName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
-                $selectHtml .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
-                $selectHtml .= "</div></div></div>";
-            }
-        }
+            $libName = '';
+            if(!isset($libraries[$libID])) $libName = $this->dao->select('name')->from(TABLE_TESTSUITE)->where('id')->eq($libID)->fetch('name');
+            $currentLibName = zget($libraries, $libID, $libName);
+            setCookie("lastCaseLib", $libID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
-        setCookie("lastCaseLib", $libID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+            $dropMenuLink = helper::createLink('caselib', 'ajaxGetDropMenu', "objectID=$libID&module=caselib&method=browse");
 
-        $pageNav     = '';
-        $pageActions = '';
-        $isMobile    = $this->app->viewType == 'mhtml';
-        if($isMobile)
-        {
-            $this->app->loadLang('qa');
-            $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
-        }
-        else
-        {
-            if($this->config->global->flow == 'full')
-            {
-                $this->app->loadLang('qa');
-                $pageNav .= '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $this->lang->qa->index . ' <span class="caret"></span></button>';
-                $pageNav .= '<ul class="dropdown-menu">';
-                if(common::hasPriv('caselib', 'create')) $pageNav .= '<li>' . html::a(helper::createLink('caselib', 'create'), '<i class="icon icon-plus"></i> ' . $this->lang->caselib->create) . '</li>';
-                $pageNav .= '</ul></div></div>';
-            }
-            else
-            {
-                $this->app->loadLang('testcase');
-                $pageActions .= "<div class='btn-group'>";
-                if(common::hasPriv('caselib', 'exportTemplet'))
-                {
-                    $link = helper::createLink('caselib', 'exportTemplet', "libID=$libID");
-                    $pageActions .= html::a($link, "<i class='icon icon-export muted'> </i>" . $this->lang->caselib->exportTemplet, '', "class='btn btn-link export'");
-                }
-                if(common::hasPriv('caselib', 'import'))
-                {
-                    $link = helper::createLink('caselib', 'import', "libID=$libID");
-                    $pageActions .= html::a($link, "<i class='icon muted icon-import'> </i>" . $this->lang->testcase->fileImport, '', "class='btn btn-link export'");
-                }
-                $pageActions .= '</div>';
-                $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0);
-                if(common::hasPriv('caselib', 'batchCreateCase'))
-                {
-                    $link = helper::createLink('caselib', 'batchCreateCase', $params);
-                    $pageActions .= html::a($link, "<i class='icon-plus'></i>" . $this->lang->testcase->batchCreate, '', "class='btn btn-secondary'");
-                }
-                if(common::hasPriv('caselib', 'createCase'))
-                {
-                    $link = helper::createLink('caselib', 'createCase', $params);
-                    $pageActions .= html::a($link, "<i class='icon-plus'></i>" . $this->lang->testcase->create, '', "class='btn btn-primary'");
-                }
-                if(common::hasPriv('caselib', 'create'))
-                {
-                    $link = helper::createLink('caselib', 'create');
-                    $pageActions .= html::a($link, "<i class='icon-plus'></i>" . $this->lang->caselib->create, '', "class='btn btn-primary'");
-                }
-            }
-        }
-        $pageNav .= $selectHtml;
+            $output  = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentLibName}'><span class='text'>{$currentLibName}</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+            $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+            $output .= "</div></div>";
 
-        $this->lang->modulePageNav = $pageNav;
-        $this->lang->TRActions     = $pageActions;
-        foreach($this->lang->caselib->menu as $key => $value)
-        {
-            if($this->config->global->flow == 'full' and $this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('caselib', $key, $libID);
-            $replace = $libID;
-            if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->caselib->menu, $key, $replace);
-        }
-
-        if($this->config->global->flow != 'full' && $this->app->getMethodName() != 'view') $this->lang->caselib->menu->bysearch = "<a class='querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'> </i>{$this->lang->testcase->bySearch}</a>";
-        if($this->lang->navGroup->caselib == 'qa')
-        {
-            foreach($this->lang->qa->subMenu->testcase as $key => $menu)
-            {
-                common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $libID);
-            }
-            $this->lang->qa->menu           = $this->lang->caselib->menu;
-            $this->lang->caselib->menu      = $this->lang->qa->subMenu->testcase;
-            $this->lang->qa->mainMenuAction = html::a(helper::createLink('caselib', 'create'), "<i class='icon-plus'></i>" . $this->lang->caselib->create, '', "class='btn btn-link'");
-
-            if(!empty($libraries))
-            {
-                $dropMenuLink = helper::createLink('caselib', 'ajaxGetDropMenu', "objectID=$libID&module=caselib&method=browse");
-
-                $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentLibName}'><span class='text'><i class='icon icon-product'></i> {$currentLibName}</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
-                $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
-                $output .= "</div></div>";
-                $this->lang->qa->switcherMenu = $output;
-            }
+            $this->lang->switcherMenu = $output;
         }
     }
 
@@ -240,7 +155,7 @@ class caselibModel extends model
         $lib = fixer::input('post')
             ->stripTags($this->config->caselib->editor->create['id'], $this->config->allowedTags)
             ->setForce('type', 'library')
-            ->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa', 'project', $this->session->project)
             ->add('addedBy', $this->app->user->account)
             ->add('addedDate', helper::now())
             ->remove('uid')
@@ -284,7 +199,7 @@ class caselibModel extends model
         {
             $cases = $this->dao->select('*')->from(TABLE_CASE)
                 ->where('lib')->eq((int)$libID)
-                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
+                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('project')->eq($this->session->project)->fi()
                 ->andWhere('product')->eq(0)
                 ->beginIF($moduleIdList)->andWhere('module')->in($moduleIdList)->fi()
                 ->beginIF($browseType == 'wait')->andWhere('status')->eq($browseType)->fi()
@@ -321,7 +236,7 @@ class caselibModel extends model
 
             $cases = $this->dao->select('*')->from(TABLE_CASE)->where($caseQuery)
                 ->beginIF($queryLibID != 'all')->andWhere('lib')->eq((int)$libID)->fi()
-                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
+                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('project')->eq($this->session->project)->fi()
                 ->andWhere('product')->eq(0)
                 ->andWhere('deleted')->eq(0)
                 ->orderBy($sort)->page($pager)->fetchAll();
@@ -542,7 +457,7 @@ class caselibModel extends model
             }
             else
             {
-                $caseData->project    = $this->session->PRJ;
+                $caseData->project    = $this->session->project;
                 $caseData->version    = 1;
                 $caseData->openedBy   = $this->app->user->account;
                 $caseData->openedDate = $now;
@@ -636,7 +551,7 @@ class caselibModel extends model
                 $data[$i]->openedDate   = $now;
                 $data[$i]->status       = $forceNotReview ? 'normal' : 'wait';
                 $data[$i]->version      = 1;
-                if($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa') $data[$i]->project = $this->session->PRJ;
+                if($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa') $data[$i]->project = $this->session->project;
 
                 $this->dao->insert(TABLE_CASE)->data($data[$i])
                     ->autoCheck()
diff --git a/module/caselib/view/ajaxgetdropmenu.html.php b/module/caselib/view/ajaxgetdropmenu.html.php
index 3e83074d48..e719bc93cf 100644
--- a/module/caselib/view/ajaxgetdropmenu.html.php
+++ b/module/caselib/view/ajaxgetdropmenu.html.php
@@ -1,8 +1,10 @@
-<div class='list-group'>
+<div class='list-group' style='max-height: 248px; padding: 5px 10px; margin: 5px 0;'>
   <?php
+  $currentLibID = $libID;
   foreach($libraries as $libID => $libName)
   {
-      echo html::a(sprintf($link, $libID), "<i class='icon-database'></i> " . $libName, '', "data-key='{$librariesPinyin[$libName]}'");
+      $selected = $currentLibID == $libID ? 'selected' : '';
+      echo html::a(sprintf($link, $libID), "<i class='icon-database'></i> " . $libName, '', "class='$selected' data-key='{$librariesPinyin[$libName]}'");
   }
   ?>
 </div>
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index 154532a8f4..cf3f8f97b7 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -19,6 +19,11 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
 js::set('batchDelete',   $lang->testcase->confirmBatchDelete);
 js::set('flow',          $config->global->flow);
 ?>
+<style>
+.btn-group a i.icon-plus {font-size: 16px;}
+.btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
+.btn-group button.dropdown-toggle.btn-primary {padding:6px;}
+</style>
 <div id='mainMenu' class='clearfix'>
   <div id="sidebarHeader">
     <div class="title">
@@ -52,12 +57,22 @@ js::set('flow',          $config->global->flow);
   </div>
   <div class='btn-toolbar pull-right'>
     <div class='btn-group'>
-     <?php common::printLink('caselib', 'exportTemplet', "libID=$libID", "<i class='icon icon-export muted'> </i>" . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='35%'");?>
+     <?php common::printLink('caselib', 'exportTemplet', "libID=$libID", "<i class='icon icon-export muted'> </i>" . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='40%'");?>
      <?php common::printLink('caselib', 'import', "libID=$libID", "<i class='icon muted icon-import'> </i>" . $lang->testcase->fileImport, '', "class='btn btn-link export'");?>
     </div>
-    <?php $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0);?>
-    <?php common::printLink('caselib', 'batchCreateCase', $params, "<i class='icon-plus'></i>" . $lang->testcase->batchCreate, '', "class='btn btn-secondary'");?>
-    <?php common::printLink('caselib', 'createCase', $params, "<i class='icon-plus'></i>" . $lang->testcase->create, '', "class='btn btn-primary'");?>
+    <?php echo html::a($this->createLink('caselib', 'create'), "<i class='icon icon-plus'> </i>" . $lang->caselib->create, '', 'class="btn btn-secondary"');?>
+    <div class='btn-group dropdown'>
+      <?php
+      $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0);
+      $actionLink = $this->createLink('caselib', 'createCase', $params);
+      echo html::a($actionLink, "<i class='icon icon-plus'></i> {$lang->testcase->create}", '', "class='btn btn-primary'");
+      ?>
+      <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+      <ul class='dropdown-menu'>
+        <li><?php echo html::a($actionLink, $lang->testcase->create);?></li>
+        <li><?php echo html::a($this->createLink('caselib', 'batchCreateCase', $params), $lang->testcase->batchCreate);?></li>
+      </ul>
+    </div>
   </div>
 </div>
 <div id="mainContent" class="main-row fade">
diff --git a/module/caselib/view/view.html.php b/module/caselib/view/view.html.php
index a2f5669ebc..1d3b1dc160 100644
--- a/module/caselib/view/view.html.php
+++ b/module/caselib/view/view.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 $browseLink = $this->session->caseList ? $this->session->caseList : $this->createLink('caselib', 'browse', "libID=$lib->id");?>
+    <?php $browseLink = $this->session->caselibList ? $this->session->caselibList : $this->createLink('caselib', 'browse', "libID=$lib->id");?>
     <?php common::printBack($browseLink, 'btn btn-secondary');?>
     <div class='divider'></div>
     <div class='page-title'>
diff --git a/module/ci/model.php b/module/ci/model.php
index acb523c31f..46ff711cc9 100644
--- a/module/ci/model.php
+++ b/module/ci/model.php
@@ -17,20 +17,7 @@ class ciModel extends model
      */
     public function setMenu()
     {
-        $repoID     = $this->session->repoID;
-        $projectID  = isset($_GET['project']) ? $_GET['project'] : 0;
-        $moduleName = $this->app->getModuleName();
-        foreach($this->lang->{$moduleName}->menu as $key => $menu) common::setMenuVars($this->lang->{$moduleName}->menu, $key, $repoID);
-        $this->lang->{$moduleName}->menuOrder = $this->lang->ci->menuOrder;
-        if(!$projectID)
-        {
-            $this->lang->navGroup->repo    = 'repo';
-            $this->lang->navGroup->jenkins = 'repo';
-            $this->lang->navGroup->job     = 'repo';
-            $this->lang->navGroup->compile = 'repo';
-            $this->lang->noMenuModule[]    = 'job';
-            $this->lang->noMenuModule[]    = 'compile';
-        }
+        common::setMenuVars('devops', $this->session->repoID);
     }
 
     /**
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
new file mode 100644
index 0000000000..00f346a769
--- /dev/null
+++ b/module/common/lang/common.php
@@ -0,0 +1,153 @@
+<?php
+$lang->common      = new stdclass();
+$lang->index       = new stdclass();
+$lang->my          = new stdclass();
+$lang->todo        = new stdclass();
+$lang->program     = new stdclass();
+$lang->product     = new stdclass();
+$lang->project     = new stdclass();
+$lang->scrum       = new stdclass();
+$lang->waterfall   = new stdclass();
+$lang->execution   = new stdclass();
+$lang->story       = new stdclass();
+$lang->release     = new stdclass();
+$lang->branch      = new stdclass();
+$lang->productplan = new stdclass();
+$lang->measurement = new stdclass();
+$lang->review      = new stdclass();
+$lang->milestone   = new stdclass();
+$lang->qa          = new stdclass();
+$lang->doc         = new stdclass();
+$lang->system      = new stdclass();
+$lang->testcase    = new stdclass();
+$lang->testtask    = new stdclass();
+$lang->testreport  = new stdclass();
+$lang->score       = new stdclass();
+$lang->auditplan   = new stdclass();
+$lang->cm          = new stdclass();
+$lang->nc          = new stdclass();
+$lang->pssp        = new stdclass();
+$lang->stakeholder = new stdclass();
+$lang->task        = new stdclass();
+$lang->build       = new stdclass();
+$lang->bug         = new stdclass();
+$lang->company     = new stdclass();
+$lang->dept        = new stdclass();
+$lang->group       = new stdclass();
+$lang->user        = new stdclass();
+$lang->report      = new stdclass();
+$lang->repo        = new stdclass();
+$lang->jenkins     = new stdclass();
+$lang->compile     = new stdclass();
+$lang->job         = new stdclass();
+$lang->svn         = new stdclass();
+$lang->git         = new stdclass();
+$lang->subject     = new stdclass();
+$lang->company     = new stdclass();
+$lang->admin       = new stdclass();
+$lang->convert     = new stdclass();
+$lang->upgrade     = new stdclass();
+$lang->action      = new stdclass();
+$lang->backup      = new stdclass();
+$lang->extension   = new stdclass();
+$lang->custom      = new stdclass();
+$lang->mail        = new stdclass();
+$lang->cron        = new stdclass();
+$lang->dev         = new stdclass();
+$lang->entry       = new stdclass();
+$lang->webhook     = new stdclass();
+$lang->message     = new stdclass();
+$lang->search      = new stdclass();
+$lang->devops      = new stdclass();
+$lang->team        = new stdclass();
+$lang->automation  = new stdclass();
+$lang->personnel   = new stdclass();
+$lang->mail        = new stdclass();
+$lang->testsuite   = new stdclass();
+$lang->caselib     = new stdclass();
+$lang->ci          = new stdclass();
+$lang->datatable   = new stdclass();
+$lang->tree        = new stdclass();
+$lang->api         = new stdclass();
+$lang->file        = new stdclass();
+$lang->misc        = new stdclass();
+
+$lang->projectbuild   = new stdclass();
+$lang->projectrelease = new stdclass();
+$lang->projectstory   = new stdclass();
+
+/* Common action icons. */
+$lang->icons['todo']      = 'check';
+$lang->icons['product']   = 'product';
+$lang->icons['bug']       = 'bug';
+$lang->icons['task']      = 'check-sign';
+$lang->icons['tasks']     = 'tasks';
+$lang->icons['program']   = 'program';
+$lang->icons['project']   = 'project';
+$lang->icons['stage']     = 'waterfall';
+$lang->icons['sprint']    = 'sprint';
+$lang->icons['doc']       = 'file-text';
+$lang->icons['doclib']    = 'folder-close';
+$lang->icons['story']     = 'lightbulb';
+$lang->icons['release']   = 'tags';
+$lang->icons['roadmap']   = 'code-fork';
+$lang->icons['plan']      = 'flag';
+$lang->icons['dynamic']   = 'volume-up';
+$lang->icons['build']     = 'tag';
+$lang->icons['test']      = 'check';
+$lang->icons['testtask']  = 'check';
+$lang->icons['group']     = 'group';
+$lang->icons['team']      = 'group';
+$lang->icons['company']   = 'sitemap';
+$lang->icons['user']      = 'user';
+$lang->icons['dept']      = 'sitemap';
+$lang->icons['tree']      = 'sitemap';
+$lang->icons['usecase']   = 'sitemap';
+$lang->icons['testcase']  = 'sitemap';
+$lang->icons['result']    = 'list-alt';
+$lang->icons['mail']      = 'envelope';
+$lang->icons['trash']     = 'trash';
+$lang->icons['extension'] = 'th-large';
+$lang->icons['app']       = 'th-large';
+
+$lang->icons['results']            = 'list-alt';
+$lang->icons['create']             = 'plus';
+$lang->icons['post']               = 'edit';
+$lang->icons['batchCreate']        = 'plus-sign';
+$lang->icons['batchEdit']          = 'edit-sign';
+$lang->icons['batchClose']         = 'off';
+$lang->icons['edit']               = 'edit';
+$lang->icons['delete']             = 'close';
+$lang->icons['copy']               = 'copy';
+$lang->icons['report']             = 'bar-chart';
+$lang->icons['export']             = 'export';
+$lang->icons['report-file']        = 'file-powerpoint';
+$lang->icons['import']             = 'import';
+$lang->icons['finish']             = 'checked';
+$lang->icons['resolve']            = 'check';
+$lang->icons['start']              = 'play';
+$lang->icons['restart']            = 'play';
+$lang->icons['run']                = 'run';
+$lang->icons['runCase']            = 'run';
+$lang->icons['batchRun']           = 'play-sign';
+$lang->icons['assign']             = 'hand-right';
+$lang->icons['assignTo']           = 'hand-right';
+$lang->icons['change']             = 'fork';
+$lang->icons['link']               = 'link';
+$lang->icons['close']              = 'off';
+$lang->icons['activate']           = 'magic';
+$lang->icons['review']             = 'glasses';
+$lang->icons['confirm']            = 'search';
+$lang->icons['confirmBug']         = 'search';
+$lang->icons['putoff']             = 'calendar';
+$lang->icons['suspend']            = 'pause';
+$lang->icons['pause']              = 'pause';
+$lang->icons['cancel']             = 'ban-circle';
+$lang->icons['recordEstimate']     = 'time';
+$lang->icons['customFields']       = 'cogs';
+$lang->icons['manage']             = 'cog';
+$lang->icons['unlock']             = 'unlock-alt';
+$lang->icons['confirmStoryChange'] = 'search';
+$lang->icons['score']              = 'tint';
+
+$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry', 'jenkins');
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 46d50c6725..c072ace827 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -64,7 +64,6 @@ $lang->required     = 'Pflicht';
 $lang->noData       = 'Kein Datensatz';
 $lang->fullscreen   = 'Fullscreen';
 $lang->retrack      = 'Retrack';
-$lang->recent       = 'Kürzlich';
 $lang->whitelist    = 'Weiße Liste';
 
 $lang->actions         = 'Aktionen';
@@ -114,14 +113,13 @@ $lang->future      = 'Warte';
 $lang->year        = 'Jahr';
 $lang->workingHour = 'Stunde';
 
-$lang->sprintCommon = $lang->iterationCommon . '/Phase';
-
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = 'Status';
 $lang->openedByAB   = 'Ersteller';
 $lang->assignedToAB = 'Bearbeiter';
 $lang->typeAB       = 'Typ';
+$lang->nameAB       = 'Name';
 
 $lang->common = new stdclass();
 $lang->common->common = 'Standard Module';
@@ -314,12 +312,13 @@ $lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assignt
 $lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
 
 $lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
-f($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
-$lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
-$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
+$lang->my->contributeMenu->task     = 'Task|my|contribute|mode=task';
+if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
+$lang->my->contributeMenu->story    = "$lang->SRCommon|my|contribute|mode=story";
+$lang->my->contributeMenu->bug      = 'Bug|my|contribute|mode=bug';
+$lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
+$lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done';
+$lang->my->contributeMenu->doc      = 'Doc|my|contribute|mode=doc&type=openedbyme';
 
 $lang->my->dividerMenu = ',myWork,score,';
 
@@ -357,7 +356,7 @@ $lang->execution->subMenu->view->tree      = 'Baumansicht|execution|tree|executi
 $lang->execution->subMenu->qa = new stdclass();
 $lang->execution->subMenu->qa->bug      = 'Bug|execution|bug|executionID=%s';
 $lang->execution->subMenu->qa->build    = array('link' => 'Build|execution|build|executionID=%s', 'subModule' => 'build');
-$lang->execution->subMenu->qa->testtask = array('link' => 'Test Aufgabe|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask');
+$lang->execution->subMenu->qa->testtask = array('link' => 'Test Aufgabe|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask', 'alias' => 'create');
 
 $lang->execution->subMenu->more = new stdclass();
 $lang->execution->subMenu->more->whitelist = array('link' => 'Whitelist|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'addwhitelist');
@@ -577,46 +576,6 @@ $lang->webhook   = new stdclass();
 $lang->message   = new stdclass();
 $lang->search    = new stdclass();
 
-/* Menu group. */
-$lang->menugroup = new stdclass();
-$lang->menugroup->release     = 'product';
-$lang->menugroup->story       = 'product';
-$lang->menugroup->branch      = 'product';
-$lang->menugroup->productplan = 'product';
-$lang->menugroup->task        = 'project';
-$lang->menugroup->build       = 'project';
-$lang->menugroup->convert     = 'admin';
-$lang->menugroup->upgrade     = 'admin';
-$lang->menugroup->user        = 'company';
-$lang->menugroup->group       = 'company';
-$lang->menugroup->bug         = 'qa';
-$lang->menugroup->testcase    = 'qa';
-$lang->menugroup->case        = 'qa';
-$lang->menugroup->testtask    = 'qa';
-$lang->menugroup->testsuite   = 'qa';
-$lang->menugroup->caselib     = 'qa';
-$lang->menugroup->testreport  = 'qa';
-$lang->menugroup->report      = 'reporting';
-$lang->menugroup->people      = 'admin';
-$lang->menugroup->dept        = 'company';
-$lang->menugroup->todo        = 'my';
-$lang->menugroup->score       = 'my';
-$lang->menugroup->action      = 'admin';
-$lang->menugroup->backup      = 'admin';
-$lang->menugroup->cron        = 'admin';
-$lang->menugroup->extension   = 'admin';
-$lang->menugroup->custom      = 'admin';
-$lang->menugroup->mail        = 'admin';
-$lang->menugroup->dev         = 'admin';
-$lang->menugroup->entry       = 'admin';
-$lang->menugroup->webhook     = 'admin';
-$lang->menugroup->message     = 'admin';
-
-$lang->menugroup->repo    = 'ci';
-$lang->menugroup->jenkins = 'ci';
-$lang->menugroup->compile = 'ci';
-$lang->menugroup->job     = 'ci';
-
 /* Nav group.*/
 $lang->navGroup = new stdclass();
 $lang->navGroup->my     = 'my';
@@ -656,7 +615,7 @@ $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
 $lang->navGroup->projectrelease = 'project';
-$lang->navGroup->projectbuild   = 'project';
+$lang->navGroup->build          = 'project';
 $lang->navGroup->repo           = 'project';
 $lang->navGroup->job            = 'project';
 $lang->navGroup->jenkins        = 'project';
@@ -667,6 +626,7 @@ $lang->navGroup->measrecord     = 'project';
 $lang->navGroup->execution = 'execution';
 $lang->navGroup->task      = 'execution';
 $lang->navGroup->build     = 'execution';
+$lang->navGroup->repo      = 'execution';
 
 $lang->navGroup->sqlbuilder    = 'system';
 $lang->navGroup->auditcl       = 'system';
@@ -900,7 +860,7 @@ $lang->menu->scrum->projectstory   = array('link' => $lang->SRCommon . '|project
 $lang->menu->scrum->doc            = 'Doc|doc|index|';
 $lang->menu->scrum->qa             = 'QA|qa|index';
 $lang->menu->scrum->ci             = 'Code|repo|browse';
-$lang->menu->scrum->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
+$lang->menu->scrum->build          = array('link' => 'Build|project|build|project={PROJECT}');
 $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse');
 $lang->menu->scrum->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
 $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
@@ -918,7 +878,7 @@ $lang->scrum->setMenu->group       = array('link' => 'Priv Group|project|group|p
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->index          = array('link' => 'Dashboard|project|index|project={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|execution|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|project={PROJECT}');
 $lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story');
@@ -927,7 +887,7 @@ $lang->menu->waterfall->ci             = 'Repo|repo|browse|';
 $lang->menu->waterfall->track          = array('link' => 'Track|projectstory|track', 'alias' => 'track');
 $lang->menu->waterfall->qa             = 'QA|qa|index';
 $lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
-$lang->menu->waterfall->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
+$lang->menu->waterfall->build          = array('link' => 'Build|project|build|project={PROJECT}');
 $lang->menu->waterfall->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
 $lang->menu->waterfall->other          = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc,workestimation,durationestimation,budget,pssp,measrecord,report');
 $lang->menu->waterfall->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
@@ -967,6 +927,6 @@ $lang->projectstory->menu       = new stdclass();
 $lang->stakeholder->menu = $lang->scrum->setMenu;
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index ecf6c9644d..1aac0409b4 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -9,6 +9,11 @@
  * @version     $Id: en.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+
+include (dirname(__FILE__) . '/common.php');
+
+global $config;
+
 $lang->arrow     = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
 $lang->colon     = '-';
 $lang->comma     = ',';
@@ -64,7 +69,6 @@ $lang->required     = 'Required';
 $lang->noData       = 'No data.';
 $lang->fullscreen   = 'Fullscreen';
 $lang->retrack      = 'Retrack';
-$lang->recent       = 'Recent';
 $lang->whitelist    = 'Access whitelist';
 
 $lang->actions         = 'Action';
@@ -114,121 +118,132 @@ $lang->future      = 'Waiting';
 $lang->year        = 'Year';
 $lang->workingHour = 'Hours';
 
-$lang->sprintCommon = $lang->iterationCommon . '/Phase';
-
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = 'Status';
 $lang->openedByAB   = 'CreatedBy';
 $lang->assignedToAB = 'AssignedTo';
 $lang->typeAB       = 'Type';
+$lang->nameAB       = 'Name';
 
-$lang->common = new stdclass();
-$lang->common->common = 'Common Module';
+$lang->common->common     = 'Common Module';
+$lang->my->common         = 'Dashboard';
+$lang->program->common    = 'Program';
+$lang->product->common    = 'Product';
+$lang->project->common    = 'Project';
+$lang->execution->common  = $config->systemMode == 'new' ? 'Execution' : $lang->executionCommon;
+$lang->qa->common         = 'QA';
+$lang->devops->common     = 'DevOps';
+$lang->doc->common        = 'Doc';
+$lang->repo->common       = 'Code';
+$lang->report->common     = 'Statistic';
+$lang->system->common     = 'System';
+$lang->admin->common      = 'Admin';
+$lang->task->common       = 'Task';
+$lang->bug->common        = 'Bug';
+$lang->testcase->common   = 'Testcase';
+$lang->testtask->common   = 'Testtask';
+$lang->score->common      = 'Score';
+$lang->build->common      = 'Build';
+$lang->testreport->common = 'Report';
+$lang->automation->common = 'Automation';
+$lang->team->common       = 'Team';
+$lang->user->common       = 'User';
+$lang->custom->common     = 'Custom';
+$lang->extension->common  = 'Extension';
+$lang->company->common    = 'Company';
+$lang->dept->common       = 'Dept';
+$lang->program->list      = 'Program List';
+$lang->execution->list    = "{$lang->executionCommon} List";
 
-global $config;
-list($programModule, $programMethod)     = explode('-', $config->programLink);
-list($productModule, $productMethod)     = explode('-', $config->productLink);
-list($projectModule, $projectMethod)     = explode('-', $config->projectLink);
-list($executionModule, $executionMethod) = explode('-', $config->executionLink);
+$lang->personnel->common     = 'Member';
+$lang->personnel->invest     = 'Investment';
+$lang->personnel->accessible = 'Accessible';
 
-/* Main menu. */
-$lang->mainNav = new stdclass();
-$lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
-$lang->mainNav->product = "<i class='icon icon-menu-product'></i> Product|$productModule|$productMethod|";
-if($config->systemMode == 'new')
-{
-    $lang->mainNav->project   = "<i class='icon icon-project'></i> Project|$projectModule|$projectMethod|";
-    $lang->mainNav->execution = "<i class='icon icon-run'></i> Execution|$executionModule|$executionMethod|";
-}
-else
-{
-    $lang->mainNav->execution = "<i class='icon icon-run'></i> $lang->executionCommon|$executionModule|$executionMethod|";
-}
-$lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
-$lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
-$lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
-$lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|company|browse|';
-$lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
-if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
+$lang->stakeholder->common = 'Stakeholder';
+$lang->release->common     = 'Release';
+$lang->message->common     = 'Message';
+$lang->mail->common        = 'Mail';
 
-$lang->dividerMenu = ',qa,report,admin,';
+$lang->my->shortCommon          = 'My';
+$lang->testcase->shortCommon    = 'Case';
+$lang->productplan->shortCommon = 'Plan';
+$lang->score->shortCommon       = 'Score';
+$lang->testreport->shortCommon  = 'Report';
+$lang->qa->shortCommon          = 'QA';
 
-/* Program set menu. */
-$lang->program = new stdclass();
-$lang->program->menu = new stdclass();
-//$lang->program->menu->index  = 'Dashboard|program|index|';
-$lang->program->menu->browse = array('link' => 'Program|program|browse|');
+$lang->dashboard  = 'Dashboard';
+$lang->contribute = 'Contribute';
+$lang->dynamic    = 'Dynamic';
+$lang->contact    = 'Contacts';
+$lang->whitelist  = 'Whitelist';
+$lang->roadmap    = 'Roadmap';
+$lang->track      = 'Track';
+$lang->settings   = 'Settings';
+$lang->overview   = 'Overview';
+$lang->module     = 'Module';
+$lang->priv       = 'Priv Group';
+$lang->design     = 'Design';
+$lang->other      = 'Other';
+$lang->estimation = 'Estimation';
+$lang->issue      = 'Issue';
+$lang->risk       = 'Risk';
+$lang->measure    = 'Report';
+$lang->treeView   = 'Tree View';
+$lang->groupView  = 'Group View';
+$lang->kanban     = 'Kanban';
+$lang->burn       = 'Burndown';
+$lang->view       = 'View';
+$lang->intro      = 'Introduction';
+$lang->indexPage  = 'Index';
+$lang->model      = 'Model';
+$lang->redev      = 'Develop';
+$lang->browser    = 'Browser';
+$lang->db         = 'Database';
+$lang->editor     = 'Editor';
+$lang->timezone   = 'Timezone';
+$lang->security   = 'Security';
+$lang->calendar   = 'Calendar';
 
-$lang->project = new stdclass();
-$lang->project->menu = new stdclass();
-if($config->systemMode == 'new')
-{
-    $lang->project->menu->browse = array('link' => 'Project|project|browse|');
-}
-else
-{
-    $lang->project->menu->browse = array('link' => "$lang->executionCommon|project|browse|");
-}
+$lang->my->work = 'Work';
 
-$lang->project->dividerMenu = ',execution,programplan,doc,other,';
+$lang->project->list = 'Project List';
 
-$lang->program->viewMenu = new stdclass();
-$lang->program->viewMenu->product     = array('link' => 'Product|program|product|program=%s', 'alias' => 'view');
-$lang->program->viewMenu->project     = array('link' => "Project|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|invest|program=%s");
-$lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
+$lang->execution->list = "{$lang->executionCommon} List";
 
-$lang->personnel = new stdClass();
-$lang->personnel->menu = new stdClass();
-$lang->personnel->menu->invest     = array('link' => "Investment|personnel|invest|program=%s");
-$lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s");
-$lang->personnel->menu->whitelist  = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
+$lang->doc->recent    = 'Recent';
+$lang->doc->my        = 'My';
+$lang->doc->favorite  = 'Favorite';
+$lang->doc->product   = 'Product';
+$lang->doc->project   = 'Project';
+$lang->doc->execution = $lang->executionCommon;
+$lang->doc->custom    = 'Custom';
+$lang->doc->wiki      = 'WIKI';
 
-/* Scrum menu. */
-$lang->product = new stdclass();
-$lang->product->menu = new stdclass();
-$lang->product->menu->home = 'Dashboard|product|index|';
-$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit');
+$lang->product->list = $lang->productCommon . ' List';
 
-$lang->product->viewMenu = new stdclass();
-$lang->product->viewMenu->dashboard   = array('link' => 'Dashboard|product|dashboard|productID=%s');
-if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->story       = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->plan        = array('link' => "Plan|productplan|browse|productID=%s", 'subModule' => 'productplan');
-$lang->product->viewMenu->release     = array('link' => "Release|release|browse|productID=%s",     'subModule' => 'release');
-$lang->product->viewMenu->roadmap     = 'Roadmap|product|roadmap|productID=%s';
-$lang->product->viewMenu->project     = "Project|product|project|status=all&productID=%s";
-$lang->product->viewMenu->track       = array('link' => "Track|story|track|productID=%s");
-$lang->product->viewMenu->doc         = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->dynamic     = 'Dynamic|product|dynamic|productID=%s';
-$lang->product->viewMenu->set         = array('link' => 'Setting|product|view|productID=%s', 'subModule' => 'tree,branch', 'alias' => 'edit');
+$lang->project->report = 'Report';
 
-$lang->product->setMenu = new stdclass();
-$lang->product->setMenu->view      = array('link' => 'View|product|view|productID={PRODUCT}', 'alias' => 'edit');
-$lang->product->setMenu->module    = array('link' => 'Module|tree|browse|product={PRODUCT}&view=story', 'subModule' => 'tree');
-$lang->product->setMenu->branch    = array('link' => '@branch@|branch|manage|product={PRODUCT}', 'subModule' => 'branch');
-$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|whitelist|product={PRODUCT}', 'subModule' => 'personnel');
+$lang->report->weekly = 'Weekly';
+$lang->report->annual = 'Annual Summary';
+$lang->report->notice = new stdclass();
+$lang->report->notice->help = 'Note: The report is generated on the results of browsing the list. Click, e.g. AssignedToMe, then click Create Report to generate a report based on AssignedToMe list.';
 
-$lang->release     = new stdclass();
-$lang->branch      = new stdclass();
-$lang->productplan = new stdclass();
+$lang->testcase->case      = 'Test Case';
+$lang->testcase->testsuite = 'Test Suite';
+$lang->testcase->caselib   = 'Case Library';
 
-$lang->release->menu     = $lang->product->viewMenu;
-$lang->branch->menu      = $lang->product->menu;
-$lang->productplan->menu = $lang->product->menu;
+$lang->devops->compile = 'Compile';
+$lang->devops->repo    = 'Repo';
+$lang->devops->rules   = 'Rule';
 
-/* System menu. */
-$lang->system = new stdclass();
-$lang->system->menu = new stdclass();
-$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
-$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
-$lang->system->menu->view     = array('link' => 'Company|company|view');
+$lang->admin->system     = 'System';
+$lang->admin->entry      = 'Application';
+$lang->admin->data       = 'Data';
+$lang->admin->cron       = 'Cron';
+$lang->admin->buildIndex = 'Full Text Search';
 
-$lang->measurement = new stdclass();
-$lang->measurement->menu = new stdclass();
+$lang->storyConcept = 'Story Concpet';
 
 $lang->searchTips = '';
 $lang->searchAB   = 'Search';
@@ -279,431 +294,6 @@ $lang->themes['pink']       = 'Pink';
 $lang->themes['blackberry'] = 'Blackberry';
 $lang->themes['classic']    = 'Classic';
 
-/* Index menu settings. */
-$lang->index = new stdclass();
-$lang->index->menu = new stdclass();
-
-$lang->index->menu->product = "{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "{$lang->executionCommon}|project|browse";
-
-/* My dashboard menu settings. */
-$lang->my = new stdclass();
-$lang->my->menu = new stdclass();
-
-$lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
-if($config->systemMode == 'new')
-{
-    $lang->my->menu->myProject   = array('link' => 'Project|my|project|');
-    $lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
-}
-else
-{
-    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
-}
-$lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
-$lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
-$lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
-
-$lang->my->workMenu = new stdclass();
-$lang->my->workMenu->task        = 'Task|my|work|mode=task';
-if($config->URAndSR) $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
-$lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
-$lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
-$lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
-if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
-$lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
-$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
-
-$lang->my->dividerMenu = ',myWork,score,';
-
-$lang->todo       = new stdclass();
-$lang->todo->menu = $lang->my->menu;
-
-$lang->product->dividerMenu = $config->URAndSR ? ',requirement,set,' : ',track,set,';
-
-$lang->story = new stdclass();
-
-$lang->story->menu = $lang->product->menu;
-
-/* Project menu settings. */
-$lang->execution = new stdclass();
-$lang->execution->menu = new stdclass();
-
-$lang->execution->menu->task     = array('link' => 'Task|execution|task|executionID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
-$lang->execution->menu->kanban   = array('link' => 'Kanban|execution|kanban|executionID=%s');
-$lang->execution->menu->burn     = array('link' => 'Burndown|execution|burn|executionID=%s');
-$lang->execution->menu->view     = array('link' => 'View|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->execution->menu->story    = array('link' => 'Story|execution|story|executionID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
-$lang->execution->menu->bug      = array('link' => 'Bug|execution|bug|executionID=%s');
-$lang->execution->menu->build    = array('link' => 'Build|execution|build|executionID=%s', 'subModule' => 'build');
-$lang->execution->menu->testtask = array('link' => 'Request|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask');
-$lang->execution->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc');
-$lang->execution->menu->product  = $lang->productCommon . '|execution|manageproducts|executionID=%s';
-$lang->execution->menu->team     = array('link' => 'Team|execution|team|executionID=%s', 'alias' => 'managemembers');
-$lang->execution->menu->more     = array('link' => 'More|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover');
-
-$lang->execution->subMenu = new stdclass();
-$lang->execution->subMenu->view = new stdclass();
-$lang->execution->subMenu->view->groupTask = 'Group View|execution|grouptask|executionID=%s';
-$lang->execution->subMenu->view->tree      = 'Tree View|execution|tree|executionID=%s';
-
-$lang->execution->subMenu->qa = new stdclass();
-$lang->execution->subMenu->qa->bug      = 'Bug|execution|bug|executionID=%s';
-$lang->execution->subMenu->qa->build    = array('link' => 'Build|execution|build|executionID=%s', 'subModule' => 'build');
-$lang->execution->subMenu->qa->testtask = array('link' => 'Request|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask');
-
-$lang->execution->subMenu->more = new stdclass();
-$lang->execution->subMenu->more->whitelist = array('link' => 'Whitelist|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'addwhitelist');
-$lang->execution->subMenu->more->action    = array('link' => 'Dynamics|execution|dynamic|executionID=%s');
-$lang->execution->subMenu->more->view      = array('link' => 'Overview|execution|view|executionID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
-
-$lang->execution->dividerMenu = ',execution,programplan,executionbuild,story,doc,other,';
-
-$lang->task  = new stdclass();
-$lang->build = new stdclass();
-$lang->task->menu  = $lang->execution->menu;
-$lang->build->menu = $lang->execution->menu;
-
-/* QA menu settings. */
-$lang->qa = new stdclass();
-$lang->qa->menu = new stdclass();
-
-$lang->qa->menu->index     = array('link' => 'Index|qa|index');
-$lang->qa->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto');
-$lang->qa->menu->testcase  = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib');
-$lang->qa->menu->testtask  = array('link' => 'Request|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
-$lang->qa->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->qa->menu->report    = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->qa->menu->caselib   = array('link' => 'Case Library|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport');
-
-$lang->qa->subMenu = new stdclass();
-$lang->qa->subMenu->testcase = new stdclass();
-$lang->qa->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
-$lang->qa->subMenu->testcase->unit    = array('link' => 'Unit Test|testtask|browseUnits|productID=%s');
-
-$lang->bug = new stdclass();
-$lang->bug->menu = new stdclass();
-$lang->bug->subMenu = $lang->qa->subMenu;
-
-$lang->bug->menu->index     = array('link' => 'Index|qa|index');
-$lang->bug->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
-$lang->bug->menu->testcase  = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->bug->menu->testtask  = array('link' => 'Request|testtask|browse|productID=%s');
-$lang->bug->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
-$lang->bug->menu->report    = array('link' => 'Report|testreport|browse|productID=%s');
-$lang->bug->menu->caselib   = array('link' => 'Case Library|caselib|browse');
-
-$lang->testcase = new stdclass();
-$lang->testcase->menu = new stdclass();
-$lang->testcase->subMenu = $lang->qa->subMenu;
-$lang->testcase->menu->index     = array('link' => 'Index|qa|index');
-$lang->testcase->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testcase->menu->testcase  = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree', 'class' => 'dropdown dropdown-hover');
-$lang->testcase->menu->testtask  = array('link' => 'Request|testtask|browse|productID=%s');
-$lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
-$lang->testcase->menu->report    = array('link' => 'Report|testreport|browse|productID=%s');
-$lang->testcase->menu->caselib   = array('link' => 'Case Library|caselib|browse');
-
-$lang->testtask = new stdclass();
-$lang->testtask->menu = new stdclass();
-$lang->testtask->subMenu = $lang->qa->subMenu;
-$lang->testtask->menu->index     = array('link' => 'Index|qa|index');
-$lang->testtask->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testtask->menu->testcase  = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testtask->menu->testtask  = array('link' => 'Request|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
-$lang->testtask->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
-$lang->testtask->menu->report    = array('link' => 'Report|testreport|browse|productID=%s');
-$lang->testtask->menu->caselib   = array('link' => 'Case Library|caselib|browse');
-
-$lang->testsuite = new stdclass();
-$lang->testsuite->menu = new stdclass();
-$lang->testsuite->subMenu = $lang->qa->subMenu;
-$lang->testsuite->menu->index     = array('link' => 'Index|qa|index');
-$lang->testsuite->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testsuite->menu->testcase  = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testsuite->menu->testtask  = array('link' => 'Request|testtask|browse|productID=%s');
-$lang->testsuite->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->testsuite->menu->report    = array('link' => 'Report|testreport|browse|productID=%s');
-$lang->testsuite->menu->caselib   = array('link' => 'Case Library|caselib|browse');
-
-$lang->testreport = new stdclass();
-$lang->testreport->menu = new stdclass();
-$lang->testreport->subMenu = $lang->qa->subMenu;
-$lang->testreport->menu->index     = array('link' => 'Index|qa|index');
-$lang->testreport->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testreport->menu->testcase  = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testreport->menu->testtask  = array('link' => 'Request|testtask|browse|productID=%s');
-$lang->testreport->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
-$lang->testreport->menu->report    = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->testreport->menu->caselib   = array('link' => 'Case Library|caselib|browse');
-
-$lang->caselib = new stdclass();
-$lang->caselib->menu = new stdclass();
-$lang->caselib->menu->index     = array('link' => 'Index|qa|index');
-$lang->caselib->menu->bug       = array('link' => 'Bug|bug|browse|');
-$lang->caselib->menu->testcase  = array('link' => 'Case|testcase|browse|', 'class' => 'dropdown dropdown-hover');
-$lang->caselib->menu->testtask  = array('link' => 'Request|testtask|browse|');
-$lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|');
-$lang->caselib->menu->report    = array('link' => 'Report|testreport|browse|');
-$lang->caselib->menu->caselib   = array('link' => 'Case Library|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
-
-$lang->caselib->subMenu = new stdclass();
-$lang->caselib->subMenu->testcase = new stdclass();
-$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
-$lang->caselib->subMenu->testcase->unit    = array('link' => 'Unit Test|testtask|browseUnits|');
-
-$lang->ci = new stdclass();
-$lang->ci->menu = new stdclass();
-$lang->ci->menu->code     = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
-$lang->ci->menu->build    = array('link' => 'Compile|job|browse', 'subModule' => 'compile,job');
-$lang->ci->menu->jenkins  = array('link' => 'Jenkins|jenkins|browse', 'alias' => 'create,edit');
-$lang->ci->menu->maintain = array('link' => 'Repo|repo|maintain', 'alias' => 'create,edit');
-$lang->ci->menu->rules    = array('link' => 'Rule|repo|setrules');
-
-$lang->repo          = new stdclass();
-$lang->jenkins       = new stdclass();
-$lang->compile       = new stdclass();
-$lang->job           = new stdclass();
-$lang->repo->menu    = $lang->ci->menu;
-$lang->jenkins->menu = $lang->ci->menu;
-$lang->compile->menu = $lang->ci->menu;
-$lang->job->menu     = $lang->ci->menu;
-
-/* Doc menu settings. */
-$lang->doc = new stdclass();
-$lang->doc->menu = new stdclass();
-
-$lang->svn = new stdclass();
-$lang->git = new stdclass();
-
-/* Project release menu settings. */
-$lang->projectrelease = new stdclass();
-$lang->projectrelease->menu = new stdclass();
-
-/* Report menu settings. */
-$lang->report = new stdclass();
-$lang->report->menu = new stdclass();
-
-$lang->report->menu->annual    = array('link' => 'Annual Summary|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
-$lang->report->menu->product   = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->execution = array('link' => 'Execution|report|executiondeviation');
-$lang->report->menu->test      = array('link' => 'Request|report|bugcreate', 'alias' => 'bugassign');
-$lang->report->menu->staff     = array('link' => 'Company|report|workload');
-
-$lang->report->notice = new stdclass();
-$lang->report->notice->help = 'Note: The report is generated on the results of browsing the list. Click, e.g. AssignedToMe, then click Create Report to generate a report based on AssignedToMe list.';
-
-/* Company menu settings. */
-$lang->company = new stdclass();
-$lang->dept    = new stdclass();
-$lang->group   = new stdclass();
-$lang->user    = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->dept->menu    = new stdclass();
-$lang->group->menu   = new stdclass();
-$lang->user->menu    = new stdclass();
-
-$lang->company = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->company->menu->browseUser  = array('link' => 'User|company|browse', 'subModule' => ',user,');
-$lang->company->menu->dept        = array('link' => 'Dept|dept|browse', 'subModule' => 'dept');
-$lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group');
-
-/* Admin menu settings. */
-$lang->admin = new stdclass();
-$lang->admin->menu = new stdclass();
-$lang->admin->menu->index     = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company   = array('link' => 'User|company|browse|', 'subModule' => ',user,dept,group,');
-$lang->admin->menu->model     = array('link' => 'Model|custom|browsestoryconcept|', 'subModule' => 'holiday');
-$lang->admin->menu->custom    = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->system    = array('link' => 'System|backup|index', 'subModule' => 'cron,backup,action');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concpet|custom|browsestoryconcept|');
-
-$lang->dept->menu  = $lang->company->menu;
-$lang->group->menu = $lang->company->menu;
-$lang->user->menu  = $lang->company->menu;
-
-$lang->admin->subMenu = new stdclass();
-$lang->admin->subMenu->message = new stdclass();
-$lang->admin->subMenu->message->mail    = array('link' => 'Mail|mail|index', 'subModule' => 'mail');
-$lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
-$lang->admin->subMenu->message->browser = array('link' => 'Browser|message|browser');
-$lang->admin->subMenu->message->setting = array('link' => 'Settings|message|setting');
-
-$lang->admin->subMenu->sso = new stdclass();
-$lang->admin->subMenu->sso->ranzhi = 'Zdoo|admin|sso';
-
-$lang->admin->subMenu->dev = new stdclass();
-$lang->admin->subMenu->dev->api    = array('link' => 'API|dev|api');
-$lang->admin->subMenu->dev->db     = array('link' => 'Database|dev|db');
-$lang->admin->subMenu->dev->editor = array('link' => 'Editor|dev|editor');
-$lang->admin->subMenu->dev->entry  = array('link' => 'Application|entry|browse', 'subModule' => 'entry');
-
-$lang->admin->subMenu->system = new stdclass();
-$lang->admin->subMenu->system->data       = array('link' => 'Data|backup|index', 'subModule' => 'action');
-$lang->admin->subMenu->system->safe       = array('link' => 'Security|admin|safe', 'alias' => 'checkweak');
-$lang->admin->subMenu->system->cron       = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
-$lang->admin->subMenu->system->timezone   = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
-$lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
-
-$lang->admin->dividerMenu = ',message,system,';
-
-$lang->convert   = new stdclass();
-$lang->upgrade   = new stdclass();
-$lang->action    = new stdclass();
-$lang->backup    = new stdclass();
-$lang->extension = new stdclass();
-$lang->custom    = new stdclass();
-$lang->mail      = new stdclass();
-$lang->cron      = new stdclass();
-$lang->dev       = new stdclass();
-$lang->entry     = new stdclass();
-$lang->webhook   = new stdclass();
-$lang->message   = new stdclass();
-$lang->search    = new stdclass();
-
-/* Menu group. */
-$lang->menugroup = new stdclass();
-$lang->menugroup->release     = 'product';
-$lang->menugroup->story       = 'product';
-$lang->menugroup->branch      = 'product';
-$lang->menugroup->productplan = 'product';
-$lang->menugroup->task        = 'project';
-$lang->menugroup->build       = 'project';
-$lang->menugroup->convert     = 'admin';
-$lang->menugroup->upgrade     = 'admin';
-$lang->menugroup->user        = 'company';
-$lang->menugroup->group       = 'company';
-$lang->menugroup->bug         = 'qa';
-$lang->menugroup->testcase    = 'qa';
-$lang->menugroup->case        = 'qa';
-$lang->menugroup->testtask    = 'qa';
-$lang->menugroup->testsuite   = 'qa';
-$lang->menugroup->caselib     = 'qa';
-$lang->menugroup->testreport  = 'qa';
-$lang->menugroup->people      = 'admin';
-$lang->menugroup->dept        = 'company';
-$lang->menugroup->todo        = 'my';
-$lang->menugroup->score       = 'my';
-$lang->menugroup->action      = 'admin';
-$lang->menugroup->backup      = 'admin';
-$lang->menugroup->cron        = 'admin';
-$lang->menugroup->extension   = 'admin';
-$lang->menugroup->custom      = 'admin';
-$lang->menugroup->mail        = 'admin';
-$lang->menugroup->dev         = 'admin';
-$lang->menugroup->entry       = 'admin';
-$lang->menugroup->webhook     = 'admin';
-$lang->menugroup->message     = 'admin';
-
-$lang->menugroup->repo    = 'ci';
-$lang->menugroup->jenkins = 'ci';
-$lang->menugroup->compile = 'ci';
-$lang->menugroup->job     = 'ci';
-
-/* Nav group.*/
-$lang->navGroup = new stdclass();
-$lang->navGroup->my     = 'my';
-$lang->navGroup->effort = 'my';
-$lang->navGroup->score  = 'my';
-
-$lang->navGroup->program   = 'program';
-$lang->navGroup->personnel = 'program';
-
-$lang->navGroup->product     = 'product';
-$lang->navGroup->productplan = 'product';
-$lang->navGroup->release     = 'product';
-$lang->navGroup->branch      = 'product';
-$lang->navGroup->story       = 'product';
-$lang->navGroup->tree        = 'product';
-
-$lang->navGroup->project     = 'project';
-$lang->navGroup->qa          = 'project';
-$lang->navGroup->bug         = 'project';
-$lang->navGroup->doc         = 'project';
-$lang->navGroup->testcase    = 'project';
-$lang->navGroup->testtask    = 'project';
-$lang->navGroup->testreport  = 'project';
-$lang->navGroup->testsuite   = 'project';
-$lang->navGroup->caselib     = 'project';
-$lang->navGroup->feedback    = 'project';
-$lang->navGroup->deploy      = 'project';
-$lang->navGroup->stakeholder = 'project';
-
-$lang->navGroup->projectstory   = 'project';
-$lang->navGroup->review         = 'project';
-$lang->navGroup->reviewissue    = 'project';
-$lang->navGroup->milestone      = 'project';
-$lang->navGroup->pssp           = 'project';
-$lang->navGroup->auditplan      = 'project';
-$lang->navGroup->cm             = 'project';
-$lang->navGroup->nc             = 'project';
-$lang->navGroup->projectrelease = 'project';
-$lang->navGroup->projectbuild   = 'project';
-$lang->navGroup->repo           = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
-$lang->navGroup->report         = 'project';
-$lang->navGroup->measrecord     = 'project';
-
-$lang->navGroup->execution = 'execution';
-$lang->navGroup->task      = 'execution';
-$lang->navGroup->build     = 'execution';
-
-$lang->navGroup->sqlbuilder    = 'system';
-$lang->navGroup->auditcl       = 'system';
-$lang->navGroup->cmcl          = 'system';
-$lang->navGroup->todo          = 'system';
-$lang->navGroup->ldap          = 'system';
-$lang->navGroup->process       = 'system';
-$lang->navGroup->activity      = 'system';
-$lang->navGroup->zoutput       = 'system';
-$lang->navGroup->classify      = 'system';
-$lang->navGroup->subject       = 'system';
-$lang->navGroup->baseline      = 'system';
-$lang->navGroup->reviewcl      = 'system';
-$lang->navGroup->reviewsetting = 'system';
-
-$lang->navGroup->attend   = 'attend';
-$lang->navGroup->leave    = 'attend';
-$lang->navGroup->makeup   = 'attend';
-$lang->navGroup->overtime = 'attend';
-$lang->navGroup->lieu     = 'attend';
-
-$lang->navGroup->admin     = 'admin';
-$lang->navGroup->company   = 'admin';
-$lang->navGroup->dept      = 'admin';
-$lang->navGroup->user      = 'admin';
-$lang->navGroup->group     = 'admin';
-$lang->navGroup->dept      = 'admin';
-$lang->navGroup->webhook   = 'admin';
-$lang->navGroup->sms       = 'admin';
-$lang->navGroup->message   = 'admin';
-$lang->navGroup->custom    = 'admin';
-$lang->navGroup->cron      = 'admin';
-$lang->navGroup->backup    = 'admin';
-$lang->navGroup->mail      = 'admin';
-$lang->navGroup->dev       = 'admin';
-$lang->navGroup->entry     = 'admin';
-$lang->navGroup->extension = 'admin';
-$lang->navGroup->action    = 'admin';
-$lang->navGroup->search    = 'admin';
-
 /* Error info. */
 $lang->error = new stdclass();
 $lang->error->companyNotFound = "The domain %s cannot be found!";
@@ -817,156 +407,4 @@ $lang->datepicker->dayNames     = array('Sunday', 'Monday', 'Tuesday', 'Wednesda
 $lang->datepicker->abbrDayNames = array('Sun', 'Mon', 'Tues', 'Wed', 'Thur', 'Fri', 'Sat');
 $lang->datepicker->monthNames   = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
 
-/* Common action icons. */
-$lang->icons['todo']      = 'check';
-$lang->icons['product']   = 'cube';
-$lang->icons['bug']       = 'bug';
-$lang->icons['task']      = 'check-sign';
-$lang->icons['tasks']     = 'tasks';
-$lang->icons['program']   = 'program';
-$lang->icons['project']   = 'project';
-$lang->icons['stage']     = 'waterfall';
-$lang->icons['sprint']    = 'sprint';
-$lang->icons['doc']       = 'file-text';
-$lang->icons['doclib']    = 'folder-close';
-$lang->icons['story']     = 'lightbulb';
-$lang->icons['release']   = 'tags';
-$lang->icons['roadmap']   = 'code-fork';
-$lang->icons['plan']      = 'flag';
-$lang->icons['dynamic']   = 'volume-up';
-$lang->icons['build']     = 'tag';
-$lang->icons['test']      = 'check';
-$lang->icons['testtask']  = 'check';
-$lang->icons['group']     = 'group';
-$lang->icons['team']      = 'group';
-$lang->icons['company']   = 'sitemap';
-$lang->icons['user']      = 'user';
-$lang->icons['dept']      = 'sitemap';
-$lang->icons['tree']      = 'sitemap';
-$lang->icons['usecase']   = 'sitemap';
-$lang->icons['testcase']  = 'sitemap';
-$lang->icons['result']    = 'list-alt';
-$lang->icons['mail']      = 'envelope';
-$lang->icons['trash']     = 'trash';
-$lang->icons['extension'] = 'th-large';
-$lang->icons['app']       = 'th-large';
-
-$lang->icons['results']            = 'list-alt';
-$lang->icons['create']             = 'plus';
-$lang->icons['post']               = 'edit';
-$lang->icons['batchCreate']        = 'plus-sign';
-$lang->icons['batchEdit']          = 'edit-sign';
-$lang->icons['batchClose']         = 'off';
-$lang->icons['edit']               = 'edit';
-$lang->icons['delete']             = 'close';
-$lang->icons['copy']               = 'copy';
-$lang->icons['report']             = 'bar-chart';
-$lang->icons['export']             = 'export';
-$lang->icons['report-file']        = 'file-powerpoint';
-$lang->icons['import']             = 'import';
-$lang->icons['finish']             = 'checked';
-$lang->icons['resolve']            = 'check';
-$lang->icons['start']              = 'play';
-$lang->icons['restart']            = 'play';
-$lang->icons['run']                = 'run';
-$lang->icons['runCase']            = 'run';
-$lang->icons['batchRun']           = 'play-sign';
-$lang->icons['assign']             = 'hand-right';
-$lang->icons['assignTo']           = 'hand-right';
-$lang->icons['change']             = 'fork';
-$lang->icons['link']               = 'link';
-$lang->icons['close']              = 'off';
-$lang->icons['activate']           = 'magic';
-$lang->icons['review']             = 'glasses';
-$lang->icons['confirm']            = 'search';
-$lang->icons['confirmBug']         = 'search';
-$lang->icons['putoff']             = 'calendar';
-$lang->icons['suspend']            = 'pause';
-$lang->icons['pause']              = 'pause';
-$lang->icons['cancel']             = 'ban-circle';
-$lang->icons['recordEstimate']     = 'time';
-$lang->icons['customFields']       = 'cogs';
-$lang->icons['manage']             = 'cog';
-$lang->icons['unlock']             = 'unlock-alt';
-$lang->icons['confirmStoryChange'] = 'search';
-$lang->icons['score']              = 'tint';
-
-/* Scrum menu. */
-$lang->menu = new stdclass();
-$lang->menu->scrum = new stdclass();
-$lang->menu->scrum->index          = 'Index|project|index|project={PROJECT}';
-$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
-$lang->menu->scrum->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story', 'subModule' => 'story', 'alias' => 'story,track');
-$lang->menu->scrum->doc            = 'Doc|doc|index|';
-$lang->menu->scrum->qa             = 'QA|qa|index';
-$lang->menu->scrum->ci             = 'Code|repo|browse';
-$lang->menu->scrum->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
-$lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse');
-$lang->menu->scrum->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
-$lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->scrum = new stdclass();
-$lang->scrum->setMenu = new stdclass();
-$lang->scrum->setMenu->view        = array('link' => 'View|project|view|project={PROJECT}');
-$lang->scrum->setMenu->products    = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts');
-$lang->scrum->setMenu->members     = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers');
-$lang->scrum->setMenu->whitelist   = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel');
-$lang->scrum->setMenu->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->scrum->setMenu->group       = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv');
-
-/* Waterfall menu. */
-$lang->menu->waterfall = new stdclass();
-$lang->menu->waterfall->index          = array('link' => 'Dashboard|project|index|project={PROJECT}');
-$lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
-$lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|project={PROJECT}');
-$lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story');
-$lang->menu->waterfall->design         = 'Design|design|browse|product={PRODUCT}';
-$lang->menu->waterfall->ci             = 'Repo|repo|browse|';
-$lang->menu->waterfall->track          = array('link' => 'Track|projectstory|track', 'alias' => 'track');
-$lang->menu->waterfall->qa             = 'QA|qa|index';
-$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
-$lang->menu->waterfall->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
-$lang->menu->waterfall->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
-$lang->menu->waterfall->other          = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc,workestimation,durationestimation,budget,pssp,measrecord,report');
-$lang->menu->waterfall->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->waterfall = new stdclass();
-$lang->waterfall->subMenu = new stdclass();
-$lang->waterfall->subMenu->other = new stdclass();
-$lang->waterfall->subMenu->other->estimation  = array('link' => 'Estimation|workestimation|index|program=%s', 'subModule' => 'workestimation,durationestimation,budget');
-$lang->waterfall->subMenu->other->issue       = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
-$lang->waterfall->subMenu->other->risk        = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
-$lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->other->report      = array('link' => 'Report|report|projectsummary|project=%s', 'subModule' => ',report,measrecord');
-$lang->waterfall->subMenu->other->auditplan   = array('link' => 'QA|auditplan|browse|', 'subModule' => 'nc');
-
-$lang->waterfall->setMenu = new stdclass();
-$lang->waterfall->setMenu = $lang->scrum->setMenu;
-
-$lang->waterfallproduct   = new stdclass();
-$lang->review             = new stdclass();
-$lang->milestone          = new stdclass();
-$lang->auditplan          = new stdclass();
-$lang->cm                 = new stdclass();
-$lang->nc                 = new stdclass();
-$lang->pssp               = new stdclass();
-$lang->stakeholder        = new stdclass();
-$lang->projectstory       = new stdclass();
-
-$lang->review->menu             = new stdclass();
-$lang->milestone->menu          = new stdclass();
-$lang->auditplan->menu          = new stdclass();
-$lang->cm->menu                 = new stdclass();
-$lang->pssp->menu               = new stdclass();
-$lang->stakeholder->menu        = new stdclass();
-$lang->waterfallproduct->menu   = new stdclass();
-$lang->projectstory->menu       = new stdclass();
-
-$lang->stakeholder->menu = $lang->scrum->setMenu;
-
-$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
-
-include (dirname(__FILE__) . '/menuOrder.php');
+include (dirname(__FILE__) . '/menu.php');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 77ecb2d28e..883f764bf2 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -64,7 +64,6 @@ $lang->required     = 'Obligatoire';
 $lang->noData       = 'No data.';
 $lang->fullscreen   = 'Plein Ecran';
 $lang->retrack      = 'Réduire';
-$lang->recent       = 'Récent';
 $lang->whitelist    = 'Liste blanche';
 
 $lang->actions         = 'Action';
@@ -114,14 +113,13 @@ $lang->future       = 'En Attente';
 $lang->year         = 'Année';
 $lang->workingHour  = 'Heures';
 
-$lang->sprintCommon = $lang->iterationCommon . '/Phase';
-
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = 'Statut';
 $lang->openedByAB   = 'Créé par';
 $lang->assignedToAB = 'Affecté à';
 $lang->typeAB       = 'Type';
+$lang->nameAB       = 'Name';
 
 $lang->common = new stdclass();
 $lang->common->common = 'Module Commun';
@@ -314,12 +312,13 @@ $lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assignt
 $lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
 
 $lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
+$lang->my->contributeMenu->task     = 'Task|my|contribute|mode=task';
 if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
-$lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
-$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
+$lang->my->contributeMenu->story    = "$lang->SRCommon|my|contribute|mode=story";
+$lang->my->contributeMenu->bug      = 'Bug|my|contribute|mode=bug';
+$lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
+$lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done';
+$lang->my->contributeMenu->doc      = 'Doc|my|contribute|mode=doc&type=openedbyme';
 
 $lang->my->dividerMenu = ',myWork,score,';
 
@@ -357,7 +356,7 @@ $lang->execution->subMenu->view->tree      = 'Arborescence|execution|tree|execut
 $lang->execution->subMenu->qa = new stdclass();
 $lang->execution->subMenu->qa->bug      = 'Bug|execution|bug|executionID=%s';
 $lang->execution->subMenu->qa->build    = array('link' => 'Build|execution|build|executionID=%s', 'subModule' => 'build');
-$lang->execution->subMenu->qa->testtask = array('link' => 'Recette|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask');
+$lang->execution->subMenu->qa->testtask = array('link' => 'Recette|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask', 'alias' => 'create');
 
 $lang->execution->subMenu->more = new stdclass();
 $lang->execution->subMenu->more->whitelist = array('link' => 'Whitelist|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'addwhitelist');
@@ -569,45 +568,6 @@ $lang->webhook   = new stdclass();
 $lang->message   = new stdclass();
 $lang->search    = new stdclass();
 
-/* Menu group. */
-$lang->menugroup = new stdclass();
-$lang->menugroup->release     = 'product';
-$lang->menugroup->story       = 'product';
-$lang->menugroup->branch      = 'product';
-$lang->menugroup->productplan = 'product';
-$lang->menugroup->task        = 'project';
-$lang->menugroup->build       = 'project';
-$lang->menugroup->convert     = 'admin';
-$lang->menugroup->upgrade     = 'admin';
-$lang->menugroup->user        = 'company';
-$lang->menugroup->group       = 'company';
-$lang->menugroup->bug         = 'qa';
-$lang->menugroup->testcase    = 'qa';
-$lang->menugroup->case        = 'qa';
-$lang->menugroup->testtask    = 'qa';
-$lang->menugroup->testsuite   = 'qa';
-$lang->menugroup->caselib     = 'qa';
-$lang->menugroup->testreport  = 'qa';
-$lang->menugroup->people      = 'admin';
-$lang->menugroup->dept        = 'company';
-$lang->menugroup->todo        = 'my';
-$lang->menugroup->score       = 'my';
-$lang->menugroup->action      = 'admin';
-$lang->menugroup->backup      = 'admin';
-$lang->menugroup->cron        = 'admin';
-$lang->menugroup->extension   = 'admin';
-$lang->menugroup->custom      = 'admin';
-$lang->menugroup->mail        = 'admin';
-$lang->menugroup->dev         = 'admin';
-$lang->menugroup->entry       = 'admin';
-$lang->menugroup->webhook     = 'admin';
-$lang->menugroup->message     = 'admin';
-
-$lang->menugroup->repo    = 'ci';
-$lang->menugroup->jenkins = 'ci';
-$lang->menugroup->compile = 'ci';
-$lang->menugroup->job     = 'ci';
-
 /* Nav group.*/
 $lang->navGroup = new stdclass();
 $lang->navGroup->my     = 'my';
@@ -647,7 +607,7 @@ $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
 $lang->navGroup->projectrelease = 'project';
-$lang->navGroup->projectbuild   = 'project';
+$lang->navGroup->build          = 'project';
 $lang->navGroup->repo           = 'project';
 $lang->navGroup->job            = 'project';
 $lang->navGroup->jenkins        = 'project';
@@ -658,6 +618,7 @@ $lang->navGroup->measrecord     = 'project';
 $lang->navGroup->execution = 'execution';
 $lang->navGroup->task      = 'execution';
 $lang->navGroup->build     = 'execution';
+$lang->navGroup->repo      = 'execution';
 
 $lang->navGroup->sqlbuilder    = 'system';
 $lang->navGroup->auditcl       = 'system';
@@ -891,7 +852,7 @@ $lang->menu->scrum->projectstory   = array('link' => $lang->SRCommon . '|project
 $lang->menu->scrum->doc            = 'Doc|doc|index|';
 $lang->menu->scrum->qa             = 'QA|qa|index';
 $lang->menu->scrum->ci             = 'Code|repo|browse';
-$lang->menu->scrum->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
+$lang->menu->scrum->build          = array('link' => 'Build|project|build|project={PROJECT}');
 $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse');
 $lang->menu->scrum->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
 $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
@@ -909,7 +870,7 @@ $lang->scrum->setMenu->group       = array('link' => 'Priv Group|project|group|p
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->index          = array('link' => 'Dashboard|project|index|project={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|execution|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|project={PROJECT}');
 $lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story');
@@ -918,7 +879,7 @@ $lang->menu->waterfall->ci             = 'Repo|repo|browse|';
 $lang->menu->waterfall->track          = array('link' => 'Track|projectstory|track', 'alias' => 'track');
 $lang->menu->waterfall->qa             = 'QA|qa|index';
 $lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
-$lang->menu->waterfall->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
+$lang->menu->waterfall->build          = array('link' => 'Build|project|build|project={PROJECT}');
 $lang->menu->waterfall->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
 $lang->menu->waterfall->other          = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc,workestimation,durationestimation,budget,pssp,measrecord,report');
 $lang->menu->waterfall->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
@@ -958,6 +919,6 @@ $lang->projectstory->menu       = new stdclass();
 $lang->stakeholder->menu = $lang->scrum->setMenu;
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
new file mode 100644
index 0000000000..2e2107aefa
--- /dev/null
+++ b/module/common/lang/menu.php
@@ -0,0 +1,557 @@
+<?php
+$lang->navIcons = array();
+$lang->navIcons['my']        = "<i class='icon icon-menu-my'></i>";
+$lang->navIcons['program']   = "<i class='icon icon-program'></i>";
+$lang->navIcons['product']   = "<i class='icon icon-product'></i>";
+$lang->navIcons['project']   = "<i class='icon icon-project'></i>";
+$lang->navIcons['execution'] = "<i class='icon icon-run'></i>";
+$lang->navIcons['qa']        = "<i class='icon icon-test'></i>";
+$lang->navIcons['devops']    = "<i class='icon icon-devops'></i>";
+$lang->navIcons['doc']       = "<i class='icon icon-doc'></i>";
+$lang->navIcons['report']    = "<i class='icon icon-statistic'></i>";
+$lang->navIcons['system']    = "<i class='icon icon-group'></i>";
+$lang->navIcons['admin']     = "<i class='icon icon-cog-outline'></i>";
+
+global $config;
+list($programModule, $programMethod)     = explode('-', $config->programLink);
+list($productModule, $productMethod)     = explode('-', $config->productLink);
+list($projectModule, $projectMethod)     = explode('-', $config->projectLink);
+list($executionModule, $executionMethod) = explode('-', $config->executionLink);
+
+/* Main Navigation. */
+$lang->mainNav = new stdclass();
+$lang->mainNav->my = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|";
+if($config->systemMode == 'new') $lang->mainNav->program = "{$lang->navIcons['program']} {$lang->program->common}|$programModule|$programMethod|";
+$lang->mainNav->product = "{$lang->navIcons['product']} {$lang->product->common}|$productModule|$productMethod|";
+if($config->systemMode == 'new') $lang->mainNav->project = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|";
+
+if($config->systemMode == 'new')
+{
+    $lang->mainNav->execution = "{$lang->navIcons['execution']} {$lang->execution->common}|$executionModule|$executionMethod|";
+}
+else
+{
+    $lang->mainNav->execution = "{$lang->navIcons['project']} {$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->doc       = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|";
+$lang->mainNav->report    = "{$lang->navIcons['report']} {$lang->report->common}|report|productSummary|";
+$lang->mainNav->system    = "{$lang->navIcons['system']} {$lang->system->common}|my|team|";
+$lang->mainNav->admin     = "{$lang->navIcons['admin']} {$lang->admin->common}|admin|index|";
+
+$lang->dividerMenu = ',doc,oa,admin,';
+$lang->mainNav->menuOrder[5]  = 'my';
+if($config->systemMode == 'new') $lang->mainNav->menuOrder[10] = 'program';
+$lang->mainNav->menuOrder[15] = 'product';
+if($config->systemMode == 'new') $lang->mainNav->menuOrder[20] = 'project';
+$lang->mainNav->menuOrder[21] = 'execution';
+$lang->mainNav->menuOrder[23] = 'qa';
+$lang->mainNav->menuOrder[25] = 'devops';
+$lang->mainNav->menuOrder[30] = 'doc';
+$lang->mainNav->menuOrder[35] = 'report';
+$lang->mainNav->menuOrder[40] = 'system';
+$lang->mainNav->menuOrder[55] = 'admin';
+
+/* My menu. */
+$lang->my->menu = new stdclass();
+$lang->my->menu->index      = array('link' => "$lang->dashboard|my|index");
+$lang->my->menu->calendar   = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo');
+$lang->my->menu->work       = array('link' => "{$lang->my->work}|my|work|mode=task", 'subModule' => 'task');
+if($config->systemMode == 'new') $lang->my->menu->project = array('link' => "{$lang->project->common}|my|project|");
+$lang->my->menu->execution  = array('link' => "{$lang->execution->common}|my|execution|type=undone");
+$lang->my->menu->contribute = array('link' => "$lang->contribute|my|contribute|mode=task");
+$lang->my->menu->dynamic    = array('link' => "$lang->dynamic|my|dynamic|");
+if($config->systemScore) $lang->my->menu->score = array('link' => "{$lang->score->shortCommon}|my|score|", 'subModule' => 'score');
+$lang->my->menu->contacts   = array('link' => "$lang->contact|my|managecontacts|");
+
+/* My menu order. */
+$lang->my->menuOrder[5]  = 'index';
+$lang->my->menuOrder[10] = 'calendar';
+$lang->my->menuOrder[15] = 'work';
+$lang->my->menuOrder[20] = 'follow';
+$lang->my->menuOrder[25] = 'project';
+$lang->my->menuOrder[30] = 'execution';
+$lang->my->menuOrder[35] = 'contribute';
+$lang->my->menuOrder[40] = 'dynamic';
+$lang->my->menuOrder[45] = 'score';
+$lang->my->menuOrder[50] = 'contacts';
+
+$lang->my->menu->work['subMenu'] = new stdclass();
+$lang->my->menu->work['subMenu']->task     = array('link' => "{$lang->task->common}|my|work|mode=task", 'subModule' => 'task');
+if($config->URAndSR) $lang->my->menu->work['subMenu']->requirement = "$lang->URCommon|my|work|mode=requirement";
+$lang->my->menu->work['subMenu']->story    = "$lang->SRCommon|my|work|mode=story";
+$lang->my->menu->work['subMenu']->bug      = "{$lang->bug->common}|my|work|mode=bug";
+$lang->my->menu->work['subMenu']->testcase = "{$lang->testcase->common}|my|work|mode=testcase&type=assigntome";
+$lang->my->menu->work['subMenu']->testtask = "{$lang->testtask->common}|my|work|mode=testtask&type=wait";
+
+$lang->my->menu->work['menuOrder'][5]  = 'task';
+$lang->my->menu->work['menuOrder'][10] = 'requirement';
+$lang->my->menu->work['menuOrder'][15] = 'story';
+$lang->my->menu->work['menuOrder'][20] = 'bug';
+$lang->my->menu->work['menuOrder'][25] = 'testcase';
+$lang->my->menu->work['menuOrder'][30] = 'testtask';
+
+$lang->my->menu->contribute['subMenu'] = new stdclass();
+$lang->my->menu->contribute['subMenu']->task     = "{$lang->task->common}|my|contribute|mode=task";
+if($config->URAndSR) $lang->my->menu->contribute['subMenu']->requirement = "$lang->URCommon|my|contribute|mode=requirement";
+$lang->my->menu->contribute['subMenu']->story    = "$lang->SRCommon|my|contribute|mode=story";
+$lang->my->menu->contribute['subMenu']->bug      = "{$lang->bug->common}|my|contribute|mode=bug";
+$lang->my->menu->contribute['subMenu']->testcase = "{$lang->testcase->shortCommon}|my|contribute|mode=testcase&type=openedbyme";
+$lang->my->menu->contribute['subMenu']->testtask = "{$lang->testtask->common}|my|contribute|mode=testtask&type=done";
+$lang->my->menu->contribute['subMenu']->doc      = "{$lang->doc->common}|my|contribute|mode=doc&type=openedbyme";
+
+$lang->my->menu->contribute['menuOrder'][5]  = 'task';
+$lang->my->menu->contribute['menuOrder'][10] = 'requirement';
+$lang->my->menu->contribute['menuOrder'][15] = 'story';
+$lang->my->menu->contribute['menuOrder'][20] = 'bug';
+$lang->my->menu->contribute['menuOrder'][25] = 'testcase';
+$lang->my->menu->contribute['menuOrder'][30] = 'testtask';
+$lang->my->menu->contribute['menuOrder'][35] = 'doc';
+
+$lang->my->dividerMenu = ',work,dynamic,';
+
+/* Program menu. */
+$lang->program->homeMenu = new stdclass();
+$lang->program->homeMenu->browse = array('link' => "{$lang->program->list}|program|browse|", 'alias' => 'create,edit');
+
+$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->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');
+
+/* Program menu order. */
+$lang->program->menuOrder[5]  = 'product';
+$lang->program->menuOrder[10] = 'project';
+$lang->program->menuOrder[15] = 'personnel';
+$lang->program->menuOrder[20] = 'stakeholder';
+
+$lang->program->menu->personnel['subMenu'] = new stdClass();
+$lang->program->menu->personnel['subMenu']->invest     = array('link' => "{$lang->personnel->invest}|personnel|invest|programID=%s");
+$lang->program->menu->personnel['subMenu']->accessible = array('link' => "{$lang->personnel->accessible}|personnel|accessible|programID=%s");
+$lang->program->menu->personnel['subMenu']->whitelist  = array('link' => "{$lang->whitelist}|personnel|whitelist|objectID=%s", 'alias' => 'addwhitelist');
+
+/* Product menu. */
+$lang->product->homeMenu = new stdclass();
+$lang->product->homeMenu->home = array('link' => "{$lang->dashboard}|product|index|");
+$lang->product->homeMenu->list = array('link' => $lang->product->list . '|product|all|', 'alias' => 'create,batchedit,manageline');
+
+$lang->product->menu = new stdclass();
+$lang->product->menu->dashboard   = array('link' => "{$lang->dashboard}|product|dashboard|productID=%s");
+if($config->URAndSR) $lang->product->menu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$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');
+$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->project     = array('link' => "{$lang->project->common}|product|project|status=all&productID=%s");
+$lang->product->menu->track       = array('link' => "{$lang->track}|story|track|productID=%s");
+$lang->product->menu->doc         = array('link' => "{$lang->doc->common}|doc|objectLibs|type=product&objectID=%s", 'subModule' => 'doc');
+$lang->product->menu->dynamic     = array('link' => "{$lang->dynamic}|product|dynamic|productID=%s");
+$lang->product->menu->settings    = array('link' => "{$lang->settings}|product|view|productID=%s", 'subModule' => 'tree,branch', 'alias' => 'edit,whitelist,addwhitelist');
+
+/* Product menu order. */
+$lang->product->menuOrder[5]  = 'dashboard';
+$lang->product->menuOrder[10] = 'story';
+$lang->product->menuOrder[15] = 'plan';
+$lang->product->menuOrder[20] = 'project';
+$lang->product->menuOrder[25] = 'release';
+$lang->product->menuOrder[30] = 'roadmap';
+$lang->product->menuOrder[35] = 'requirement';
+$lang->product->menuOrder[40] = 'track';
+$lang->product->menuOrder[45] = 'doc';
+$lang->product->menuOrder[50] = 'dynamic';
+$lang->product->menuOrder[55] = 'settings';
+$lang->product->menuOrder[60] = 'create';
+$lang->product->menuOrder[65] = 'all';
+
+$lang->product->menu->doc['subMenu'] = new stdclass();
+
+$lang->product->menu->settings['subMenu'] = new stdclass();
+$lang->product->menu->settings['subMenu']->view      = array('link' => "{$lang->overview}|product|view|productID=%s", 'alias' => 'edit');
+$lang->product->menu->settings['subMenu']->module    = array('link' => "{$lang->module}|tree|browse|product=%s&view=story", 'subModule' => 'tree');
+$lang->product->menu->settings['subMenu']->branch    = array('link' => "@branch@|branch|manage|product=%s", 'subModule' => 'branch');
+$lang->product->menu->settings['subMenu']->whitelist = array('link' => "{$lang->whitelist}|product|whitelist|product=%s", 'subModule' => 'personnel');
+
+$lang->product->dividerMenu = $config->URAndSR ? ',story,requirement,settings,' : ',story,track,settings,';
+
+/* Project menu. */
+$lang->project->homeMenu = new stdclass();
+$lang->project->homeMenu->browse = array('link' => ($config->systemMode == 'new' ? $lang->project->list : $lang->executionCommon) . '|project|browse|', 'alias' => 'batchedit,create');
+
+/* Scrum menu. */
+$lang->scrum->menu = new stdclass();
+$lang->scrum->menu->index     = array('link' => "{$lang->dashboard}|project|index|project=%s");
+$lang->scrum->menu->execution = array('link' => "$lang->executionCommon|project|execution|status=all&projectID=%s", 'exclude' => 'execution-testreport');
+$lang->scrum->menu->story     = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree', 'alias' => 'story,track');
+$lang->scrum->menu->doc       = array('link' => "{$lang->doc->common}|doc|objectLibs|type=project&objectID=%s", 'subModule' => 'doc');
+$lang->scrum->menu->qa        = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport,execution', 'alias' => 'bug,testtask,testcase,testreport', 'exclude' => 'execution-create,execution-batchedit');
+$lang->scrum->menu->devops    = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
+$lang->scrum->menu->build     = array('link' => "{$lang->build->common}|project|build|project=%s");
+$lang->scrum->menu->release   = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease');
+$lang->scrum->menu->dynamic   = array('link' => "$lang->dynamic|project|dynamic|project=%s");
+$lang->scrum->menu->settings  = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
+
+$lang->scrum->dividerMenu = ',execution,programplan,doc,settings,';
+
+/* Scrum menu order. */
+$lang->scrum->menuOrder[5]  = 'index';
+$lang->scrum->menuOrder[10] = 'execution';
+$lang->scrum->menuOrder[15] = 'story';
+$lang->scrum->menuOrder[20] = 'qa';
+$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->menu->doc['subMenu'] = new stdclass();
+
+$lang->scrum->menu->qa['subMenu'] = new stdclass();
+//$lang->scrum->menu->qa['subMenu']->index      = array('link' => "$lang->dashboard|project|qa|projectID=%s");
+$lang->scrum->menu->qa['subMenu']->bug        = array('link' => "{$lang->bug->common}|project|bug|projectID=%s", 'subModule' => 'bug');
+$lang->scrum->menu->qa['subMenu']->testcase   = array('link' => "{$lang->testcase->shortCommon}|project|testcase|projectID=%s", 'subModule' => 'testsuite,testcase,caselib,tree');
+$lang->scrum->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
+$lang->scrum->menu->qa['subMenu']->testreport = array('link' => "{$lang->testreport->common}|project|testreport|projectID=%s", 'subModule' => 'testreport');
+
+$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']->members     = array('link' => "{$lang->team->common}|project|manageMembers|project=%s", 'alias' => 'managemembers');
+$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');
+$lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->priv}|project|group|project=%s", 'alias' => 'group,manageview,managepriv');
+
+/* Execution menu. */
+$lang->execution->homeMenu = new stdclass();
+if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
+$lang->execution->homeMenu->list  = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');
+
+$lang->execution->menu = new stdclass();
+$lang->execution->menu->task     = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
+$lang->execution->menu->kanban   = array('link' => "$lang->kanban|execution|kanban|executionID=%s");
+$lang->execution->menu->burn     = array('link' => "$lang->burn|execution|burn|executionID=%s");
+$lang->execution->menu->view     = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
+$lang->execution->menu->story    = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban');
+$lang->execution->menu->qa       = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
+$lang->execution->menu->devops   = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
+$lang->execution->menu->doc      = array('link' => "{$lang->doc->common}|doc|objectLibs|type=execution&objectID=%s", 'subModule' => 'doc');
+$lang->execution->menu->build    = array('link' => "{$lang->build->common}|execution|build|executionID=%s", 'subModule' => 'build');
+$lang->execution->menu->action   = array('link' => "$lang->dynamic|execution|dynamic|executionID=%s");
+$lang->execution->menu->settings = array('link' => "$lang->settings|execution|view|executionID=%s", 'subModule' => 'personnel', 'alias' => 'edit,manageproducts,team,whitelist,addwhitelist,managemembers', 'class' => 'dropdown dropdown-hover');
+
+/* Execution menu order. */
+$lang->execution->menuOrder[5]  = 'task';
+$lang->execution->menuOrder[10] = 'kanban';
+$lang->execution->menuOrder[15] = 'burn';
+$lang->execution->menuOrder[20] = 'view';
+$lang->execution->menuOrder[25] = 'story';
+$lang->execution->menuOrder[30] = 'qa';
+$lang->execution->menuOrder[35] = 'repo';
+$lang->execution->menuOrder[40] = 'devops';
+$lang->execution->menuOrder[45] = 'doc';
+$lang->execution->menuOrder[50] = 'build';
+$lang->execution->menuOrder[55] = 'release';
+$lang->execution->menuOrder[60] = 'action';
+$lang->execution->menuOrder[65] = 'settings';
+
+$lang->execution->menu->doc['subMenu'] = new stdclass();
+
+$lang->execution->menu->view['subMenu'] = new stdclass();
+$lang->execution->menu->view['subMenu']->groupTask = "$lang->groupView|execution|grouptask|executionID=%s";
+$lang->execution->menu->view['subMenu']->tree      = "$lang->treeView|execution|tree|executionID=%s";
+
+$lang->execution->menu->qa['subMenu'] = new stdclass();
+//$lang->execution->menu->qa['subMenu']->qa         = array('link' => "$lang->dashboard|execution|qa|executionID=%s");
+$lang->execution->menu->qa['subMenu']->bug        = array('link' => "{$lang->bug->common}|execution|bug|executionID=%s", 'subModule' => 'bug');
+$lang->execution->menu->qa['subMenu']->testcase   = array('link' => "{$lang->testcase->shortCommon}|execution|testcase|executionID=%s", 'subModule' => 'testcase');
+$lang->execution->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|execution|testtask|executionID=%s", 'subModule' => 'testtask');
+$lang->execution->menu->qa['subMenu']->testreport = array('link' => "{$lang->testreport->common}|execution|testreport|exeutionID=%s", 'subModule' => 'testreport');
+
+$lang->execution->menu->qa['menuOrder'][5]  = 'qa';
+$lang->execution->menu->qa['menuOrder'][10] = 'bug';
+$lang->execution->menu->qa['menuOrder'][15] = 'testcase';
+$lang->execution->menu->qa['menuOrder'][20] = 'testtask';
+
+$lang->execution->menu->settings['subMenu'] = new stdclass();
+$lang->execution->menu->settings['subMenu']->view      = array('link' => "$lang->overview|execution|view|executionID=%s", 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
+$lang->execution->menu->settings['subMenu']->products  = array('link' => "$lang->productCommon|execution|manageproducts|executionID=%s");
+$lang->execution->menu->settings['subMenu']->team      = array('link' => "{$lang->team->common}|execution|team|executionID=%s", 'alias' => 'managemembers');
+$lang->execution->menu->settings['subMenu']->whitelist = array('link' => "$lang->whitelist|execution|whitelist|executionID=%s", 'subModule' => 'personnel', 'alias' => 'addwhitelist');
+
+$lang->execution->dividerMenu = ',story,build,settings,';
+
+/* QA menu.*/
+$lang->qa->menu = new stdclass();
+$lang->qa->menu->index      = array('link' => "$lang->dashboard|qa|index");
+$lang->qa->menu->bug        = array('link' => "{$lang->bug->common}|bug|browse|productID=%s", 'subModule' => 'bug');
+$lang->qa->menu->testcase   = array('link' => "{$lang->testcase->shortCommon}|testcase|browse|productID=%s", 'subModule' => 'testcase,story');
+$lang->qa->menu->testsuite  = array('link' => "{$lang->testcase->testsuite}|testsuite|browse|productID=%s", 'subModule' => 'testsuite');
+$lang->qa->menu->testtask   = array('link' => "{$lang->testtask->common}|testtask|browse|productID=%s", 'subModule' => 'testtask', 'alias' => 'view,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
+$lang->qa->menu->report     = array('link' => "{$lang->testreport->common}|testreport|browse|productID=%s", 'subModule' => 'testreport');
+$lang->qa->menu->caselib    = array('link' => "{$lang->testcase->caselib}|caselib|browse|libID=0", 'subModule' => 'caselib');
+$lang->qa->menu->automation = array('link' => "{$lang->automation->common}|automation|browse|productID=%s", 'subModule' => 'automation', 'alias' => '');
+
+/* QA menu order. */
+$lang->qa->menuOrder[5]  = 'product';
+$lang->qa->menuOrder[10] = 'index';
+$lang->qa->menuOrder[15] = 'bug';
+$lang->qa->menuOrder[20] = 'testcase';
+$lang->qa->menuOrder[25] = 'testsuite';
+$lang->qa->menuOrder[30] = 'testtask';
+$lang->qa->menuOrder[35] = 'report';
+$lang->qa->menuOrder[40] = 'caselib';
+$lang->qa->menuOrder[45] = 'automation';
+
+// $lang->qa->menu->automation['subMenu'] = new stdclass();
+// $lang->qa->menu->automation['subMenu']->browse      = array('link' => "{$lang->intro}|automation|browse|productID=%s", 'alias' => '');
+// $lang->qa->menu->automation['subMenu']->framework   = array('link' => '框架|automation|framework|productID=%s', 'alias' => '');
+// $lang->qa->menu->automation['subMenu']->data        = array('link' => '数据|automation|date|productID=%s', 'alias' => '');
+// $lang->qa->menu->automation['subMenu']->interface   = array('link' => '接口|automation|interface|productID=%s', 'alias' => '');
+// $lang->qa->menu->automation['subMenu']->environment = array('link' => '环境|automation|environment|productID=%s', 'alias' => '');
+
+$lang->qa->dividerMenu = ',bug,testtask,caselib,';
+
+/* DevOps menu. */
+$lang->devops->menu = new stdclass();
+$lang->devops->menu->code     = array('link' => "{$lang->repo->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccomment');
+$lang->devops->menu->compile  = array('link' => "{$lang->devops->compile}|job|browse", 'subModule' => 'compile,job');
+$lang->devops->menu->jenkins  = array('link' => "Jenkins|jenkins|browse", 'alias' => 'create,edit');
+$lang->devops->menu->maintain = array('link' => "{$lang->devops->repo}|repo|maintain", 'alias' => 'create,edit');
+$lang->devops->menu->rules    = array('link' => "{$lang->devops->rules}|repo|setrules");
+
+$lang->devops->menuOrder[5]  = 'code';
+$lang->devops->menuOrder[10] = 'compile';
+$lang->devops->menuOrder[15] = 'jenkins';
+$lang->devops->menuOrder[20] = 'maintain';
+$lang->devops->menuOrder[25] = 'rules';
+
+/* Doc menu.*/
+$lang->doc->menu = new stdclass();
+$lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index");
+$lang->doc->menu->recent    = array('link' => "{$lang->doc->recent}|doc|browse|browseTyp=byediteddate", 'alias' => 'recent');
+$lang->doc->menu->my        = array('link' => "{$lang->doc->my}|doc|browse|browseTyp=openedbyme", 'alias' => 'my');
+$lang->doc->menu->collect   = array('link' => "{$lang->doc->favorite}|doc|browse|browseTyp=collectedbyme", 'alias' => 'collect');
+$lang->doc->menu->product   = array('link' => "{$lang->doc->product}|doc|objectLibs|type=product", 'alias' => 'product');
+if($config->systemMode == 'new') $lang->doc->menu->project = array('link' => "{$lang->doc->project}|doc|objectLibs|type=project", 'alias' => 'project');
+if($config->systemMode == 'classic') $lang->doc->menu->execution = array('link' => "{$lang->doc->execution}|doc|objectLibs|type=execution", 'alias' => 'execution');
+$lang->doc->menu->custom    = array('link' => "{$lang->doc->custom}|doc|objectLibs|type=custom", 'alias' => 'custom');
+
+$lang->doc->dividerMenu = ',product,';
+
+/* Doc menu order. */
+$lang->doc->menuOrder[5]  = 'dashboard';
+$lang->doc->menuOrder[10] = 'recent';
+$lang->doc->menuOrder[15] = 'my';
+$lang->doc->menuOrder[20] = 'collect';
+$lang->doc->menuOrder[25] = 'product';
+if($config->systemMode == 'new') $lang->doc->menuOrder[30] = 'project';
+if($config->systemMode == 'classic') $lang->doc->menuOrder[30] = 'execution';
+$lang->doc->menuOrder[35] = 'custom';
+
+$lang->doc->menu->product['subMenu'] = new stdclass();
+if($config->systemMode == 'new') $lang->doc->menu->project['subMenu'] = new stdclass();
+if($config->systemMode == 'classic') $lang->doc->menu->execution['subMenu'] = new stdclass();
+$lang->doc->menu->custom['subMenu']  = new stdclass();
+
+/* Report menu.*/
+$lang->report->menu = new stdclass();
+$lang->report->menu->annual  = array('link' => "{$lang->report->annual}|report|annualData|year=&dept=&userID=" . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
+$lang->report->menu->product = array('link' => "{$lang->product->common}|report|productsummary");
+$lang->report->menu->project = array('link' => "{$lang->project->common}|report|projectdeviation");
+$lang->report->menu->test    = array('link' => "{$lang->qa->common}|report|bugcreate", 'alias' => 'bugassign');
+$lang->report->menu->staff   = array('link' => "{$lang->system->common}|report|workload");
+
+/* Report menu order. */
+$lang->report->menuOrder[5]  = 'annual';
+$lang->report->menuOrder[10] = 'product';
+$lang->report->menuOrder[15] = 'project';
+$lang->report->menuOrder[20] = 'test';
+$lang->report->menuOrder[25] = 'staff';
+
+/* Company menu.*/
+$lang->company->menu = new stdclass();
+$lang->company->menu->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => ',user,');
+$lang->company->menu->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
+$lang->company->menu->browseGroup = array('link' => "$lang->priv|group|browse", 'subModule' => 'group');
+
+/* Company menu order. */
+$lang->company->menuOrder[5]  = 'browseUser';
+$lang->company->menuOrder[10] = 'dept';
+$lang->company->menuOrder[15] = 'browseGroup';
+$lang->company->menuOrder[20] = 'addGroup';
+$lang->company->menuOrder[25] = 'batchAddUser';
+$lang->company->menuOrder[30] = 'addUser';
+
+/* Admin menu. */
+$lang->admin->menu = new stdclass();
+$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
+$lang->admin->menu->model     = array('link' => "$lang->model|custom|browsestoryconcept|", 'subModule' => 'holiday');
+$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');
+$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
+
+/* Admin menu order. */
+$lang->admin->menuOrder[5]  = 'index';
+$lang->admin->menuOrder[10] = 'company';
+$lang->admin->menuOrder[15] = 'model';
+$lang->admin->menuOrder[20] = 'custom';
+$lang->admin->menuOrder[25] = 'message';
+$lang->admin->menuOrder[30] = 'extension';
+$lang->admin->menuOrder[35] = 'dev';
+$lang->admin->menuOrder[40] = 'system';
+
+$lang->admin->menu->model['subMenu'] = new stdclass();
+$lang->admin->menu->model['subMenu']->storyConcept = array('link' => "{$lang->storyConcept}|custom|browsestoryconcept|");
+
+$lang->admin->menu->model['menuOrder'][5] = 'storyConcept';
+
+$lang->admin->menu->message['subMenu'] = new stdclass();
+$lang->admin->menu->message['subMenu']->message = new stdclass();
+$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');
+$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'][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']->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->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|");
+
+$lang->admin->dividerMenu = ',company,message,system,';
+
+$lang->subject->menu = new stdclass();
+$lang->subject->menu->storyConcept = array('link' => "{$lang->storyConcept}|custom|browsestoryconcept|");
+
+/* System menu. */
+$lang->system->menu = new stdclass();
+$lang->system->menu->team     = array('link' => "{$lang->team->common}|my|team|", 'subModule' => 'user');
+$lang->system->menu->dynamic  = array('link' => "$lang->dynamic|company|dynamic|");
+$lang->system->menu->view     = array('link' => "{$lang->company->common}|company|view");
+
+/* System menu order. */
+$lang->system->menuOrder[5]  = 'team';
+$lang->system->menuOrder[10] = 'calendar';
+$lang->system->menuOrder[15] = 'dynamic';
+$lang->system->menuOrder[20] = 'view';
+
+/* Nav group.*/
+$lang->navGroup = new stdclass();
+$lang->navGroup->my     = 'my';
+$lang->navGroup->effort = 'my';
+$lang->navGroup->score  = 'my';
+$lang->navGroup->todo   = 'my';
+
+$lang->navGroup->program   = 'program';
+$lang->navGroup->personnel = 'program';
+
+$lang->navGroup->product     = 'product';
+$lang->navGroup->productplan = 'product';
+$lang->navGroup->release     = 'product';
+$lang->navGroup->branch      = 'product';
+$lang->navGroup->story       = 'product';
+
+$lang->navGroup->project     = 'project';
+$lang->navGroup->deploy      = 'project';
+$lang->navGroup->stakeholder = 'project';
+
+$lang->navGroup->projectbuild   = 'project';
+$lang->navGroup->projectstory   = 'project';
+$lang->navGroup->review         = 'project';
+$lang->navGroup->reviewissue    = 'project';
+$lang->navGroup->pssp           = 'project';
+$lang->navGroup->auditplan      = 'project';
+$lang->navGroup->cm             = 'project';
+$lang->navGroup->nc             = 'project';
+$lang->navGroup->projectrelease = 'project';
+$lang->navGroup->build          = 'project';
+$lang->navGroup->measrecord     = 'project';
+$lang->navGroup->milestone      = 'project';
+
+$lang->navGroup->execution = 'execution';
+$lang->navGroup->task      = 'execution';
+$lang->navGroup->build     = 'execution';
+$lang->navGroup->team      = 'execution';
+
+$lang->navGroup->doc    = 'doc';
+$lang->navGroup->doclib = 'doc';
+
+$lang->navGroup->report = 'report';
+
+$lang->navGroup->qa         = 'qa';
+$lang->navGroup->bug        = 'qa';
+$lang->navGroup->testcase   = 'qa';
+$lang->navGroup->testtask   = 'qa';
+$lang->navGroup->automation = 'qa';
+$lang->navGroup->testreport = 'qa';
+$lang->navGroup->testcase   = 'qa';
+$lang->navGroup->testtask   = 'qa';
+$lang->navGroup->testsuite  = 'qa';
+$lang->navGroup->caselib    = 'qa';
+
+$lang->navGroup->devops  = 'devops';
+$lang->navGroup->repo    = 'devops';
+$lang->navGroup->job     = 'devops';
+$lang->navGroup->jenkins = 'devops';
+$lang->navGroup->compile = 'devops';
+$lang->navGroup->ci      = 'devops';
+$lang->navGroup->svn     = 'devops';
+$lang->navGroup->git     = 'devops';
+
+$lang->navGroup->company = 'system';
+
+$lang->navGroup->attend   = 'attend';
+$lang->navGroup->leave    = 'attend';
+$lang->navGroup->makeup   = 'attend';
+$lang->navGroup->overtime = 'attend';
+$lang->navGroup->lieu     = 'attend';
+
+$lang->navGroup->admin     = 'admin';
+$lang->navGroup->dept      = 'admin';
+$lang->navGroup->user      = 'admin';
+$lang->navGroup->group     = 'admin';
+$lang->navGroup->dept      = 'admin';
+$lang->navGroup->webhook   = 'admin';
+$lang->navGroup->sms       = 'admin';
+$lang->navGroup->message   = 'admin';
+$lang->navGroup->custom    = 'admin';
+$lang->navGroup->cron      = 'admin';
+$lang->navGroup->backup    = 'admin';
+$lang->navGroup->mail      = 'admin';
+$lang->navGroup->dev       = 'admin';
+$lang->navGroup->entry     = 'admin';
+$lang->navGroup->extension = 'admin';
+$lang->navGroup->action    = 'admin';
+
+$lang->navGroup->search  = 'search';
+$lang->navGroup->index   = 'index';
+$lang->navGroup->tree    = 'tree';
+$lang->navGroup->misc    = 'misc';
+$lang->navGroup->upgrade = 'upgrade';
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
deleted file mode 100644
index 0bfe490118..0000000000
--- a/module/common/lang/menuOrder.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-$lang->mainNav->menuOrder[5]  = 'my';
-$lang->mainNav->menuOrder[15] = 'product';
-$lang->mainNav->menuOrder[20] = 'project';
-$lang->mainNav->menuOrder[21] = 'execution';
-$lang->mainNav->menuOrder[23] = 'qa';
-$lang->mainNav->menuOrder[25] = 'repo';
-$lang->mainNav->menuOrder[30] = 'doc';
-$lang->mainNav->menuOrder[35] = 'report';
-$lang->mainNav->menuOrder[60] = 'system';
-$lang->mainNav->menuOrder[70] = 'admin';
-if($config->systemMode == 'new') $lang->mainNav->menuOrder[10] = 'program';
-
-/* Waterfall menu order. */
-$lang->waterfall->menuOrder[5]  = 'programindex';
-$lang->waterfall->menuOrder[10] = 'programplan';
-$lang->waterfall->menuOrder[15] = 'project';
-$lang->waterfall->menuOrder[20] = 'projectstory';
-$lang->waterfall->menuOrder[25] = 'design';
-$lang->waterfall->menuOrder[30] = 'ci';
-$lang->waterfall->menuOrder[35] = 'track';
-$lang->waterfall->menuOrder[38] = 'review';
-$lang->waterfall->menuOrder[39] = 'cm';
-$lang->waterfall->menuOrder[40] = 'qa';
-$lang->waterfall->menuOrder[45] = 'doc';
-$lang->waterfall->menuOrder[50] = 'projectbuild';
-$lang->waterfall->menuOrder[55] = 'projectrelease';
-$lang->waterfall->menuOrder[60] = 'weekly';
-$lang->waterfall->menuOrder[65] = 'other';
-$lang->waterfall->menuOrder[68] = 'dynamic';
-$lang->waterfall->menuOrder[70] = 'projectsetting';
-
-/* Sort of main menu. */
-$lang->scrum->menuOrder[5]  = 'index';
-$lang->scrum->menuOrder[10] = 'execution';
-$lang->scrum->menuOrder[15] = 'projectstory';
-$lang->scrum->menuOrder[20] = 'qa';
-$lang->scrum->menuOrder[25] = 'ci';
-$lang->scrum->menuOrder[30] = 'doc';
-$lang->scrum->menuOrder[35] = 'projectbuild';
-$lang->scrum->menuOrder[40] = 'projectrelease';
-$lang->scrum->menuOrder[45] = 'other';
-$lang->scrum->menuOrder[48] = 'dynamic';
-$lang->scrum->menuOrder[50] = 'projectsetting';
-
-/* index menu order. */
-$lang->index->menuOrder[5]  = 'product';
-$lang->index->menuOrder[10] = 'project';
-
-/* my menu order. */
-$lang->my->menuOrder[5]  = 'index';
-$lang->my->menuOrder[10] = 'myWork';
-$lang->my->menuOrder[15] = 'myProject';
-$lang->my->menuOrder[20] = 'myExecution';
-$lang->my->menuOrder[25] = 'contribute';
-$lang->my->menuOrder[30] = 'score';
-$lang->my->menuOrder[35] = 'dynamic';
-$lang->my->menuOrder[40] = 'follow';
-$lang->my->menuOrder[45] = 'contacts';
-$lang->todo->menuOrder = $lang->my->menuOrder;
-
-/* product menu order. */
-$lang->product->menuOrder[5]  = 'dashboard';
-$lang->product->menuOrder[10] = 'story';
-$lang->product->menuOrder[15] = 'plan';
-$lang->product->menuOrder[20] = 'project';
-$lang->product->menuOrder[25] = 'release';
-$lang->product->menuOrder[30] = 'roadmap';
-$lang->product->menuOrder[35] = 'requirement';
-$lang->product->menuOrder[40] = 'track';
-$lang->product->menuOrder[45] = 'doc';
-$lang->product->menuOrder[50] = 'dynamic';
-$lang->product->menuOrder[55] = 'setting';
-$lang->product->menuOrder[60] = 'create';
-$lang->product->menuOrder[65] = 'all';
-
-$lang->story->menuOrder       = $lang->product->menuOrder;
-$lang->productplan->menuOrder = $lang->product->menuOrder;
-$lang->release->menuOrder     = $lang->product->menuOrder;
-$lang->branch->menuOrder      = $lang->product->menuOrder;
-
-/* project menu order. */
-$lang->execution->menuOrder[5]  = 'task';
-$lang->execution->menuOrder[10] = 'kanban';
-$lang->execution->menuOrder[15] = 'burn';
-$lang->execution->menuOrder[20] = 'view';
-$lang->execution->menuOrder[25] = 'story';
-$lang->execution->menuOrder[30] = 'qa';
-$lang->execution->menuOrder[35] = 'repo';
-$lang->execution->menuOrder[40] = 'ci';
-$lang->execution->menuOrder[45] = 'doc';
-$lang->execution->menuOrder[50] = 'build';
-$lang->execution->menuOrder[55] = 'release';
-$lang->execution->menuOrder[60] = 'action';
-$lang->execution->menuOrder[65] = 'setting';
-
-$lang->task->menuOrder  = $lang->execution->menuOrder;
-$lang->build->menuOrder = $lang->execution->menuOrder;
-
-/* qa menu order. */
-$lang->qa->menuOrder[5]      = 'product';
-$lang->qa->menuOrder[10]     = 'index';
-$lang->qa->menuOrder[15]     = 'bug';
-$lang->qa->menuOrder[20]     = 'testcase';
-$lang->qa->menuOrder[25]     = 'testtask';
-$lang->qa->menuOrder[30]     = 'report';
-$lang->qa->menuOrder[35]     = 'testsuite';
-$lang->qa->menuOrder[40]     = 'caselib';
-$lang->bug->menuOrder        = $lang->qa->menuOrder;
-$lang->testtask->menuOrder   = $lang->qa->menuOrder;
-$lang->testreport->menuOrder = $lang->qa->menuOrder;
-
-$lang->testcase->menuOrder[5]  = 'feature';
-$lang->testcase->menuOrder[10] = 'unit';
-$lang->testcase->menuOrder[15] = 'testsuite';
-$lang->testcase->menuOrder[20] = 'caselib';
-$lang->caselib->menuOrder   = $lang->testcase->menuOrder;
-$lang->testsuite->menuOrder = $lang->testcase->menuOrder;
-
-$lang->ci->menuOrder[5]  = 'code';
-$lang->ci->menuOrder[10] = 'build';
-$lang->ci->menuOrder[15] = 'jenkins';
-$lang->ci->menuOrder[20] = 'maintain';
-$lang->ci->menuOrder[25] = 'rules';
-
-$lang->repo->menuOrder    = $lang->ci->menuOrder;
-$lang->jenkins->menuOrder = $lang->ci->menuOrder;
-
-/* doc menu order. */
-$lang->doc->menuOrder[5]  = 'list';
-$lang->doc->menuOrder[10] = 'product';
-$lang->doc->menuOrder[15] = 'project';
-$lang->doc->menuOrder[20] = 'custom';
-$lang->doc->menuOrder[25] = 'index';
-$lang->doc->menuOrder[30] = 'create';
-
-/* report menu order. */
-$lang->report->menuOrder[5]  = 'annual';
-$lang->report->menuOrder[10] = 'product';
-$lang->report->menuOrder[15] = 'execution';
-$lang->report->menuOrder[20] = 'test';
-$lang->report->menuOrder[25] = 'staff';
-
-/* company menu order. */
-$lang->company->menuOrder[5]  = 'browseUser';
-$lang->company->menuOrder[10] = 'dept';
-$lang->company->menuOrder[15] = 'browseGroup';
-$lang->company->menuOrder[20] = 'addGroup';
-$lang->company->menuOrder[25] = 'batchAddUser';
-$lang->company->menuOrder[30] = 'addUser';
-$lang->dept->menuOrder        = $lang->company->menuOrder;
-$lang->group->menuOrder       = $lang->company->menuOrder;
-$lang->user->menuOrder        = $lang->company->menuOrder;
-
-/* system menu order. */
-$lang->system->menuOrder[5]  = 'team';
-$lang->system->menuOrder[10] = 'calendar';
-$lang->system->menuOrder[15] = 'dynamic';
-$lang->system->menuOrder[20] = 'view';
-
-/* admin menu order. */
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'model';
-$lang->admin->menuOrder[20] = 'custom';
-$lang->admin->menuOrder[25] = 'message';
-$lang->admin->menuOrder[30] = 'extension';
-$lang->admin->menuOrder[35] = 'dev';
-$lang->admin->menuOrder[40] = 'system';
-
-$lang->admin->subMenuOrder = new stdclass();
-$lang->admin->subMenuOrder->message[5]  = 'mail';
-$lang->admin->subMenuOrder->message[10] = 'webhook';
-$lang->admin->subMenuOrder->message[15] = 'browser';
-$lang->admin->subMenuOrder->message[20] = 'setting';
-$lang->admin->subMenuOrder->sso[5]      = 'ranzhi';
-$lang->admin->subMenuOrder->dev[5]      = 'api';
-$lang->admin->subMenuOrder->dev[10]     = 'db';
-$lang->admin->subMenuOrder->dev[15]     = 'editor';
-$lang->admin->subMenuOrder->dev[20]     = 'entry';
-$lang->admin->subMenuOrder->system[5]   = 'data';
-$lang->admin->subMenuOrder->system[10]  = 'safe';
-$lang->admin->subMenuOrder->system[15]  = 'cron';
-$lang->admin->subMenuOrder->system[20]  = 'timezone';
-$lang->admin->subMenuOrder->system[25]  = 'buildIndex';
-
-$lang->convert->menuOrder   = $lang->admin->menuOrder;
-$lang->upgrade->menuOrder   = $lang->admin->menuOrder;
-$lang->action->menuOrder    = $lang->admin->menuOrder;
-$lang->backup->menuOrder    = $lang->admin->menuOrder;
-$lang->cron->menuOrder      = $lang->admin->menuOrder;
-$lang->extension->menuOrder = $lang->admin->menuOrder;
-$lang->custom->menuOrder    = $lang->admin->menuOrder;
-$lang->mail->menuOrder      = $lang->admin->menuOrder;
-$lang->dev->menuOrder       = $lang->admin->menuOrder;
-$lang->entry->menuOrder     = $lang->admin->menuOrder;
-$lang->webhook->menuOrder   = $lang->admin->menuOrder;
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 5495f24549..acab25b119 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -64,7 +64,6 @@ $lang->required     = 'Bắt buộc';
 $lang->noData       = 'Không có dữ liệu.';
 $lang->fullscreen   = 'Fullscreen';
 $lang->retrack      = 'Retrack';
-$lang->recent       = 'Recente';
 $lang->whitelist    = 'Lista bianca';
 
 $lang->actions         = 'Hành động';
@@ -114,14 +113,13 @@ $lang->future      = 'Đang đợi';
 $lang->year        = 'Năm';
 $lang->workingHour = 'giờ';
 
-$lang->sprintCommon = $lang->iterationCommon . '/Phase';
-
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = 'Tình trạng';
 $lang->openedByAB   = 'Người tạo';
 $lang->assignedToAB = 'Giao cho';
 $lang->typeAB       = 'Loại';
+$lang->nameAB       = 'Name';
 
 $lang->common = new stdclass();
 $lang->common->common = 'Module chung';
@@ -314,12 +312,13 @@ $lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assignt
 $lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
 
 $lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
+$lang->my->contributeMenu->task     = 'Task|my|contribute|mode=task';
 if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
-$lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
-$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
+$lang->my->contributeMenu->story    = "$lang->SRCommon|my|contribute|mode=story";
+$lang->my->contributeMenu->bug      = 'Bug|my|contribute|mode=bug';
+$lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
+$lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done';
+$lang->my->contributeMenu->doc      = 'Doc|my|contribute|mode=doc&type=openedbyme';
 
 $lang->my->dividerMenu = ',myProject,team,';
 
@@ -357,7 +356,7 @@ $lang->execution->subMenu->view->tree      = 'Xem theo cây|execution|tree|execu
 $lang->execution->subMenu->qa = new stdclass();
 $lang->execution->subMenu->qa->bug      = 'Bug|execution|bug|executionID=%s';
 $lang->execution->subMenu->qa->build    = array('link' => 'Bản dựng|execution|build|executionID=%s', 'subModule' => 'build');
-$lang->execution->subMenu->qa->testtask = array('link' => 'Yêu cầu|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask');
+$lang->execution->subMenu->qa->testtask = array('link' => 'Yêu cầu|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask', 'alias' => 'create');
 
 $lang->execution->subMenu->more = new stdclass();
 $lang->execution->subMenu->more->whitelist = array('link' => 'Whitelist|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'addwhitelist');
@@ -575,45 +574,6 @@ $lang->webhook   = new stdclass();
 $lang->message   = new stdclass();
 $lang->search    = new stdclass();
 
-/* Menu group. */
-$lang->menugroup = new stdclass();
-$lang->menugroup->release     = 'product';
-$lang->menugroup->story       = 'product';
-$lang->menugroup->branch      = 'product';
-$lang->menugroup->productplan = 'product';
-$lang->menugroup->task        = 'project';
-$lang->menugroup->build       = 'project';
-$lang->menugroup->convert     = 'admin';
-$lang->menugroup->upgrade     = 'admin';
-$lang->menugroup->user        = 'company';
-$lang->menugroup->group       = 'company';
-$lang->menugroup->bug         = 'qa';
-$lang->menugroup->testcase    = 'qa';
-$lang->menugroup->case        = 'qa';
-$lang->menugroup->testtask    = 'qa';
-$lang->menugroup->testsuite   = 'qa';
-$lang->menugroup->caselib     = 'qa';
-$lang->menugroup->testreport  = 'qa';
-$lang->menugroup->people      = 'admin';
-$lang->menugroup->dept        = 'company';
-$lang->menugroup->todo        = 'my';
-$lang->menugroup->score       = 'my';
-$lang->menugroup->action      = 'admin';
-$lang->menugroup->backup      = 'admin';
-$lang->menugroup->cron        = 'admin';
-$lang->menugroup->extension   = 'admin';
-$lang->menugroup->custom      = 'admin';
-$lang->menugroup->mail        = 'admin';
-$lang->menugroup->dev         = 'admin';
-$lang->menugroup->entry       = 'admin';
-$lang->menugroup->webhook     = 'admin';
-$lang->menugroup->message     = 'admin';
-
-$lang->menugroup->repo    = 'ci';
-$lang->menugroup->jenkins = 'ci';
-$lang->menugroup->compile = 'ci';
-$lang->menugroup->job     = 'ci';
-
 /* Nav group.*/
 $lang->navGroup = new stdclass();
 $lang->navGroup->my     = 'my';
@@ -653,7 +613,7 @@ $lang->navGroup->auditplan      = 'project';
 $lang->navGroup->cm             = 'project';
 $lang->navGroup->nc             = 'project';
 $lang->navGroup->projectrelease = 'project';
-$lang->navGroup->projectbuild   = 'project';
+$lang->navGroup->build          = 'project';
 $lang->navGroup->repo           = 'project';
 $lang->navGroup->job            = 'project';
 $lang->navGroup->jenkins        = 'project';
@@ -664,6 +624,7 @@ $lang->navGroup->measrecord     = 'project';
 $lang->navGroup->execution = 'execution';
 $lang->navGroup->task      = 'execution';
 $lang->navGroup->build     = 'execution';
+$lang->navGroup->repo      = 'execution';
 
 $lang->navGroup->sqlbuilder    = 'system';
 $lang->navGroup->auditcl       = 'system';
@@ -897,7 +858,7 @@ $lang->menu->scrum->projectstory   = array('link' => $lang->SRCommon . '|project
 $lang->menu->scrum->doc            = 'Doc|doc|index|';
 $lang->menu->scrum->qa             = 'QA|qa|index';
 $lang->menu->scrum->ci             = 'Code|repo|browse';
-$lang->menu->scrum->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
+$lang->menu->scrum->build          = array('link' => 'Build|project|build|project={PROJECT}');
 $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse');
 $lang->menu->scrum->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
 $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
@@ -915,7 +876,7 @@ $lang->scrum->setMenu->group       = array('link' => 'Priv Group|project|group|p
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->index          = array('link' => 'Dashboard|project|index|project={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|execution|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|project={PROJECT}');
 $lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story');
@@ -924,7 +885,7 @@ $lang->menu->waterfall->ci             = 'Repo|repo|browse|';
 $lang->menu->waterfall->track          = array('link' => 'Track|projectstory|track', 'alias' => 'track');
 $lang->menu->waterfall->qa             = 'QA|qa|index';
 $lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
-$lang->menu->waterfall->projectbuild   = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
+$lang->menu->waterfall->build          = array('link' => 'Build|project|build|project={PROJECT}');
 $lang->menu->waterfall->dynamic        = array('link' => 'Dynamic|project|dynamic|project={PROJECT}');
 $lang->menu->waterfall->other          = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc,workestimation,durationestimation,budget,pssp,measrecord,report');
 $lang->menu->waterfall->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
@@ -964,6 +925,6 @@ $lang->projectstory->menu       = new stdclass();
 $lang->stakeholder->menu = $lang->scrum->setMenu;
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 0d3efbf150..ad5b452a85 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -9,6 +9,11 @@
  * @version     $Id: zh-cn.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+
+include (dirname(__FILE__) . '/common.php');
+
+global $config;
+
 $lang->arrow     = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
 $lang->colon     = '-';
 $lang->comma     = '，';
@@ -64,7 +69,6 @@ $lang->required     = '必填';
 $lang->noData       = '暂无';
 $lang->fullscreen   = '全屏';
 $lang->retrack      = '收起';
-$lang->recent       = '近期';
 $lang->whitelist    = '访问白名单';
 
 $lang->actions         = '操作';
@@ -105,7 +109,7 @@ $lang->select        = '选择';
 $lang->selectAll     = '全选';
 $lang->selectReverse = '反选';
 $lang->loading       = '稍候...';
-$lang->notFound      = '抱歉，您访问的对象并不存在！';
+$lang->notFound      = '抱歉，您访问的对象不存在！';
 $lang->notPage       =  '抱歉，您访问的功能正在开发中！';
 $lang->showAll       = '[[全部显示]]';
 $lang->selectedItems = '已选择 <strong>{0}</strong> 项';
@@ -114,121 +118,132 @@ $lang->future      = '未来';
 $lang->year        = '年';
 $lang->workingHour = '工时';
 
-$lang->sprintCommon = $lang->iterationCommon . '/阶段';
-
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = '状态';
 $lang->openedByAB   = '创建';
 $lang->assignedToAB = '指派';
 $lang->typeAB       = '类型';
+$lang->nameAB       = '名称';
 
-$lang->common = new stdclass();
-$lang->common->common = '公有模块';
+$lang->common->common     = '公有模块';
+$lang->my->common         = '地盘';
+$lang->program->common    = '项目集';
+$lang->product->common    = '产品';
+$lang->project->common    = '项目';
+$lang->execution->common  = $config->systemMode == 'new' ? '执行' : $lang->executionCommon;
+$lang->qa->common         = '测试';
+$lang->devops->common     = 'DevOps';
+$lang->doc->common        = '文档';
+$lang->repo->common       = '代码';
+$lang->report->common     = '统计';
+$lang->system->common     = '组织';
+$lang->admin->common      = '后台';
+$lang->task->common       = '任务';
+$lang->bug->common        = 'Bug';
+$lang->testcase->common   = '用例';
+$lang->testtask->common   = '测试单';
+$lang->score->common      = '我的积分';
+$lang->build->common      = '版本';
+$lang->testreport->common = '测试报告';
+$lang->automation->common = '自动化';
+$lang->team->common       = '团队';
+$lang->user->common       = '用户';
+$lang->custom->common     = '自定义';
+$lang->extension->common  = '插件';
+$lang->company->common    = '公司';
+$lang->dept->common       = '部门';
+$lang->program->list      = '项目集列表';
+$lang->execution->list    = "{$lang->executionCommon}列表";
 
-global $config;
-list($programModule, $programMethod)     = explode('-', $config->programLink);
-list($productModule, $productMethod)     = explode('-', $config->productLink);
-list($projectModule, $projectMethod)     = explode('-', $config->projectLink);
-list($executionModule, $executionMethod) = explode('-', $config->executionLink);
+$lang->personnel->common     = '人员';
+$lang->personnel->invest     = '投入人员';
+$lang->personnel->accessible = '可访问人员';
 
-/* 主导航菜单。*/
-$lang->mainNav = new stdclass();
-$lang->mainNav->my      = '<i class="icon icon-menu-my"></i> 地盘|my|index|';
-$lang->mainNav->product = "<i class='icon icon-product'></i> 产品|$productModule|$productMethod|";
-if($config->systemMode == 'new')
-{
-    $lang->mainNav->project   = "<i class='icon icon-project'></i> 项目|$projectModule|$projectMethod|";
-    $lang->mainNav->execution = "<i class='icon icon-run'></i> 执行|$executionModule|$executionMethod|";
-}
-else
-{
-    $lang->mainNav->execution = "<i class='icon icon-run'></i> $lang->executionCommon|$executionModule|$executionMethod|";
-}
-$lang->mainNav->qa      = '<i class="icon icon-test"></i> 测试|qa|index|';
-$lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代码|repo|browse|';
-$lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文档|doc|index|';
-$lang->mainNav->report  = "<i class='icon icon-statistic'></i> 统计|report|productSummary|";
-$lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|my|team|';
-$lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
-if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> 项目集|$programModule|$programMethod|";
+$lang->stakeholder->common = '干系人';
+$lang->release->common     = '发布';
+$lang->message->common     = '通知';
+$lang->mail->common        = '邮件';
 
-$lang->dividerMenu = ',qa,report,admin,';
+$lang->my->shortCommon          = '地盘';
+$lang->testcase->shortCommon    = '用例';
+$lang->productplan->shortCommon = '计划';
+$lang->score->shortCommon       = '积分';
+$lang->testreport->shortCommon  = '报告';
+$lang->qa->shortCommon          = 'QA';
 
-/* Program set menu. */
-$lang->program = new stdclass();
-$lang->program->menu = new stdclass();
-//$lang->program->menu->index  = '仪表盘|program|index|';
-$lang->program->menu->browse = array('link' => '项目集|program|browse|');
+$lang->dashboard  = '仪表盘';
+$lang->contribute = '贡献';
+$lang->dynamic    = '动态';
+$lang->contact    = '联系人';
+$lang->whitelist  = '白名单';
+$lang->roadmap    = '路线图';
+$lang->track      = '矩阵';
+$lang->settings   = '设置';
+$lang->overview   = '概况';
+$lang->module     = '模块';
+$lang->priv       = '权限';
+$lang->design     = '设计';
+$lang->other      = '其他';
+$lang->estimation = '估算';
+$lang->issue      = '问题';
+$lang->risk       = '风险';
+$lang->measure    = '度量';
+$lang->treeView   = '树状图';
+$lang->groupView  = '分组视图';
+$lang->kanban     = '看板';
+$lang->burn       = '燃尽图';
+$lang->view       = '视图';
+$lang->intro      = '介绍';
+$lang->indexPage  = '首页';
+$lang->model      = '模型';
+$lang->redev      = '二次开发';
+$lang->browser    = '浏览器';
+$lang->db         = '数据库';
+$lang->editor     = '编辑器';
+$lang->timezone   = '时区';
+$lang->security   = '安全';
+$lang->calendar   = '日程';
 
-$lang->project = new stdclass();
-$lang->project->menu = new stdclass();
-if($config->systemMode == 'new')
-{
-    $lang->project->menu->browse = array('link' => '项目|project|browse|');
-}
-else
-{
-    $lang->project->menu->browse = array('link' => "$lang->executionCommon|project|browse|");
-}
+$lang->my->work = '待处理';
 
-$lang->project->dividerMenu = ',execution,programplan,doc,dynamic,';
+$lang->project->list = '项目列表';
 
-$lang->program->viewMenu = new stdclass();
-$lang->program->viewMenu->product     = array('link' => '产品|program|product|program=%s', 'alias' => 'view');
-$lang->program->viewMenu->project     = array('link' => "项目|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "人员|personnel|invest|program=%s");
-$lang->program->viewMenu->stakeholder = array('link' => "干系人|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
+$lang->execution->list = "{$lang->executionCommon}列表";
 
-$lang->personnel = new stdClass();
-$lang->personnel->menu = new stdClass();
-$lang->personnel->menu->invest    = array('link' => "投入人员|personnel|invest|program=%s");
-$lang->personnel->menu->accessible = array('link' => "可访问人员|personnel|accessible|program=%s");
-$lang->personnel->menu->whitelist  = array('link' => "白名单|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
+$lang->doc->recent    = '最近文档';
+$lang->doc->my        = '我的文档';
+$lang->doc->favorite  = '我的收藏';
+$lang->doc->product   = '产品库';
+$lang->doc->project   = '项目库';
+$lang->doc->execution = "{$lang->executionCommon}库";
+$lang->doc->custom    = '自定义库';
+$lang->doc->wiki      = 'WIKI';
 
-/* Scrum menu. */
-$lang->product = new stdclass();
-$lang->product->menu = new stdclass();
-$lang->product->menu->home = '仪表盘|product|index|';
-$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit,manageline');
+$lang->product->list = $lang->productCommon . '列表';
 
-$lang->product->viewMenu = new stdclass();
-$lang->product->viewMenu->dashboard   = array('link' => '仪表盘|product|dashboard|productID=%s');
-if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->story       = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->plan        = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan');
-$lang->product->viewMenu->release     = array('link' => '发布|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->viewMenu->roadmap     = '路线图|product|roadmap|productID=%s';
-$lang->product->viewMenu->project     = "项目|product|project|status=all&productID=%s";
-$lang->product->viewMenu->track       = array('link' => "矩阵|story|track|productID=%s");
-$lang->product->viewMenu->doc         = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->dynamic     = '动态|product|dynamic|productID=%s';
-$lang->product->viewMenu->set         = array('link' => '设置|product|view|productID=%s', 'subModule' => 'tree,branch', 'alias' => 'edit');
+$lang->project->report = '报告';
 
-$lang->product->setMenu = new stdclass();
-$lang->product->setMenu->view      = array('link' => '概况|product|view|productID={PRODUCT}', 'alias' => 'edit');
-$lang->product->setMenu->module    = array('link' => '模块|tree|browse|product={PRODUCT}&view=story', 'subModule' => 'tree');
-$lang->product->setMenu->branch    = array('link' => '@branch@|branch|manage|product={PRODUCT}', 'subModule' => 'branch');
-$lang->product->setMenu->whitelist = array('link' => '白名单|product|whitelist|product={PRODUCT}', 'subModule' => 'personnel');
+$lang->report->weekly = '周报';
+$lang->report->annual = '年度总结';
+$lang->report->notice = new stdclass();
+$lang->report->notice->help = '注：统计报表的数据来源于列表页面的检索结果，生成统计报表前请先在列表页面进行检索。比如列表页面我们检索的是%tab%，那么报表就是基于之前检索的%tab%的结果集进行统计。';
 
-$lang->release     = new stdclass();
-$lang->branch      = new stdclass();
-$lang->productplan = new stdclass();
+$lang->testcase->case      = '用例';
+$lang->testcase->testsuite = '套件';
+$lang->testcase->caselib   = '用例库';
 
-$lang->release->menu     = $lang->product->viewMenu;
-$lang->branch->menu      = $lang->product->menu;
-$lang->productplan->menu = $lang->product->menu;
+$lang->devops->compile = '构建';
+$lang->devops->repo    = '版本库';
+$lang->devops->rules   = '指令';
 
-/* System menu. */
-$lang->system = new stdclass();
-$lang->system->menu = new stdclass();
-$lang->system->menu->team     = array('link' => '团队|my|team|', 'subModule' => 'user');
-$lang->system->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->system->menu->dynamic  = '动态|company|dynamic|';
-$lang->system->menu->view     = array('link' => '公司|company|view');
+$lang->admin->system     = '系统';
+$lang->admin->entry      = '应用';
+$lang->admin->data       = '数据';
+$lang->admin->cron       = '定时';
+$lang->admin->buildIndex = '重建索引';
 
-$lang->measurement = new stdclass();
-$lang->measurement->menu = new stdclass();
+$lang->storyConcept = '需求概念';
 
 $lang->searchTips = '';
 $lang->searchAB   = '搜索';
@@ -279,437 +294,6 @@ $lang->themes['pink']       = '芙蕖粉';
 $lang->themes['blackberry'] = '露莓黑';
 $lang->themes['classic']    = '经典蓝';
 
-/* 首页菜单设置。*/
-$lang->index = new stdclass();
-$lang->index->menu = new stdclass();
-
-$lang->index->menu->product = "浏览{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "浏览{$lang->executionCommon}|project|browse";
-
-/* 我的地盘菜单设置。*/
-$lang->my = new stdclass();
-$lang->my->menu = new stdclass();
-
-$lang->my->menu->index       = '仪表盘|my|index';
-$lang->my->menu->myWork      = array('link' => '待处理|my|work|mode=task');
-if($config->systemMode == 'new')
-{
-    $lang->my->menu->myProject   = array('link' => '项目|my|project|');
-    $lang->my->menu->myExecution = '执行|my|execution|type=undone';
-}
-else
-{
-    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
-}
-$lang->my->menu->contribute  = array('link' => '贡献|my|contribute|mode=task');
-$lang->my->menu->dynamic     = '动态|my|dynamic|';
-$lang->my->menu->score       = array('link' => '积分|my|score|', 'subModule' => 'score');
-$lang->my->menu->contacts    = '联系人|my|managecontacts|';
-
-$lang->my->workMenu = new stdclass();
-$lang->my->workMenu->task        = '任务|my|work|mode=task';
-if($config->URAndSR) $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
-$lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
-$lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testcase    = '用例|my|work|mode=testcase&type=assigntome';
-$lang->my->workMenu->testtask    = '测试单|my|work|mode=testtask&type=wait';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->task        = '任务|my|contribute|mode=task';
-if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
-$lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testcase    = '用例|my|contribute|mode=testcase&type=openedbyme';
-$lang->my->contributeMenu->testtask    = '测试单|my|contribute|mode=testtask&type=done';
-
-$lang->my->dividerMenu = ',myWork,score,';
-
-$lang->todo       = new stdclass();
-$lang->todo->menu = $lang->my->menu;
-
-$lang->product->dividerMenu = $config->URAndSR ? ',requirement,set,' : ',track,set,';
-
-$lang->story = new stdclass();
-
-$lang->story->menu = $lang->product->menu;
-
-/* 执行视图菜单设置。*/
-$lang->execution = new stdclass();
-$lang->execution->homeMenu = new stdclass();
-$lang->execution->homeMenu->index = '仪表盘|execution|index|';
-$lang->execution->homeMenu->list  = array('link' => '执行|execution|all|', 'alias' => 'batchedit');
-
-$lang->execution->menu = new stdclass();
-$lang->execution->menu->task     = array('link' => '任务|execution|task|executionID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
-$lang->execution->menu->kanban   = array('link' => '看板|execution|kanban|executionID=%s');
-$lang->execution->menu->burn     = array('link' => '燃尽图|execution|burn|executionID=%s');
-$lang->execution->menu->view     = array('link' => '视图|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->execution->menu->story    = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
-$lang->execution->menu->qa       = array('link' => '测试|execution|qa|', 'alias' => 'qa,bug,testcase,testtask,testreport');
-$lang->execution->menu->repo     = array('link' => '代码|repo|browse|projectID=%s');
-$lang->execution->menu->doc      = array('link' => '文档|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc');
-$lang->execution->menu->build    = array('link' => '版本|execution|build|executionID=%s', 'subModule' => 'build');
-$lang->execution->menu->release  = array('link' => '发布|projectrelease|browse|project=%s');
-$lang->execution->menu->action   = array('link' => '动态|execution|dynamic|executionID=%s');
-$lang->execution->menu->setting  = array('link' => '设置|execution|view|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit,manageproducts,team,whitelist,addwhitelist,managemembers', 'class' => 'dropdown dropdown-hover');
-
-$lang->execution->viewMenu = new stdclass();
-$lang->execution->viewMenu->groupTask = '分组视图|execution|grouptask|executionID=%s';
-$lang->execution->viewMenu->tree      = '树状图|execution|tree|executionID=%s';
-
-$lang->execution->qaMenu = new stdclass();
-$lang->execution->qaMenu->qa         = array('link' => '仪表盘|execution|qa|executionID=%s');
-$lang->execution->qaMenu->bug        = array('link' => 'Bug|execution|bug|executionID=%s');
-$lang->execution->qaMenu->testcase   = array('link' => '用例|execution|testcase|executionID=%s');
-$lang->execution->qaMenu->testtask   = array('link' => '测试单|execution|testtask|executionID=%s');
-$lang->execution->qaMenu->testreport = array('link' => '报告|execution|testreport|exeutionID=%s');
-
-$lang->execution->settingMenu = new stdclass();
-$lang->execution->settingMenu = new stdclass();
-$lang->execution->settingMenu->view      = array('link' => '概况|execution|view|executionID={EXECUTION}', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
-$lang->execution->settingMenu->products  = $lang->productCommon . '|execution|manageproducts|executionID={EXECUTION}';
-$lang->execution->settingMenu->team      = array('link' => '团队|execution|team|executionID={EXECUTION}', 'alias' => 'managemembers');
-$lang->execution->settingMenu->whitelist = array('link' => '白名单|execution|whitelist|executionID={EXECUTION}', 'subModule' => 'personnel', 'alias' => 'addwhitelist');
-
-$lang->execution->dividerMenu = ',story,build,setting,';
-
-$lang->task  = new stdclass();
-$lang->build = new stdclass();
-$lang->task->menu  = $lang->execution->menu;
-$lang->build->menu = $lang->execution->menu;
-
-/* QA视图菜单设置。*/
-$lang->qa = new stdclass();
-$lang->qa->menu = new stdclass();
-
-$lang->qa->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->qa->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto');
-$lang->qa->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'subModule' => 'testsuite,caselib', 'class' => 'dropdown dropdown-hover');
-$lang->qa->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult', 'class' => 'dropdown dropdown-hover');
-$lang->qa->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->qa->subMenu = new stdclass();
-$lang->qa->subMenu->testcase = new stdclass();
-$lang->qa->subMenu->testcase->feature   = array('link' => '功能测试|testcase|browse|productID=%s', 'subModule' => 'testcase,tree,story');
-$lang->qa->subMenu->testcase->unit      = array('link' => '单元测试|testtask|browseUnits|productID=%s', 'alias' => 'browseunits');
-$lang->qa->subMenu->testcase->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'subModule' => 'testsuite');
-$lang->qa->subMenu->testcase->caselib   = array('link' => '用例库|caselib|browse|libID=0');
-
-$lang->qa->subMenu->testtask = new stdclass();
-$lang->qa->subMenu->testtask->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
-$lang->qa->subMenu->testtask->report   = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
-
-$lang->qa->subMenu->automation = new stdclass();
-$lang->qa->subMenu->automation->browse      = array('link' => '介绍|automation|browse|productID=%s', 'alias' => '');
-//$lang->qa->subMenu->automation->framework   = array('link' => '框架|automation|framework|productID=%s', 'alias' => '');
-//$lang->qa->subMenu->automation->data        = array('link' => '数据|automation|date|productID=%s', 'alias' => '');
-//$lang->qa->subMenu->automation->interface   = array('link' => '接口|automation|interface|productID=%s', 'alias' => '');
-//$lang->qa->subMenu->automation->environment = array('link' => '环境|automation|environment|productID=%s', 'alias' => '');
-
-$lang->bug = new stdclass();
-$lang->bug->menu = new stdclass();
-$lang->bug->subMenu = $lang->qa->subMenu;
-
-$lang->bug->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->bug->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
-$lang->bug->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->bug->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->bug->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->testcase = new stdclass();
-$lang->testcase->menu = new stdclass();
-$lang->testcase->subMenu = $lang->qa->subMenu;
-$lang->testcase->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->testcase->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testcase->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story', 'class' => 'dropdown dropdown-hover');
-$lang->testcase->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testcase->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->testtask = new stdclass();
-$lang->testtask->menu = new stdclass();
-$lang->testtask->subMenu = $lang->qa->subMenu;
-$lang->testtask->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->testtask->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testtask->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testtask->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testtask->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->testsuite = new stdclass();
-$lang->testsuite->menu = new stdclass();
-$lang->testsuite->subMenu = $lang->qa->subMenu;
-$lang->testsuite->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->testsuite->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testsuite->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'subModule' => 'testsuite', 'class' => 'dropdown dropdown-hover');
-$lang->testsuite->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testsuite->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->testreport = new stdclass();
-$lang->testreport->menu = new stdclass();
-$lang->testreport->subMenu = $lang->qa->subMenu;
-$lang->testreport->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->testreport->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testreport->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testreport->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'subModule' => 'testreport', 'class' => 'dropdown dropdown-hover');
-$lang->testreport->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->caselib = new stdclass();
-$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
-$lang->caselib->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->caselib->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->caselib->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'subModule' => 'caselib', 'class' => 'dropdown dropdown-hover');
-$lang->caselib->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->caselib->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->automation = new stdclass();
-$lang->automation->menu = new stdclass();
-$lang->automation->subMenu = $lang->qa->subMenu;
-$lang->automation->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->automation->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->automation->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->automation->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'subModule' => 'testreport', 'class' => 'dropdown dropdown-hover');
-$lang->automation->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
-
-$lang->ci = new stdclass();
-$lang->ci->menu = new stdclass();
-$lang->ci->menu->code     = array('link' => '代码|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
-$lang->ci->menu->build    = array('link' => '构建|job|browse', 'subModule' => 'compile,job');
-$lang->ci->menu->jenkins  = array('link' => 'Jenkins|jenkins|browse', 'alias' => 'create,edit');
-$lang->ci->menu->maintain = array('link' => '版本库|repo|maintain', 'alias' => 'create,edit');
-$lang->ci->menu->rules    = array('link' => '指令|repo|setrules');
-
-$lang->repo          = new stdclass();
-$lang->jenkins       = new stdclass();
-$lang->compile       = new stdclass();
-$lang->job           = new stdclass();
-$lang->repo->menu    = $lang->ci->menu;
-$lang->jenkins->menu = $lang->ci->menu;
-$lang->compile->menu = $lang->ci->menu;
-$lang->job->menu     = $lang->ci->menu;
-
-/* 文档视图菜单设置。*/
-$lang->doc = new stdclass();
-$lang->doc->menu = new stdclass();
-
-$lang->svn = new stdclass();
-$lang->git = new stdclass();
-
-/* 发布视图菜单设置。*/
-$lang->projectrelease = new stdclass();
-$lang->projectrelease->menu = new stdclass();
-
-/* 统计视图菜单设置。*/
-$lang->report = new stdclass();
-$lang->report->menu = new stdclass();
-
-$lang->report->menu->annual    = array('link' => '年度总结|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
-$lang->report->menu->product   = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->execution = array('link' => '执行|report|executiondeviation');
-$lang->report->menu->test      = array('link' => '测试|report|bugcreate', 'alias' => 'bugassign');
-$lang->report->menu->staff     = array('link' => '组织|report|workload');
-
-$lang->report->notice = new stdclass();
-$lang->report->notice->help = '注：统计报表的数据来源于列表页面的检索结果，生成统计报表前请先在列表页面进行检索。比如列表页面我们检索的是%tab%，那么报表就是基于之前检索的%tab%的结果集进行统计。';
-
-/* 组织结构视图菜单设置。*/
-$lang->company = new stdclass();
-$lang->dept    = new stdclass();
-$lang->group   = new stdclass();
-$lang->user    = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->dept->menu    = new stdclass();
-$lang->group->menu   = new stdclass();
-$lang->user->menu    = new stdclass();
-
-$lang->company = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->company->menu->browseUser  = array('link' => '用户|company|browse', 'subModule' => ',user,');
-$lang->company->menu->dept        = array('link' => '部门|dept|browse', 'subModule' => 'dept');
-$lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group');
-
-/* 后台管理菜单设置。*/
-$lang->admin = new stdclass();
-$lang->admin->menu = new stdclass();
-$lang->admin->menu->index     = array('link' => '首页|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company   = array('link' => '人员|company|browse|', 'subModule' => ',user,dept,group,');
-$lang->admin->menu->model     = array('link' => '模型|custom|browsestoryconcept|', 'subModule' => 'holiday');
-$lang->admin->menu->custom    = array('link' => '自定义|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->system    = array('link' => '系统|backup|index', 'subModule' => 'cron,backup,action');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
-
-$lang->dept->menu  = $lang->company->menu;
-$lang->group->menu = $lang->company->menu;
-$lang->user->menu  = $lang->company->menu;
-
-$lang->admin->subMenu = new stdclass();
-$lang->admin->subMenu->message = new stdclass();
-$lang->admin->subMenu->message->mail    = array('link' => '邮件|mail|index', 'subModule' => 'mail');
-$lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
-$lang->admin->subMenu->message->browser = array('link' => '浏览器|message|browser');
-$lang->admin->subMenu->message->setting = array('link' => '设置|message|setting');
-
-$lang->admin->subMenu->sso = new stdclass();
-$lang->admin->subMenu->sso->ranzhi = 'ZDOO|admin|sso';
-
-$lang->admin->subMenu->dev = new stdclass();
-$lang->admin->subMenu->dev->api    = array('link' => 'API|dev|api');
-$lang->admin->subMenu->dev->db     = array('link' => '数据库|dev|db');
-$lang->admin->subMenu->dev->editor = array('link' => '编辑器|dev|editor');
-$lang->admin->subMenu->dev->entry  = array('link' => '应用|entry|browse', 'subModule' => 'entry');
-
-$lang->admin->subMenu->system = new stdclass();
-$lang->admin->subMenu->system->data       = array('link' => '数据|backup|index', 'subModule' => 'action');
-$lang->admin->subMenu->system->safe       = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
-$lang->admin->subMenu->system->cron       = array('link' => '定时|cron|index', 'subModule' => 'cron');
-$lang->admin->subMenu->system->timezone   = array('link' => '时区|custom|timezone', 'subModule' => 'custom');
-$lang->admin->subMenu->system->buildIndex = array('link' => '重建索引|search|buildindex|');
-
-$lang->admin->dividerMenu = ',company,message,system,';
-
-$lang->convert   = new stdclass();
-$lang->upgrade   = new stdclass();
-$lang->action    = new stdclass();
-$lang->backup    = new stdclass();
-$lang->extension = new stdclass();
-$lang->custom    = new stdclass();
-$lang->mail      = new stdclass();
-$lang->cron      = new stdclass();
-$lang->dev       = new stdclass();
-$lang->entry     = new stdclass();
-$lang->webhook   = new stdclass();
-$lang->message   = new stdclass();
-$lang->search    = new stdclass();
-
-/* 菜单分组。*/
-$lang->menugroup = new stdclass();
-$lang->menugroup->release     = 'product';
-$lang->menugroup->story       = 'product';
-$lang->menugroup->branch      = 'product';
-$lang->menugroup->productplan = 'product';
-$lang->menugroup->task        = 'project';
-$lang->menugroup->build       = 'project';
-$lang->menugroup->convert     = 'admin';
-$lang->menugroup->upgrade     = 'admin';
-$lang->menugroup->user        = 'company';
-$lang->menugroup->group       = 'company';
-$lang->menugroup->bug         = 'qa';
-$lang->menugroup->case        = 'qa';
-$lang->menugroup->testreport  = 'qa';
-$lang->menugroup->people      = 'admin';
-$lang->menugroup->dept        = 'company';
-$lang->menugroup->todo        = 'my';
-$lang->menugroup->score       = 'my';
-$lang->menugroup->action      = 'admin';
-$lang->menugroup->backup      = 'admin';
-$lang->menugroup->cron        = 'admin';
-$lang->menugroup->extension   = 'admin';
-$lang->menugroup->custom      = 'admin';
-$lang->menugroup->mail        = 'admin';
-$lang->menugroup->dev         = 'admin';
-$lang->menugroup->entry       = 'admin';
-$lang->menugroup->webhook     = 'admin';
-$lang->menugroup->message     = 'admin';
-
-$lang->menugroup->repo    = 'ci';
-$lang->menugroup->jenkins = 'ci';
-$lang->menugroup->compile = 'ci';
-$lang->menugroup->job     = 'ci';
-
-/* Nav group.*/
-$lang->navGroup = new stdclass();
-$lang->navGroup->my     = 'my';
-$lang->navGroup->effort = 'my';
-$lang->navGroup->score  = 'my';
-
-$lang->navGroup->program   = 'program';
-$lang->navGroup->personnel = 'program';
-
-$lang->navGroup->product     = 'product';
-$lang->navGroup->productplan = 'product';
-$lang->navGroup->release     = 'product';
-$lang->navGroup->branch      = 'product';
-$lang->navGroup->story       = 'product';
-$lang->navGroup->tree        = 'product';
-
-$lang->navGroup->project     = 'project';
-$lang->navGroup->qa          = 'project';
-$lang->navGroup->bug         = 'project';
-$lang->navGroup->doc         = 'project';
-$lang->navGroup->testcase    = 'project';
-$lang->navGroup->testtask    = 'project';
-$lang->navGroup->testreport  = 'project';
-$lang->navGroup->testsuite   = 'project';
-$lang->navGroup->caselib     = 'project';
-$lang->navGroup->feedback    = 'project';
-$lang->navGroup->deploy      = 'project';
-$lang->navGroup->stakeholder = 'project';
-
-$lang->navGroup->projectstory   = 'project';
-$lang->navGroup->review         = 'project';
-$lang->navGroup->reviewissue    = 'project';
-$lang->navGroup->milestone      = 'project';
-$lang->navGroup->pssp           = 'project';
-$lang->navGroup->auditplan      = 'project';
-$lang->navGroup->cm             = 'project';
-$lang->navGroup->nc             = 'project';
-$lang->navGroup->projectrelease = 'project';
-$lang->navGroup->projectbuild   = 'project';
-$lang->navGroup->repo           = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
-$lang->navGroup->report         = 'project';
-$lang->navGroup->measrecord     = 'project';
-
-$lang->navGroup->execution = 'execution';
-$lang->navGroup->task      = 'execution';
-$lang->navGroup->build     = 'execution';
-
-$lang->navGroup->company       = 'system';
-$lang->navGroup->sqlbuilder    = 'system';
-$lang->navGroup->auditcl       = 'system';
-$lang->navGroup->cmcl          = 'system';
-$lang->navGroup->todo          = 'system';
-$lang->navGroup->ldap          = 'system';
-$lang->navGroup->process       = 'system';
-$lang->navGroup->activity      = 'system';
-$lang->navGroup->zoutput       = 'system';
-$lang->navGroup->classify      = 'system';
-$lang->navGroup->subject       = 'system';
-$lang->navGroup->baseline      = 'system';
-$lang->navGroup->reviewcl      = 'system';
-$lang->navGroup->reviewsetting = 'system';
-
-$lang->navGroup->attend   = 'attend';
-$lang->navGroup->leave    = 'attend';
-$lang->navGroup->makeup   = 'attend';
-$lang->navGroup->overtime = 'attend';
-$lang->navGroup->lieu     = 'attend';
-
-$lang->navGroup->admin     = 'admin';
-$lang->navGroup->dept      = 'admin';
-$lang->navGroup->user      = 'admin';
-$lang->navGroup->group     = 'admin';
-$lang->navGroup->dept      = 'admin';
-$lang->navGroup->webhook   = 'admin';
-$lang->navGroup->sms       = 'admin';
-$lang->navGroup->message   = 'admin';
-$lang->navGroup->custom    = 'admin';
-$lang->navGroup->cron      = 'admin';
-$lang->navGroup->backup    = 'admin';
-$lang->navGroup->mail      = 'admin';
-$lang->navGroup->dev       = 'admin';
-$lang->navGroup->entry     = 'admin';
-$lang->navGroup->extension = 'admin';
-$lang->navGroup->action    = 'admin';
-$lang->navGroup->search    = 'admin';
-
 /* 错误提示信息。*/
 $lang->error = new stdclass();
 $lang->error->companyNotFound = "您访问的域名 %s 没有对应的公司。";
@@ -823,168 +407,4 @@ $lang->datepicker->dayNames     = array('星期日', '星期一', '星期二', '
 $lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五', '六');
 $lang->datepicker->monthNames   = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
 
-/* Common action icons 通用动作图标 */
-$lang->icons['todo']      = 'check';
-$lang->icons['product']   = 'product';
-$lang->icons['bug']       = 'bug';
-$lang->icons['task']      = 'check-sign';
-$lang->icons['tasks']     = 'tasks';
-$lang->icons['program']   = 'program';
-$lang->icons['project']   = 'project';
-$lang->icons['stage']     = 'waterfall';
-$lang->icons['sprint']    = 'sprint';
-$lang->icons['doc']       = 'file-text';
-$lang->icons['doclib']    = 'folder-close';
-$lang->icons['story']     = 'lightbulb';
-$lang->icons['release']   = 'tags';
-$lang->icons['roadmap']   = 'code-fork';
-$lang->icons['plan']      = 'flag';
-$lang->icons['dynamic']   = 'volume-up';
-$lang->icons['build']     = 'tag';
-$lang->icons['test']      = 'check';
-$lang->icons['testtask']  = 'check';
-$lang->icons['group']     = 'group';
-$lang->icons['team']      = 'group';
-$lang->icons['company']   = 'sitemap';
-$lang->icons['user']      = 'user';
-$lang->icons['dept']      = 'sitemap';
-$lang->icons['tree']      = 'sitemap';
-$lang->icons['usecase']   = 'sitemap';
-$lang->icons['testcase']  = 'sitemap';
-$lang->icons['result']    = 'list-alt';
-$lang->icons['mail']      = 'envelope';
-$lang->icons['trash']     = 'trash';
-$lang->icons['extension'] = 'th-large';
-$lang->icons['app']       = 'th-large';
-
-$lang->icons['results']            = 'list-alt';
-$lang->icons['create']             = 'plus';
-$lang->icons['post']               = 'edit';
-$lang->icons['batchCreate']        = 'plus-sign';
-$lang->icons['batchEdit']          = 'edit-sign';
-$lang->icons['batchClose']         = 'off';
-$lang->icons['edit']               = 'edit';
-$lang->icons['delete']             = 'close';
-$lang->icons['copy']               = 'copy';
-$lang->icons['report']             = 'bar-chart';
-$lang->icons['export']             = 'export';
-$lang->icons['report-file']        = 'file-powerpoint';
-$lang->icons['import']             = 'import';
-$lang->icons['finish']             = 'checked';
-$lang->icons['resolve']            = 'check';
-$lang->icons['start']              = 'play';
-$lang->icons['restart']            = 'play';
-$lang->icons['run']                = 'run';
-$lang->icons['runCase']            = 'run';
-$lang->icons['batchRun']           = 'play-sign';
-$lang->icons['assign']             = 'hand-right';
-$lang->icons['assignTo']           = 'hand-right';
-$lang->icons['change']             = 'fork';
-$lang->icons['link']               = 'link';
-$lang->icons['close']              = 'off';
-$lang->icons['activate']           = 'magic';
-$lang->icons['review']             = 'glasses';
-$lang->icons['confirm']            = 'search';
-$lang->icons['confirmBug']         = 'search';
-$lang->icons['putoff']             = 'calendar';
-$lang->icons['suspend']            = 'pause';
-$lang->icons['pause']              = 'pause';
-$lang->icons['cancel']             = 'ban-circle';
-$lang->icons['recordEstimate']     = 'time';
-$lang->icons['customFields']       = 'cogs';
-$lang->icons['manage']             = 'cog';
-$lang->icons['unlock']             = 'unlock-alt';
-$lang->icons['confirmStoryChange'] = 'search';
-$lang->icons['score']              = 'tint';
-
-/* Scrum menu. */
-$lang->menu = new stdclass();
-$lang->menu->scrum = new stdclass();
-$lang->menu->scrum->index          = '仪表盘|project|index|project={PROJECT}';
-$lang->menu->scrum->execution      = "$lang->executionCommon|execution|all|status=all&projectID={PROJECT}&from=project";
-$lang->menu->scrum->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story', 'alias' => 'story,track');
-$lang->menu->scrum->doc            = '文档|doc|index|';
-$lang->menu->scrum->qa             = array('link' => '测试|qa|index', 'subModule' => 'testcase,testtask');
-$lang->menu->scrum->ci             = '代码|repo|browse';
-$lang->menu->scrum->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
-$lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse|project={PROJECT}');
-$lang->menu->scrum->dynamic        = array('link' => '动态|project|dynamic|project={PROJECT}');
-$lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->projectQa = new stdclass();
-$lang->projectQa->menu = new stdclass();
-$lang->projectQa->menu->index      = array('link' => '仪表盘|qa|index');
-$lang->projectQa->menu->bug        = array('link' => 'Bug|bug|browse|productID=%s', 'subModule' => 'bug');
-$lang->projectQa->menu->testcase   = array('link' => '用例|testcase|browse|productID=%s', 'subModule' => 'testsuite,testcase,caselib');
-$lang->projectQa->menu->testtask   = array('link' => '测试单|testtask|browse|productID=%s', 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
-
-$lang->projectQa->subMenu = new stdclass();
-$lang->projectQa->subMenu->testtask = new stdclass();
-$lang->projectQa->subMenu->testtask->testtask = array('link' => '测试单|testtask|browse|productID=%s');
-$lang->projectQa->subMenu->testtask->report   = array('link' => '报告|testreport|browse|productID=%s');
-
-$lang->scrum = new stdclass();
-$lang->scrum->setMenu = new stdclass();
-$lang->scrum->setMenu->view        = array('link' => '概况|project|view|project={PROJECT}', 'alias' => 'edit');
-$lang->scrum->setMenu->products    = array('link' => '产品|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts');
-$lang->scrum->setMenu->members     = array('link' => '团队|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers');
-$lang->scrum->setMenu->whitelist   = array('link' => '白名单|project|whitelist|project={PROJECT}', 'subModule' => 'personnel');
-$lang->scrum->setMenu->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->scrum->setMenu->group       = array('link' => '权限|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv');
-
-/* Waterfall menu. */
-$lang->menu->waterfall = new stdclass();
-$lang->menu->waterfall->index          = array('link' => '仪表盘|project|index|project={PROJECT}');
-$lang->menu->waterfall->programplan    = array('link' => '计划|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
-$lang->menu->waterfall->doc            = array('link' => '文档|doc|index|project={PROJECT}');
-$lang->menu->waterfall->weekly         = array('link' => '报告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story');
-$lang->menu->waterfall->design         = '设计|design|browse|product={PRODUCT}';
-$lang->menu->waterfall->ci             = '代码|repo|browse|';
-$lang->menu->waterfall->track          = array('link' => '矩阵|projectstory|track', 'alias' => 'track');
-$lang->menu->waterfall->qa             = '测试|qa|index';
-$lang->menu->waterfall->projectrelease = array('link' => '发布|projectrelease|browse');
-$lang->menu->waterfall->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
-$lang->menu->waterfall->dynamic        = array('link' => '动态|project|dynamic|project={PROJECT}');
-$lang->menu->waterfall->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc,workestimation,durationestimation,budget,pssp,measrecord,report');
-$lang->menu->waterfall->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->waterfall = new stdclass();
-$lang->waterfall->subMenu = new stdclass();
-$lang->waterfall->subMenu->other = new stdclass();
-$lang->waterfall->subMenu->other->estimation  = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'workestimation,durationestimation,budget');
-$lang->waterfall->subMenu->other->issue       = array('link' => '问题|issue|browse|', 'subModule' => 'issue');
-$lang->waterfall->subMenu->other->risk        = array('link' => '风险|risk|browse|', 'subModule' => 'risk');
-$lang->waterfall->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->other->report      = array('link' => '度量|report|projectsummary|project=%s', 'subModule' => ',report,measrecord');
-$lang->waterfall->subMenu->other->auditplan   = array('link' => 'QA|auditplan|browse|', 'subModule' => 'nc');
-
-$lang->waterfall->setMenu = new stdclass();
-$lang->waterfall->setMenu = $lang->scrum->setMenu;
-
-$lang->waterfallproduct   = new stdclass();
-$lang->review             = new stdclass();
-$lang->milestone          = new stdclass();
-$lang->auditplan          = new stdclass();
-$lang->cm                 = new stdclass();
-$lang->nc                 = new stdclass();
-$lang->pssp               = new stdclass();
-$lang->stakeholder        = new stdclass();
-$lang->projectstory       = new stdclass();
-
-$lang->review->menu             = new stdclass();
-$lang->milestone->menu          = new stdclass();
-$lang->auditplan->menu          = new stdclass();
-$lang->cm->menu                 = new stdclass();
-$lang->pssp->menu               = new stdclass();
-$lang->stakeholder->menu        = new stdclass();
-$lang->waterfallproduct->menu   = new stdclass();
-$lang->projectstory->menu       = new stdclass();
-
-$lang->stakeholder->menu = $lang->scrum->setMenu;
-
-$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry');
-
-include (dirname(__FILE__) . '/menuOrder.php');
+include (dirname(__FILE__) . '/menu.php');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 93208c2619..f314c4182e 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -6,9 +6,14 @@
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     ZenTaoPMS
- * @version     $Id: zh-cn.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+
+include (dirname(__FILE__) . '/common.php');
+
+global $config;
+
 $lang->arrow     = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
 $lang->colon     = '-';
 $lang->comma     = '，';
@@ -64,7 +69,6 @@ $lang->required     = '必填';
 $lang->noData       = '暫無';
 $lang->fullscreen   = '全屏';
 $lang->retrack      = '收起';
-$lang->recent       = '近期';
 $lang->whitelist    = '訪問白名單';
 
 $lang->actions         = '操作';
@@ -105,7 +109,7 @@ $lang->select        = '選擇';
 $lang->selectAll     = '全選';
 $lang->selectReverse = '反選';
 $lang->loading       = '稍候...';
-$lang->notFound      = '抱歉，您訪問的對象並不存在！';
+$lang->notFound      = '抱歉，您訪問的對象不存在！';
 $lang->notPage       =  '抱歉，您訪問的功能正在開發中！';
 $lang->showAll       = '[[全部顯示]]';
 $lang->selectedItems = '已選擇 <strong>{0}</strong> 項';
@@ -114,124 +118,132 @@ $lang->future      = '未來';
 $lang->year        = '年';
 $lang->workingHour = '工時';
 
-$lang->sprintCommon = $lang->iterationCommon . '/階段';
-
-$lang->execution = new stdclass();
-$lang->executionCommon = '執行';
-$lang->execution->sprint = '迭代';
-$lang->execution->stage  = '階段';
-
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = '狀態';
 $lang->openedByAB   = '創建';
 $lang->assignedToAB = '指派';
 $lang->typeAB       = '類型';
+$lang->nameAB       = '名稱';
 
-$lang->common = new stdclass();
-$lang->common->common = '公有模組';
+$lang->common->common     = '公有模組';
+$lang->my->common         = '地盤';
+$lang->program->common    = '項目集';
+$lang->product->common    = '產品';
+$lang->project->common    = '項目';
+$lang->execution->common  = $config->systemMode == 'new' ? '執行' : $lang->executionCommon;
+$lang->qa->common         = '測試';
+$lang->devops->common     = 'DevOps';
+$lang->doc->common        = '文檔';
+$lang->repo->common       = '代碼';
+$lang->report->common     = '統計';
+$lang->system->common     = '組織';
+$lang->admin->common      = '後台';
+$lang->task->common       = '任務';
+$lang->bug->common        = 'Bug';
+$lang->testcase->common   = '用例';
+$lang->testtask->common   = '測試單';
+$lang->score->common      = '我的積分';
+$lang->build->common      = '版本';
+$lang->testreport->common = '測試報告';
+$lang->automation->common = '自動化';
+$lang->team->common       = '團隊';
+$lang->user->common       = '用戶';
+$lang->custom->common     = '自定義';
+$lang->extension->common  = '插件';
+$lang->company->common    = '公司';
+$lang->dept->common       = '部門';
+$lang->program->list      = '項目集列表';
+$lang->execution->list    = "{$lang->executionCommon}列表";
 
-global $config;
-list($programModule, $programMethod) = explode('-', $config->programLink);
-list($productModule, $productMethod) = explode('-', $config->productLink);
-list($projectModule, $projectMethod) = explode('-', $config->projectLink);
+$lang->personnel->common     = '人員';
+$lang->personnel->invest     = '投入人員';
+$lang->personnel->accessible = '可訪問人員';
 
-/* 主導航菜單。*/
-$lang->mainNav = new stdclass();
-$lang->mainNav->my      = '<i class="icon icon-menu-my"></i> 地盤|my|index|';
-$lang->mainNav->product = "<i class='icon icon-product'></i> 產品|$productModule|$productMethod|";
-if($config->systemMode == 'new')
-{
-    $lang->mainNav->project   = "<i class='icon icon-project'></i> 項目|$projectModule|$projectMethod|";
-    $lang->mainNav->execution = "<i class='icon icon-run'></i> 執行|execution|task|";
-}
-else
-{
-    $lang->mainNav->project = "<i class='icon icon-project'></i> $lang->executionCommon|$projectModule|$projectMethod|";
-}
-$lang->mainNav->qa      = '<i class="icon icon-test"></i> 測試|qa|index|';
-$lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代碼|repo|browse|';
-$lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文檔|doc|index|';
-$lang->mainNav->report  = "<i class='icon icon-statistic'></i> 統計|report|productSummary|";
-$lang->mainNav->system  = '<i class="icon icon-group"></i> 組織|custom|browsestoryconcept|';
-$lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 後台|admin|index|';
-if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> 項目集|$programModule|$programMethod|";
+$lang->stakeholder->common = '干係人';
+$lang->release->common     = '發佈';
+$lang->message->common     = '通知';
+$lang->mail->common        = '郵件';
 
-$lang->dividerMenu = ',qa,report,admin,';
+$lang->my->shortCommon          = '地盤';
+$lang->testcase->shortCommon    = '用例';
+$lang->productplan->shortCommon = '計劃';
+$lang->score->shortCommon       = '積分';
+$lang->testreport->shortCommon  = '報告';
+$lang->qa->shortCommon          = 'QA';
 
-/* Program set menu. */
-$lang->program = new stdclass();
-$lang->program->menu = new stdclass();
-//$lang->program->menu->index   = '儀錶盤|program|index|';
-$lang->program->menu->browse  = array('link' => '項目集|program|browse|');
+$lang->dashboard  = '儀表盤';
+$lang->contribute = '貢獻';
+$lang->dynamic    = '動態';
+$lang->contact    = '聯繫人';
+$lang->whitelist  = '白名單';
+$lang->roadmap    = '路線圖';
+$lang->track      = '矩陣';
+$lang->settings   = '設置';
+$lang->overview   = '概況';
+$lang->module     = '模組';
+$lang->priv       = '權限';
+$lang->design     = '設計';
+$lang->other      = '其他';
+$lang->estimation = '估算';
+$lang->issue      = '問題';
+$lang->risk       = '風險';
+$lang->measure    = '度量';
+$lang->treeView   = '樹狀圖';
+$lang->groupView  = '分組視圖';
+$lang->kanban     = '看板';
+$lang->burn       = '燃盡圖';
+$lang->view       = '視圖';
+$lang->intro      = '介紹';
+$lang->indexPage  = '首頁';
+$lang->model      = '模型';
+$lang->redev      = '二次開發';
+$lang->browser    = '瀏覽器';
+$lang->db         = '資料庫';
+$lang->editor     = '編輯器';
+$lang->timezone   = '時區';
+$lang->security   = '安全';
+$lang->calendar   = '日程';
 
-$lang->project = new stdclass();
-$lang->project->menu = new stdclass();
-if($config->systemMode == 'new')
-{
-    $lang->project->menu->browse = array('link' => '項目|project|browse|');
-}
-else
-{
-    $lang->project->menu->browse = array('link' => "$lang->executionCommon|project|browse|");
-}
+$lang->my->work = '待處理';
 
-$lang->program->viewMenu = new stdclass();
-$lang->program->viewMenu->product     = array('link' => '產品|program|product|program=%s', 'alias' => 'view');
-$lang->program->viewMenu->project     = array('link' => "項目|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "人員|personnel|accessible|program=%s");
-$lang->program->viewMenu->stakeholder = array('link' => "干係人|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
+$lang->project->list = '項目列表';
 
-$lang->personnel = new stdClass();
-$lang->personnel->menu = new stdClass();
-$lang->personnel->menu->accessible = array('link' => "可訪問人員|personnel|accessible|program=%s");
-$lang->personnel->menu->whitelist  = array('link' => "白名單|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
-$lang->personnel->menu->invest    = array('link' => "投入人員|personnel|invest|program=%s");
+$lang->execution->list = "{$lang->executionCommon}列表";
 
-/* Scrum menu. */
-$lang->product = new stdclass();
-$lang->product->menu = new stdclass();
-$lang->product->menu->home = '儀錶盤|product|index|';
-$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit,manageline');
+$lang->doc->recent    = '最近文檔';
+$lang->doc->my        = '我的文檔';
+$lang->doc->favorite  = '我的收藏';
+$lang->doc->product   = '產品庫';
+$lang->doc->project   = '項目庫';
+$lang->doc->execution = "{$lang->executionCommon}庫";
+$lang->doc->custom    = '自定義庫';
+$lang->doc->wiki      = 'WIKI';
 
-$lang->product->viewMenu = new stdclass();
-$lang->product->viewMenu->dashboard   = array('link' => '儀表盤|product|dashboard|productID=%s');
-if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->story       = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->plan        = array('link' => "計劃|productplan|browse|productID=%s", 'subModule' => 'productplan');
-$lang->product->viewMenu->release     = array('link' => '發佈|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->viewMenu->roadmap     = '路線圖|product|roadmap|productID=%s';
-$lang->product->viewMenu->project     = "項目|product|project|status=all&productID=%s";
-$lang->product->viewMenu->track       = array('link' => "矩陣|story|track|productID=%s");
-$lang->product->viewMenu->doc         = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->dynamic     = '動態|product|dynamic|productID=%s';
-$lang->product->viewMenu->set         = array('link' => '設置|product|view|productID=%s', 'subModule' => 'tree,branch', 'alias' => 'edit');
+$lang->product->list = $lang->productCommon . '列表';
 
-$lang->product->setMenu = new stdclass();
-$lang->product->setMenu->view      = array('link' => '概況|product|view|productID={PRODUCT}', 'alias' => 'edit');
-$lang->product->setMenu->module    = array('link' => '模組|tree|browse|product={PRODUCT}&view=story', 'subModule' => 'tree');
-$lang->product->setMenu->branch    = array('link' => '@branch@|branch|manage|product={PRODUCT}', 'subModule' => 'branch');
-$lang->product->setMenu->whitelist = array('link' => '白名單|product|whitelist|product={PRODUCT}', 'subModule' => 'personnel');
+$lang->project->report = '報告';
 
-$lang->release     = new stdclass();
-$lang->branch      = new stdclass();
-$lang->productplan = new stdclass();
+$lang->report->weekly = '周報';
+$lang->report->annual = '年度總結';
+$lang->report->notice = new stdclass();
+$lang->report->notice->help = '註：統計報表的數據來源於列表頁面的檢索結果，生成統計報表前請先在列表頁面進行檢索。比如列表頁面我們檢索的是%tab%，那麼報表就是基于之前檢索的%tab%的結果集進行統計。';
 
-$lang->release->menu     = $lang->product->viewMenu;
-$lang->branch->menu      = $lang->product->menu;
-$lang->productplan->menu = $lang->product->menu;
+$lang->testcase->case      = '用例';
+$lang->testcase->testsuite = '套件';
+$lang->testcase->caselib   = '用例庫';
 
-/* System menu. */
-$lang->system = new stdclass();
-$lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => '全局設置|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->devops->compile = '構建';
+$lang->devops->repo    = '版本庫';
+$lang->devops->rules   = '指令';
 
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
+$lang->admin->system     = '系統';
+$lang->admin->entry      = '應用';
+$lang->admin->data       = '數據';
+$lang->admin->cron       = '定時';
+$lang->admin->buildIndex = '重建索引';
 
-$lang->measurement = new stdclass();
-$lang->measurement->menu = new stdclass();
+$lang->storyConcept = '需求概念';
 
 $lang->searchTips = '';
 $lang->searchAB   = '搜索';
@@ -282,423 +294,6 @@ $lang->themes['pink']       = '芙蕖粉';
 $lang->themes['blackberry'] = '露莓黑';
 $lang->themes['classic']    = '經典藍';
 
-/* 首頁菜單設置。*/
-$lang->index = new stdclass();
-$lang->index->menu = new stdclass();
-
-$lang->index->menu->product = "瀏覽{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "瀏覽{$lang->executionCommon}|project|browse";
-
-/* 我的地盤菜單設置。*/
-$lang->my = new stdclass();
-$lang->my->menu = new stdclass();
-
-$lang->my->menu->index       = '首頁|my|index';
-$lang->my->menu->calendar    = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->my->menu->myWork      = array('link' => '待處理|my|work|mode=task');
-if($config->systemMode == 'new')
-{
-    $lang->my->menu->myProject   = array('link' => '項目|my|project|');
-    $lang->my->menu->myExecution = '執行|my|execution|type=undone';
-}
-else
-{
-    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
-}
-$lang->my->menu->contribute  = array('link' => '貢獻|my|contribute|mode=task');
-$lang->my->menu->dynamic     = '動態|my|dynamic|';
-$lang->my->menu->score       = array('link' => '積分|my|score|', 'subModule' => 'score');
-$lang->my->menu->team        = array('link' => '團隊|my|team|', 'subModule' => 'user');
-$lang->my->menu->contacts    = '聯繫人|my|managecontacts|';
-
-$lang->my->workMenu = new stdclass();
-$lang->my->workMenu->task        = '任務|my|work|mode=task';
-if($config->URAndSR) $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
-$lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
-$lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testcase    = '用例|my|work|mode=testcase&type=assigntome';
-$lang->my->workMenu->testtask    = '測試單|my|work|mode=testtask&type=wait';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->task        = '任務|my|contribute|mode=task';
-if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
-$lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testcase    = '用例|my|contribute|mode=testcase&type=openedbyme';
-$lang->my->contributeMenu->testtask    = '測試單|my|contribute|mode=testtask&type=done';
-
-$lang->my->dividerMenu = ',myProject,team,';
-
-$lang->todo       = new stdclass();
-$lang->todo->menu = $lang->my->menu;
-
-$lang->product->dividerMenu = ',requirement,set,';
-
-$lang->story = new stdclass();
-
-$lang->story->menu = $lang->product->menu;
-
-/* 項目視圖菜單設置。*/
-$lang->project = new stdclass();
-$lang->project->menu = new stdclass();
-
-$lang->project->menu->task     = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
-$lang->project->menu->kanban   = array('link' => '看板|project|kanban|projectID=%s');
-$lang->project->menu->burn     = array('link' => '燃盡圖|project|burn|projectID=%s');
-$lang->project->menu->view     = array('link' => '視圖|project|grouptask|projectID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->project->menu->story    = array('link' => "{$lang->SRCommon}|project|story|projectID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
-$lang->project->menu->bug      = array('link' => 'Bug|project|bug|projectID=%s');
-$lang->project->menu->build    = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->menu->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
-$lang->project->menu->doc      = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
-$lang->project->menu->product  = $lang->productCommon . '|project|manageproducts|projectID=%s';
-$lang->project->menu->team     = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers');
-$lang->project->menu->more     = array('link' => '更多|project|whitelist|projectID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover');
-
-$lang->project->subMenu = new stdclass();
-$lang->project->subMenu->view = new stdclass();
-$lang->project->subMenu->view->groupTask = '分組視圖|project|grouptask|projectID=%s';
-$lang->project->subMenu->view->tree      = '樹狀圖|project|tree|projectID=%s';
-
-$lang->project->subMenu->qa = new stdclass();
-$lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
-$lang->project->subMenu->qa->build    = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->subMenu->qa->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
-
-$lang->project->subMenu->more = new stdclass();
-$lang->project->subMenu->more->whitelist = array('link' => '白名單|project|whitelist|projectID=%s', 'subModule' => 'personnel', 'alias' => 'addwhitelist');
-$lang->project->subMenu->more->action    = array('link' => '動態|project|dynamic|projectID=%s');
-$lang->project->subMenu->more->view      = array('link' => '概況|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
-
-$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
-
-$lang->task  = new stdclass();
-$lang->build = new stdclass();
-$lang->task->menu  = $lang->project->menu;
-$lang->build->menu = $lang->project->menu;
-
-/* QA視圖菜單設置。*/
-$lang->qa = new stdclass();
-$lang->qa->menu = new stdclass();
-
-$lang->qa->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->qa->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto');
-$lang->qa->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'class' => 'dropdown dropdown-hover');
-$lang->qa->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
-$lang->qa->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->qa->menu->report    = array('link' => '報告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->qa->menu->caselib   = array('link' => '用例庫|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport');
-
-$lang->qa->subMenu = new stdclass();
-$lang->qa->subMenu->testcase = new stdclass();
-$lang->qa->subMenu->testcase->feature = array('link' => '功能測試|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
-$lang->qa->subMenu->testcase->unit    = array('link' => '單元測試|testtask|browseUnits|productID=%s', 'alias' => 'browseunits');
-
-$lang->bug = new stdclass();
-$lang->bug->menu = new stdclass();
-$lang->bug->subMenu = $lang->qa->subMenu;
-
-$lang->bug->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->bug->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
-$lang->bug->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->bug->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->bug->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->bug->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->bug->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testcase = new stdclass();
-$lang->testcase->menu = new stdclass();
-$lang->testcase->subMenu = $lang->qa->subMenu;
-$lang->testcase->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testcase->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testcase->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story', 'class' => 'dropdown dropdown-hover');
-$lang->testcase->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->testcase->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->testcase->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testtask = new stdclass();
-$lang->testtask->menu = new stdclass();
-$lang->testtask->subMenu = $lang->qa->subMenu;
-$lang->testtask->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testtask->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testtask->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testtask->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s', 'subModule' => 'testtask', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
-$lang->testtask->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->testtask->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->testtask->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testsuite = new stdclass();
-$lang->testsuite->menu = new stdclass();
-$lang->testsuite->subMenu = $lang->qa->subMenu;
-$lang->testsuite->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testsuite->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testsuite->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testsuite->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->testsuite->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->testsuite->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->testsuite->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testreport = new stdclass();
-$lang->testreport->menu = new stdclass();
-$lang->testreport->subMenu = $lang->qa->subMenu;
-$lang->testreport->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testreport->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testreport->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testreport->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->testreport->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->testreport->menu->report    = array('link' => '報告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->testreport->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->caselib = new stdclass();
-$lang->caselib->menu = new stdclass();
-$lang->caselib->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->caselib->menu->bug       = array('link' => 'Bug|bug|browse|');
-$lang->caselib->menu->testcase  = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover');
-$lang->caselib->menu->testtask  = array('link' => '測試單|testtask|browse|');
-$lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|');
-$lang->caselib->menu->report    = array('link' => '報告|testreport|browse|');
-$lang->caselib->menu->caselib   = array('link' => '用例庫|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
-
-$lang->caselib->subMenu = new stdclass();
-$lang->caselib->subMenu->testcase = new stdclass();
-$lang->caselib->subMenu->testcase->feature = array('link' => '功能測試|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
-$lang->caselib->subMenu->testcase->unit    = array('link' => '單元測試|testtask|browseUnits|');
-
-$lang->ci = new stdclass();
-$lang->ci->menu = new stdclass();
-$lang->ci->menu->code     = array('link' => '代碼|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
-$lang->ci->menu->build    = array('link' => '構建|job|browse', 'subModule' => 'compile,job');
-$lang->ci->menu->jenkins  = array('link' => 'Jenkins|jenkins|browse', 'alias' => 'create,edit');
-$lang->ci->menu->maintain = array('link' => '版本庫|repo|maintain', 'alias' => 'create,edit');
-$lang->ci->menu->rules    = array('link' => '指令|repo|setrules');
-
-$lang->repo          = new stdclass();
-$lang->jenkins       = new stdclass();
-$lang->compile       = new stdclass();
-$lang->job           = new stdclass();
-$lang->repo->menu    = $lang->ci->menu;
-$lang->jenkins->menu = $lang->ci->menu;
-$lang->compile->menu = $lang->ci->menu;
-$lang->job->menu     = $lang->ci->menu;
-
-/* 文檔視圖菜單設置。*/
-$lang->doc = new stdclass();
-$lang->doc->menu = new stdclass();
-
-$lang->svn = new stdclass();
-$lang->git = new stdclass();
-
-/* 發佈視圖菜單設置。*/
-$lang->projectrelease = new stdclass();
-$lang->projectrelease->menu = new stdclass();
-
-/* 統計視圖菜單設置。*/
-$lang->report = new stdclass();
-$lang->report->menu = new stdclass();
-
-$lang->report->menu->annual    = array('link' => '年度總結|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
-$lang->report->menu->product   = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->execution = array('link' => $lang->executionCommon . '|report|executiondeviation');
-$lang->report->menu->test      = array('link' => '測試|report|bugcreate', 'alias' => 'bugassign');
-$lang->report->menu->staff     = array('link' => '組織|report|workload');
-
-$lang->report->notice = new stdclass();
-$lang->report->notice->help = '註：統計報表的數據來源於列表頁面的檢索結果，生成統計報表前請先在列表頁面進行檢索。比如列表頁面我們檢索的是%tab%，那麼報表就是基于之前檢索的%tab%的結果集進行統計。';
-
-/* 組織結構視圖菜單設置。*/
-$lang->company = new stdclass();
-$lang->dept    = new stdclass();
-$lang->group   = new stdclass();
-$lang->user    = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->dept->menu    = new stdclass();
-$lang->group->menu   = new stdclass();
-$lang->user->menu    = new stdclass();
-
-$lang->company = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->company->menu->browseUser  = array('link' => '用戶|company|browse', 'subModule' => ',user,');
-$lang->company->menu->dept        = array('link' => '部門|dept|browse', 'subModule' => 'dept');
-$lang->company->menu->browseGroup = array('link' => '權限|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = '動態|company|dynamic|';
-$lang->company->menu->view        = array('link' => '公司|company|view');
-
-/* 後台管理菜單設置。*/
-$lang->admin = new stdclass();
-$lang->admin->menu = new stdclass();
-$lang->admin->menu->index   = array('link' => '首頁|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company = array('link' => '人員|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->custom  = array('link' => '自定義|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->system  = array('link' => '系統|backup|index', 'subModule' => 'cron,admin,backup,action');
-
-$lang->company->menu = $lang->company->menu;
-$lang->dept->menu    = $lang->company->menu;
-$lang->group->menu   = $lang->company->menu;
-$lang->user->menu    = $lang->company->menu;
-
-$lang->admin->subMenu = new stdclass();
-$lang->admin->subMenu->message = new stdclass();
-$lang->admin->subMenu->message->mail    = array('link' => '郵件|mail|index', 'subModule' => 'mail');
-$lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
-$lang->admin->subMenu->message->browser = array('link' => '瀏覽器|message|browser');
-$lang->admin->subMenu->message->setting = array('link' => '設置|message|setting');
-
-$lang->admin->subMenu->sso = new stdclass();
-$lang->admin->subMenu->sso->ranzhi = 'ZDOO|admin|sso';
-
-$lang->admin->subMenu->dev = new stdclass();
-$lang->admin->subMenu->dev->api    = array('link' => 'API|dev|api');
-$lang->admin->subMenu->dev->db     = array('link' => '資料庫|dev|db');
-$lang->admin->subMenu->dev->editor = array('link' => '編輯器|dev|editor');
-$lang->admin->subMenu->dev->entry  = array('link' => '應用|entry|browse', 'subModule' => 'entry');
-
-$lang->admin->subMenu->system = new stdclass();
-$lang->admin->subMenu->system->data       = array('link' => '數據|backup|index', 'subModule' => 'action');
-$lang->admin->subMenu->system->safe       = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
-$lang->admin->subMenu->system->cron       = array('link' => '定時|cron|index', 'subModule' => 'cron');
-$lang->admin->subMenu->system->timezone   = array('link' => '時區|custom|timezone', 'subModule' => 'custom');
-$lang->admin->subMenu->system->buildIndex = array('link' => '重建索引|search|buildindex|');
-
-$lang->convert   = new stdclass();
-$lang->upgrade   = new stdclass();
-$lang->action    = new stdclass();
-$lang->backup    = new stdclass();
-$lang->extension = new stdclass();
-$lang->custom    = new stdclass();
-$lang->mail      = new stdclass();
-$lang->cron      = new stdclass();
-$lang->dev       = new stdclass();
-$lang->entry     = new stdclass();
-$lang->webhook   = new stdclass();
-$lang->message   = new stdclass();
-$lang->search    = new stdclass();
-
-/* 菜單分組。*/
-$lang->menugroup = new stdclass();
-$lang->menugroup->release     = 'product';
-$lang->menugroup->story       = 'product';
-$lang->menugroup->branch      = 'product';
-$lang->menugroup->productplan = 'product';
-$lang->menugroup->task        = 'project';
-$lang->menugroup->build       = 'project';
-$lang->menugroup->convert     = 'admin';
-$lang->menugroup->upgrade     = 'admin';
-$lang->menugroup->user        = 'company';
-$lang->menugroup->group       = 'company';
-$lang->menugroup->bug         = 'qa';
-$lang->menugroup->testcase    = 'qa';
-$lang->menugroup->case        = 'qa';
-$lang->menugroup->testtask    = 'qa';
-$lang->menugroup->testsuite   = 'qa';
-$lang->menugroup->caselib     = 'qa';
-$lang->menugroup->testreport  = 'qa';
-$lang->menugroup->people      = 'admin';
-$lang->menugroup->dept        = 'company';
-$lang->menugroup->todo        = 'my';
-$lang->menugroup->score       = 'my';
-$lang->menugroup->action      = 'admin';
-$lang->menugroup->backup      = 'admin';
-$lang->menugroup->cron        = 'admin';
-$lang->menugroup->extension   = 'admin';
-$lang->menugroup->custom      = 'admin';
-$lang->menugroup->mail        = 'admin';
-$lang->menugroup->dev         = 'admin';
-$lang->menugroup->entry       = 'admin';
-$lang->menugroup->webhook     = 'admin';
-$lang->menugroup->message     = 'admin';
-
-$lang->menugroup->repo    = 'ci';
-$lang->menugroup->jenkins = 'ci';
-$lang->menugroup->compile = 'ci';
-$lang->menugroup->job     = 'ci';
-
-/* Nav group.*/
-$lang->navGroup = new stdclass();
-$lang->navGroup->my     = 'my';
-$lang->navGroup->todo   = 'my';
-$lang->navGroup->effort = 'my';
-$lang->navGroup->score  = 'my';
-
-$lang->navGroup->program   = 'program';
-$lang->navGroup->personnel = 'program';
-
-$lang->navGroup->product     = 'product';
-$lang->navGroup->productplan = 'product';
-$lang->navGroup->release     = 'product';
-$lang->navGroup->branch      = 'product';
-$lang->navGroup->story       = 'product';
-$lang->navGroup->tree        = 'product';
-
-$lang->navGroup->project     = 'project';
-$lang->navGroup->task        = 'project';
-$lang->navGroup->qa          = 'project';
-$lang->navGroup->bug         = 'project';
-$lang->navGroup->doc         = 'project';
-$lang->navGroup->testcase    = 'project';
-$lang->navGroup->testtask    = 'project';
-$lang->navGroup->testreport  = 'project';
-$lang->navGroup->testsuite   = 'project';
-$lang->navGroup->caselib     = 'project';
-$lang->navGroup->feedback    = 'project';
-$lang->navGroup->deploy      = 'project';
-$lang->navGroup->stakeholder = 'project';
-
-$lang->navGroup->projectstory   = 'project';
-$lang->navGroup->review         = 'project';
-$lang->navGroup->reviewissue    = 'project';
-$lang->navGroup->milestone      = 'project';
-$lang->navGroup->pssp           = 'project';
-$lang->navGroup->auditplan      = 'project';
-$lang->navGroup->cm             = 'project';
-$lang->navGroup->nc             = 'project';
-$lang->navGroup->build          = 'project';
-$lang->navGroup->projectrelease = 'project';
-$lang->navGroup->projectbuild   = 'project';
-$lang->navGroup->repo           = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
-$lang->navGroup->report         = 'project';
-$lang->navGroup->measrecord     = 'project';
-
-$lang->navGroup->sqlbuilder    = 'system';
-$lang->navGroup->auditcl       = 'system';
-$lang->navGroup->cmcl          = 'system';
-$lang->navGroup->process       = 'system';
-$lang->navGroup->activity      = 'system';
-$lang->navGroup->zoutput       = 'system';
-$lang->navGroup->classify      = 'system';
-$lang->navGroup->subject       = 'system';
-$lang->navGroup->baseline      = 'system';
-$lang->navGroup->reviewcl      = 'system';
-$lang->navGroup->reviewsetting = 'system';
-
-$lang->navGroup->attend   = 'attend';
-$lang->navGroup->leave    = 'attend';
-$lang->navGroup->makeup   = 'attend';
-$lang->navGroup->overtime = 'attend';
-$lang->navGroup->lieu     = 'attend';
-
-$lang->navGroup->admin     = 'admin';
-$lang->navGroup->company   = 'admin';
-$lang->navGroup->dept      = 'admin';
-$lang->navGroup->ldap      = 'admin';
-$lang->navGroup->group     = 'admin';
-$lang->navGroup->webhook   = 'admin';
-$lang->navGroup->sms       = 'admin';
-$lang->navGroup->message   = 'admin';
-$lang->navGroup->user      = 'admin';
-$lang->navGroup->custom    = 'admin';
-$lang->navGroup->cron      = 'admin';
-$lang->navGroup->backup    = 'admin';
-$lang->navGroup->mail      = 'admin';
-$lang->navGroup->dev       = 'admin';
-$lang->navGroup->extension = 'admin';
-$lang->navGroup->action    = 'admin';
-$lang->navGroup->search    = 'admin';
-
 /* 錯誤提示信息。*/
 $lang->error = new stdclass();
 $lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。";
@@ -812,164 +407,4 @@ $lang->datepicker->dayNames     = array('星期日', '星期一', '星期二', '
 $lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五', '六');
 $lang->datepicker->monthNames   = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
 
-/* Common action icons 通用動作表徵圖 */
-$lang->icons['todo']      = 'check';
-$lang->icons['product']   = 'product';
-$lang->icons['bug']       = 'bug';
-$lang->icons['task']      = 'check-sign';
-$lang->icons['tasks']     = 'tasks';
-$lang->icons['program']   = 'program';
-$lang->icons['project']   = 'project';
-$lang->icons['stage']     = 'waterfall';
-$lang->icons['sprint']    = 'sprint';
-$lang->icons['doc']       = 'file-text';
-$lang->icons['doclib']    = 'folder-close';
-$lang->icons['story']     = 'lightbulb';
-$lang->icons['release']   = 'tags';
-$lang->icons['roadmap']   = 'code-fork';
-$lang->icons['plan']      = 'flag';
-$lang->icons['dynamic']   = 'volume-up';
-$lang->icons['build']     = 'tag';
-$lang->icons['test']      = 'check';
-$lang->icons['testtask']  = 'check';
-$lang->icons['group']     = 'group';
-$lang->icons['team']      = 'group';
-$lang->icons['company']   = 'sitemap';
-$lang->icons['user']      = 'user';
-$lang->icons['dept']      = 'sitemap';
-$lang->icons['tree']      = 'sitemap';
-$lang->icons['usecase']   = 'sitemap';
-$lang->icons['testcase']  = 'sitemap';
-$lang->icons['result']    = 'list-alt';
-$lang->icons['mail']      = 'envelope';
-$lang->icons['trash']     = 'trash';
-$lang->icons['extension'] = 'th-large';
-$lang->icons['app']       = 'th-large';
-
-$lang->icons['results']            = 'list-alt';
-$lang->icons['create']             = 'plus';
-$lang->icons['post']               = 'edit';
-$lang->icons['batchCreate']        = 'plus-sign';
-$lang->icons['batchEdit']          = 'edit-sign';
-$lang->icons['batchClose']         = 'off';
-$lang->icons['edit']               = 'edit';
-$lang->icons['delete']             = 'close';
-$lang->icons['copy']               = 'copy';
-$lang->icons['report']             = 'bar-chart';
-$lang->icons['export']             = 'export';
-$lang->icons['report-file']        = 'file-powerpoint';
-$lang->icons['import']             = 'import';
-$lang->icons['finish']             = 'checked';
-$lang->icons['resolve']            = 'check';
-$lang->icons['start']              = 'play';
-$lang->icons['restart']            = 'play';
-$lang->icons['run']                = 'run';
-$lang->icons['runCase']            = 'run';
-$lang->icons['batchRun']           = 'play-sign';
-$lang->icons['assign']             = 'hand-right';
-$lang->icons['assignTo']           = 'hand-right';
-$lang->icons['change']             = 'fork';
-$lang->icons['link']               = 'link';
-$lang->icons['close']              = 'off';
-$lang->icons['activate']           = 'magic';
-$lang->icons['review']             = 'glasses';
-$lang->icons['confirm']            = 'search';
-$lang->icons['confirmBug']         = 'search';
-$lang->icons['putoff']             = 'calendar';
-$lang->icons['suspend']            = 'pause';
-$lang->icons['pause']              = 'pause';
-$lang->icons['cancel']             = 'ban-circle';
-$lang->icons['recordEstimate']     = 'time';
-$lang->icons['customFields']       = 'cogs';
-$lang->icons['manage']             = 'cog';
-$lang->icons['unlock']             = 'unlock-alt';
-$lang->icons['confirmStoryChange'] = 'search';
-$lang->icons['score']              = 'tint';
-
-/* Scrum menu. */
-$lang->menu = new stdclass();
-$lang->menu->scrum = new stdclass();
-$lang->menu->scrum->index          = '儀表盤|program|index|project={PROJECT}';
-$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
-$lang->menu->scrum->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story', 'alias' => 'story,track');
-$lang->menu->scrum->doc            = '文檔|doc|index|';
-$lang->menu->scrum->qa             = '測試|qa|index';
-$lang->menu->scrum->ci             = '代碼|repo|browse';
-$lang->menu->scrum->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
-$lang->menu->scrum->projectrelease = array('link' => '發佈|projectrelease|browse');
-$lang->menu->scrum->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
-$lang->menu->scrum->projectsetting = array('link' => '設置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->scrum = new stdclass();
-$lang->scrum->subMenu = new stdclass();
-$lang->scrum->subMenu->other = new stdclass();
-$lang->scrum->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
-
-$lang->scrum->setMenu = new stdclass();
-$lang->scrum->setMenu->view      = array('link' => '概況|project|view|project={PROJECT}', 'alias' => 'edit');
-$lang->scrum->setMenu->products  = array('link' => '產品|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts');
-$lang->scrum->setMenu->group     = array('link' => '權限|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv');
-$lang->scrum->setMenu->members   = array('link' => '團隊|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers');
-$lang->scrum->setMenu->whitelist = array('link' => '白名單|project|whitelist|project={PROJECT}', 'subModule' => 'personnel');
-
-/* Waterfall menu. */
-$lang->menu->waterfall = new stdclass();
-$lang->menu->waterfall->index          = array('link' => '儀表盤|project|index|project={PROJECT}');
-$lang->menu->waterfall->programplan    = array('link' => '計劃|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
-$lang->menu->waterfall->doc            = array('link' => '文檔|doc|index|project={PROJECT}');
-$lang->menu->waterfall->weekly         = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story');
-$lang->menu->waterfall->design         = '設計|design|browse|product={PRODUCT}';
-$lang->menu->waterfall->ci             = '代碼|repo|browse|';
-$lang->menu->waterfall->track          = array('link' => '矩陣|projectstory|track', 'alias' => 'track');
-$lang->menu->waterfall->qa             = '測試|qa|index';
-$lang->menu->waterfall->projectrelease = array('link' => '發佈|projectrelease|browse');
-$lang->menu->waterfall->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
-$lang->menu->waterfall->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc,workestimation,durationestimation,budget,pssp,measrecord,report');
-$lang->menu->waterfall->projectsetting = array('link' => '設置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->waterfall = new stdclass();
-$lang->waterfall->subMenu = new stdclass();
-$lang->waterfall->subMenu->other = new stdclass();
-$lang->waterfall->subMenu->other->estimation  = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'workestimation,durationestimation,budget');
-$lang->waterfall->subMenu->other->issue       = array('link' => '問題|issue|browse|', 'subModule' => 'issue');
-$lang->waterfall->subMenu->other->risk        = array('link' => '風險|risk|browse|', 'subModule' => 'risk');
-$lang->waterfall->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->other->report      = array('link' => '度量|report|projectsummary|project=%s', 'subModule' => ',report,measrecord');
-$lang->waterfall->subMenu->other->auditplan   = array('link' => 'QA|auditplan|browse|', 'subModule' => 'nc');
-
-$lang->waterfall->setMenu = new stdclass();
-$lang->waterfall->setMenu = $lang->scrum->setMenu;
-
-$lang->waterfallproduct   = new stdclass();
-$lang->review             = new stdclass();
-$lang->milestone          = new stdclass();
-$lang->auditplan          = new stdclass();
-$lang->cm                 = new stdclass();
-$lang->nc                 = new stdclass();
-$lang->pssp               = new stdclass();
-$lang->stakeholder        = new stdclass();
-$lang->projectstory       = new stdclass();
-
-$lang->review->menu             = new stdclass();
-$lang->milestone->menu          = new stdclass();
-$lang->auditplan->menu          = new stdclass();
-$lang->cm->menu                 = new stdclass();
-$lang->pssp->menu               = new stdclass();
-$lang->stakeholder->menu        = new stdclass();
-$lang->waterfallproduct->menu   = new stdclass();
-$lang->projectstory->menu       = new stdclass();
-
-$lang->stakeholder->menu->list  = array('link' => '干係人列表|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate');
-$lang->stakeholder->menu->issue = array('link' => '問題管理|stakeholder|issue|');
-
-$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
-if($config->systemMode == 'classic')
-{
-    $lang->noMenuModule[] = 'project';
-    $lang->noMenuModule[] = 'task';
-}
-
-include (dirname(__FILE__) . '/menuOrder.php');
+include (dirname(__FILE__) . '/menu.php');
diff --git a/module/common/model.php b/module/common/model.php
index 801d0503d3..31181f9425 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -47,6 +47,20 @@ class commonModel extends model
         header("Content-Type: text/html; Language={$this->config->charset}");
         header("Cache-control: private");
 
+        /* Send HTTP header. */
+        if($this->config->framework->sendXCTO)  header("X-Content-Type-Options: nosniff");
+        if($this->config->framework->sendXXP)   header("X-XSS-Protection: 1; mode=block");
+        if($this->config->framework->sendHSTS)  header("Strict-Transport-Security: max-age=3600; includeSubDomains");
+        if($this->config->framework->sendRP)    header("Referrer-Policy: no-referrer-when-downgrade");
+        if($this->config->framework->sendXPCDP) header("X-Permitted-Cross-Domain-Policies: master-only");
+        if($this->config->framework->sendXDO)   header("X-Download-Options: noopen");
+
+        /* Set Content-Security-Policy header. */
+        if($this->config->CSPs)
+        {
+            foreach($this->config->CSPs as $CSP) header("Content-Security-Policy: $CSP;");
+        }
+
         if($this->loadModel('setting')->getItem('owner=system&module=sso&key=turnon'))
         {
             if(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on')
@@ -164,6 +178,7 @@ class commonModel extends model
      */
     public function isOpenMethod($module, $method)
     {
+        if($module == 'upgrade' and $method == 'ajaxupdatefile') return true;
         if($module == 'user' and strpos('login|logout|deny|reset|refreshrandom', $method) !== false) return true;
         if($module == 'api'  and $method == 'getsessionid') return true;
         if($module == 'misc' and $method == 'checktable') return true;
@@ -280,7 +295,7 @@ class commonModel extends model
 
             echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
             echo "<div id='main-avatar' class='avatar avatar bg-secondary avatar-circle'>";
-            echo $app->user->avatar ? html::image($app->user->avatar) : strtoupper($app->user->account[0]);
+            echo !empty($app->user->avatar) ? html::image($app->user->avatar) : strtoupper($app->user->account[0]);
             echo "</div>\n";
             echo '</a>';
             echo "<ul class='dropdown-menu pull-right'>";
@@ -298,7 +313,6 @@ class commonModel extends model
                 echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), "<i class='icon icon-account'></i> " . $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'preference', '', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='650'") . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
-                echo "<li id='menuToggleItem'><a type='button' class='menu-toggle'><i class='icon icon-sm icon-menu-collapse'></i> <span class='is-unfold'>$lang->unfoldMenu</span><span class='is-collapse'>$lang->collapseMenu</span></a></li>";
 
                 echo "<li class='divider'></li>";
             }
@@ -330,11 +344,11 @@ class commonModel extends model
             echo '<li>';
             if($isGuest)
             {
-                echo html::a(helper::createLink('user', 'login'), $lang->login);
+                echo html::a(helper::createLink('user', 'login'), $lang->login, '_top');
             }
             else
             {
-                echo html::a(helper::createLink('user', 'logout'), "<i class='icon icon-exit'></i> " . $lang->logout);
+                echo html::a(helper::createLink('user', 'logout'), "<i class='icon icon-exit'></i> " . $lang->logout, '_top');
             }
             echo '</li></ul>';
         }
@@ -390,18 +404,7 @@ class commonModel extends model
             }
             else
             {
-                if($group == 'program')
-                {
-                    $link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars, '', '', $app->session->PRJ);
-                }
-                elseif($group == 'product' && $menuItem->name == 'doc')
-                {
-                    $link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars, '', '', 0, true);
-                }
-                else
-                {
-                    $link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars);
-                }
+                $link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars);
             }
         }
         return $link;
@@ -416,115 +419,70 @@ class commonModel extends model
      * @access public
      * @return array
      */
-    public static function createSubMenu($items, $replace)
+    public static function createDropMenu($items, $replace)
     {
-        $subMenu = array();
-        foreach($items as $subMenuKey => $subMenuLink)
+        $dropMenu = array();
+        foreach($items as $dropMenuKey => $dropMenuLink)
         {
-            if(is_array($subMenuLink) and isset($subMenuLink['link'])) $subMenuLink = $subMenuLink['link'];
+            if(is_array($dropMenuLink) and isset($dropMenuLink['link'])) $dropMenuLink = $dropMenuLink['link'];
             if(is_array($replace))
             {
-                $subMenuLink = vsprintf($subMenuLink, $replace);
+                $dropMenuLink = vsprintf($dropMenuLink, $replace);
             }
             else
             {
-                $subMenuLink = sprintf($subMenuLink, $replace);
+                $dropMenuLink = sprintf($dropMenuLink, $replace);
             }
-            list($subMenuName, $subMenuModule, $subMenuMethod, $subMenuParams) = explode('|', $subMenuLink);
+            list($dropMenuName, $dropMenuModule, $dropMenuMethod, $dropMenuParams) = explode('|', $dropMenuLink);
 
             $link = array();
-            $link['module'] = $subMenuModule;
-            $link['method'] = $subMenuMethod;
-            $link['vars']   = $subMenuParams;
+            $link['module'] = $dropMenuModule;
+            $link['method'] = $dropMenuMethod;
+            $link['vars']   = $dropMenuParams;
 
-            $subMenuItem     = isset($items->$subMenuKey) ? $items->$subMenuKey : array();
+            $dropMenuItem     = isset($items->$dropMenuKey) ? $items->$dropMenuKey : array();
             $menu            = new stdclass();
-            $menu->name      = $subMenuKey;
+            $menu->name      = $dropMenuKey;
             $menu->link      = $link;
-            $menu->text      = $subMenuName;
-            $menu->subModule = isset($subMenuItem['subModule']) ? $subMenuItem['subModule'] : '';
-            $menu->alias     = isset($subMenuItem['alias'])     ? $subMenuItem['alias'] : '';
+            $menu->text      = $dropMenuName;
+            $menu->subModule = isset($dropMenuItem['subModule']) ? $dropMenuItem['subModule'] : '';
+            $menu->alias     = isset($dropMenuItem['alias'])     ? $dropMenuItem['alias'] : '';
             $menu->hidden    = false;
-            $subMenu[$subMenuKey] = $menu;
+            $dropMenu[$dropMenuKey] = $menu;
         }
 
-        return $subMenu;
+        return $dropMenu;
     }
 
     /**
-     * Init submenu for project menu.
+     * Print admin dropMenu.
      *
-     * @static
-     * @access public
-     * @return array
-     */
-    public static function initProjectSubmenu()
-    {
-        global $lang, $app;
-        $moduleName = $app->getModuleName();
-        $methodName = $app->getMethodName();
-
-        foreach(array('waterfall', 'scrum') as $model)
-        {
-            foreach($lang->menu->$model as $key => $menu)
-            {
-                /* Replace for dropdown submenu. */
-                if(isset($lang->$model->subMenu->$key))
-                {
-                    $programSubMenu = $lang->$model->subMenu->$key;
-                    $subMenu        = common::createSubMenu($programSubMenu, $app->session->PRJ);
-
-                    if(!empty($subMenu))
-                    {
-                        foreach($subMenu as $menuKey => $menu)
-                        {
-                            $itemMenu = zget($programSubMenu, $menuKey, '');
-                            $isActive['method']    = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']));
-                            $isActive['alias']     = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false));
-                            $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false);
-
-                            if($isActive['method'] or $isActive['alias'] or $isActive['subModule'])
-                            {
-                                $lang->menu->$model->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
-                                break;
-                            }
-                        }
-                        $lang->menu->$model->{$key}['subMenu'] = $subMenu;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Print admin subMenu.
-     *
-     * @param  string    $subMenu
+     * @param  string    $dropMenu
      * @static
      * @access public
      * @return void
      */
-    public static function printAdminSubMenu($subMenu)
+    public static function printAdminDropMenu($dropMenu)
     {
         global $app, $lang;
         $currentModule = $app->getModuleName();
         $currentMethod = $app->getMethodName();
-        if(isset($lang->admin->subMenuOrder->$subMenu))
+        if(isset($lang->admin->dropMenuOrder->$dropMenu))
         {
-            ksort($lang->admin->subMenuOrder->$subMenu);
-            foreach($lang->admin->subMenuOrder->$subMenu as $type)
+            ksort($lang->admin->dropMenuOrder->$dropMenu);
+            foreach($lang->admin->dropMenuOrder->$dropMenu as $type)
             {
-                if(isset($lang->admin->subMenu->$subMenu->$type))
+                if(isset($lang->admin->dropMenu->$dropMenu->$type))
                 {
                     $subModule = '';
                     $alias     = '';
-                    $link      = $lang->admin->subMenu->$subMenu->$type;
-                    if(is_array($lang->admin->subMenu->$subMenu->$type))
+                    $link      = $lang->admin->dropMenu->$dropMenu->$type;
+                    if(is_array($lang->admin->dropMenu->$dropMenu->$type))
                     {
-                        $subMenuType = $lang->admin->subMenu->$subMenu->$type;
-                        if(isset($subMenuType['subModule'])) $subModule = $subMenuType['subModule'];
-                        if(isset($subMenuType['alias']))     $alias     = $subMenuType['alias'];
-                        if(isset($subMenuType['link']))      $link      = $subMenuType['link'];
+                        $dropMenuType = $lang->admin->dropMenu->$dropMenu->$type;
+                        if(isset($dropMenuType['subModule'])) $subModule = $dropMenuType['subModule'];
+                        if(isset($dropMenuType['alias']))     $alias     = $dropMenuType['alias'];
+                        if(isset($dropMenuType['link']))      $link      = $dropMenuType['link'];
                     }
 
                     list($text, $moduleName, $methodName)= explode('|', $link);
@@ -565,6 +523,42 @@ class commonModel extends model
         }
     }
 
+    /**
+     * Print upper left corner home button.
+     *
+     * @param  string $openApp
+     * @static
+     * @access public
+     * @return void
+     */
+    public static function printHomeButton($openApp)
+    {
+        global $lang;
+        global $config;
+
+        if(!$openApp) return;
+        $icon = zget($lang->navIcons, $openApp, '');
+
+        if(!in_array($openApp, array('program', 'product', 'project')))
+        {
+            $nav = $lang->mainNav->$openApp;
+            list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
+            if($openApp == 'execution') $currentMethod = 'all';
+        }
+        else
+        {
+            $currentModule = $openApp;
+            if($openApp == 'program' or $openApp == 'project') $currentMethod = 'browse';
+            if($openApp == 'product') $currentMethod = 'all';
+        }
+
+        if($config->systemMode == 'classic' and $openApp == 'execution') $icon = zget($lang->navIcons, 'project', '');
+        $link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : '';
+        $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}";
+
+        echo "<div class='btn-group header-btn'>" . $html . '</div>';
+    }
+
     /**
      * Get main nav items list
      *
@@ -583,13 +577,23 @@ class commonModel extends model
 
         $items = array();
         $lastItem = end($menuOrder);
+        $divider = false;
         foreach($menuOrder as $key => $group)
         {
             $nav = $lang->mainNav->$group;
             list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
 
+            /* When last divider is not used in mainNav, use it next menu. */
+            $divider = ($divider || ($lastItem != $key) && strpos($lang->dividerMenu, ",{$group},") !== false) ? true : false;
+
             if(!common::hasPriv($currentModule, $currentMethod)) continue;
 
+            if($divider)
+            {
+                $items[] = 'divider';
+                $divider = false;
+            }
+
             $item = new stdClass();
             $item->group      = $group;
             $item->code       = $group;
@@ -601,122 +605,125 @@ class commonModel extends model
             $item->url        = helper::createLink($currentModule, $currentMethod, $vars, '', 0, 0, 1);
 
             $items[] = $item;
-
-            if(($lastItem != $key) && strpos($lang->dividerMenu, ",{$group},") !== false)
-            {
-                $items[] = 'divider';
-            }
         }
         return $items;
     }
 
-    /**
-     * Print recent menu.
-     *
-     * @access public
-     * @return void
-     */
-    public static function printRecentMenu()
-    {
-        global $lang;
-        echo '<li><a id="recentMenu"><i class="icon icon-recent"></i><span class="text">' . $lang->recent . '</span></a></li>';
-    }
-
     /**
      * Print the main menu.
      *
-     * @param  string $moduleName
-     * @param  string $methodName
-     *
      * @static
      * @access public
-     * @return void
+     * @return string
      */
-    public static function printMainmenu($moduleName, $methodName = '')
+    public static function printMainMenu()
     {
         global $app, $lang, $config;
 
-        if($moduleName == 'product' and $methodName == 'create') return;
+        /* Set main menu by openApp and module. */
+        self::setMainMenu();
+
+        $activeMenu = '';
+        $openApp = $app->openApp;
 
-        /* Set the main main menu. */
-        $mainMenu      = $moduleName;
         $currentModule = $app->rawModule;
         $currentMethod = $app->rawMethod;
 
-        /* Set main menu by group. */
-        $group = isset($lang->navGroup->$moduleName) ? $lang->navGroup->$moduleName : $moduleName;
-        self::setMainMenuByGroup($group, $moduleName, $methodName);
-
         /* Print all main menus. */
-        $menu       = customModel::getMainMenu();
-        $activeName = 'active';
-        $lastMenu   = end($menu);
-        if(isset($lang->menugroup->$moduleName)) $mainMenu = $lang->menugroup->$moduleName;
+        $menu     = customModel::getMainMenu();
+        $lastMenu = end($menu);
 
         echo "<ul class='nav nav-default'>\n";
         foreach($menu as $menuItem)
         {
             if(isset($menuItem->hidden) && $menuItem->hidden) continue;
             if(empty($menuItem->link)) continue;
-            if(isset($lang->$group->dividerMenu) and strpos($lang->$group->dividerMenu, ",{$menuItem->name},") !== false) echo "<li class='divider'></li>";
+            if($menuItem->divider) echo "<li class='divider'></li>";
 
             /* Init the these vars. */
             $alias     = isset($menuItem->alias) ? $menuItem->alias : '';
             $subModule = isset($menuItem->subModule) ? explode(',', $menuItem->subModule) : array();
             $class     = isset($menuItem->class) ? $menuItem->class : '';
-            $active    = $menuItem->name == $mainMenu ? "active" : '';
-            if($subModule and in_array($currentModule, $subModule)) $active = 'active';
+            $exclude   = isset($menuItem->exclude) ? $menuItem->exclude : '';
+
+            $active = '';
+            if($menuItem->name == $currentModule and strpos(",$exclude,", ",$currentModule-$currentMethod,") === false)
+            {
+                $activeMenu = $menuItem->name;
+                $active = 'active';
+            }
+            if($subModule and in_array($currentModule, $subModule) and strpos(",$exclude,", ",$currentModule-$currentMethod,") === false)
+            {
+                $activeMenu = $menuItem->name;
+                $active = 'active';
+            }
+
             if($menuItem->link)
             {
                 $target = '';
                 $module = '';
                 $method = '';
-                $link   = commonModel::createMenuLink($menuItem, $group);
+                $link   = commonModel::createMenuLink($menuItem, $openApp);
                 if(is_array($menuItem->link))
                 {
                     if(isset($menuItem->link['target'])) $target = $menuItem->link['target'];
                     if(isset($menuItem->link['module'])) $module = $menuItem->link['module'];
                     if(isset($menuItem->link['method'])) $method = $menuItem->link['method'];
                 }
-                if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false)) $active = 'active';
-
-                $label   = $menuItem->text;
-                $subMenu = '';
-
-                /* Print sub menus. */
-                if(isset($menuItem->subMenu))
+                if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false) and strpos(",$exclude,", ",$currentMethod,") === false)
                 {
-                    foreach($menuItem->subMenu as $subMenuItem)
-                    {
-                        if($subMenuItem->hidden) continue;
-
-                        $subActive  = '';
-                        $subModule  = '';
-                        $subMethod  = '';
-                        $subParams  = '';
-                        $subProgram = '';
-                        $subLabel   = $subMenuItem->text;
-                        if(isset($subMenuItem->link['module'])) $subModule = $subMenuItem->link['module'];
-                        if(isset($subMenuItem->link['method'])) $subMethod = $subMenuItem->link['method'];
-                        if(isset($subMenuItem->link['vars']))   $subParams = $subMenuItem->link['vars'];
-
-                        $subLink = helper::createLink($subModule, $subMethod, $subParams);
-                        if($currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod)) $subActive = 'active';
-                        $subMenu .= "<li class='$subActive' data-id='$subMenuItem->name'>" . html::a($subLink, $subLabel) . $subProgram . '</li>';
-                    }
-
-                    if(empty($subMenu)) continue;
-
-                    $label   .= "<span class='caret'></span>";
-                    $subMenu  = "<ul class='dropdown-menu'>{$subMenu}</ul>";
+                    $activeMenu = $menuItem->name;
+                    $active = 'active';
                 }
 
-                /* Avoid highlighting the same navigation method at the same time. */
-                if($currentModule == 'feedback' and $currentMethod == 'admin') $active = '';
-                if($currentModule == 'product' and $currentMethod == 'browse') $active = '';
-                if($currentModule == 'story') $active = '';
+                $label    = $menuItem->text;
+                $dropMenu = '';
 
-                $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target) . $subMenu . "</li>\n";
+                /* Print drop menus. */
+                if(isset($menuItem->dropMenu))
+                {
+                    foreach($menuItem->dropMenu as $dropMenuName => $dropMenuItem)
+                    {
+                        if(isset($dropMenuItem->hidden) and $dropMenuItem->hidden) continue;
+
+
+                        /* Parse drop menu link. */
+                        $dropMenuLink = $dropMenuItem;
+                        if(is_array($dropMenuItem) and isset($dropMenuItem['link'])) $dropMenuLink = $dropMenuLink['link'];
+
+                        list($subLabel, $subModule, $subMethod, $subParams) = explode('|', $dropMenuLink);
+                        $subLink = helper::createLink($subModule, $subMethod, $subParams);
+
+                        $subActive = '';
+                        $activeMainMenu = false;
+                        if($currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod))
+                        {
+                            $activeMainMenu = true;
+                        }
+                        else
+                        {
+                            $subModule = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
+                            if($subModule and in_array($currentModule, $subModule) and strpos(",$exclude,", ",$currentModule-$currentMethod,") === false) $activeMainMenu = true;
+                        }
+
+                        if($activeMainMenu)
+                        {
+                            $activeMenu = $dropMenuName;
+                            $active     = 'active';
+                            $subActive  = 'active';
+                            $label      = $subLabel;
+                        }
+                        $dropMenu .= "<li class='$subActive' data-id='$subLabel'>" . html::a($subLink, $subLabel, '', "data-app='$openApp'") . '</li>';
+                    }
+
+                    if(empty($dropMenu)) continue;
+
+                    $label   .= "<span class='caret'></span>";
+                    $dropMenu  = "<ul class='dropdown-menu'>{$dropMenu}</ul>";
+                }
+
+                $misc = (isset($lang->navGroup->$module) and $openApp != $lang->navGroup->$module) ? "data-app='$openApp'" : '';
+                $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target, $misc) . $dropMenu . "</li>\n";
 
                 echo $menuItemHtml;
             }
@@ -726,6 +733,8 @@ class commonModel extends model
             }
         }
         echo "</ul>\n";
+
+        return $activeMenu;
     }
 
     /**
@@ -738,11 +747,17 @@ class commonModel extends model
     public static function printSearchBox()
     {
         global $lang;
+        global $config;
+
         $searchObject = 'bug';
         echo "<div class='input-group-btn'>";
         echo html::hidden('searchType', $searchObject);
         echo "<ul id='searchTypeMenu' class='dropdown-menu'>";
-        foreach ($lang->searchObjects as $key => $value)
+
+        $searchObjects = $lang->searchObjects;
+        if($config->systemMode != 'new') unset($searchObjects['program'], $searchObjects['project']);
+
+        foreach ($searchObjects as $key => $value)
         {
             $class = $key == $searchObject ? "class='selected'" : '';
             if($key == 'program')    $key = 'program-product';
@@ -756,43 +771,21 @@ class commonModel extends model
     /**
      * Print the module menu.
      *
-     * @param  string $moduleName
+     * @param  string $actveMenu
+     * @param  string $methodName
      * @static
      * @access public
      * @return void
      */
-    public static function printModuleMenu($moduleName)
+    public static function printModuleMenu($activeMenu)
     {
-        global $config, $lang, $app;
+        global $app, $lang;
         $moduleName = $app->rawModule;
         $methodName = $app->rawMethod;
-        $mainMenu   = $moduleName;
-        if(isset($lang->menugroup->$moduleName)) $mainMenu = $lang->menugroup->$moduleName;
 
-        /* Set main menu by group. */
-        $group = isset($lang->navGroup->$moduleName) ? $lang->navGroup->$moduleName : '';
-        if($moduleName == 'admin') return;
-        if($group == 'repo' || $group == 'ops' || $group == 'feedback') return;
-        if($group == 'my') self::getMyModuleMenu($moduleName, $methodName);
-        if($group == 'project') self::getProjectModuleMenu($moduleName, $methodName);
-        if($group == 'product')
-        {
-            $lang->product->menu = $lang->product->setMenu;
-            self::processMenuVars($lang->product->menu);
-        }
-        if($group == 'execution')
-        {
-            if(in_array($methodName, array('grouptask', 'tree'))) $lang->execution->menu = $lang->execution->viewMenu;
-            if(in_array($methodName, array('qa', 'bug', 'testtask', 'testcase', 'testreport'))) $lang->execution->menu = $lang->execution->qaMenu;
-            if(in_array($methodName, array('view', 'manageproducts', 'team', 'whitelist', 'edit', 'managemembers', 'addwhitelist'))) $lang->execution->menu = self::processMenuVars($lang->execution->settingMenu);
-        }
-        if(strpos('qa|bug|testcase|testreport|testtask', $moduleName) !== false and $group == 'project')
-        {
-            unset($lang->$moduleName->menu->testsuite);
-            unset($lang->$moduleName->menu->caselib);
-        }
+        $openApp = $app->openApp;
 
-        if(!isset($lang->$moduleName->menu))
+        if(!isset($lang->$openApp->menu))
         {
             echo "<ul></ul>";
             return;
@@ -805,30 +798,28 @@ class commonModel extends model
         $isMobile       = $app->viewType === 'mhtml';
 
         /* When use workflow then set rawModule to moduleName. */
-        if($moduleName == 'flow') $moduleName = $app->rawModule;
-        $menu = customModel::getModuleMenu($moduleName);
+        if($moduleName == 'flow') $activeMenu = $app->rawModule;
+        $menu = customModel::getModuleMenu($activeMenu);
 
         /* If this is not workflow then use rawModule and rawMethod to judge highlight. */
         if($app->isFlow)
         {
-            $currentModule  = $app->rawModule;
-            $currentMethod  = $app->rawMethod;
+            $currentModule = $app->rawModule;
+            $currentMethod = $app->rawMethod;
         }
 
-        if($isTutorialMode and defined('WIZARD_MODULE')) $currentModule  = WIZARD_MODULE;
-        if($isTutorialMode and defined('WIZARD_METHOD')) $currentMethod  = WIZARD_METHOD;
+        if($isTutorialMode and defined('WIZARD_MODULE')) $currentModule = WIZARD_MODULE;
+        if($isTutorialMode and defined('WIZARD_METHOD')) $currentMethod = WIZARD_METHOD;
 
         /* The beginning of the menu. */
         echo $isMobile ? '' : "<ul class='nav nav-default'>\n";
 
-        if(isset($lang->menugroup->$moduleName)) $moduleName = $lang->menugroup->$moduleName;
-
         /* Cycling to print every sub menu. */
         foreach($menu as $menuItem)
         {
             if(isset($menuItem->hidden) && $menuItem->hidden) continue;
             if($isMobile and empty($menuItem->link)) continue;
-            if(isset($lang->$moduleName->dividerMenu) and strpos($lang->$moduleName->dividerMenu, ",{$menuItem->name},") !== false) echo "<li class='divider'></li>";
+            if($menuItem->divider) echo "<li class='divider'></li>";
 
             /* Init the these vars. */
             $alias     = isset($menuItem->alias) ? $menuItem->alias : '';
@@ -836,13 +827,13 @@ class commonModel extends model
             $class     = isset($menuItem->class) ? $menuItem->class : '';
             $active    = '';
             if($subModule and in_array($currentModule, $subModule)) $active = 'active';
-            if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
+            // if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
             if($menuItem->link)
             {
                 $target = '';
                 $module = '';
                 $method = '';
-                $link   = commonModel::createMenuLink($menuItem, $group);
+                $link   = commonModel::createMenuLink($menuItem, $openApp);
                 if(is_array($menuItem->link))
                 {
                     if(isset($menuItem->link['target'])) $target = $menuItem->link['target'];
@@ -851,39 +842,42 @@ class commonModel extends model
                 }
                 if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false)) $active = 'active';
 
-                $label   = $menuItem->text;
-                $subMenu = '';
+                $label    = $menuItem->text;
+                $dropMenu = '';
                 /* Print sub menus. */
-                if(isset($menuItem->subMenu))
+                if(isset($menuItem->dropMenu))
                 {
-                    foreach($menuItem->subMenu as $subMenuItem)
+                    foreach($menuItem->dropMenu as $dropMenuItem)
                     {
-                        if($subMenuItem->hidden) continue;
+                        if($dropMenuItem->hidden) continue;
 
                         $subActive = '';
                         $subModule = '';
                         $subMethod = '';
                         $subParams = '';
-                        $subLabel  = $subMenuItem->text;
-                        if(isset($subMenuItem->link['module'])) $subModule = $subMenuItem->link['module'];
-                        if(isset($subMenuItem->link['method'])) $subMethod = $subMenuItem->link['method'];
-                        if(isset($subMenuItem->link['vars']))   $subParams = $subMenuItem->link['vars'];
+                        $subLabel  = $dropMenuItem->text;
+                        if(isset($dropMenuItem->link['module'])) $subModule = $dropMenuItem->link['module'];
+                        if(isset($dropMenuItem->link['method'])) $subMethod = $dropMenuItem->link['method'];
+                        if(isset($dropMenuItem->link['vars']))   $subParams = $dropMenuItem->link['vars'];
 
                         $subLink = helper::createLink($subModule, $subMethod, $subParams);
 
                         if($currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod)) $subActive = 'active';
 
-                        $subMenu .= "<li class='$subActive' data-id='$subMenuItem->name'>" . html::a($subLink, $subLabel) . '</li>';
+                        $misc = (isset($lang->navGroup->$subModule) and $openApp != $lang->navGroup->$subModule) ? "data-app='$openApp'" : '';
+                        $dropMenu .= "<li class='$subActive' data-id='$dropMenuItem->name'>" . html::a($subLink, $subLabel, '', $misc) . '</li>';
                     }
 
-                    if(empty($subMenu)) continue;
+                    if(empty($dropMenu)) continue;
 
                     $label   .= "<span class='caret'></span>";
-                    $subMenu  = "<ul class='dropdown-menu'>{$subMenu}</ul>";
+                    $dropMenu  = "<ul class='dropdown-menu'>{$dropMenu}</ul>";
                 }
 
-                $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target) . $subMenu . "</li>\n";
-                if($isMobile) $menuItemHtml = html::a($link, $menuItem->text, $target, "class='$class $active'") . "\n";
+                $misc = (isset($lang->navGroup->$module) and $openApp != $lang->navGroup->$module) ? "data-app='$openApp'" : '';
+                $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target, $misc) . $dropMenu . "</li>\n";
+
+                if($isMobile) $menuItemHtml = html::a($link, $menuItem->text, $target, $misc . " class='$class $active'") . "\n";
                 echo $menuItemHtml;
             }
             else
@@ -907,7 +901,6 @@ class commonModel extends model
     {
         global $lang;
         $mainMenu = $moduleName;
-        if(isset($lang->menugroup->$moduleName)) $mainMenu = $lang->menugroup->$moduleName;
         echo "<ul class='breadcrumb'>";
         echo '<li>' . html::a(helper::createLink('my', 'index'), $lang->zentaoPMS) . '</li>';
         if($moduleName != 'index')
@@ -1037,7 +1030,7 @@ class commonModel extends model
             $className = 'header';
         }
         $link = helper::createLink($module, $method, sprintf($vars, $orderBy));
-        echo $isMobile ? html::a($link, $label, '', "class='$className'") : html::a($link, $label, '', "class='$className'");
+        echo $isMobile ? html::a($link, $label, '', "class='$className' data-app={$app->openApp}") : html::a($link, $label, '', "class='$className' data-app={$app->openApp}");
     }
 
     /**
@@ -1329,13 +1322,16 @@ EOD;
         global $lang, $app;
         if(isonlybody()) return false;
 
+        $moduleName = ($app->getModuleName() == 'story' and $app->openApp == 'project') ? 'projectstory' : $app->getModuleName();
         echo "<nav class='container'>";
         if(isset($preAndNext->pre) and $preAndNext->pre)
         {
             $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->pre->case)) ? 'case' : 'id';
             $title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
             $title = '#' . $preAndNext->pre->$id . ' ' . $title . ' ' . $lang->preShortcutKey;
-            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->pre->$id) : inLink('view', "ID={$preAndNext->pre->$id}");
+
+            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->pre->$id) : helper::createLink($moduleName, 'view', "ID={$preAndNext->pre->$id}");
+            $link .= '#app=' . $app->openApp;
             echo html::a($link, '<i class="icon-pre icon-chevron-left"></i>', '', "id='prevPage' class='btn' title='{$title}'");
         }
         if(isset($preAndNext->next) and $preAndNext->next)
@@ -1343,7 +1339,8 @@ EOD;
             $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->next->case)) ? 'case' : 'id';
             $title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
             $title = '#' . $preAndNext->next->$id . ' ' . $title . ' ' . $lang->nextShortcutKey;
-            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->next->$id) : inLink('view', "ID={$preAndNext->next->$id}");
+            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->next->$id) : helper::createLink($moduleName, 'view', "ID={$preAndNext->next->$id}");
+            $link .= '#app=' . $app->openApp;
             echo html::a($link, '<i class="icon-pre icon-chevron-right"></i>', '', "id='nextPage' class='btn' title='$title'");
         }
         echo '</nav>';
@@ -1393,7 +1390,6 @@ EOD;
         }
 
         $changes    = array();
-        $magicQuote = get_magic_quotes_gpc();
         foreach($new as $key => $value)
         {
             if(is_object($value) or is_array($value)) continue;
@@ -1403,17 +1399,19 @@ EOD;
             if(strtolower($key) == 'editedby')        continue;
             if(strtolower($key) == 'editeddate')      continue;
             if(strtolower($key) == 'uid')             continue;
-            if(strtolower($key) == 'finisheddate' && $value == '')  continue;
-            if(strtolower($key) == 'canceleddate' && $value == '')  continue;
-            if(strtolower($key) == 'closeddate'   && $value == '')  continue;
+            if(strtolower($key) == 'finisheddate' && $value == '')    continue;
+            if(strtolower($key) == 'canceleddate' && $value == '')    continue;
+            if(strtolower($key) == 'hangupeddate' && $value == '')    continue;
+            if(strtolower($key) == 'lastcheckeddate' && $value == '') continue;
+            if(strtolower($key) == 'activateddate' && $value == '')   continue;
+            if(strtolower($key) == 'closeddate'   && $value == '')    continue;
 
-            if($magicQuote) $value = stripslashes($value);
             if(isset($old->$key) and $value != stripslashes($old->$key))
             {
                 $diff = '';
                 if(substr_count($value, "\n") > 1     or
                     substr_count($old->$key, "\n") > 1 or
-                    strpos('name,title,desc,spec,steps,content,digest,verify,report', strtolower($key)) !== false)
+                    strpos('name,title,desc,spec,steps,content,digest,verify,report,analysis,summary,prevention,resolution', strtolower($key)) !== false)
                 {
                     $diff = commonModel::diff($old->$key, $value);
                 }
@@ -1517,7 +1515,8 @@ EOD;
                 $id  = $object->$key;
                 $objectList[$id] = $object;
             }
-            $this->session->set($objectIdListKey, array('sql' => $sql, 'objectList' => $objectList));
+
+            $this->session->set($objectIdListKey, array('sql' => $sql, 'objectList' => $objectList), $this->app->openApp);
             $existsObjectList = $this->session->$objectIdListKey;
         }
 
@@ -1526,22 +1525,25 @@ EOD;
         $preAndNextObject->next = '';
 
         $preObj = false;
-        foreach($existsObjectList['objectList'] as $id => $object)
+        if(isset($existsObjectList['objectList']))
         {
-            /* Get next object. */
-            if($preObj === true)
+            foreach($existsObjectList['objectList'] as $id => $object)
             {
-                $preAndNextObject->next = $object;
-                break;
-            }
+                /* Get next object. */
+                if($preObj === true)
+                {
+                    $preAndNextObject->next = $object;
+                    break;
+                }
 
-            /* Get pre object. */
-            if($id == $objectID)
-            {
-                if($preObj) $preAndNextObject->pre = $preObj;
-                $preObj = true;
+                /* Get pre object. */
+                if($id == $objectID)
+                {
+                    if($preObj) $preAndNextObject->pre = $preObj;
+                    $preObj = true;
+                }
+                if($preObj !== true) $preObj = $object;
             }
-            if($preObj !== true) $preObj = $object;
         }
 
         return $preAndNextObject;
@@ -1576,8 +1578,8 @@ EOD;
         $queryCondition = trim($queryCondition);
         if(empty($queryCondition)) $queryCondition = "1=1";
 
-        $this->session->set($objectType . 'QueryCondition', $queryCondition);
-        $this->session->set($objectType . 'OnlyCondition', $onlyCondition);
+        $this->session->set($objectType . 'QueryCondition', $queryCondition, $this->app->openApp);
+        $this->session->set($objectType . 'OnlyCondition', $onlyCondition, $this->app->openApp);
 
         /* Set the query condition session. */
         $orderBy = explode(' ORDER BY ', $sql);
@@ -1588,8 +1590,8 @@ EOD;
             $orderBy = $orderBy[0];
             if($onlyCondition) $orderBy = str_replace('t1.', '', $orderBy);
         }
-        $this->session->set($objectType . 'OrderBy', $orderBy);
-        $this->session->set($objectType . 'BrowseList', array());
+        $this->session->set($objectType . 'OrderBy', $orderBy, $this->app->openApp);
+        $this->session->set($objectType . 'BrowseList', array(), $this->app->openApp);
     }
 
     /**
@@ -1721,7 +1723,7 @@ EOD;
             $method = $this->app->rawMethod;
         }
 
-        if(!empty($this->app->user->modifyPassword) and (($module != 'my' or $method != 'changepassword') and ($module != 'user' or $method != 'logout'))) die(js::locate(helper::createLink('my', 'changepassword', '', '', true)));
+        if(!empty($this->app->user->modifyPassword) and (($module != 'user' or $method != 'deny') and ($module != 'my' or $method != 'changepassword') and ($module != 'user' or $method != 'logout'))) die(js::locate(helper::createLink('my', 'changepassword', '', '', true)));
         if($this->isOpenMethod($module, $method)) return true;
         if(!$this->loadModel('user')->isLogon() and $this->server->php_auth_user) $this->user->identifyByPhpAuth();
         if(!$this->loadModel('user')->isLogon() and $this->cookie->za) $this->user->identifyByCookie();
@@ -1734,7 +1736,7 @@ EOD;
             if(!defined('IN_UPGRADE') and $inProject)
             {
                 /* Check program priv. */
-                if($this->session->PRJ and strpos(",{$this->app->user->view->projects},", ",{$this->session->PRJ},") === false and !$this->app->user->admin) $this->loadModel('project')->accessDenied();
+                if($this->session->project and strpos(",{$this->app->user->view->projects},", ",{$this->session->project},") === false and !$this->app->user->admin) $this->loadModel('project')->accessDenied();
                 $this->resetProgramPriv($module, $method);
                 if(!commonModel::hasPriv($module, $method)) $this->deny($module, $method, false);
             }
@@ -1771,7 +1773,7 @@ EOD;
 
         /* If is the program admin, have all program privs. */
         $inProject = isset($lang->navGroup->$module) && $lang->navGroup->$module == 'project';
-        if($inProject && $app->session->PRJ && strpos(",{$app->user->rights['projects']},", ",{$app->session->PRJ},") !== false) return true;
+        if($inProject && $app->session->project && strpos(",{$app->user->rights['projects']},", ",{$app->session->project},") !== false) return true;
 
         /* If module is project and method is execution, check for all execution privilege. */
         if($module == 'project' and $method == 'execution')
@@ -1791,7 +1793,7 @@ EOD;
             if(!commonModel::hasDBPriv($object, $module, $method)) return false;
 
             if(empty($acls['views'])) return true;
-            $menu = isset($lang->menugroup->$module) ? $lang->menugroup->$module : $module;
+            $menu = isset($lang->navGroup->$module) ? $lang->navGroup->$module : $module;
             $menu = strtolower($menu);
             if($menu != 'qa' and !isset($lang->$menu->menu)) return true;
             if($menu == 'my' or $menu == 'index' or $module == 'tree') return true;
@@ -1818,8 +1820,8 @@ EOD;
     public function resetProgramPriv($module, $method)
     {
         /* Get user program priv. */
-        if(!$this->app->session->PRJ) return;
-        $program       = $this->dao->findByID($this->app->session->PRJ)->from(TABLE_PROJECT)->fetch();
+        if(!$this->app->session->project) return;
+        $program       = $this->dao->findByID($this->app->session->project)->from(TABLE_PROJECT)->fetch();
         $programRights = $this->dao->select('t3.module, t3.method')->from(TABLE_GROUP)->alias('t1')
             ->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id = t2.group')
             ->leftJoin(TABLE_GROUPPRIV)->alias('t3')->on('t2.group=t3.group')
@@ -1944,52 +1946,6 @@ EOD;
         return (($ip & $netmask) == ($ipWhiteList & $netmask));
     }
 
-    /**
-     * Replace the %s of one key of a menu by $params.
-     *
-     * All the menus are defined in the common's language file. But there're many dynamic params, so in the defination,
-     * we used %s as placeholder. These %s should be setted in one module.
-     *
-     * The items of one module's menu may be an string or array. For example, please see module/common/lang.
-     *
-     * @param  string $object     the menus of one module
-     * @param  string $key        the menu item to be replaced
-     * @param  string $params     the params passed to the menu item
-     * @access public
-     * @return void
-     */
-    public static function setMenuVars($menu, $key, $params)
-    {
-        if(!isset($menu->$key)) return false;
-
-        if(is_array($params))
-        {
-            if(is_array($menu->$key))
-            {
-                $menu->$key = (object)$menu->$key;
-                $menu->$key->link = vsprintf($menu->$key->link, $params);
-                $menu->$key = (array)$menu->$key;
-            }
-            else
-            {
-                $menu->$key = vsprintf($menu->$key, $params);
-            }
-        }
-        else
-        {
-            if(is_array($menu->$key))
-            {
-                $menu->$key = (object)$menu->$key;
-                $menu->$key->link = sprintf($menu->$key->link, $params);
-                $menu->$key = (array)$menu->$key;
-            }
-            else
-            {
-                $menu->$key = sprintf($menu->$key, $params);
-            }
-        }
-    }
-
     /**
      * Get the full url of the system.
      *
@@ -2178,20 +2134,30 @@ EOD;
     public static function canBeChanged($module, $object = null)
     {
         global $app, $config;
+        static $productsStatus   = array();
+        static $executionsStatus = array();
 
         /* Check the product is closed. */
         if(!empty($object->product) and is_numeric($object->product) and empty($config->CRProduct))
         {
-            $product = $app->control->loadModel('product')->getByID($object->product);
-            if($product->status == 'closed') return false;
+            if(!isset($productsStatus[$object->product]))
+            {
+                $product = $app->control->loadModel('product')->getByID($object->product);
+                $productsStatus[$object->product] = $product ? $product->status : '';
+            }
+            if($productsStatus[$object->product] == 'closed') return false;
         }
 
         /* Check the execution is closed. */
         $productModuleList = array('story', 'bug', 'testtask');
         if(!in_array($module, $productModuleList) and !empty($object->execution) and is_numeric($object->execution) and empty($config->CRExecution))
         {
-            $execution = $app->control->loadModel('execution')->getByID($object->execution);
-            if($execution->status == 'closed') return false;
+            if(!isset($executionsStatus[$object->execution]))
+            {
+                $execution = $app->control->loadModel('execution')->getByID($object->execution);
+                $executionsStatus[$object->execution] = $execution ? $execution->status : '';
+            }
+            if($executionsStatus[$object->execution] == 'closed') return false;
         }
 
         return true;
@@ -2300,202 +2266,55 @@ EOD;
     }
 
     /**
-     * Set main menu by nav group.
+     * Set main menu.
      *
-     * @param  string  $group
-     * @param  string  $moduleName
-     * @param  string  $methodName
      * @static
      * @access public
      * @return string
      */
-    public static function setMainMenuByGroup($group, $moduleName, $methodName)
-    {
-        global $lang, $config;
-        if($group == 'my')
-        {
-            $lang->menu      = $lang->my->menu;
-            $lang->menuOrder = $lang->my->menuOrder;
-        }
-        if($group == 'system')
-        {
-            $lang->menu         = $lang->system->menu;
-            $lang->menuOrder    = $lang->system->menuOrder;
-            $lang->report->menu = $lang->measurement->menu;
-        }
-        if($group == 'doclib') return;
-        if($group == 'report')
-        {
-            $lang->menu      = $lang->report->menu;
-            $lang->menuOrder = $lang->report->menuOrder;
-        }
-        if($group == 'qa')
-        {
-            $lang->menu      = $lang->qa->menu;
-            $lang->menuOrder = $lang->qa->menuOrder;
-        }
-        if($group == 'attend')
-        {
-            $lang->menu      = $lang->attend->menu;
-            $lang->menuOrder = $lang->attend->menuOrder;
-        }
-        if($group == 'admin')
-        {
-            $lang->menu      = $lang->admin->menu;
-            $lang->menuOrder = $lang->admin->menuOrder;
-        }
-        if($group == 'program')
-        {
-            $lang->menu = $lang->program->menu;
-        }
-        if($group == 'product')
-        {
-            $lang->menu      = $lang->product->menu;
-            $lang->menuOrder = $lang->product->menuOrder;
-        }
-        if($group == 'repo')
-        {
-            $lang->menu      = $lang->repo->menu;
-            $lang->menuOrder = $lang->repo->menuOrder;
-        }
-        if($group == 'ops')
-        {
-            $lang->menu      = $lang->ops->menu;
-            $lang->menuOrder = $lang->ops->menuOrder;
-        }
-        if($group == 'feedback')
-        {
-            $lang->menu      = $lang->feedback->menu;
-            $lang->menuOrder = $lang->feedback->menuOrder;
-        }
-        if($group == 'execution')
-        {
-            $lang->menu      = $lang->execution->menu;
-            $lang->menuOrder = $lang->execution->menuOrder;
-        }
-        if($group == 'project')
-        {
-            if($config->systemMode == 'classic' or ($moduleName == 'project' and $methodName == 'browse'))
-            {
-                $lang->menu = $lang->project->menu;
-            }
-            else
-            {
-                $lang->menu = self::getProjectMainMenu($moduleName);
-            }
-        }
-    }
-
-    /**
-     * Replace menu vars.
-     *
-     * @param  object  $menus
-     * @static
-     * @access public
-     * @return string
-     */
-    public static function processMenuVars($menus)
+    public static function setMainMenu()
     {
         global $app, $lang;
-        if(empty($menus)) return;
-        foreach($menus as $name => $setting)
+
+        $openApp = $app->openApp;
+
+        /* If homeMenu is not exists or unset, display menu. */
+        if(!isset($lang->$openApp->homeMenu))
         {
-            $link = is_array($setting) ? $setting['link'] : $setting;
+            $lang->menu      = $lang->$openApp->menu;
+            $lang->menuOrder = $lang->$openApp->menuOrder;
+            return;
+        }
 
-            if(strpos($link, "{PRODUCT}") !== false)   $link = str_replace('{PRODUCT}', $app->session->product, $link);
-            if(strpos($link, "{EXECUTION}") !== false) $link = str_replace('{EXECUTION}', $app->session->execution, $link);
-            if(strpos($link, "{PROJECT}") !== false)   $link = str_replace('{PROJECT}', $app->session->PRJ, $link);
+        if($app->rawModule == $openApp && $app->rawMethod == 'create')
+        {
+            $lang->menu = $lang->$openApp->homeMenu;
+            return;
+        }
 
-            if(is_array($setting))
+        /* If the method is in homeMenu, display homeMenu. */
+        foreach($lang->$openApp->homeMenu as $menu)
+        {
+            $link   = is_array($menu) ? $menu['link'] : $menu;
+            $params = explode('|', $link);
+            $method = $params[2];
+
+            if($method == $app->rawMethod)
             {
-                $setting['link'] = $link;
-            }
-            else
-            {
-                $setting = $link;
+                $lang->menu = $lang->$openApp->homeMenu;
+                return;
             }
 
-            $menus->$name = $setting;
+            if(isset($menu['alias']) and in_array(strtolower($app->rawMethod), explode(',', strtolower($menu['alias']))))
+            {
+                $lang->menu = $lang->$openApp->homeMenu;
+                return;
+            }
         }
 
-        return $menus;
-    }
-
-    /**
-     * Get project main menu by model.
-     *
-     * @param  string $moduleName
-     * @static
-     * @access public
-     * @return string
-     */
-    public static function getProjectMainMenu($moduleName)
-    {
-        global $app, $lang, $dbh, $config;
-        $project = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->PRJ}'")->fetch();
-        if(empty($project)) return;
-
-        self::initProjectSubmenu();
-        if($project->model == 'scrum')
-        {
-            $lang->menuOrder = $lang->scrum->menuOrder;
-
-            /* The scrum project temporarily hides the trace matrix. */
-            unset($lang->projectstory->menu->track);
-            return self::processMenuVars($lang->menu->scrum);
-        }
-
-        if($project->model == 'waterfall')
-        {
-            $lang->project->dividerMenu = str_replace(',project,', ',', $lang->project->dividerMenu);
-            $lang->release->menu        = new stdclass();
-            $lang->menugroup->release   = '';
-            $lang->menuOrder            = $lang->waterfall->menuOrder;
-            return self::processMenuVars($lang->menu->waterfall);
-        }
-    }
-
-    /**
-     * Get project module menu by model.
-     *
-     * @param  varchar $moduleName
-     * @param  varchar $methodName
-     * @static
-     * @access public
-     * @return string
-     */
-    public static function getProjectModuleMenu($moduleName, $methodName)
-    {
-        global $app, $lang, $dbh;
-        $program = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->PRJ}'")->fetch();
-        if(empty($program)) return;
-        if($program->model == 'waterfall')
-        {
-            $lang->$moduleName->menu = self::processMenuVars($lang->$moduleName->menu);
-        }
-        if($program->model == 'scrum')
-        {
-            $lang->$moduleName->menu = self::processMenuVars($lang->$moduleName->menu);
-            unset($lang->stakeholder->menu->issue);
-            unset($lang->stakeholder->menu->plan);
-            unset($lang->stakeholder->menu->expectation);
-        }
-    }
-
-    /**
-     * Get my module menu by methodName.
-     *
-     * @param  string $moduleName
-     * @param  string $methodName
-     * @static
-     * @access public
-     * @return void
-     */
-    public static function getMyModuleMenu($moduleName, $methodName)
-    {
-        global $lang;
-        if($methodName == 'work')       $lang->my->menu = $lang->my->workMenu;
-        if($methodName == 'contribute') $lang->my->menu = $lang->my->contributeMenu;
+        /* Default, display menu. */
+        $lang->menu      = $lang->$openApp->menu;
+        $lang->menuOrder = $lang->$openApp->menuOrder;
     }
 
     /**
@@ -2519,6 +2338,79 @@ EOD;
             ->fetchAll();
     }
 
+    /**
+     * Replace the %s of one key of a menu by objectID or $params.
+     *
+     * All the menus are defined in the common's language file. But there're many dynamic params, so in the defination,
+     * we used %s as placeholder. These %s should be setted in one module.
+     *
+     * @param  string  $moduleName
+     * @param  int     $objectID
+     * @param  array   $params
+     *
+     * @access public
+     * @return string
+     */
+    static public function setMenuVars($moduleName, $objectID, $params = array())
+    {
+        global $app, $lang;
+
+        $menuKey = 'menu';
+        if($app->viewType == 'mhtml') $menuKey = 'webMenu';
+
+        foreach($lang->$moduleName->$menuKey as $label => $menu)
+        {
+            $lang->$moduleName->$menuKey->$label = self::setMenuVarsEx($menu, $objectID, $params);
+            if(isset($menu['subMenu']))
+            {
+                foreach($menu['subMenu'] as $key1 => $subMenu)
+                {
+                    $lang->$moduleName->$menuKey->{$label}['subMenu']->$key1 = self::setMenuVarsEx($subMenu, $objectID, $params);
+                }
+            }
+
+            if(!isset($menu['dropMenu'])) continue;
+
+            foreach($menu['dropMenu'] as $key2 => $dropMenu)
+            {
+                $lang->$moduleName->$menuKey->{$label}['dropMenu']->$key2 = self::setMenuVarsEx($dropMenu, $objectID, $params);
+
+                if(!isset($dropMenu['subMenu'])) continue;
+
+                foreach($dropMenu['subMenu'] as $key3 => $subMenu)
+                {
+                    $lang->$moduleName->$menuKey->{$label}['dropMenu']->$key3 = self::setMenuVarsEx($subMenu, $objectID, $params);
+                }
+            }
+        }
+
+        /* If objectID is set, cannot use homeMenu. */
+        unset($lang->$moduleName->homeMenu);
+    }
+
+    /*
+     * Replace the %s of one key of a menu by objectID or $params.
+     * @param  object  $menu
+     * @param  int     $objectID
+     * @param  array   $params
+     */
+    static private function setMenuVarsEx($menu, $objectID, $params = array())
+    {
+        if(is_array($menu))
+        {
+            if(!isset($menu['link'])) return $menu;
+
+            $link = sprintf($menu['link'], $objectID);
+            $menu['link'] = vsprintf($link, $params);
+        }
+        else
+        {
+            $menu = sprintf($menu, $objectID);
+            $menu = vsprintf($menu, $params);
+        }
+
+        return $menu;
+    }
 }
 
 class common extends commonModel
diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 95a77574d5..fbb3031a4e 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -17,7 +17,15 @@ $(function()
             <?php $mode = isset($config->datatable->$datatableId->mode) ? $config->datatable->$datatableId->mode : 'table';?>
             var $dropdown = $('<div class="dropdown"><button id="tableCustomBtn" type="button" class="btn btn-link" data-toggle="dropdown"><i class="icon-cog-outline"></i></button></div>');
             var $dropmenu = $('<ul class="dropdown-menu pull-right"></ul>');
-            $dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
+            if(typeof(storyType) != 'undefined' && storyType == 'requirement')
+            {
+                $dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName . '&extra=requirement')?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
+            }
+            else
+            {
+                $dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
+
+            }
             $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
             $dropdown.append($dropmenu).appendTo($btnToolbar);
         }
@@ -84,7 +92,7 @@ $(function()
             <?php if($app->moduleName == 'execution' && $app->methodName == 'task'):?>
             <tr>
               <td><?php echo $lang->datatable->showAllModule;?></td>
-              <td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->project->task->allModule) ? $config->project->task->allModule : 0);?></td>
+              <td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?></td>
             </tr>
             <?php endif;?>
             <tr>
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 8d950a20ff..8084267eeb 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -7,45 +7,28 @@ include 'chosen.html.php';
 <?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
 <?php $this->app->loadConfig('sso');?>
 <?php if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
-<?php
-$rawModule   = zget($lang->navGroup, $app->rawModule);
-$isProgram   = $rawModule == 'program';
-$isProduct   = $rawModule == 'product';
-$isProject   = $rawModule == 'project';
-$isExecution = $rawModule == 'execution';
-$isReport    = $rawModule == 'report';
-$isQa        = $rawModule == 'qa';
-?>
 <header id='header'>
   <div id='mainHeader'>
     <div class='container'>
       <div id='heading'>
-        <?php if($isProduct)   echo isset($lang->product->switcherMenu) ? $lang->product->switcherMenu : '';?>
-        <?php if($isQa)        echo isset($lang->qa->switcherMenu) ? $lang->qa->switcherMenu : '';?>
-        <?php if($this->config->systemMode == 'new'):?>
-        <?php if($isProgram)   echo isset($lang->program->switcherMenu) ? $lang->program->switcherMenu : '';?>
-        <?php if($isProject)   echo $this->loadModel('project')->getSwitcher($this->session->PRJ, $app->rawModule, $app->rawMethod);?>
-        <?php if($isExecution) echo $this->loadModel('execution')->getSwitcher($this->session->execution, $app->rawModule, $app->rawMethod);?>
-        <?php elseif($this->config->systemMode == 'classic'):?>
-        <?php if($isProject)   echo isset($lang->project->switcherMenu) ? $lang->project->switcherMenu : '';;?>
-        <?php endif;?>
+        <?php common::printHomeButton($app->openApp);?>
+        <?php echo isset($lang->switcherMenu) ? $lang->switcherMenu : '';?>
       </div>
-      <nav id='navbar'><?php commonModel::printMainmenu($app->rawModule, $app->rawMethod);?></nav>
+      <nav id='navbar'><?php $activeMenu = commonModel::printMainMenu();?></nav>
       <div id='toolbar'>
-        <?php if($isProgram)   echo isset($lang->program->mainMenuAction) ? $lang->program->mainMenuAction : '';?>
-        <?php if($isProject)   echo $this->loadModel('project')->getMainAction($app->rawModule, $app->rawMethod);?>
-        <?php if($isExecution) echo $this->execution->getMainAction($app->rawModule, $app->rawMethod);?>
-        <?php if($isProduct)   echo isset($lang->product->mainMenuAction) ? $lang->product->mainMenuAction : '';?>
-        <?php if($isReport)    echo isset($lang->report->mainMenuAction) ? $lang->report->mainMenuAction : '';?>
-        <?php if($isQa)        echo isset($lang->qa->mainMenuAction) ? $lang->qa->mainMenuAction : '';?>
+        <div id='userMenu'>
+          <ul id="userNav" class="nav nav-default">
+            <li class='dropdown dropdown-hover has-avatar'><?php common::printUserBar();?></li>
+          </ul>
+        </div>
       </div>
     </div>
   </div>
-  <?php if(!in_array($app->rawModule, $lang->noMenuModule)):?>
+  <?php if(isset($lang->{$app->openApp}->menu->$activeMenu) and isset($lang->{$app->openApp}->menu->{$activeMenu}['subMenu'])):?>
   <div id='subHeader'>
     <div class='container'>
       <div id="pageNav" class='btn-toolbar'><?php if(isset($lang->modulePageNav)) echo $lang->modulePageNav;?></div>
-      <nav id='subNavbar'><?php common::printModuleMenu($app->rawModule);?></nav>
+      <nav id='subNavbar'><?php common::printModuleMenu($activeMenu);?></nav>
       <div id="pageActions"><div class='btn-toolbar'><?php if(isset($lang->TRActions)) echo $lang->TRActions;?></div></div>
     </div>
   </div>
diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php
index e07fa3263d..14eee9e636 100755
--- a/module/common/view/header.lite.html.php
+++ b/module/common/view/header.lite.html.php
@@ -70,8 +70,9 @@ $extHookFiles = glob($extHookRule);
 if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
 ?>
 </head>
+<?php $singleClass = $this->app->getViewType() == 'xhtml' ? 'allow-self-open' : '';?>
 <?php if($this->moduleName == 'index' && $this->methodName == 'index' && $this->cookie->hideMenu): ?>
-<body class='menu-hide'>
+<body class='menu-hide <?php echo $singleClass;?>'>
 <?php else: ?>
-<body>
+<body class='<?php echo $singleClass;?>'>
 <?php endif; ?>
diff --git a/module/company/config.php b/module/company/config.php
index 72c4590568..7b6de8a08f 100644
--- a/module/company/config.php
+++ b/module/company/config.php
@@ -9,17 +9,19 @@ $app->loadLang('user');
 $config->company->dynamic = new stdclass();
 $config->company->dynamic->search['module']               = 'action';
 $config->company->dynamic->search['fields']['product']    = $lang->action->product;
+$config->company->dynamic->search['fields']['project']    = '项目';
+$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;
-$config->company->dynamic->search['fields']['execution']  = $lang->action->execution;
 $config->company->dynamic->search['fields']['objectType'] = $lang->action->objectType;
 $config->company->dynamic->search['fields']['date']       = $lang->action->date;
 $config->company->dynamic->search['fields']['action']     = $lang->action->action;
 
 $config->company->dynamic->search['params']['product']    = array('operator' => '=',  'control' => 'select', 'values' => '');
+$config->company->dynamic->search['params']['project']    = array('operator' => '=',  'control' => 'select', 'values' => '');
+$config->company->dynamic->search['params']['execution']  = array('operator' => '=',  'control' => 'select', 'values' => '');
 $config->company->dynamic->search['params']['actor']      = array('operator' => '=',  'control' => 'select', 'values' => '');
 $config->company->dynamic->search['params']['objectID']   = array('operator' => '=',  'control' => 'input',  'values' => '');
-$config->company->dynamic->search['params']['execution']  = array('operator' => '=',  'control' => 'select', 'values' => '');
 $config->company->dynamic->search['params']['objectType'] = array('operator' => '=',  'control' => 'select', 'values' => $lang->action->search->objectTypeList);
 $config->company->dynamic->search['params']['date']       = array('operator' => '=',  'control' => 'input',  'values' => '', 'class' => 'date');
 $config->company->dynamic->search['params']['action']     = array('operator' => '=',  'control' => 'select', 'values' => '');
diff --git a/module/company/control.php b/module/company/control.php
index 3abae4659c..d5d6cad741 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -13,7 +13,7 @@ class company extends control
 {
     /**
      * Construct function, load dept and user models auto.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -25,7 +25,7 @@ class company extends control
 
     /**
      * Index page, header to browse.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -36,13 +36,13 @@ class company extends control
 
     /**
      * Browse departments and users of a company.
-     * 
-     * @param  int    $param 
-     * @param  string $type 
-     * @param  string $orderBy 
-     * @param  int    $recTotal 
-     * @param  int    $recPerPage 
-     * @param  int    $pageID 
+     *
+     * @param  int    $param
+     * @param  string $type
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
@@ -51,13 +51,12 @@ class company extends control
         $this->lang->navGroup->company = 'admin';
 
         $this->loadModel('search');
-        $this->lang->set('menugroup.company', 'company');
 
         $deptID = $type == 'bydept' ? (int)$param : 0;
         $this->company->setMenu($deptID);
 
         /* Save session. */
-        $this->session->set('userList', $this->app->getURI(true));
+        $this->session->set('userList', $this->app->getURI(true), 'admin');
 
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
@@ -113,7 +112,7 @@ class company extends control
 
     /**
      * Edit a company.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -143,14 +142,12 @@ class company extends control
 
     /**
      * View a company.
-     * 
+     *
      * @access public
      * @return void
      */
     public function view()
     {
-        $this->lang->noMenuModule[] = 'company';
-
         $this->company->setMenu();
         $this->view->title      = $this->lang->company->common . $this->lang->colon . $this->lang->company->view;
         $this->view->position[] = $this->lang->company->view;
@@ -160,19 +157,17 @@ class company extends control
 
     /**
      * Company dynamic.
-     * 
-     * @param  string $browseType 
-     * @param  string $param 
-     * @param  int    $recTotal 
-     * @param  string $date 
-     * @param  string $direction    next|pre 
+     *
+     * @param  string $browseType
+     * @param  string $param
+     * @param  int    $recTotal
+     * @param  string $date
+     * @param  string $direction    next|pre
      * @access public
      * @return void
      */
     public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
-        $this->lang->noMenuModule[] = 'company';
-
         $this->company->setMenu();
         $this->app->loadLang('user');
         $this->app->loadLang('execution');
@@ -180,16 +175,21 @@ class company extends control
 
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('executionList',   $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('riskList',        $uri, 'project');
+        $this->session->set('opportunityList', $uri, 'project');
+        $this->session->set('trainplanList',   $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('effortList',      $uri, 'my');
 
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
@@ -208,8 +208,9 @@ class company extends control
             if($user) $account = $user->account;
         }
         $product   = $browseType  == 'product'   ? $param : 'all';
+        $project   = $browseType  == 'project'   ? $param : 'all';
         $execution = $browseType  == 'execution' ? $param : 'all';
-        $period    = ($browseType == 'account' or $browseType == 'product' or $browseType == 'execution') ? 'all'  : $browseType;
+        $period    = in_array($browseType, array('account', 'product', 'project', 'execution')) ? 'all' : $browseType;
         $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
         $date      = empty($date) ? '' : date('Y-m-d', $date);
 
@@ -218,6 +219,11 @@ class company extends control
         $products = array($this->lang->company->product) + $products;
         $this->view->products = $products;
 
+        /* Get projects' list.*/
+        $projects = $this->loadModel('project')->getPairsByProgram(0);
+        $projects = array($this->lang->company->project) + $projects;
+        $this->view->projects = $projects;
+
         /* Get executions' list.*/
         $executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
         $executions = array($this->lang->company->execution) + $executions;
@@ -238,11 +244,11 @@ class company extends control
         /* Get actions. */
         if($browseType != 'bysearch')
         {
-            $actions = $this->action->getDynamic($account, $period, $sort, $pager, $product, $execution, $date, $direction);
+            $actions = $this->action->getDynamic($account, $period, $sort, $pager, $product, $project, $execution, $date, $direction);
         }
         else
         {
-            $actions = $this->action->getDynamicBySearch($products, $executions, $queryID, $sort, $pager, $date, $direction);
+            $actions = $this->action->getDynamicBySearch($products, $projects, $executions, $queryID, $sort, $pager, $date, $direction);
         }
 
         /* Build search form. */
@@ -261,8 +267,9 @@ class company extends control
         $this->config->company->dynamic->search['actionURL'] = $this->createLink('company', 'dynamic', "browseType=bysearch&param=myQueryID");
         $this->config->company->dynamic->search['queryID'] = $queryID;
         $this->config->company->dynamic->search['params']['action']['values']    = $this->lang->action->search->label;
-        $this->config->company->dynamic->search['params']['execution']['values'] = $executions;
         $this->config->company->dynamic->search['params']['product']['values']   = $products;
+        $this->config->company->dynamic->search['params']['project']['values']   = $projects;
+        $this->config->company->dynamic->search['params']['execution']['values'] = $executions;
         $this->config->company->dynamic->search['params']['actor']['values']     = $accountPairs;
         $this->loadModel('search')->setSearchParams($this->config->company->dynamic->search);
 
@@ -271,6 +278,7 @@ class company extends control
         $this->view->account      = $account;
         $this->view->accountPairs = $accountPairs;
         $this->view->product      = $product;
+        $this->view->project      = $project;
         $this->view->execution    = $execution;
         $this->view->queryID      = $queryID;
         $this->view->orderBy      = $orderBy;
diff --git a/module/company/js/dynamic.js b/module/company/js/dynamic.js
index 1b0c11597d..d6c43a72e3 100644
--- a/module/company/js/dynamic.js
+++ b/module/company/js/dynamic.js
@@ -10,13 +10,21 @@ function changeUser(account)
     }
     location.href = link;
 }
-function changeExecution(execution)
-{
-    link = createLink('company', 'dynamic', 'type=execution&param=' + execution);
-    location.href = link;
-}
+
 function changeProduct(product)
 {
     link = createLink('company', 'dynamic', 'type=product&param=' + product);
     location.href = link;
 }
+
+function changeProject(project)
+{
+    link = createLink('company', 'dynamic', 'type=project&param=' + project);
+    location.href = link;
+}
+
+function changeExecution(execution)
+{
+    link = createLink('company', 'dynamic', 'type=execution&param=' + execution);
+    location.href = link;
+}
diff --git a/module/company/lang/de.php b/module/company/lang/de.php
index 590589eb1f..9e6522dbcf 100644
--- a/module/company/lang/de.php
+++ b/module/company/lang/de.php
@@ -29,6 +29,7 @@ $lang->company->guest    = 'Gast Login';
 $lang->company->admins   = 'Administratoren';
 
 $lang->company->product   = $lang->productCommon;
+$lang->company->project   = 'Project';
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = 'Benutzer';
 
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index 4146531395..b8b23f5fed 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -29,6 +29,7 @@ $lang->company->guest    = 'Guest Login';
 $lang->company->admins   = 'Administrator';
 
 $lang->company->product   = $lang->productCommon;
+$lang->company->project   = 'Project';
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = 'User';
 
diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php
index 80c01b1312..e0da1fcd0f 100644
--- a/module/company/lang/fr.php
+++ b/module/company/lang/fr.php
@@ -29,6 +29,7 @@ $lang->company->guest    = 'Connexion Invités';
 $lang->company->admins   = 'Administrateur';
 
 $lang->company->product   = $lang->productCommon;
+$lang->company->project   = 'Project';
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = 'Utilisateurs';
 
diff --git a/module/company/lang/vi.php b/module/company/lang/vi.php
index d5e2f8c92f..328e176471 100644
--- a/module/company/lang/vi.php
+++ b/module/company/lang/vi.php
@@ -29,6 +29,7 @@ $lang->company->guest    = 'Khách truy cập';
 $lang->company->admins   = 'Quản trị viên';
 
 $lang->company->product   = $lang->productCommon;
+$lang->company->project   = 'Project';
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = 'Người dùng';
 
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index b1faf37167..75e63a4bb1 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -29,6 +29,7 @@ $lang->company->guest    = '匿名登录';
 $lang->company->admins   = '管理员';
 
 $lang->company->product   = $lang->productCommon;
+$lang->company->project   = '项目';
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = '用户';
 
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index 3dc34e48df..c7634b4304 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -29,6 +29,7 @@ $lang->company->guest    = '匿名登錄';
 $lang->company->admins   = '管理員';
 
 $lang->company->product   = $lang->productCommon;
+$lang->company->project   = '項目';
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = '用戶';
 
diff --git a/module/company/model.php b/module/company/model.php
index 7fedd6e733..a287493aa8 100644
--- a/module/company/model.php
+++ b/module/company/model.php
@@ -22,9 +22,11 @@ class companyModel extends model
      */
     public function setMenu($dept = 0)
     {
+        /*
         common::setMenuVars($this->lang->company->menu, 'name', array($this->app->company->name));
         common::setMenuVars($this->lang->company->menu, 'addUser', array($dept));
         common::setMenuVars($this->lang->company->menu, 'batchAddUser', array($dept));
+         */
     }
 
     /**
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index a4d22c29a5..c928da837c 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -27,6 +27,7 @@
     <?php endforeach;?>
     <div class="input-control space w-150px"><?php echo html::select('account', $userIdPairs, $user ? $user->id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?></div>
     <div class="input-control space w-150px"><?php echo html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen"');?></div>
+    <div class="input-control space w-150px"><?php echo html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen"');?></div>
     <div class="input-control space w-150px"><?php echo html::select('execution', $executions, $execution, 'onchange=changeExecution(this.value) class="form-control chosen"'); ?></div>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->action->dynamic->search;?></a>
   </div>
diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php
index ae73267a10..c7919b7a71 100644
--- a/module/cron/lang/zh-cn.php
+++ b/module/cron/lang/zh-cn.php
@@ -1,5 +1,5 @@
 <?php
-$lang->cron->common       = '计划任务';
+$lang->cron->common       = '定时任务';
 $lang->cron->index        = '首页';
 $lang->cron->list         = '任务列表';
 $lang->cron->create       = '添加';
@@ -54,3 +54,4 @@ $lang->cron->notice->mon  = '取值范围:1-12';
 $lang->cron->notice->dow  = '取值范围:0-6';
 $lang->cron->notice->help = '注：如果服务器重启，或者发现计划任务没有正常工作，那么计划任务已经停止工作。需要手动点击【重启】按钮，或者一分钟后刷新页面，来开启计划任务。如果任务列表中第一条记录的最后执行时间改变，说明任务开启成功。';
 $lang->cron->notice->errorRule = '"%s" 填写的不是合法的值';
+$lang->cron->notice->errorType = '不能创建操作系统命令类型的计划任务';
diff --git a/module/cron/lang/zh-tw.php b/module/cron/lang/zh-tw.php
index 436348daf4..cfd0b42981 100644
--- a/module/cron/lang/zh-tw.php
+++ b/module/cron/lang/zh-tw.php
@@ -1,5 +1,5 @@
 <?php
-$lang->cron->common       = '計劃任務';
+$lang->cron->common       = '定時任務';
 $lang->cron->index        = '首頁';
 $lang->cron->list         = '任務列表';
 $lang->cron->create       = '添加';
@@ -54,3 +54,4 @@ $lang->cron->notice->mon  = '取值範圍:1-12';
 $lang->cron->notice->dow  = '取值範圍:0-6';
 $lang->cron->notice->help = '註：如果伺服器重啟，或者發現計劃任務沒有正常工作，那麼計劃任務已經停止工作。需要手動點擊【重啟】按鈕，或者一分鐘後刷新頁面，來開啟計劃任務。如果任務列表中第一條記錄的最後執行時間改變，說明任務開啟成功。';
 $lang->cron->notice->errorRule = '"%s" 填寫的不是合法的值';
+$lang->cron->notice->errorType = '不能創建操作系統命令類型的計劃任務';
diff --git a/module/cron/model.php b/module/cron/model.php
index 6690222c3b..ab9822d8fc 100644
--- a/module/cron/model.php
+++ b/module/cron/model.php
@@ -13,8 +13,8 @@ class cronModel extends model
 {
     /**
      * Get by Id.
-     * 
-     * @param  int    $cronID 
+     *
+     * @param  int    $cronID
      * @access public
      * @return object
      */
@@ -25,8 +25,8 @@ class cronModel extends model
 
     /**
      * Get crons.
-     * 
-     * @param  string $params 
+     *
+     * @param  string $params
      * @access public
      * @return array
      */
@@ -40,8 +40,8 @@ class cronModel extends model
 
     /**
      * Parse crons.
-     * 
-     * @param  array    $crons 
+     *
+     * @param  array    $crons
      * @access public
      * @return array
      */
@@ -64,12 +64,12 @@ class cronModel extends model
                     $parsedCron['cron']     = CronExpression::factory($parsedCron['schema']);
                     $parsedCron['time']     = $parsedCron['cron']->getNextRunDate();
                     $parsedCrons[$cron->id] = $parsedCron;
-                }   
-                catch(InvalidArgumentException $e) 
+                }
+                catch(InvalidArgumentException $e)
                 {
                     $this->dao->update(TABLE_CRON)->set('status')->eq('stop')->where('id')->eq($cron->id)->exec();
                     continue;
-                }   
+                }
             }
         }
         $this->dao->update(TABLE_CRON)->set('lastTime')->eq(date(DT_DATETIME1))->where('lastTime')->eq('0000-00-00 00:00:00')->andWhere('status')->ne('stop')->exec();
@@ -78,10 +78,10 @@ class cronModel extends model
 
     /**
      * Change cron status.
-     * 
-     * @param  int    $cronID 
-     * @param  string $status 
-     * @param  bool   $changeTime 
+     *
+     * @param  int    $cronID
+     * @param  string $status
+     * @param  bool   $changeTime
      * @access public
      * @return bool
      */
@@ -96,8 +96,8 @@ class cronModel extends model
 
     /**
      * Log cron.
-     * 
-     * @param  string    $log 
+     *
+     * @param  string    $log
      * @access public
      * @return void
      */
@@ -115,7 +115,7 @@ class cronModel extends model
 
     /**
      * Get last execed time.
-     * 
+     *
      * @access public
      * @return string
      */
@@ -127,7 +127,7 @@ class cronModel extends model
 
     /**
      * Runable cron.
-     * 
+     *
      * @access public
      * @return bool
      */
@@ -145,7 +145,7 @@ class cronModel extends model
 
     /**
      * Check change cron.
-     * 
+     *
      * @access public
      * @return bool
      */
@@ -156,8 +156,8 @@ class cronModel extends model
     }
 
     /**
-     * Create cron. 
-     * 
+     * Create cron.
+     *
      * @access public
      * @return int
      */
@@ -169,6 +169,12 @@ class cronModel extends model
             ->skipSpecial('m,h,dom,mon,dow,command')
             ->get();
 
+        if(!$this->config->features->cronSystemCall and $cron->type == 'system')
+        {
+            dao::$errors[] = $this->lang->cron->notice->errorType;
+            return false;
+        }
+
         $result = $this->checkRule($cron);
         if(!empty($result))
         {
@@ -182,9 +188,9 @@ class cronModel extends model
     }
 
     /**
-     * Update cron. 
-     * 
-     * @param  int    $cronID 
+     * Update cron.
+     *
+     * @param  int    $cronID
      * @access public
      * @return bool
      */
@@ -195,6 +201,12 @@ class cronModel extends model
             ->skipSpecial('m,h,dom,mon,dow,command')
             ->get();
 
+        if(!$this->config->features->cronSystemCall and $cron->type == 'system')
+        {
+            dao::$errors[] = $this->lang->cron->notice->errorType;
+            return false;
+        }
+
         $result = $this->checkRule($cron);
         if(!empty($result))
         {
@@ -208,8 +220,8 @@ class cronModel extends model
 
     /**
      * Check cron rule.
-     * 
-     * @param  object $cron 
+     *
+     * @param  object $cron
      * @access public
      * @return string
      */
@@ -256,7 +268,7 @@ class cronModel extends model
 
     /**
      * Get current cron status.
-     * 
+     *
      * @access public
      * @return int
      */
diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php
index fc3b7a209d..afed61d995 100644
--- a/module/cron/view/create.html.php
+++ b/module/cron/view/create.html.php
@@ -11,9 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/module/cron/view/edit.html.php b/module/cron/view/edit.html.php
index a9e0ec185c..24b6207096 100644
--- a/module/cron/view/edit.html.php
+++ b/module/cron/view/edit.html.php
@@ -11,9 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php
index 3ff520f910..aa9993434d 100644
--- a/module/cron/view/index.html.php
+++ b/module/cron/view/index.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 common::printAdminSubMenu('system');?></div>
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class='main-content'>
   <?php if(!empty($config->global->cron)):?>
diff --git a/module/custom/config.php b/module/custom/config.php
index d8c98dc875..4b000df4ce 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -1,6 +1,6 @@
 <?php
 $config->custom = new stdClass();
-$config->custom->canAdd['story']    = 'reasonList,sourceList,priList';
+$config->custom->canAdd['story']    = 'reasonList,sourceList,priList,categoryList';
 $config->custom->canAdd['task']     = 'priList,typeList,reasonList';
 $config->custom->canAdd['bug']      = 'priList,severityList,osList,browserList,typeList,resolutionList';
 $config->custom->canAdd['testcase'] = 'priList,typeList,stageList,resultList,statusList';
@@ -62,7 +62,7 @@ $config->custom->fieldList['testsuite']              = 'desc';
 $config->custom->fieldList['caselib']                = 'desc';
 $config->custom->fieldList['testcase']['createcase'] = 'lib,stage,pri,precondition,keywords';
 $config->custom->fieldList['testreport']             = 'begin,end,members,report';
-$config->custom->fieldList['testtask']               = 'owner,pri,status,desc';
+$config->custom->fieldList['testtask']               = 'owner,pri,desc';
 $config->custom->fieldList['doc']                    = 'keywords,content';
 $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';
diff --git a/module/custom/control.php b/module/custom/control.php
index 3867c57aaf..f0b13b6818 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -19,7 +19,11 @@ class custom extends control
      */
     public function index()
     {
-        if(common::hasPriv('custom', 'set')) die(js::locate(inlink('set', "module=project&field=" . key($this->lang->custom->project->fields))));
+        if(($this->config->systemMode == 'new') and common::hasPriv('custom', 'set'))
+        {
+            die(js::locate(inlink('set', "module=project&field=" . key($this->lang->custom->project->fields))));
+        }
+
         if(common::hasPriv('custom', 'product'))   die(js::locate(inlink('product')));
         if(common::hasPriv('custom', 'execution')) die(js::locate(inlink('execution')));
 
@@ -55,6 +59,11 @@ class custom extends control
             $this->view->unitList        = explode(',', $unitList);
             $this->view->defaultCurrency = zget($this->config->$module, 'defaultCurrency', 'CNY');
         }
+        if($module == 'story' and $field == 'reviewRules')
+        {
+            $this->app->loadConfig($module);
+            $this->view->reviewRule = zget($this->config->$module, 'reviewRules', '1');
+        }
         if(($module == 'story' or $module == 'testcase') and $field == 'review')
         {
             $this->app->loadConfig($module);
@@ -102,6 +111,11 @@ class custom extends control
                 $data = fixer::input('post')->join('forceReview', ',')->get();
                 $this->loadModel('setting')->setItems("system.$module", $data);
             }
+            elseif($module == 'story' and $field == 'reviewRules')
+            {
+                $data = fixer::input('post')->get();
+                $this->loadModel('setting')->setItems("system.$module", $data);
+            }
             elseif($module == 'testcase' and $field == 'review')
             {
                 $review = fixer::input('post')->get();
@@ -207,7 +221,7 @@ class custom extends control
         $this->view->fieldList   = $fieldList;
         $this->view->dbFields    = $dbFields;
         $this->view->field       = $field;
-        $this->view->lang2Set     = str_replace('_', '-', $lang);
+        $this->view->lang2Set    = str_replace('_', '-', $lang);
         $this->view->module      = $module;
         $this->view->currentLang = $currentLang;
         $this->view->canAdd      = strpos($this->config->custom->canAdd[$module], $field) !== false;
@@ -284,8 +298,8 @@ class custom extends control
 
         if($moduleName == 'doc')
         {
-            unset($requiredFields['createLib']);
-            unset($requiredFields['editLib']);
+            unset($requiredFields['createlib']);
+            unset($requiredFields['editlib']);
         }
 
         $this->view->title      = $this->lang->custom->required;
@@ -332,7 +346,6 @@ class custom extends control
 
         unset($this->lang->admin->menu->custom['subModule']);
         $this->lang->admin->menu->system['subModule'] = 'custom';
-        $this->lang->custom->menu = $this->lang->admin->menu;
 
         $this->view->title = $this->lang->custom->timezone;
         $this->view->position[] = $this->lang->custom->timezone;
@@ -347,14 +360,6 @@ class custom extends control
      */
     public function browseStoryConcept()
     {
-        /* Process menu.*/
-        $this->app->loadLang('custom');
-        $this->lang->custom->menu = $this->lang->subject->menu;
-        $this->lang->navGroup->custom = 'admin';
-        $this->lang->admin->menu->model['subModule'] .= ',custom';
-        $key = array_search('custom', $this->lang->noMenuModule);
-        if($key !== false) unset($this->lang->noMenuModule[$key]);
-
         $this->view->title      = $this->lang->custom->browseStoryConcept;
         $this->view->position[] = $this->lang->custom->browseStoryConcept;
         $this->view->URSRList   = $this->custom->getURSRList();
@@ -514,6 +519,7 @@ class custom extends control
         {
             $this->custom->setConcept();
             $this->loadModel('setting')->setItem('system.custom.URAndSR', $this->post->URAndSR);
+            if(!isset($this->config->maxVersion)) $this->loadModel('setting')->setItem('system.custom.hourPoint', $this->post->hourPoint);
 
             $this->app->loadLang('common');
             $locate = inlink('flow');
@@ -544,7 +550,7 @@ class custom extends control
         $mode = zget($this->config->global, 'mode', 'classic');
         if($mode == 'new')
         {
-            if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') $this->locate($this->createLink('upgrade', 'mergeProgram'));
+            if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') die(js::locate($this->createLink('upgrade', 'mergeProgram'), 'parent'));
 
             unset($_SESSION['upgrading']);
             $this->locate(inlink('index'));
@@ -718,7 +724,7 @@ class custom extends control
             $data = fixer::input('post')->join('showLibs', ',')->get();
             if(isset($data->showLibs)) $data = $data->showLibs;
             $this->loadModel('setting')->setItem("{$this->app->user->account}.doc.custom.showLibs", $data);
-            die(js::reload('parent.parent'));
+            die(js::reload('parent'));
         }
     }
 
diff --git a/module/custom/js/flow.js b/module/custom/js/flow.js
index f55fd1a8bd..d067848782 100644
--- a/module/custom/js/flow.js
+++ b/module/custom/js/flow.js
@@ -1,15 +1,4 @@
 $(document).ready(function()
 { 
     $('#mainMenu #flowTab').addClass('btn-active-text');
-
-    toggleStoryOrRequirement($("[name='storyRequirement']:checked").val());
-    $("[name='storyRequirement']").change(function(){ toggleStoryOrRequirement($(this).val())});
 });
-
-function toggleStoryOrRequirement(value)
-{
-    $('#requirementpoint').toggle(value == 0);
-    $('#storypoint').toggle(value != 0);
-    $('#hourPoint1').closest('.radio-inline').toggle(value != 0);
-    $('#hourPoint2').closest('.radio-inline').toggle(value == 0);
-}
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index cb2bfc9838..0066022c91 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -1,4 +1,6 @@
 <?php
+global $config;
+
 $lang->custom->common               = 'Custom';
 $lang->custom->index                = 'Home';
 $lang->custom->set                  = 'Customize';
@@ -19,7 +21,6 @@ $lang->custom->score                = 'Score';
 $lang->custom->timezone             = 'Timezone';
 $lang->custom->scoreReset           = 'Reset Score';
 $lang->custom->scoreTitle           = 'Point Feature';
-$lang->custom->execution            = 'Execution';
 $lang->custom->product              = $lang->productCommon;
 $lang->custom->convertFactor        = 'Convert factor';
 $lang->custom->region               = 'Interval';
@@ -42,10 +43,14 @@ $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
 $lang->custom->SRConcept            = "SR Concept";
+$lang->custom->reviewRule           = 'Review Rules';
 $lang->custom->switch               = "Switch";
 $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
+
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
 $lang->custom->unitList['cost']       = 'Yuan/Hour';
@@ -71,12 +76,12 @@ $lang->custom->saveTips            = 'After clicking save, the current %s will b
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
-$lang->custom->closedExecution = 'Closed Executions';
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
 $lang->custom->closedProduct   = 'Closed ' . $lang->productCommon;
 
-$lang->custom->object['project']   = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project']   = 'Project';
 $lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
 $lang->custom->object['story']     = 'Story';
 $lang->custom->object['task']      = 'Task';
 $lang->custom->object['bug']       = 'Bug';
@@ -92,11 +97,13 @@ $lang->custom->project->defaultCurrency    = 'Default Currency';
 $lang->custom->project->fields['unitList'] = 'Unit List';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['sourceList']       = 'Source';
 $lang->custom->story->fields['reasonList']       = 'Close Reason';
 $lang->custom->story->fields['stageList']        = 'Phase';
 $lang->custom->story->fields['statusList']       = 'Status';
+$lang->custom->story->fields['reviewRules']      = 'Review Rules';
 $lang->custom->story->fields['reviewResultList'] = 'Review Result';
 $lang->custom->story->fields['review']           = 'Review Required';
 
@@ -164,7 +171,7 @@ $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->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution 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->URSREmpty           = 'Custom requirement name can not be empty!';
 $lang->custom->notice->confirmDelete       = 'Are you sure you want to delete it?';
 
@@ -221,7 +228,7 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = 'Plan';
-$lang->custom->moduleName['execution']   = 'Execution';
+$lang->custom->moduleName['execution']   = $lang->custom->execution;
 
 $lang->custom->conceptQuestions['overview'] = "1. Which combination of management fits your company?";
 $lang->custom->conceptQuestions['URAndSR']  = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
@@ -242,3 +249,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
+
+$lang->custom->reviewRules['allpass']  = 'All passed';
+$lang->custom->reviewRules['halfpass'] = 'More than half passed';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 60bdd11682..6473f51d14 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -1,4 +1,6 @@
 <?php
+global $config;
+
 $lang->custom->common               = 'Custom';
 $lang->custom->index                = 'Home';
 $lang->custom->set                  = 'Customize';
@@ -19,7 +21,6 @@ $lang->custom->score                = 'Point';
 $lang->custom->timezone             = 'Timezone';
 $lang->custom->scoreReset           = 'Reset Points';
 $lang->custom->scoreTitle           = 'Point Feature';
-$lang->custom->execution            = 'Execution';
 $lang->custom->product              = $lang->productCommon;
 $lang->custom->convertFactor        = 'Convert factor';
 $lang->custom->region               = 'Interval';
@@ -42,10 +43,14 @@ $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
 $lang->custom->SRConcept            = "SR Concept";
+$lang->custom->reviewRule           = 'Review Rules';
 $lang->custom->switch               = "Switch";
 $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
+
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
 $lang->custom->unitList['cost']       = 'Yuan/Hour';
@@ -71,12 +76,12 @@ $lang->custom->saveTips            = 'After clicking save, the current %s will b
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
-$lang->custom->closedExecution = 'Closed Executions'; 
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
 $lang->custom->closedProduct   = 'Closed ' . $lang->productCommon;
 
-$lang->custom->object['project']   = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project']   = 'Project';
 $lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
 $lang->custom->object['story']     = 'Story';
 $lang->custom->object['task']      = 'Task';
 $lang->custom->object['bug']       = 'Bug';
@@ -92,11 +97,13 @@ $lang->custom->project->defaultCurrency    = 'Default Currency';
 $lang->custom->project->fields['unitList'] = 'Unit List';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['sourceList']       = 'Source';
 $lang->custom->story->fields['reasonList']       = 'Close Reason';
 $lang->custom->story->fields['stageList']        = 'Phase';
 $lang->custom->story->fields['statusList']       = 'Status';
+$lang->custom->story->fields['reviewRules']      = 'Review Rules';
 $lang->custom->story->fields['reviewResultList'] = 'Review Result';
 $lang->custom->story->fields['review']           = 'Need Review';
 
@@ -164,7 +171,7 @@ $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->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution 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->URSREmpty           = 'Custom requirement name can not be empty!';
 $lang->custom->notice->confirmDelete       = 'Are you sure you want to delete it?';
 
@@ -221,11 +228,12 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = 'Plan';
-$lang->custom->moduleName['execution']   = $lang->sprintCommon;
+$lang->custom->moduleName['execution']   = $lang->custom->execution;
 
 $lang->custom->conceptQuestions['overview'] = "1. Which combination of management fits your company?";
 $lang->custom->conceptQuestions['URAndSR']  = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
 
+
 $lang->custom->conceptOptions             = new stdclass;
 $lang->custom->conceptOptions->story      = array();
 $lang->custom->conceptOptions->story['0'] = 'Requirement';
@@ -242,3 +250,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
+
+$lang->custom->reviewRules['allpass']  = 'All passed';
+$lang->custom->reviewRules['halfpass'] = 'More than half passed';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 8f403c1fb6..dc63dcbc5b 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -1,4 +1,6 @@
 <?php
+global $config;
+
 $lang->custom->common               = 'Personnalisation';
 $lang->custom->index                = 'Accueil';
 $lang->custom->set                  = 'Personnaliser';
@@ -19,7 +21,6 @@ $lang->custom->score                = 'Point';
 $lang->custom->timezone             = 'Timezone';
 $lang->custom->scoreReset           = 'Réinit Points';
 $lang->custom->scoreTitle           = 'Fonctionnalité des Points';
-$lang->custom->execution            = 'Execution';
 $lang->custom->product              = $lang->productCommon;
 $lang->custom->convertFactor        = 'Convert factor';
 $lang->custom->region               = 'Interval';
@@ -42,10 +43,14 @@ $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
 $lang->custom->SRConcept            = "SR Concept";
+$lang->custom->reviewRule           = 'Review Rules';
 $lang->custom->switch               = "Switch";
 $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
+
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
 $lang->custom->unitList['cost']       = 'Yuan/Hour';
@@ -71,12 +76,12 @@ $lang->custom->saveTips            = 'After clicking save, the current %s will b
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
-$lang->custom->closedExecution = 'Closed Executions';
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
 $lang->custom->closedProduct   = 'Closed ' . $lang->productCommon;
 
-$lang->custom->object['project']   = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project']   = 'Project';
 $lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
 $lang->custom->object['story']     = 'Story';
 $lang->custom->object['task']      = 'Tâche';
 $lang->custom->object['bug']       = 'Bug';
@@ -92,11 +97,13 @@ $lang->custom->project->defaultCurrency    = 'Default Currency';
 $lang->custom->project->fields['unitList'] = 'Unit List';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priorité';
 $lang->custom->story->fields['sourceList']       = 'Source';
 $lang->custom->story->fields['reasonList']       = 'Raison Fermeture';
 $lang->custom->story->fields['stageList']        = 'Phase';
 $lang->custom->story->fields['statusList']       = 'Statut';
+$lang->custom->story->fields['reviewRules']      = 'Review Rules';
 $lang->custom->story->fields['reviewResultList'] = 'Valider Résultats';
 $lang->custom->story->fields['review']           = 'Validation Requise';
 
@@ -164,7 +171,7 @@ $lang->custom->notice->required            = 'Le champ sélectionné est obligat
 $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->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution 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->URSREmpty           = 'Custom requirement name can not be empty!';
 $lang->custom->notice->confirmDelete       = 'Are you sure you want to delete it?';
 
@@ -221,7 +228,7 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = 'Plan';
-$lang->custom->moduleName['execution']   = 'Execution';
+$lang->custom->moduleName['execution']   = $lang->custom->execution;
 
 $lang->custom->conceptQuestions['overview'] = "1. Quelle combinaison de gestion convient le mieux à votre entreprise ?";
 $lang->custom->conceptQuestions['URAndSR']  = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
@@ -242,3 +249,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
+
+$lang->custom->reviewRules['allpass']  = 'All passed';
+$lang->custom->reviewRules['halfpass'] = 'More than half passed';
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index 01f807d6a5..f4a8b48a17 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -1,4 +1,6 @@
 <?php
+global $config;
+
 $lang->custom->common               = 'Tùy biến';
 $lang->custom->index                = 'Trang chủ';
 $lang->custom->set                  = 'Tùy biến';
@@ -19,7 +21,6 @@ $lang->custom->score                = 'Điểm';
 $lang->custom->timezone             = 'Timezone';
 $lang->custom->scoreReset           = 'Thiết lập lại điểm';
 $lang->custom->scoreTitle           = 'Tính năng điểm';
-$lang->custom->execution            = 'Execution';
 $lang->custom->product              = $lang->productCommon;
 $lang->custom->convertFactor        = 'Convert factor';
 $lang->custom->region               = 'Interval';
@@ -42,10 +43,14 @@ $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
 $lang->custom->SRConcept            = "SR Concept";
+$lang->custom->reviewRule           = 'Review Rules';
 $lang->custom->switch               = "Switch";
 $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
+
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
 $lang->custom->unitList['cost']       = 'Yuan/Hour';
@@ -71,12 +76,12 @@ $lang->custom->saveTips            = 'After clicking save, the current %s will b
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
-$lang->custom->closedExecution = 'Closed Executions';
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
 $lang->custom->closedProduct   = 'Closed ' . $lang->productCommon;
 
-$lang->custom->object['project']   = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project']   = 'Project';
 $lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
 $lang->custom->object['story']     = 'Câu chuyện';
 $lang->custom->object['task']      = 'Nhiệm vụ';
 $lang->custom->object['bug']       = 'Bug';
@@ -92,11 +97,13 @@ $lang->custom->project->defaultCurrency    = 'Default Currency';
 $lang->custom->project->fields['unitList'] = 'Unit List';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Ưu tiên';
 $lang->custom->story->fields['sourceList']       = 'Nguồn';
 $lang->custom->story->fields['reasonList']       = 'Lý do đóng';
 $lang->custom->story->fields['stageList']        = 'Giai đoạn';
 $lang->custom->story->fields['statusList']       = 'Tình trạng';
+$lang->custom->story->fields['reviewRules']      = 'Review Rules';
 $lang->custom->story->fields['reviewResultList'] = 'Duyệt kết quả';
 $lang->custom->story->fields['review']           = 'Duyệt nhu cầu';
 
@@ -164,7 +171,7 @@ $lang->custom->notice->required            = 'Trường được chọn là bắ
 $lang->custom->notice->conceptResult       = 'According to your preference, <b> %s-%s </b> is set for you. Sử dụng <b>%s</b> + <b> %s</b>.';
 $lang->custom->notice->conceptPath         = 'Vào Quản trị -> Tùy biến -> Mô hình để thiết lập nó.';
 $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->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution 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->URSREmpty           = 'Custom requirement name can not be empty!';
 $lang->custom->notice->confirmDelete       = 'Are you sure you want to delete it?';
 
@@ -221,7 +228,7 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = 'Kế hoạch';
-$lang->custom->moduleName['execution']   = 'Execution';
+$lang->custom->moduleName['execution']   = $lang->custom->execution;
 
 $lang->custom->conceptQuestions['overview'] = "1. Sự kết hợp quản lý nào phù hợp với công ty của bạn?";
 $lang->custom->conceptQuestions['URAndSR']  = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
@@ -242,3 +249,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
+
+$lang->custom->reviewRules['allpass']  = 'All passed';
+$lang->custom->reviewRules['halfpass'] = 'More than half passed';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index d02db166d0..60b1e10b0b 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -1,4 +1,6 @@
 <?php
+global $config;
+
 $lang->custom->common               = '自定义';
 $lang->custom->index                = '首页';
 $lang->custom->set                  = '自定义配置';
@@ -19,7 +21,6 @@ $lang->custom->score                = '积分';
 $lang->custom->timezone             = '时区';
 $lang->custom->scoreReset           = '重置积分';
 $lang->custom->scoreTitle           = '积分功能';
-$lang->custom->execution            = '执行';
 $lang->custom->product              = $lang->productCommon;
 $lang->custom->convertFactor        = '换算系数';
 $lang->custom->region               = '区间';
@@ -42,10 +43,14 @@ $lang->custom->browseStoryConcept   = "需求概念列表";
 $lang->custom->deleteStoryConcept   = "删除需求概念";
 $lang->custom->URConcept            = "用需概念";
 $lang->custom->SRConcept            = "软需概念";
+$lang->custom->reviewRule           = "评审规则";
 $lang->custom->switch               = "切换";
 $lang->custom->oneUnit              = "一个{$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "请先设置{$lang->hourCommon}转换为%s的换算系数";
 
+if($config->systemMode == 'new') $lang->custom->execution = '执行';
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
+
 $lang->custom->unitList['efficiency'] = '工时/';
 $lang->custom->unitList['manhour']    = '人时/';
 $lang->custom->unitList['cost']       = '元/小时';
@@ -71,12 +76,12 @@ $lang->custom->saveTips            = '点击保存后，则以当前%s为默认
 
 $lang->custom->numberError = '区间必须大于零';
 
-$lang->custom->closedExecution = '已关闭执行';
+$lang->custom->closedExecution = '已关闭' . $lang->custom->execution;
 $lang->custom->closedProduct   = '已关闭' . $lang->productCommon;
 
-$lang->custom->object['project']   = '项目';
+if($config->systemMode == 'new') $lang->custom->object['project']   = '项目';
 $lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = '执行';
+$lang->custom->object['execution'] = $lang->custom->execution;
 $lang->custom->object['story']     = $lang->SRCommon;
 $lang->custom->object['task']      = '任务';
 $lang->custom->object['bug']       = 'Bug';
@@ -92,11 +97,13 @@ $lang->custom->project->defaultCurrency    = '默认货币';
 $lang->custom->project->fields['unitList'] = '预算单位';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['categoryList']     = '类型';
 $lang->custom->story->fields['priList']          = '优先级';
 $lang->custom->story->fields['sourceList']       = '来源';
 $lang->custom->story->fields['reasonList']       = '关闭原因';
 $lang->custom->story->fields['stageList']        = '阶段';
 $lang->custom->story->fields['statusList']       = '状态';
+$lang->custom->story->fields['reviewRules']      = '评审规则';
 $lang->custom->story->fields['reviewResultList'] = '评审结果';
 $lang->custom->story->fields['review']           = '评审流程';
 
@@ -151,26 +158,26 @@ $lang->custom->allLang     = '适用所有语言';
 $lang->custom->confirmRestore = '是否要恢复默认配置？';
 
 $lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice             = '控制以上字段在用户相关页面是否显示，留空则全部显示';
-$lang->custom->notice->canNotAdd                   = '该项参与运算，不提供自定义添加功能';
-$lang->custom->notice->forceReview                 = "指定人提交的%s必须评审。";
-$lang->custom->notice->forceNotReview              = "指定人提交的%s不需要评审。";
-$lang->custom->notice->longlife                    = 'Bug列表页面的久未处理标签中，列出设置天数之前未处理的Bug。';
-$lang->custom->notice->invalidNumberKey            = '键值应为不大于255的数字';
-$lang->custom->notice->invalidStringKey            = '键值应当为小写英文字母、数字或下划线的组合';
-$lang->custom->notice->cannotSetTimezone           = 'date_default_timezone_set方法不存在或禁用，不能设置时区。';
-$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->readOnlyOfExecution         = '禁止修改后，已关闭执行下的任务、版本、日志以及关联需求都禁止修改。';
-$lang->custom->notice->URSREmpty                   = '自定义需求名称不能为空！';
-$lang->custom->notice->confirmDelete               = '您确定要删除吗？';
+$lang->custom->notice->userFieldNotice     = '控制以上字段在用户相关页面是否显示，留空则全部显示';
+$lang->custom->notice->canNotAdd           = '该项参与运算，不提供自定义添加功能';
+$lang->custom->notice->forceReview         = "指定人提交的%s必须评审。";
+$lang->custom->notice->forceNotReview      = "指定人提交的%s不需要评审。";
+$lang->custom->notice->longlife            = 'Bug列表页面的久未处理标签中，列出设置天数之前未处理的Bug。';
+$lang->custom->notice->invalidNumberKey    = '键值应为不大于255的数字';
+$lang->custom->notice->invalidStringKey    = '键值应当为小写英文字母、数字或下划线的组合';
+$lang->custom->notice->cannotSetTimezone   = 'date_default_timezone_set方法不存在或禁用，不能设置时区。';
+$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->readOnlyOfExecution = "禁止修改后，已关闭{$lang->custom->execution}下的任务、版本、日志以及关联需求都禁止修改。";
+$lang->custom->notice->URSREmpty           = '自定义需求名称不能为空！';
+$lang->custom->notice->confirmDelete       = '您确定要删除吗？';
 
-$lang->custom->notice->indexPage['product']        = "从8.2版本起增加了产品主页视图，是否默认进入产品主页？";
-$lang->custom->notice->indexPage['project']        = "从8.2版本起增加了项目主页视图，是否默认进入项目主页？";
-$lang->custom->notice->indexPage['qa']             = "从8.2版本起增加了测试主页视图，是否默认进入测试主页？";
+$lang->custom->notice->indexPage['product'] = "从8.2版本起增加了产品主页视图，是否默认进入产品主页？";
+$lang->custom->notice->indexPage['project'] = "从8.2版本起增加了项目主页视图，是否默认进入项目主页？";
+$lang->custom->notice->indexPage['qa']      = "从8.2版本起增加了测试主页视图，是否默认进入测试主页？";
 
 $lang->custom->notice->invalidStrlen['ten']        = '键的长度必须小于10个字符！';
 $lang->custom->notice->invalidStrlen['twenty']     = '键的长度必须小于20个字符！';
@@ -221,10 +228,11 @@ $lang->custom->CRExecution[0] = '禁止修改';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = '计划';
-$lang->custom->moduleName['execution']   = '执行';
+$lang->custom->moduleName['execution']   = $lang->custom->execution;
 
-$lang->custom->conceptQuestions['overview'] = "1. 下述哪种组合方式更适合您公司的管理现状？";
-$lang->custom->conceptQuestions['URAndSR']  = "2. 是否启用{$lang->URCommon}和{$lang->SRCommon}概念？";
+$lang->custom->conceptQuestions['overview']   = "1. 下述哪种组合方式更适合您公司的管理现状？";
+$lang->custom->conceptQuestions['URAndSR']    = "2. 是否启用{$lang->URCommon}和{$lang->SRCommon}概念？";
+$lang->custom->conceptQuestions['storypoint'] = "3. 您公司是在使用以下哪种单位来做规模估算？";
 
 $lang->custom->conceptOptions             = new stdclass;
 $lang->custom->conceptOptions->story      = array();
@@ -242,3 +250,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = '功能点';
 
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = '设置项目概念';
+
+$lang->custom->reviewRules['allpass']  = '全部通过通过';
+$lang->custom->reviewRules['halfpass'] = '半数以上通过通过';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 61a6f84101..5dff2482e1 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -1,4 +1,6 @@
 <?php
+global $config;
+
 $lang->custom->common               = '自定義';
 $lang->custom->index                = '首頁';
 $lang->custom->set                  = '自定義配置';
@@ -19,7 +21,6 @@ $lang->custom->score                = '積分';
 $lang->custom->timezone             = '時區';
 $lang->custom->scoreReset           = '重置積分';
 $lang->custom->scoreTitle           = '積分功能';
-$lang->custom->execution            = $lang->sprintCommon;
 $lang->custom->product              = $lang->productCommon;
 $lang->custom->convertFactor        = '換算係數';
 $lang->custom->region               = '區間';
@@ -42,10 +43,14 @@ $lang->custom->browseStoryConcept   = "需求概念列表";
 $lang->custom->deleteStoryConcept   = "刪除需求概念";
 $lang->custom->URConcept            = "用需概念";
 $lang->custom->SRConcept            = "軟需概念";
+$lang->custom->reviewRule           = "評審規則";
 $lang->custom->switch               = "切換";
 $lang->custom->oneUnit              = "一個{$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "請先設置{$lang->hourCommon}轉換為%s的換算係數";
 
+if($config->systemMode == 'new') $lang->custom->execution = '執行';
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
+
 $lang->custom->unitList['efficiency'] = '工時/';
 $lang->custom->unitList['manhour']    = '人時/';
 $lang->custom->unitList['cost']       = '元/小時';
@@ -71,12 +76,12 @@ $lang->custom->saveTips            = '點擊保存後，則以當前%s為預設
 
 $lang->custom->numberError = '區間必須大於零';
 
-$lang->custom->closedExecution = '已關閉' . $lang->sprintCommon;
+$lang->custom->closedExecution = '已關閉' . $lang->custom->execution;
 $lang->custom->closedProduct   = '已關閉' . $lang->productCommon;
 
-$lang->custom->object['project']   = '項目';
+if($config->systemMode == 'new') $lang->custom->object['project']   = '項目';
 $lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = $lang->sprintCommon;
+$lang->custom->object['execution'] = $lang->custom->execution;
 $lang->custom->object['story']     = $lang->SRCommon;
 $lang->custom->object['task']      = '任務';
 $lang->custom->object['bug']       = 'Bug';
@@ -92,11 +97,13 @@ $lang->custom->project->defaultCurrency    = '預設貨幣';
 $lang->custom->project->fields['unitList'] = '預算單位';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['categoryList']     = '類型';
 $lang->custom->story->fields['priList']          = '優先順序';
 $lang->custom->story->fields['sourceList']       = '來源';
 $lang->custom->story->fields['reasonList']       = '關閉原因';
 $lang->custom->story->fields['stageList']        = '階段';
 $lang->custom->story->fields['statusList']       = '狀態';
+$lang->custom->story->fields['reviewRules']      = '評審規則';
 $lang->custom->story->fields['reviewResultList'] = '評審結果';
 $lang->custom->story->fields['review']           = '評審流程';
 
@@ -151,26 +158,26 @@ $lang->custom->allLang     = '適用所有語言';
 $lang->custom->confirmRestore = '是否要恢復預設配置？';
 
 $lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice             = '控制以上欄位在用戶相關頁面是否顯示，留空則全部顯示';
-$lang->custom->notice->canNotAdd                   = '該項參與運算，不提供自定義添加功能';
-$lang->custom->notice->forceReview                 = "指定人提交的%s必須評審。";
-$lang->custom->notice->forceNotReview              = "指定人提交的%s不需要評審。";
-$lang->custom->notice->longlife                    = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
-$lang->custom->notice->invalidNumberKey            = '鍵值應為不大於255的數字';
-$lang->custom->notice->invalidStringKey            = '鍵值應當為小寫英文字母、數字或下劃線的組合';
-$lang->custom->notice->cannotSetTimezone           = 'date_default_timezone_set方法不存在或禁用，不能設置時區。';
-$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->readOnlyOfExecution         = '禁止修改後，已關閉' . $lang->sprintCommon . '下的任務、版本、日誌以及關聯需求都禁止修改。';
-$lang->custom->notice->URSREmpty                   = '自定義需求名稱不能為空！';
-$lang->custom->notice->confirmDelete               = '您確定要刪除嗎？';
+$lang->custom->notice->userFieldNotice     = '控制以上欄位在用戶相關頁面是否顯示，留空則全部顯示';
+$lang->custom->notice->canNotAdd           = '該項參與運算，不提供自定義添加功能';
+$lang->custom->notice->forceReview         = "指定人提交的%s必須評審。";
+$lang->custom->notice->forceNotReview      = "指定人提交的%s不需要評審。";
+$lang->custom->notice->longlife            = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
+$lang->custom->notice->invalidNumberKey    = '鍵值應為不大於255的數字';
+$lang->custom->notice->invalidStringKey    = '鍵值應當為小寫英文字母、數字或下劃線的組合';
+$lang->custom->notice->cannotSetTimezone   = 'date_default_timezone_set方法不存在或禁用，不能設置時區。';
+$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->readOnlyOfExecution = "禁止修改後，已關閉{$lang->custom->execution}下的任務、版本、日誌以及關聯需求都禁止修改。";
+$lang->custom->notice->URSREmpty           = '自定義需求名稱不能為空！';
+$lang->custom->notice->confirmDelete       = '您確定要刪除嗎？';
 
-$lang->custom->notice->indexPage['product']        = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
-$lang->custom->notice->indexPage['project']        = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
-$lang->custom->notice->indexPage['qa']             = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？";
+$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
+$lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
+$lang->custom->notice->indexPage['qa']      = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？";
 
 $lang->custom->notice->invalidStrlen['ten']        = '鍵的長度必須小於10個字元！';
 $lang->custom->notice->invalidStrlen['twenty']     = '鍵的長度必須小於20個字元！';
@@ -221,10 +228,11 @@ $lang->custom->CRExecution[0] = '禁止修改';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = '計劃';
-$lang->custom->moduleName['execution']   = $lang->sprintCommon;
+$lang->custom->moduleName['execution']   = $lang->custom->execution;
 
-$lang->custom->conceptQuestions['overview'] = "1. 下述哪種組合方式更適合您公司的管理現狀？";
-$lang->custom->conceptQuestions['URAndSR']  = "2. 是否啟用{$lang->URCommon}和{$lang->SRCommon}概念？";
+$lang->custom->conceptQuestions['overview']   = "1. 下述哪種組合方式更適合您公司的管理現狀？";
+$lang->custom->conceptQuestions['URAndSR']    = "2. 是否啟用{$lang->URCommon}和{$lang->SRCommon}概念？";
+$lang->custom->conceptQuestions['storypoint'] = "3. 您公司是在使用以下哪種單位來做規模估算？";
 
 $lang->custom->conceptOptions             = new stdclass;
 $lang->custom->conceptOptions->story      = array();
@@ -242,3 +250,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = '功能點';
 
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = '設置項目概念';
+
+$lang->custom->reviewRules['allpass']  = '全部通過通過';
+$lang->custom->reviewRules['halfpass'] = '半數以上通過通過';
diff --git a/module/custom/model.php b/module/custom/model.php
index e303c10a9c..48af012607 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -155,6 +155,7 @@ class customModel extends model
         $menuModuleName = $module;
         $order          = 1;
         $customMenuMap  = array();
+        $openApp        = $app->openApp;
         $isTutorialMode = commonModel::isTutorialMode();
 
         if($customMenu)
@@ -194,7 +195,7 @@ class customModel extends model
         }
         elseif($module)
         {
-            $menuOrder = ($module == 'main' and isset($lang->menuOrder)) ? $lang->menuOrder : (isset($lang->$module->menuOrder) ? $lang->$module->menuOrder : array());
+            $menuOrder = ($module == 'main' and isset($lang->menuOrder)) ? $lang->menuOrder : (isset($lang->menu->{$module}['menuOrder']) ? $lang->menu->{$module}['menuOrder'] : array());
             if($menuOrder)
             {
                 ksort($menuOrder);
@@ -226,7 +227,9 @@ class customModel extends model
             $class     = '';
             $subModule = '';
             $subMenu   = '';
+            $dropMenu  = '';
             $alias     = '';
+            $exclude   = '';
 
             $link = (is_array($item) and isset($item['link'])) ? $item['link'] : $item;
             /* The variable of item has not link and is not link then ignore it. */
@@ -256,25 +259,31 @@ class customModel extends model
                     if(isset($item['class']))     $class     = $item['class'];
                     if(isset($item['subModule'])) $subModule = $item['subModule'];
                     if(isset($item['subMenu']))   $subMenu   = $item['subMenu'];
+                    if(isset($item['dropMenu']))  $dropMenu  = $item['dropMenu'];
                     if(isset($item['alias']))     $alias     = $item['alias'];
+                    if(isset($item['exclude']))   $exclude   = $item['exclude'];
                 }
 
                 $hidden = isset($customMenuMap[$name]) && isset($customMenuMap[$name]->hidden) && $customMenuMap[$name]->hidden;
 
-                if(is_array($item) and isset($item['subMenu']))
+                if(is_array($item) and (isset($item['subMenu']) or isset($item['dropMenu'])))
                 {
-                    foreach($item['subMenu'] as $subItem)
+                    foreach(array('subMenu', 'dropMenu') as $key)
                     {
-                        if(isset($subItem->link['module']) && isset($subItem->link['method']))
+                        if(!isset($item[$key])) continue;
+                        foreach($item[$key] as $subItem)
                         {
-                            $subItem->hidden = !common::hasPriv($subItem->link['module'], $subItem->link['method']);
+                            if(isset($subItem->link['module']) && isset($subItem->link['method']))
+                            {
+                                $subItem->hidden = !common::hasPriv($subItem->link['module'], $subItem->link['method']);
+                            }
                         }
-                    }
-                    if(isset($customMenuMap[$name]->subMenu))
-                    {
-                        foreach($customMenuMap[$name]->subMenu as $subItem)
+                        if(isset($customMenuMap[$name]->$key))
                         {
-                            if(isset($subItem->hidden) && isset($item['subMenu'][$subItem->name])) $item['subMenu'][$subItem->name]->hidden = $subItem->hidden;
+                            foreach($customMenuMap[$name]->$key as $subItem)
+                            {
+                                if(isset($subItem->hidden) && isset($item[$key][$subItem->name])) $item[$key][$subItem->name]->hidden = $subItem->hidden;
+                            }
                         }
                     }
                 }
@@ -290,7 +299,9 @@ class customModel extends model
                 if($class)    $menuItem->class     = $class;
                 if($subModule)$menuItem->subModule = $subModule;
                 if($subMenu)  $menuItem->subMenu   = $subMenu;
+                if($dropMenu) $menuItem->dropMenu  = $dropMenu;
                 if($alias)    $menuItem->alias     = $alias;
+                if($exclude)  $menuItem->exclude   = $exclude;
                 if($isTutorialMode) $menuItem->tutorial = true;
 
                 /* Hidden menu by config in mobile. */
@@ -302,6 +313,35 @@ class customModel extends model
         }
 
         ksort($menu, SORT_NUMERIC);
+
+        /* Set divider in main and module menu. */
+        if(!isset($lang->$openApp->menuOrder)) $lang->$openApp->menuOrder = array();
+        ksort($lang->$openApp->menuOrder, SORT_NUMERIC);
+
+        $group = 0;
+        $dividerOrders = array();
+        foreach($lang->$openApp->menuOrder as $name)
+        {
+            if(isset($lang->$openApp->dividerMenu) and strpos($lang->$openApp->dividerMenu, ",{$name},") !== false) $group++;
+            $dividerOrders[$name] = $group;
+        }
+
+        $isFirst = true; // No divider before First item.
+        $group   = 0;
+        foreach($menu as $item)
+        {
+            if(isset($dividerOrders[$item->name]) and $dividerOrders[$item->name] > $group)
+            {
+                $menu[$item->order]->divider = $isFirst ? false : true;
+                $group = $dividerOrders[$item->name];
+            }
+            else
+            {
+                $isFirst = false;
+                $menu[$item->order]->divider = false;
+            }
+        }
+
         return array_values($menu);
     }
 
@@ -314,18 +354,22 @@ class customModel extends model
      */
     public static function getModuleMenu($module = 'main', $rebuild = false)
     {
+        global $app, $lang, $config;
+
         if(empty($module)) $module = 'main';
 
-        global $app, $lang, $config;
-        $allMenu = $module == 'main' ? $lang->menu : (isset($lang->$module->menu) ? $lang->$module->menu : $lang->my->menu);
+        $allMenu = new stdclass();
+        if($module == 'main' and !empty($lang->menu)) $allMenu = $lang->menu;
+        if($module != 'main' and isset($lang->menu->$module) and isset($lang->menu->{$module}['subMenu'])) $allMenu = $lang->menu->{$module}['subMenu'];
         if($module == 'product' and isset($allMenu->branch)) $allMenu->branch = str_replace('@branch@', $lang->custom->branch, $allMenu->branch);
-        if($module != 'main' and isset($lang->menugroup->$module)) $module = $lang->menugroup->$module;
         $flowModule = $config->global->flow . '_' . $module;
         $customMenu = isset($config->customMenu->$flowModule) ? $config->customMenu->$flowModule : array();
         if(commonModel::isTutorialMode() && $module === 'main') $customMenu = 'my,product,project,qa,company';
         if(!empty($customMenu) && is_string($customMenu) && substr($customMenu, 0, 1) === '[') $customMenu = json_decode($customMenu);
         if($module == 'my' && empty($config->global->scoreStatus)) unset($allMenu->score);
+
         $menu = self::setMenuByConfig($allMenu, $customMenu, $module);
+
         return $menu;
     }
 
@@ -472,7 +516,7 @@ class customModel extends model
      * Get UR and SR pairs.
      *
      * @access public
-     * @return void
+     * @return array
      */
     public function getURSRPairs()
     {
@@ -482,6 +526,11 @@ class customModel extends model
             ->andWhere('module')->eq('custom')
             ->andWhere('section')->eq('URSRList')
             ->fetchAll();
+        if(empty($langData))
+        {
+            $URSR     = $this->loadModel('setting')->getURSR();
+            $langData = $this->dao->select('`key`, `value`, `system`')->from(TABLE_LANG)->where('`key`')->eq($URSR)->andWhere('module')->eq('custom')->andWhere('section')->eq('URSRList')->fetchAll();
+        }
 
         $URSRPairs = array();
         foreach($langData as $id => $content)
@@ -497,11 +546,16 @@ class customModel extends model
      * Get UR pairs.
      *
      * @access public
-     * @return void
+     * @return array
      */
     public function getURPairs()
     {
         $URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($this->app->clientLang)->fetchPairs();
+        if(empty($URSRList))
+        {
+            $URSR     = $this->loadModel('setting')->getURSR();
+            $URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('`key`')->eq($URSR)->fetchPairs();
+        }
 
         $URPairs = array();
         foreach($URSRList as $key => $value)
@@ -517,11 +571,16 @@ class customModel extends model
      * Get SR pairs.
      *
      * @access public
-     * @return void
+     * @return array
      */
     public function getSRPairs()
     {
         $URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($this->app->clientLang)->fetchPairs();
+        if(empty($URSRList))
+        {
+            $URSR     = $this->loadModel('setting')->getURSR();
+            $URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('`key`')->eq($URSR)->fetchPairs();
+        }
 
         $SRPairs = array();
         foreach($URSRList as $key => $value)
@@ -537,7 +596,7 @@ class customModel extends model
      * Get UR and SR list.
      *
      * @access public
-     * @return void
+     * @return array
      */
     public function getURSRList()
     {
@@ -549,6 +608,11 @@ class customModel extends model
             ->andWhere('module')->eq('custom')
             ->andWhere('section')->eq('URSRList')
             ->fetchAll();
+        if(empty($langData))
+        {
+            $URSR     = $this->loadModel('setting')->getURSR();
+            $langData = $this->dao->select('`key`, `value`, `system`')->from(TABLE_LANG)->where('`key`')->eq($URSR)->andWhere('module')->eq('custom')->andWhere('section')->eq('URSRList')->fetchAll();
+        }
 
         $URSRList = array();
         foreach($langData as $id => $content)
diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php
index b3f840a7a9..bd4627b047 100644
--- a/module/custom/view/browsestoryconcept.html.php
+++ b/module/custom/view/browsestoryconcept.html.php
@@ -11,11 +11,11 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <style>
-    .table-form>tbody>tr>th{text-align: center}
+.table-form>tbody>tr>th{text-align: center}
 </style>
 <div id='mainMenu' class='clearfix'>
   <div class='pull-right'>
-    <?php if(common::hasPriv('custom', 'setstoryconcept')) echo html::a($this->createLink('custom', 'setstoryconcept', '', '', true), $lang->custom->setStoryConcept, '', "class='btn btn-primary iframe'");?>
+    <?php if(common::hasPriv('custom', 'setstoryconcept')) echo html::a($this->createLink('custom', 'setstoryconcept', '', '', true), $lang->custom->setStoryConcept, '', "class='btn btn-primary iframe' data-width=50%");?>
   </div>
 </div>
 <div id='mainContent' class='main-row'>
@@ -45,7 +45,7 @@
             <td class='text-left'><?php echo $URSR['SRName'];?></td>
             <td class='c-actions'>
               <?php $disabled = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
-              <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' title={$lang->edit}");?>
+              <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' data-width=50% title={$lang->edit}");?>
               <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($this->createLink('custom', 'deleteStoryConcept', "id=$key"), "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='admin'");?>
             </td>
           </tr>
@@ -55,7 +55,6 @@
   </div>
 </div>
 <script>
-$('#navbar li[data-id="custom"]').removeClass('active');
 $("input[name='default']").change(function()
 {
     var checked = $(this).val();
diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php
index 5f541cea3e..f45a550cd7 100644
--- a/module/custom/view/flow.html.php
+++ b/module/custom/view/flow.html.php
@@ -34,6 +34,12 @@
         <label><?php echo $lang->custom->conceptQuestions['URAndSR']?></label>
         <div class="checkbox"> <?php echo html::radio('URAndSR', $lang->custom->conceptOptions->URAndSR, zget($this->config->custom, 'URAndSR', '0'));?></div>
       </div>
+      <?php if(!isset($config->maxVersion)):?>
+      <div class="form-group">
+        <label id='storypoint'><?php echo $lang->custom->conceptQuestions['storypoint'];?></label>
+        <div class="checkbox"> <?php echo html::radio('hourPoint', $lang->custom->conceptOptions->hourPoint, zget($this->config->custom, 'hourPoint'))?> </div>
+      </div>
+      <?php endif;?>
       <div class="form-group">
         <label></label>
         <div><?php echo html::submitButton();?></div>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 9b0adf192b..ea2287d284 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -70,6 +70,17 @@ EOT;
           <td colspan='4' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
+      <?php elseif($module == 'story' and $field == 'reviewRules'):?>
+      <table class='table table-form mw-700px'>
+        <tr>
+          <th class='thWidth'><?php echo $lang->custom->reviewRule;?></th>
+          <td><?php echo html::radio('reviewRules', $lang->custom->reviewRules, $reviewRule);?></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
+        </tr>
+      </table>
       <?php elseif(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
       <table class='table table-form mw-800px'>
         <tr>
diff --git a/module/custom/view/timezone.html.php b/module/custom/view/timezone.html.php
index 1c582bc1fc..3f802adc1e 100644
--- a/module/custom/view/timezone.html.php
+++ b/module/custom/view/timezone.html.php
@@ -11,9 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='mw-500px'>
     <?php if(!function_exists('date_default_timezone_set')):?>
diff --git a/module/datatable/control.php b/module/datatable/control.php
index 4c2b53230b..6707a493bf 100644
--- a/module/datatable/control.php
+++ b/module/datatable/control.php
@@ -3,17 +3,17 @@
  * The view file of datatable module of ZenTaoPMS.
  *
  * @copyright   Copyright 2014-2014 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @license     business(商业软件) 
+ * @license     business(商业软件)
  * @author      Hao sun <sunhao@cnezsoft.com>
- * @package     datatable 
+ * @package     datatable
  * @version     $Id$
  * @link        http://www.zentao.net
  */
 class datatable extends control
 {
     /**
-     * Construct function, set menu. 
-     * 
+     * Construct function, set menu.
+     *
      * @access public
      * @return void
      */
@@ -24,7 +24,7 @@ class datatable extends control
 
     /**
      * Save config
-     * 
+     *
      * @access public
      * @return void
      */
@@ -47,13 +47,14 @@ class datatable extends control
 
     /**
      * custom fields.
-     * 
-     * @param  string $module 
-     * @param  string $method 
+     *
+     * @param  string $module
+     * @param  string $method
+     * @param  string $extra
      * @access public
      * @return void
      */
-    public function ajaxCustom($module, $method)
+    public function ajaxCustom($module, $method, $extra = '')
     {
         $target = $module . ucfirst($method);
         $mode   = isset($this->config->datatable->$target->mode) ? $this->config->datatable->$target->mode : 'table';
@@ -85,17 +86,24 @@ class datatable extends control
             $setting = json_encode($this->config->$module->datatable->defaultField);
         }
 
-        $this->view->cols    = $this->datatable->getFieldList($module);
+        $cols = $this->datatable->getFieldList($module);
+        if($extra == 'requirement')
+        {
+            unset($cols['plan']);
+            unset($cols['stage']);
+        }
+
+        $this->view->cols    = $cols;
         $this->view->setting = $setting;
         $this->display();
     }
 
     /**
      * Ajax reset cols
-     * 
-     * @param  string $module 
-     * @param  string $method 
-     * @param  string $confirm 
+     *
+     * @param  string $module
+     * @param  string $method
+     * @param  string $confirm
      * @access public
      * @return void
      */
diff --git a/module/datatable/model.php b/module/datatable/model.php
index d37b0db5c6..ba863840c7 100644
--- a/module/datatable/model.php
+++ b/module/datatable/model.php
@@ -88,6 +88,11 @@ class datatableModel extends model
                 $set->title = $fieldList[$id]['title'];
                 $set->sort  = isset($fieldList[$id]['sort']) ? $fieldList[$id]['sort'] : 'yes';
                 $set->name  = isset($fieldList[$id]['name']) ? $fieldList[$id]['name'] : '';
+
+                if(isset($fieldList[$id]['minWidth'])) $set->minWidth = $fieldList[$id]['minWidth'];
+                if(isset($fieldList[$id]['maxWidth'])) $set->maxWidth = $fieldList[$id]['maxWidth'];
+                if(isset($fieldList[$id]['pri']))      $set->pri = $fieldList[$id]['pri'];
+
                 $setting[$key] = $set;
             }
         }
@@ -152,10 +157,26 @@ class datatableModel extends model
             $title = isset($col->title) ? "title='$col->title'" : '';
             $title = (isset($col->name) and $col->name) ? "title='$col->name'" : $title;
             if($id == 'id' and (int)$width < 90) $width = '90px';
-            $width = "data-width='$width' style='width:$width'";
             $align = $id == 'actions' ? 'text-center' : '';
+            $align = in_array($id, array('budget', 'teamCount', 'estimate', 'consume')) ? 'text-right' : $align;
 
-            echo "<th data-flex='$fixed' $width class='c-$id $align' $title>";
+            $style  = '';
+            $data   = '';
+            $data  .= "data-width='$width'";
+            $style .= "width:$width;";
+            if(isset($col->minWidth))
+            {
+                $data  .= "data-minWidth='{$col->minWidth}px'";
+                $style .= "min-width:{$col->minWidth}px;";
+            }
+            if(isset($col->maxWidth))
+            {
+                $data  .= "data-maxWidth='{$col->maxWidth}px'";
+                $style .= "max-width:{$col->maxWidth}px;";
+            }
+            if(isset($col->pri)) $data .= "data-pri='{$col->pri}'";
+
+            echo "<th data-flex='$fixed' $data style='$style' class='c-$id $align' $title>";
             if($id == 'actions')
             {
                 echo $this->lang->actions;
diff --git a/module/dept/control.php b/module/dept/control.php
index 4078b36d2e..43bc729a1b 100644
--- a/module/dept/control.php
+++ b/module/dept/control.php
@@ -14,8 +14,8 @@ class dept extends control
     const NEW_CHILD_COUNT = 10;
 
     /**
-     * Construct function, set menu. 
-     * 
+     * Construct function, set menu.
+     *
      * @access public
      * @return void
      */
@@ -27,8 +27,8 @@ class dept extends control
 
     /**
      * Browse a department.
-     * 
-     * @param  int    $deptID 
+     *
+     * @param  int    $deptID
      * @access public
      * @return void
      */
@@ -47,7 +47,7 @@ class dept extends control
 
     /**
      * Update the departments order.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -62,7 +62,7 @@ class dept extends control
 
     /**
      * Manage childs.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -70,15 +70,16 @@ class dept extends control
     {
         if(!empty($_POST))
         {
-            $this->dept->manageChild($_POST['parentDeptID'], $_POST['depts']);
+            $deptIDList = $this->dept->manageChild($_POST['parentDeptID'], $_POST['depts']);
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $deptIDList));
             die(js::reload('parent'));
         }
     }
 
     /**
-     * Edit dept. 
-     * 
-     * @param  int    $deptID 
+     * Edit dept.
+     *
+     * @param  int    $deptID
      * @access public
      * @return void
      */
@@ -91,7 +92,8 @@ class dept extends control
         }
 
         $dept  = $this->dept->getById($deptID);
-        $users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted|all');
+        $users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted|all', $dept->manager, $this->config->maxCount);
+        if(!empty($this->config->user->moreLink)) $this->config->moreLinks["manager"] = $this->config->user->moreLink;
 
         $this->view->optionMenu = $this->dept->getOptionMenu();
 
@@ -107,8 +109,8 @@ class dept extends control
 
     /**
      * Delete a department.
-     * 
-     * @param  int    $deptID 
+     *
+     * @param  int    $deptID
      * @param  string $confirm  yes|no
      * @access public
      * @return void
@@ -133,10 +135,10 @@ class dept extends control
     }
 
     /**
-     * Ajax get users 
-     * 
-     * @param  int    $dept 
-     * @param  string $user 
+     * Ajax get users
+     *
+     * @param  int    $dept
+     * @param  string $user
      * @access public
      * @return void
      */
diff --git a/module/dept/model.php b/module/dept/model.php
index 038f2549c0..29a65424ed 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -318,7 +318,7 @@ class deptModel extends model
      * @param  int    $parentDeptID
      * @param  string $childs
      * @access public
-     * @return void
+     * @return array
      */
     public function manageChild($parentDeptID, $childs)
     {
@@ -335,18 +335,21 @@ class deptModel extends model
         }
 
         $i = 1;
+        $deptIDList = array();
         foreach($childs as $deptID => $deptName)
         {
             if(empty($deptName)) continue;
             if(is_numeric($deptID))
             {
+                $dept = new stdclass();
                 $dept->name   = strip_tags($deptName);
                 $dept->parent = $parentDeptID;
                 $dept->grade  = $grade;
                 $dept->order  = $this->post->maxOrder + $i * 10;
                 $this->dao->insert(TABLE_DEPT)->data($dept)->exec();
-                $deptID = $this->dao->lastInsertID();
-                $childPath = $parentPath . "$deptID,";
+                $deptID       = $this->dao->lastInsertID();
+                $deptIDList[] = $deptID;
+                $childPath    = $parentPath . "$deptID,";
                 $this->dao->update(TABLE_DEPT)->set('path')->eq($childPath)->where('id')->eq($deptID)->exec();
                 $i++;
             }
@@ -356,6 +359,8 @@ class deptModel extends model
                 $this->dao->update(TABLE_DEPT)->set('name')->eq(strip_tags($deptName))->where('id')->eq($deptID)->exec();
             }
         }
+
+        return $deptIDList;
     }
 
     /**
diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php
index 1213d49328..aef6145c96 100644
--- a/module/dept/view/edit.html.php
+++ b/module/dept/view/edit.html.php
@@ -47,4 +47,13 @@ if(isset($pageCSS)) css::internal($pageCSS);
 <script>
 <?php if(isset($pageJS)) echo $pageJS;?>
 $('#dataform .chosen').chosen();
+$(document).ready(function()
+{
+    $("#dataform .picker-select[data-pickertype!='remote']").picker({chosenMode: true});
+    $("#dataform [data-pickertype='remote']").each(function()
+    {
+        var pickerremote = $(this).attr('data-pickerremote');
+        $(this).picker({chosenMode: true, remote: pickerremote});
+    })
+});
 </script>
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index 13c6cad624..41f00d6f24 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -50,9 +50,10 @@ $lang->dev->tableList['lang']             = '語言定義';
 $lang->dev->tableList['module']           = '模組';
 $lang->dev->tableList['product']          = $lang->productCommon;
 $lang->dev->tableList['productplan']      = $lang->productCommon . '計劃';
-$lang->dev->tableList['project']          = $lang->executionCommon;
-$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->executionCommon . $lang->SRCommon;
+$lang->dev->tableList['project']          = '項目'; 
+$lang->dev->tableList['projectproduct']   = '項目' .  $lang->productCommon;
+$lang->dev->tableList['projectstory']     = '項目' .  $lang->SRCommon;
+$lang->dev->tableList['execution']        = $lang->executionCommon;
 $lang->dev->tableList['release']          = '發佈';
 $lang->dev->tableList['story']            = $lang->SRCommon;
 $lang->dev->tableList['storyspec']        = "{$lang->SRCommon}描述";
@@ -117,17 +118,19 @@ $lang->dev->tableList['job']              = '構建任務';
 $lang->dev->tableList['searchdict']       = '搜索字典';
 $lang->dev->tableList['searchindex']      = '搜索索引';
 
-$lang->dev->groupList['my']      = '我的地盤';
-$lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->executionCommon;
-$lang->dev->groupList['qa']      = '測試';
-$lang->dev->groupList['doc']     = '文檔';
-$lang->dev->groupList['report']  = '統計';
-$lang->dev->groupList['company'] = '組織';
-$lang->dev->groupList['repo']    = '持續整合';
-$lang->dev->groupList['api']     = 'API';
-$lang->dev->groupList['message'] = '消息';
-$lang->dev->groupList['search']  = '搜索';
+$lang->dev->groupList['my']        = '我的地盤';
+$lang->dev->groupList['program']   = '項目集';
+$lang->dev->groupList['product']   = $lang->productCommon;
+$lang->dev->groupList['project']   = '項目';
+$lang->dev->groupList['execution'] = $lang->executionCommon;
+$lang->dev->groupList['qa']        = '測試';
+$lang->dev->groupList['doc']       = '文檔';
+$lang->dev->groupList['report']    = '統計';
+$lang->dev->groupList['company']   = '組織';
+$lang->dev->groupList['repo']      = '持續整合';
+$lang->dev->groupList['api']       = 'API';
+$lang->dev->groupList['message']   = '消息';
+$lang->dev->groupList['search']    = '搜索';
 
 $lang->dev->endGroupList['admin']  = '後台';
 $lang->dev->endGroupList['system'] = '系統';
diff --git a/module/dev/model.php b/module/dev/model.php
index 4e8bc4e641..e953d61897 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -184,7 +184,9 @@ class devModel extends model
                 {
                     $b++;
                     $blocks[] = array();
-                } else if($b == -1) {
+                }
+                else if($b == -1)
+                {
                     $b = 0;
                     $blocks[] = array();
                 }
diff --git a/module/dev/view/header.html.php b/module/dev/view/header.html.php
index 023667c840..090073ba79 100644
--- a/module/dev/view/header.html.php
+++ b/module/dev/view/header.html.php
@@ -1,5 +1,5 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('dev');?></div>
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('dev');?></div>
 </div>
 <script>$('#mainMenu #<?php echo $tab;?>').addClass('btn-active-text')</script>
diff --git a/module/doc/control.php b/module/doc/control.php
index 4de5d6f41e..91547bb8dd 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -26,11 +26,6 @@ class doc extends control
         $this->loadModel('product');
         $this->loadModel('project');
         $this->loadModel('execution');
-        $this->from      = $this->cookie->from ? $this->cookie->from : 'doc';
-        $this->productID = $this->cookie->product ? $this->cookie->product : '0';
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
-        if($this->from == 'doc') $this->session->set('project', '');
-        if(!$this->projectID) $this->lang->navGroup->doc = 'doc';
     }
 
     /**
@@ -41,30 +36,21 @@ class doc extends control
      */
     public function index()
     {
-        $this->from = 'doc';
-        setcookie('from', 'doc', $this->config->cookieLife, $this->config->webRoot, '', false, true);
-
-        $this->doc->setMenu();
-
-        $this->session->set('docList', $this->app->getURI(true));
+        $this->session->set('docList', $this->app->getURI(true), 'doc');
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 5, 1);
 
-        $this->lang->TRActions  = $this->doc->setFastMenu($this->lang->doc->fast);
-        $this->lang->TRActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createlib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
-        $this->lang->TRActions .= common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc() : '';
-
         $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID");
         $this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index');
 
         $this->view->title      = $this->lang->doc->common . $this->lang->colon . $this->lang->doc->index;
         $this->view->position[] = $this->lang->doc->index;
 
-        $this->view->latestEditedDocs = $this->doc->getDocsByBrowseType(0, 'byediteddate', 0, 0, 'editedDate_desc, id_desc', $pager);
-        $this->view->myDocs           = $this->doc->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager);
+        $this->view->latestEditedDocs = $this->doc->getDocsByBrowseType('byediteddate', 0, 0, 'editedDate_desc, id_desc', $pager);
+        $this->view->myDocs           = $this->doc->getDocsByBrowseType('openedbyme', 0, 0, 'addedDate_desc', $pager);
+        $this->view->collectedDocs    = $this->doc->getDocsByBrowseType('collectedbyme', 0, 0, 'addedDate_desc', $pager);
         $this->view->statisticInfo    = $this->doc->getStatisticInfo();
         $this->view->users            = $this->user->getPairs('noletter');
-        $this->view->doingExecutions  = $this->execution->getByProject($this->projectID, 'undone', 5);
 
         $this->display();
     }
@@ -73,22 +59,18 @@ class doc extends control
      * Browse docs.
      *
      * @param  string|int $libID    product|execution or the int id of custom library
-     * @param  int    $moduleID
-     * @param  int    $productID
-     * @param  int    $executionID
+     * @param  string $browseType
+     * @param  int    $param
      * @param  string $orderBy
-     * @param  string $from  doc|project|product
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
      * @access public
      * @return void
      */
-    public function browse($libID = 0, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $from = 'doc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->from = $from;
-        setcookie('from', $from, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-
+        $this->session->set('docList', $this->app->getURI(true), 'doc');
         $this->loadModel('search');
 
         /* Set browseType.*/
@@ -96,50 +78,8 @@ class doc extends control
         $queryID    = ($browseType == 'bysearch') ? (int)$param : 0;
         $moduleID   = ($browseType == 'bymodule') ? (int)$param : 0;
 
-        $type = '';
-        $productID   = 0;
-        $executionID = 0;
-        if($libID)
-        {
-            $lib         = $this->doc->getLibByID($libID);
-            $type        = $lib->type;
-            $productID   = $lib->product;
-            $executionID = $lib->execution;
-
-            if($type != 'product' and $type != 'execution') $from = 'doc';
-        }
-
-        $this->libs = $this->doc->getLibs($type, '', $libID);
-
-        /* According the from, set menus. */
-        if($from == 'product')
-        {
-            $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
-            $this->product->setMenu($this->product->getPairs(), $productID);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->lang->noMenuModule[] = 'doc';
-            $this->lang->set('menugroup.doc', 'product');
-        }
-        elseif($from == 'project')
-        {
-            $this->lang->navGroup->doc  = 'project';
-            $this->lang->doc->menu      = $this->lang->project->menu;
-            $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
-            if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
-            $this->project->setMenu($this->project->getPairs($this->session->PRJ, 'all', 0, true), $lib->project);
-        }
-        else
-        {
-            $menuType = (!$type && (in_array($browseType, array_keys($this->lang->doc->fastMenuList)) || $browseType == 'bysearch')) ? $browseType : $type;
-            $this->doc->setMenu($menuType, $libID, $moduleID, $productID, $executionID);
-        }
-        $this->session->set('docList', $this->app->getURI(true));
-
         /* Set header and position. */
-        $this->view->title      = $this->lang->doc->common . ($libID ? $this->lang->colon . $this->libs[$libID] : '');
-        $this->view->position[] = $libID ? $this->libs[$libID] : '';
+        $this->view->title      = $this->lang->doc->common;
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -148,61 +88,26 @@ class doc extends control
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
-        /* Build the search form. */
-        $actionURL = $this->createLink('doc', 'browse', "lib=$libID&browseType=bySearch&queryID=myQueryID&orderBy=$orderBy&from=$from");
-        $this->doc->buildSearchForm($libID, $this->libs, $queryID, $actionURL, $type);
-
-        $title   = '';
-        $module  = $moduleID ? $this->tree->getByID($moduleID) : '';
-        if($module) $title = $module->name;
-        if($libID)  $title = html::a(helper::createLink('doc', 'browse', "libID=$libID"), $this->libs[$libID], '');
-        if(in_array($browseType, array_keys($this->lang->doc->fastMenuList))) $title = $this->lang->doc->fastMenuList[$browseType];
-        if($browseType == 'bysearch') $title = $this->lang->doc->search;
-        if($param != 0) $title = $this->doc->buildCrumbTitle($libID, $param, $title);
-        if($browseType == 'fastsearch')
-        {
-            if($this->post->searchDoc) $this->session->set('searchDoc', $this->post->searchDoc);
-            $title = '"' . $this->session->searchDoc  . '" ' . $this->lang->doc->searchResult;
-        }
-        else
-        {
-            $this->session->set('searchDoc', '');
-        }
-
-        $libs = array();
         if($browseType == 'collectedbyme')
         {
-            $libs = $this->doc->getAllLibsByType('collector');
-            $this->view->itemCounts = $this->doc->statLibCounts(array_keys($libs));
+            $this->app->rawMethod = 'collect';
         }
-
-        $attachLibs = array();
-        if(!empty($lib) and (!empty($lib->product) or !empty($lib->execution)) and $browseType != 'bymodule')
+        elseif($browseType == 'openedbyme')
         {
-            $count = $this->dao->select('count(*) as count')->from(TABLE_DOCLIB)->where('execution')->eq($lib->execution)->andWhere('product')->eq($lib->product)->fetch('count');
-            if($count == 1 and $type and isset($lib->$type))
-            {
-                $objectLibs = $this->doc->getLibsByObject($type, $lib->$type);
-                if(isset($objectLibs['execution'])) $attachLibs['execution'] = $objectLibs['execution'];
-                if(isset($objectLibs['files']))     $attachLibs['files']     = $objectLibs['files'];
-            }
+            $this->app->rawMethod = 'my';
+        }
+        elseif($browseType == 'byediteddate')
+        {
+            $this->app->rawMethod = 'recent';
         }
 
-        $this->view->breadTitle = $title;
-        $this->view->libID      = $libID;
         $this->view->moduleID   = $moduleID;
-        $this->view->modules    = $this->doc->getDocMenu($libID, $moduleID, '`order`', $browseType);
-        $this->view->docs       = $this->doc->getDocsByBrowseType($libID, $browseType, $queryID, $moduleID, $sort, $pager);
-        $this->view->attachLibs = $attachLibs;
+        $this->view->docs       = $this->doc->getDocsByBrowseType($browseType, $queryID, $moduleID, $sort, $pager);
         $this->view->users      = $this->user->getPairs('noletter');
         $this->view->orderBy    = $orderBy;
         $this->view->browseType = $browseType;
         $this->view->param      = $param;
-        $this->view->type       = $type;
-        $this->view->from       = $this->lang->navGroup->doc == 'project' ? 'project' : $from;
         $this->view->pager      = $pager;
-        $this->view->libs       = $libs;
-        $this->view->currentLib = $libID ? $lib : '';
 
         $this->display();
     }
@@ -222,8 +127,23 @@ class doc extends control
             $libID = $this->doc->createlib();
             if(!dao::isError())
             {
+                $objectType = $this->post->type;
+                if($objectType == 'project' and $this->post->project)     $objectID = $this->post->project;
+                if($objectType == 'product' and $this->post->product)     $objectID = $this->post->product;
+                if($objectType == 'execution' and $this->post->execution) $objectID = $this->post->execution;
+                if($objectType == 'custom' or $objectType == 'book')      $objectID = 0;
+
+                if($objectType == 'execution' and $this->config->systemMode == 'new' and $this->app->openApp == 'doc')
+                {
+                    $execution  = $this->execution->getByID($this->post->execution);
+                    $objectType = 'project';
+                    $objectID   = $execution->project;
+                }
+
                 $this->action->create('docLib', $libID, 'Created');
-                die(js::locate($this->createLink($this->moduleName, 'browse', "libID=$libID"), 'parent.parent'));
+
+                if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $libID));
+                die(js::locate($this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$objectID&libID=$libID"), 'parent.parent'));
             }
             else
             {
@@ -231,17 +151,26 @@ class doc extends control
             }
         }
 
-        $projectID  = $this->session->PRJ;
-        $products   = $this->product->getProductPairsByProject($projectID, 'noclosed');
-        $executions = $this->execution->getByProject($projectID, 'all', 0, true);
+        $products   = $this->product->getPairs();
+        $projects   = $this->project->getPairsByProgram();
+        $executions = $this->execution->getPairs();
+
+        if($type == 'execution')
+        {
+            $execution = $this->execution->getByID($objectID);
+            if($execution->type == 'stage') $this->lang->doc->execution = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->doc->execution);
+            if($execution->type == 'stage') $this->lang->doc->libTypeList['execution'] = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->doc->libTypeList['execution']);
+        }
 
         $libTypeList = $this->lang->doc->libTypeList;
         if(empty($products))   unset($libTypeList['product']);
+        if(empty($projects))   unset($libTypeList['project']);
         if(empty($executions)) unset($libTypeList['execution']);
 
         $this->view->groups      = $this->loadModel('group')->getPairs();
         $this->view->users       = $this->user->getPairs('nocode');
         $this->view->products    = $products;
+        $this->view->projects    = $projects;
         $this->view->executions  = $executions;
         $this->view->type        = $type;
         $this->view->libTypeList = $libTypeList;
@@ -267,15 +196,24 @@ class doc extends control
                 $actionID = $this->action->create('docLib', $libID, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
-            die(js::locate($this->createLink($this->moduleName, 'browse', "libID=$libID"), 'parent.parent'));
+            $response['message'] = $this->lang->saveSuccess;
+            $response['result']  = 'success';
+            $response['locate']  = 'parent';
+            $this->send($response);
         }
 
         $lib = $this->doc->getLibByID($libID);
         if(!empty($lib->product))   $this->view->product   = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->eq($lib->product)->fetch();
-        if(!empty($lib->execution)) $this->view->execution = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->eq($lib->execution)->fetch();
+        if(!empty($lib->execution))
+        {
+            $execution = $this->execution->getByID($lib->execution);
+            if($execution->type == 'stage') $this->lang->doc->execution = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->doc->execution);
+
+            $this->view->execution = $execution;
+        }
         $this->view->lib     = $lib;
         $this->view->groups  = $this->loadModel('group')->getPairs();
-        $this->view->users   = $this->user->getPairs('noletter', $lib->users);
+        $this->view->users   = $this->user->getPairs('noletter|noclosed', $lib->users);
         $this->view->libID   = $libID;
 
         die($this->display());
@@ -302,24 +240,40 @@ class doc extends control
             if(!empty($lib->main)) die(js::alert($this->lang->doc->errorMainSysLib));
 
             $this->doc->delete(TABLE_DOCLIB, $libID);
-            die(js::locate($this->createLink('doc', 'browse'), 'parent'));
+            if(isonlybody())
+            {
+                unset($_GET['onlybody']);
+                die(js::locate($this->createLink('doc', 'objectLibs', 'type=book'), 'parent.parent'));
+            }
+
+            $browseLink = $this->createLink('doc', 'index');
+            if(in_array($this->app->openApp, array('product', 'project', 'execution')))
+            {
+                $objectType = $lib->type;
+                $objectID   = $lib->{$objectType};
+                $browseLink = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$objectID");
+            }
+
+            die(js::locate($browseLink, 'parent'));
         }
     }
 
     /**
      * Create a doc.
      *
+     * @param  string       $objectType
+     * @param  int          $objectID
      * @param  int|string   $libID
      * @param  int          $moduleID
      * @param  string       $docType
      * @access public
      * @return void
      */
-    public function create($libID, $moduleID = 0, $docType = '')
+    public function create($objectType, $objectID, $libID, $moduleID = 0, $docType = '')
     {
         if(!empty($_POST))
         {
-            setcookie('lastDocModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
+            setcookie('lastDocModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $docResult = $this->doc->create();
             if(!$docResult or dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
@@ -335,45 +289,36 @@ class doc extends control
             if(!empty($files)) $fileAction = $this->lang->addFiles . join(',', $files) . "\n" ;
             $this->action->create('doc', $docID, 'Created', $fileAction);
 
-            $vars = "libID=" . (int)$this->post->lib . "&browseType=byModule&moduleID=" . (int)$this->post->module . "&orderBy=id_desc&from=$this->from";
-            $link = $this->createLink('doc', 'browse', $vars);
-            if($this->app->getViewType() == 'xhtml') $link = $this->createLink('doc', 'view', "docID=$docID");
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $docID));
+            $objectID = zget($lib, $lib->type, '');
+            $params   = "type={$lib->type}&objectID=$objectID&libID={$lib->id}&docID=" . $docResult['id'];
+            $link     = $this->createLink('doc', 'objectLibs', $params);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
         }
 
+        if($this->app->openApp == 'product')
+        {
+            $this->product->setMenu($objectID);
+            unset($this->lang->product->menu->doc['subMenu']);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $this->project->setMenu($objectID);
+            unset($this->lang->project->menu->doc['subMenu']);
+        }
+        else if($this->app->openApp == 'execution')
+        {
+            $this->execution->setMenu($objectID);
+            unset($this->lang->execution->menu->doc['subMenu']);
+        }
+        else
+        {
+            $this->app->rawMethod = $objectType;
+        }
+
         $lib  = $this->doc->getLibByID($libID);
         $type = $lib->type;
 
-        /* According the from, set menus. */
-        if($this->from == 'product')
-        {
-            $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menu      = $this->lang->product->menu;
-            $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
-            $this->product->setMenu($this->product->getPairs(), $lib->product);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($lib->product);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->lang->noMenuModule[] = 'doc';
-            $this->lang->set('menugroup.doc', 'product');
-
-            $this->lang->TRActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createlib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
-        }
-        elseif($this->from == 'project')
-        {
-            $this->lang->navGroup->doc  = 'project';
-            $this->lang->doc->menu      = $this->lang->project->menu;
-            $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
-            if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
-            $this->project->setMenu($this->project->getPairs($this->session->PRJ, 'all', 0, true), $lib->project);
-            $this->lang->set('menugroup.doc', 'project');
-
-            $this->lang->TRActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createlib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
-        }
-        else
-        {
-            $this->doc->setMenu($type, $libID, $moduleID, $lib->product, $lib->execution);
-        }
-
         $this->view->title      = $lib->name . $this->lang->colon . $this->lang->doc->create;
         $this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$libID"), $lib->name);
         $this->view->position[] = $this->lang->doc->create;
@@ -381,8 +326,7 @@ class doc extends control
         $unclosed = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'unclosedProject' : '';
 
         $this->view->libID            = $libID;
-        $this->view->type             = $type;
-        $this->view->libs             = $this->doc->getLibs($type = 'all', $extra = "withObject,$unclosed", $libID);
+        $this->view->libs             = $this->doc->getLibs($objectType, $extra = "withObject,$unclosed", $libID, $objectID);
         $this->view->libName          = $this->dao->findByID($libID)->from(TABLE_DOCLIB)->fetch('name');
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($libID, 'doc', $startModuleID = 0);
         $this->view->moduleID         = $moduleID ? (int)$moduleID : (int)$this->cookie->lastDocModule;
@@ -398,10 +342,13 @@ class doc extends control
      *
      * @param  int    $docID
      * @param  bool   $comment
+     * @param  string $objectType
+     * @param  int    $objectID
+     * @param  int    $libID
      * @access public
      * @return void
      */
-    public function edit($docID, $comment = false)
+    public function edit($docID, $comment = false, $objectType = '', $objectID = 0, $libID = 0)
     {
         if(!empty($_POST))
         {
@@ -420,11 +367,19 @@ class doc extends control
                 $actionID = $this->action->create('doc', $docID, $action, $fileAction . $this->post->comment);
                 if(!empty($changes)) $this->action->logHistory($actionID, $changes);
             }
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'view', "docID=$docID")));
+
+            $link = $this->session->docList ? $this->session->docList : $this->createLink('doc', 'index');
+            if(!empty($objectType) and $objectType != 'doc')
+            {
+                $link = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$objectID&libID=$libID&docID=$docID");
+            }
+
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
         }
 
         /* Get doc and set menu. */
-        $doc = $this->doc->getById($docID);
+        $doc   = $this->doc->getById($docID);
         $libID = $doc->lib;
 
         if($doc->contentType == 'markdown') $this->config->doc->markdown->edit = array('id' => 'content', 'tools' => 'toolbar');
@@ -432,33 +387,48 @@ class doc extends control
         $lib  = $this->doc->getLibByID($libID);
         $type = $lib->type;
 
-        /* According the from, set menus. */
-        if($this->from == 'product')
+        /* set menus. */
+        if($this->app->openApp == 'product')
         {
-            $objectID = $lib->product;
-            $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
-            $this->product->setMenu($this->product->getPairs(), $objectID);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($objectID);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->lang->noMenuModule[] = 'doc';
-            $this->lang->set('menugroup.doc', 'product');
+            $this->product->setMenu($objectID);
+            unset($this->lang->product->menu->doc['subMenu']);
         }
-        elseif($this->from == 'project')
+        else if($this->app->openApp == 'project')
         {
-            $objectID = $lib->project;
-            $this->lang->navGroup->doc  = 'project';
-            $this->lang->doc->menu      = $this->lang->project->menu;
-            $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
-            if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
-            $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
-            $this->lang->set('menugroup.doc', 'project');
+            $this->project->setMenu($objectID);
+            unset($this->lang->project->menu->doc['subMenu']);
+        }
+        else if($this->app->openApp == 'execution')
+        {
+            $this->execution->setMenu($objectID);
+            unset($this->lang->execution->menu->doc['subMenu']);
+        }
+        else if($this->app->openApp == 'my')
+        {
+            $this->lang->doc->menu     = $this->lang->my->menu->contribute;
+            $this->lang->modulePageNav = '';
+            $this->lang->TRActions     = '';
+            $this->lang->my->menu->contribute['subModule'] = 'doc';
         }
         else
         {
-            $this->doc->setMenu($type, $libID, $doc->module, $lib->product, $lib->execution);
+            $this->app->rawMethod = $objectType;
+
+            /* High light menu. */
+            if(strpos(',product,project,execution,custom,book,', ",$objectType,") !== false)
+            {
+                $menu = $this->lang->doc->menu->$objectType;
+                $menu['alias']    .= ',edit';
+                $menu['subModule'] = 'doc';
+                $this->lang->doc->menu->$objectType = $menu;
+            }
         }
 
+        $objects = $this->doc->getOrderedObjects($objectType);
+        $libs    = $this->doc->getLibsByObject($objectType, $objectID);
+        $this->lang->modulePageNav = $this->doc->select($objectType, $objects, $objectID, $libs, $libID);
+        $this->lang->TRActions     = common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc($objectType, $objectID, $libID) : '';
+
         $this->view->title      = $lib->name . $this->lang->colon . $this->lang->doc->edit;
         $this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$libID"), $lib->name);
         $this->view->position[] = $this->lang->doc->edit;
@@ -466,7 +436,7 @@ class doc extends control
         $this->view->doc              = $doc;
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($libID, 'doc', $startModuleID = 0);
         $this->view->type             = $type;
-        $this->view->libs             = $this->doc->getLibs('all', $extra = 'withObject|noBook');
+        $this->view->libs             = $this->doc->getLibs('all', $extra = 'withObject|noBook', $libID, $objectID);
         $this->view->groups           = $this->loadModel('group')->getPairs();
         $this->view->users            = $this->user->getPairs('noletter|noclosed|nodeleted', $doc->users);
         $this->display();
@@ -483,14 +453,41 @@ class doc extends control
     public function view($docID, $version = 0)
     {
         /* Get doc. */
-        $doc = $this->doc->getById($docID, $version, true);
+        $docID = (int)$docID;
+        $doc   = $this->doc->getById($docID, $version, true);
         if(!$doc) die(js::error($this->lang->notFound) . js::locate('back'));
 
+        /* The global search opens in the document library. */
+        if(!isonlybody())
+        {
+            $docLib = $this->doc->getLibById($doc->lib);
+            if($docLib->type == 'custom')
+            {
+                $libID    = $doc->lib;
+                $objectID = 0;
+                $type     = 'custom';
+            }
+            else
+            {
+                $libID    = $docLib->id;
+                $type     = $docLib->type;
+                $objectID = $docLib->$type;
+            }
+
+            if($type == 'execution')
+            {
+                $type     = 'project';
+                $objectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($objectID)->fetch('project');
+            }
+
+            $browseLink = inLink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID=$docID");
+            $this->locate($browseLink);
+        }
+
         if($doc->contentType == 'markdown')
         {
             $hyperdown    = $this->app->loadClass('hyperdown');
             $doc->content = $hyperdown->makeHtml($doc->content);
-
             $doc->digest  = $hyperdown->makeHtml($doc->digest);
         }
 
@@ -498,34 +495,6 @@ class doc extends control
         $lib  = $this->doc->getLibByID($doc->lib);
         $type = $lib->type;
 
-        /* According the from, set menus. */
-        if($this->from == 'product')
-        {
-            $objectID = $lib->product;
-            $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
-            $this->product->setMenu($this->product->getPairs(), $objectID);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($objectID);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->lang->noMenuModule[] = 'doc';
-            $this->lang->set('menugroup.doc', 'product');
-        }
-        elseif($this->from == 'project')
-        {
-            $objectID = $lib->project;
-            $this->lang->navGroup->doc  = 'project';
-            $this->lang->doc->menu      = $this->lang->project->menu;
-            $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
-            if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
-            $this->project->setMenu($this->project->getPairs($this->session->PRJ, 'all', 0, true), $objectID);
-            $this->lang->set('menugroup.doc', 'project');
-        }
-        else
-        {
-            /* Set menu. */
-            $this->doc->setMenu($type, $doc->lib, $doc->module, $lib->product, $lib->execution);
-        }
-
         $this->view->title      = "DOC #$doc->id $doc->title - " . $lib->name;
         $this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$doc->lib"), $lib->name);
         $this->view->position[] = $this->lang->doc->view;
@@ -547,17 +516,23 @@ class doc extends control
      *
      * @param  int    $docID
      * @param  string $confirm  yes|no
+     * @param  string $from
      * @access public
      * @return void
      */
-    public function delete($docID, $confirm = 'no')
+    public function delete($docID, $confirm = 'no', $from = 'list')
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->doc->confirmDelete, inlink('delete', "docID=$docID&confirm=yes")));
+            $type = $this->dao->select('type')->from(TABLE_DOC)->where('id')->eq($docID)->fetch('type');
+            $tips = $type == 'chapter' ? $this->lang->doc->confirmDeleteChapter : $this->lang->doc->confirmDelete;
+            die(js::confirm($tips, inlink('delete', "docID=$docID&confirm=yes")));
         }
         else
         {
+            $doc        = $this->doc->getByID($docID);
+            $objectType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($doc->lib)->fetch('type');
+            if($this->config->systemMode == 'classic' and $objectType == 'project') $objectType = 'execution';
             $this->doc->delete(TABLE_DOC, $docID);
 
             /* if ajax request, send result. */
@@ -572,19 +547,25 @@ class doc extends control
                 {
                     $response['result']  = 'success';
                     $response['message'] = '';
+
+                    if($from == 'lib')
+                    {
+                        $response['locate']  = $this->createLink('doc', 'objectLibs', "type=$objectType");
+                    }
                 }
                 $this->send($response);
             }
+
             die(js::locate($this->session->docList, 'parent'));
         }
     }
 
     /**
      * Delete file for doc.
-     * 
-     * @param  int    $docID 
-     * @param  int    $fileID 
-     * @param  string $confirm 
+     *
+     * @param  int    $docID
+     * @param  int    $fileID
+     * @param  string $confirm
      * @access public
      * @return void
      */
@@ -742,7 +723,7 @@ class doc extends control
     }
 
     /**
-     * Ajax get all child module. 
+     * Ajax get all child module.
      *
      * @access public
      * @return void
@@ -767,7 +748,7 @@ class doc extends control
      */
     public function allLibs($type, $product = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        setcookie('product', $product, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie('product', $product, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         $libName = $this->lang->doc->libTypeList[$type];
         $crumb   = html::a(inlink('allLibs', "type=$type&product=$product"), $libName);
@@ -776,8 +757,6 @@ class doc extends control
         $this->view->title      = $libName;
         $this->view->position[] = $libName;
 
-        $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID = 0, $executionID = 0, $crumb);
-
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
@@ -803,97 +782,6 @@ class doc extends control
         $this->display();
     }
 
-    /**
-     * Show files for product or execution.
-     *
-     * @param  string $type
-     * @param  int    $objectID
-     * @param  string $from  product|project|doc
-     * @param  string $viewType
-     * @param  string $orderBy
-     * @param  int    $recTotal
-     * @param  int    $recPerPage
-     * @param  int    $pageID
-     * @access public
-     * @return void
-     */
-    public function showFiles($type, $objectID, $from = 'doc', $viewType = '', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
-    {
-        $uri = $this->app->getURI(true);
-        $this->app->session->set('taskList',  $uri);
-        $this->app->session->set('storyList', $uri);
-        $this->app->session->set('docList',   $uri);
-
-        if(empty($viewType)) $viewType = !empty($_COOKIE['docFilesViewType']) ? $this->cookie->docFilesViewType : 'card';
-        setcookie('docFilesViewType', $viewType, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-
-        $table  = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
-        $object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch();
-
-        /* According the from, set menus. */
-        if($this->from == 'product')
-        {
-            $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
-            $this->product->setMenu($this->product->getPairs(), $objectID);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($objectID);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->lang->noMenuModule[] = 'doc';
-            $this->lang->set('menugroup.doc', 'product');
-        }
-        elseif($this->from == 'project')
-        {
-            $this->lang->navGroup->doc  = 'project';
-            $this->lang->doc->menu      = $this->lang->project->menu;
-            $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
-            if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
-            $this->project->setMenu($this->project->getPairs($this->session->PRJ, 'all', 0, true), $objectID);
-            $this->lang->set('menugroup.doc', 'project');
-        }
-        else
-        {
-            $crumb  = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->executionCommon) . $this->lang->doc->separator;
-            if($this->productID and $type == 'execution') $crumb = $this->doc->getProductCrumb($this->productID, $objectID);
-            $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name);
-            $crumb .= $this->lang->doc->separator . ' ' . $this->lang->doclib->files;
-
-            $productID   = 0;
-            $executionID = 0;
-            if($type == 'product')
-            {
-                $productID = $objectID;
-                if(!$this->product->checkPriv($objectID)) $this->accessDenied();
-            }
-
-            if($type == 'execution')
-            {
-                $executionID = $objectID;
-                if(!$this->executionID->checkPriv($objectID)) $this->accessDenied();
-            }
-
-            $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID, $executionID, $crumb);
-        }
-
-        /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager($recTotal, $recPerPage, $pageID);
-
-        $this->view->title        = $object->name;
-        $this->view->position[]   = $object->name;
-
-        $this->view->type         = $type;
-        $this->view->object       = $object;
-        $this->view->files        = $this->doc->getLibFiles($type, $objectID, $orderBy, $pager);
-        $this->view->users        = $this->user->getPairs('noletter');
-        $this->view->pager        = $pager;
-        $this->view->viewType     = $viewType;
-        $this->view->orderBy      = $orderBy;
-        $this->view->objectID     = $objectID;
-        $this->view->canBeChanged = common::canModify($type, $object); // Determines whether an object is editable.
-
-        $this->display();
-    }
-
     /**
      * Show accessDenied response.
      *
@@ -913,70 +801,148 @@ class doc extends control
     }
 
     /**
-     * Show libs for product or execution.
+     * Show libs for product or project.
      *
      * @param  string $type
-     * @param  int    $objectID
-     * @param  string $from
+     * @param  int    $objectID  projectID|productID
+     * @param  int    $libID
+     * @param  int    $docID
+     * @param  int    $version
      * @access public
      * @return void
      */
-    public function objectLibs($type, $objectID, $from = 'doc')
+    public function objectLibs($type, $objectID = 0, $libID = 0, $docID = 0, $version = 0)
     {
-        $this->from = $from;
-        setcookie('from', $from, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        $this->session->set('docList', $this->app->getURI(true));
-
-        $table  = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
-        $object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch();
-        if(empty($object)) $this->locate($this->createLink($type, 'create', '', '', '', $this->session->PRJ));
-
-        if($from == 'product')
+        if(empty($type))
         {
-            $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
-            $this->product->setMenu($this->product->getPairs(), $objectID);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($objectID);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->lang->noMenuModule[] = 'doc';
-            $this->lang->set('menugroup.doc', 'product');
+            $doclib   = $this->doc->getLibById($libID);
+            $type     = $doclib->type == 'execution' ? 'project' : $doclib->type;
+            $objectID = $type == 'custom' or $type == 'book' ? 0 : $doclib->$type;
         }
-        elseif($from == 'project')
+
+        $this->session->set('docList', $this->app->getURI(true), $this->app->openApp);
+
+        $objects = $this->doc->getOrderedObjects($type);
+
+        if($type == 'custom')
         {
-            $this->lang->navGroup->doc  = 'project';
-            $this->lang->doc->menu      = $this->lang->project->menu;
-            $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
-            if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
-            $this->project->setMenu($this->project->getPairs($this->session->PRJ, 'all', 0, true), $objectID);
-            $this->lang->set('menugroup.doc', 'project');
+            $libs = $this->doc->getLibsByObject('custom', 0);
+            $this->app->rawMethod = 'custom';
+            if($libID == 0) $libID = key($libs);
+            $this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs, $libID);
+
+            $object = new stdclass();
+            $object->id = 0;
+        }
+        elseif($type == 'book')
+        {
+            $libs = $this->doc->getLibsByObject('book', 0);
+            $this->app->rawMethod = 'book';
+            if($libID == 0 and !empty($libs)) $libID = reset($libs)->id;
+            $this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs, $libID);
+
+            if(!$docID) $docID = $this->dao->select('id')->from(TABLE_DOC)
+                ->where('lib')->eq($libID)
+                ->andWhere('type')->eq('article')
+                ->andWhere('deleted')->eq(0)
+                ->orderBy('editedDate_desc,id_desc')
+                ->fetch('id');
+
+            $object = new stdclass();
+            $object->id = 0;
         }
         else
         {
-            $crumb  = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->executionCommon) . $this->lang->doc->separator;
-            if($this->productID and $type == 'execution') $crumb = $this->doc->getProductCrumb($this->productID, $objectID);
-            $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name);
-            $productID   = $type == 'product'   ? $objectID : 0;
-            $executionID = $type == 'execution' ? $objectID : 0;
-            $this->doc->setMenu($type, 0, 0, $productID, $executionID, $crumb);
+            if($type == 'product')
+            {
+                $objectID = $this->product->saveState($objectID, $objects);
+                $table    = TABLE_PRODUCT;
+
+                $libs = $this->doc->getLibsByObject('product', $objectID);
+
+                if($libID == 0) $libID = key($libs);
+                $this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs, $libID);
+
+                $this->app->rawMethod = 'product';
+            }
+            else if($type == 'project')
+            {
+                $objectID = $this->project->saveState($objectID, $objects);
+                $table    = TABLE_PROJECT;
+
+                $libs = $this->doc->getLibsByObject('project', $objectID);
+
+                if($libID == 0) $libID = key($libs);
+                $this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs, $libID);
+
+                $this->app->rawMethod = 'project';
+            }
+            else if($type == 'execution')
+            {
+                $objectID = $this->execution->saveState($objectID, $objects);
+                $table = TABLE_EXECUTION;
+                $libs  = $this->doc->getLibsByObject('execution', $objectID);
+
+                if($libID == 0) $libID = key($libs);
+                $this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs, $libID);
+
+                $this->app->rawMethod = 'execution';
+            }
+
+            $object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch();
+            if(empty($object)) $this->locate($this->createLink($type, 'create', '', '', '', $this->session->project));
         }
 
+        if(!$libID) $libID = key($libs);
+
+        $openApp = strpos('doc,product,project,execution', $this->app->openApp) !== false ? $this->app->openApp : 'doc';
+        if($openApp != 'doc') $this->loadModel($openApp)->setMenu($objectID);
+
         /* Set Custom. */
         foreach(explode(',', $this->config->doc->customObjectLibs) as $libType) $customObjectLibs[$libType] = $this->lang->doc->customObjectLibs[$libType];
 
         $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID");
         $this->doc->buildSearchForm(0, array(), 0, $actionURL, 'objectLibs');
 
+        $this->lang->TRActions = common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc($type, $objectID, $libID) : '';
+
+        $moduleTree = $type == 'book' ? $this->doc->getBookStructure($libID) : $this->doc->getTreeMenu($type, $objectID, $libID, 0, $docID);
+
+        /* Get doc. */
+        if($docID)
+        {
+            $doc = $this->doc->getById($docID, $version, true);
+            if(!$doc) die(js::error($this->lang->notFound) . js::locate('back'));
+
+            if($doc->contentType == 'markdown')
+            {
+                $hyperdown    = $this->app->loadClass('hyperdown');
+                $doc->content = $hyperdown->makeHtml($doc->content);
+                $doc->digest  = $hyperdown->makeHtml($doc->digest);
+            }
+        }
+
         $this->view->customObjectLibs = $customObjectLibs;
         $this->view->showLibs         = $this->config->doc->custom->objectLibs;
 
-        $this->view->title      = $object->name;
-        $this->view->position[] = $object->name;
+        $this->view->title      = ($type == 'book' or $type == 'custom') ? $this->lang->doc->customAB : $object->name;
+        $this->view->position[] = ($type == 'book' or $type == 'custom') ? $this->lang->doc->customAB : $object->name;
 
+        $this->view->docID        = $docID;
+        $this->view->doc          = $docID ? $doc : '';
         $this->view->type         = $type;
+        $this->view->version      = $version;
         $this->view->object       = $object;
-        $this->view->from         = $this->lang->navGroup->doc == 'project' ? 'project' : $from;
+        $this->view->objectID     = $objectID;
+        $this->view->objectType   = $type;
+        $this->view->libID        = $libID;
+        $this->view->lib          = isset($libs[$libID]) ? $libs[$libID] : new stdclass();
+
         $this->view->libs         = $this->doc->getLibsByObject($type, $objectID);
+        $this->view->moduleTree   = $moduleTree;
         $this->view->canBeChanged = common::canModify($type, $object); // Determines whether an object is editable.
+        $this->view->actions      = $docID ? $this->action->getList('doc', $docID) : array();
+        $this->view->users        = $this->user->getPairs('noclosed,noletter');
         $this->display();
     }
 }
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 7ad0d97b8a..710f7335fd 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -42,10 +42,10 @@
 .files-grid .file-name,
 .files-grid .file-info {text-overflow: ellipsis; white-space: nowrap; overflow: hidden; line-height: 20px;}
 .files-grid .file-info {font-size: 12px; margin-top: 3px;}
-.files-grid .icon-folder {background: url(data:image/svg+xml; base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5pY29uLWJpZy1mb2xkZXJpY29uLWJpZy1mb2xkZXI8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJ3ZWItbWF4IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTA5NS4wMDAwMDAsIC02OTUuMDAwMDAwKSI+ICAgICAgICAgICAgPGcgaWQ9Ijgt5paH5qGjIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMDkwLjAwMDAwMCwgNTgzLjAwMDAwMCkiPiAgICAgICAgICAgICAgICA8ZyBpZD0iaWNvbi1iaWctZm9sZGVyIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1LjAwMDAwMCwgMTEyLjAwMDAwMCkiPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIxLjA0NTY4OTEsNC4yNzAyMzU0MiBDMjEuOTYxODA1OSw1LjEwNzIwMzY1IDIzLjAyMjcwMDQsNS41NTc5NjY1OSAyNC4zNjg4OTQ0LDUuNTI1MDEyMTggTDI2LjE2MDIzOCw1LjUyNTAxMjE4IEwzMC44MTIxMDExLDUuNTI1MDEyMTggQzI5LjYwMDkxMDksNS41MjUwMTIxOCAyOC40Mzg1MTg2LDUuMDM1NzUxMTMgMjcuNTc3MDQ3LDQuMTg1ODk1OTMgTDI0LjY3ODE1NjYsMS4zMjY0MDI3MSBDMjMuODE2NTgwOCwwLjQ3NjU0NzUxMSAyMi42NTQyOTI3LDAgMjEuNDQzMTAyNSwwIEwxNS4xMTQ5MDQ2LDAgTDE1LDAgQzE2LjIyNjg2NzksMC4wMzk0MzcwODA1IDE3LjMwMjA1NTcsMC41NTY4NjUwODcgMTguMTYzNTI3MywxLjQwNjYxNjIyIEwyMS4wNDU2ODkxLDQuMjcwMjM1NDIgWiIgaWQ9IlNoYXBlLUNvcHktNyIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMMzguNTUxNzAzMSw1LjUyMDAyOTE4IEwzNi44MDY4NTk0LDUuNTIwMDI5MTggTDMyLjI3NTc1LDUuNTIwMDI5MTggTDMwLjUzMDkwNjMsNS41MjAwMjkxOCBMMjYsNS41MjAwMjkxOCBMMjQuMjU1MTU2Miw1LjUyMDAyOTE4IEMyMy4wNzU0MDYzLDUuNTIwMDI5MTggMjEuOTQzMTg3NSw1LjA0MjgxMzM1IDIxLjEwNDA3ODEsNC4xOTE3NjYzIEwxOC4yODA0Mzc1LDEuMzI4MjYyODggQzE3LjQ0MTIyNjYsMC40NzcyMTU4MjkgMTYuMzA5MTA5NCwwIDE1LjEyOTM1OTQsMCBMOC45NjU1MzEyNSwwIEwyLjY4OTY3OTY5LDAgQzEuMjA0MjI2NTYsNy40MDUxNTkyM2UtMTYgMCwxLjIzNTcxNjk5IDAsMi43NjAwMTQ1OSBMMCw4LjI4MDA0Mzc3IEwwLDkuMjAwMDgzMzcgTDAsNDMuMjM5OTg1NCBDMCw0NC43NjQyODMgMS4yMDQyMjY1Niw0NiAyLjY4OTY3OTY5LDQ2IEw0OS4zMTAzMjAzLDQ2IEM1MC43OTU3NzM0LDQ2IDUyLDQ0Ljc2NDI4MyA1Miw0My4yMzk5ODU0IEw1Miw4LjI4MDA0Mzc3IEM1Miw2Ljc1NTY0MTk1IDUwLjc5NTc3MzQsNS41MjAwMjkxOCA0OS4zMTAzMjAzLDUuNTIwMDI5MTggTDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBaIiBpZD0iU2hhcGUtQ29weS04IiBmaWxsPSIjRkZFMDY2Ij48L3BhdGg+ICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=) no-repeat center;}
-.files-grid .icon-paper-clip {background:url('data:image/svg+xml; base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNTJweCIgaGVpZ2h0PSI0NnB4IiB2aWV3Qm94PSIwIDAgNTIgNDYiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDQ5LjEgKDUxMTQ3KSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5pY29uLWJpZy1lbmNsb3NlaWNvbi1iaWctZW5jbG9zZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJQYWdlLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmiYDmnIlJQ09OIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQwNC4wMDAwMDAsIC02OTUuMDAwMDAwKSI+CiAgICAgICAgICAgIDxnIGlkPSI4LeaWh+ahoyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTA5MC4wMDAwMDAsIDU4My4wMDAwMDApIj4KICAgICAgICAgICAgICAgIDxnIGlkPSJHcm91cC03LUNvcHkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDMxNC4wMDAwMDAsIDExMi4wMDAwMDApIj4KICAgICAgICAgICAgICAgICAgICA8ZyBpZD0iaWNvbi1iaWctZm9sZGVyIj4KICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIxLjA0NTY4OTEsNC4yNzAyMzU0MiBDMjEuOTYxODA1OSw1LjEwNzIwMzY1IDIzLjAyMjcwMDQsNS41NTc5NjY1OSAyNC4zNjg4OTQ0LDUuNTI1MDEyMTggTDI2LjE2MDIzOCw1LjUyNTAxMjE4IEwzMC44MTIxMDExLDUuNTI1MDEyMTggQzI5LjYwMDkxMDksNS41MjUwMTIxOCAyOC40Mzg1MTg2LDUuMDM1NzUxMTMgMjcuNTc3MDQ3LDQuMTg1ODk1OTMgTDI0LjY3ODE1NjYsMS4zMjY0MDI3MSBDMjMuODE2NTgwOCwwLjQ3NjU0NzUxMSAyMi42NTQyOTI3LDAgMjEuNDQzMTAyNSwwIEwxNS4xMTQ5MDQ2LDAgTDE1LDAgQzE2LjIyNjg2NzksMC4wMzk0MzcwODA1IDE3LjMwMjA1NTcsMC41NTY4NjUwODcgMTguMTYzNTI3MywxLjQwNjYxNjIyIEwyMS4wNDU2ODkxLDQuMjcwMjM1NDIgWiIgaWQ9IlNoYXBlLUNvcHktNyIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPgogICAgICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNNDkuMzEwMzIwMyw1LjUyMDAyOTE4IEwzOC41NTE3MDMxLDUuNTIwMDI5MTggTDM2LjgwNjg1OTQsNS41MjAwMjkxOCBMMzIuMjc1NzUsNS41MjAwMjkxOCBMMzAuNTMwOTA2Myw1LjUyMDAyOTE4IEwyNiw1LjUyMDAyOTE4IEwyNC4yNTUxNTYyLDUuNTIwMDI5MTggQzIzLjA3NTQwNjMsNS41MjAwMjkxOCAyMS45NDMxODc1LDUuMDQyODEzMzUgMjEuMTA0MDc4MSw0LjE5MTc2NjMgTDE4LjI4MDQzNzUsMS4zMjgyNjI4OCBDMTcuNDQxMjI2NiwwLjQ3NzIxNTgyOSAxNi4zMDkxMDk0LDAgMTUuMTI5MzU5NCwwIEw4Ljk2NTUzMTI1LDAgTDIuNjg5Njc5NjksMCBDMS4yMDQyMjY1Niw3LjQwNTE1OTIzZS0xNiAwLDEuMjM1NzE2OTkgMCwyLjc2MDAxNDU5IEwwLDguMjgwMDQzNzcgTDAsOS4yMDAwODMzNyBMMCw0My4yMzk5ODU0IEMwLDQ0Ljc2NDI4MyAxLjIwNDIyNjU2LDQ2IDIuNjg5Njc5NjksNDYgTDQ5LjMxMDMyMDMsNDYgQzUwLjc5NTc3MzQsNDYgNTIsNDQuNzY0MjgzIDUyLDQzLjIzOTk4NTQgTDUyLDguMjgwMDQzNzcgQzUyLDYuNzU1NjQxOTUgNTAuNzk1NzczNCw1LjUyMDAyOTE4IDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMNDkuMzEwMzIwMyw1LjUyMDAyOTE4IFoiIGlkPSJTaGFwZS1Db3B5LTgiIGZpbGw9IiNGRkUwNjYiPjwvcGF0aD4KICAgICAgICAgICAgICAgICAgICA8L2c+CiAgICAgICAgICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgyNi41MDAwMDAsIDI2LjUwMDAwMCkgcm90YXRlKDQ1LjAwMDAwMCkgdHJhbnNsYXRlKC0yNi41MDAwMDAsIC0yNi41MDAwMDApIHRyYW5zbGF0ZSgyMC4wMDAwMDAsIDE0LjAwMDAwMCkiIGZpbGw9IiNGRkE5MjkiIGZpbGwtcnVsZT0ibm9uemVybyI+CiAgICAgICAgICAgICAgICAgICAgICAgIDxwYXRoIGQ9Ik0yLjUsMTguMjUgQzIuNSwxOC45NDAzNTU5IDEuOTQwMzU1OTQsMTkuNSAxLjI1LDE5LjUgQzAuNTU5NjQ0MDYzLDE5LjUgMCwxOC45NDAzNTU5IDAsMTguMjUgTDAsNi4yNSBDMCwyLjc5ODIyMDMxIDIuNzk4MjIwMzEsMCA2LjI1LDAgQzkuNzAxNzc5NjksMCAxMi41LDIuNzk4MjIwMzEgMTIuNSw2LjI1IEwxMi41LDIwLjI1IEMxMi41LDIwLjk0MDM1NTkgMTEuOTQwMzU1OSwyMS41IDExLjI1LDIxLjUgQzEwLjU1OTY0NDEsMjEuNSAxMCwyMC45NDAzNTU5IDEwLDIwLjI1IEwxMCw2LjI1IEMxMCw0LjE3ODkzMjE5IDguMzIxMDY3ODEsMi41IDYuMjUsMi41IEM0LjE3ODkzMjE5LDIuNSAyLjUsNC4xNzg5MzIxOSAyLjUsNi4yNSBMMi41LDE4LjI1IFoiIGlkPSJSZWN0YW5nbGUtMzciPjwvcGF0aD4KICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTYsNS43NSBDNiw1LjA1OTY0NDA2IDYuNTU5NjQ0MDYsNC41IDcuMjUsNC41IEM3Ljk0MDM1NTk0LDQuNSA4LjUsNS4wNTk2NDQwNiA4LjUsNS43NSBMOC41LDIwLjI1IEM4LjUsMjIuNTk3MjEwMiA2LjU5NzIxMDE5LDI0LjUgNC4yNSwyNC41IEMxLjkwMjc4OTgxLDI0LjUgMCwyMi41OTcyMTAyIDAsMjAuMjUgTDAsOC4yNSBDMCw3LjU1OTY0NDA2IDAuNTU5NjQ0MDYzLDcgMS4yNSw3IEMxLjk0MDM1NTk0LDcgMi41LDcuNTU5NjQ0MDYgMi41LDguMjUgTDIuNSwyMC4yNSBDMi41LDIxLjIxNjQ5ODMgMy4yODM1MDE2OSwyMiA0LjI1LDIyIEM1LjIxNjQ5ODMxLDIyIDYsMjEuMjE2NDk4MyA2LDIwLjI1IEw2LDUuNzUgWiIgaWQ9IlJlY3RhbmdsZS0zNy1Db3B5Ij48L3BhdGg+CiAgICAgICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=') no-repeat center;}
-.files-grid .icon-product {background: url(data:image/svg+xml; base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5Hcm91cCA4PC90aXRsZT4gICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+ICAgIDxkZWZzPjwvZGVmcz4gICAgPGcgaWQ9IlBhZ2UtMiIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iR3JvdXAtOCI+ICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwLUNvcHktMiI+ICAgICAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMS4wNDU2ODkxLDQuMjcwMjM1NDIgQzIxLjk2MTgwNTksNS4xMDcyMDM2NSAyMy4wMjI3MDA0LDUuNTU3OTY2NTkgMjQuMzY4ODk0NCw1LjUyNTAxMjE4IEwyNi4xNjAyMzgsNS41MjUwMTIxOCBMMzAuODEyMTAxMSw1LjUyNTAxMjE4IEMyOS42MDA5MTA5LDUuNTI1MDEyMTggMjguNDM4NTE4Niw1LjAzNTc1MTEzIDI3LjU3NzA0Nyw0LjE4NTg5NTkzIEwyNC42NzgxNTY2LDEuMzI2NDAyNzEgQzIzLjgxNjU4MDgsMC40NzY1NDc1MTEgMjIuNjU0MjkyNywwIDIxLjQ0MzEwMjUsMCBMMTUuMTE0OTA0NiwwIEwxNSwwIEMxNi4yMjY4Njc5LDAuMDM5NDM3MDgwNSAxNy4zMDIwNTU3LDAuNTU2ODY1MDg3IDE4LjE2MzUyNzMsMS40MDY2MTYyMiBMMjEuMDQ1Njg5MSw0LjI3MDIzNTQyIFoiIGlkPSJTaGFwZSIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNNDkuMzEwMzIwMyw1LjUyMDAyOTE4IEwzOC41NTE3MDMxLDUuNTIwMDI5MTggTDM2LjgwNjg1OTQsNS41MjAwMjkxOCBMMzIuMjc1NzUsNS41MjAwMjkxOCBMMzAuNTMwOTA2Myw1LjUyMDAyOTE4IEwyNiw1LjUyMDAyOTE4IEwyNC4yNTUxNTYyLDUuNTIwMDI5MTggQzIzLjA3NTQwNjMsNS41MjAwMjkxOCAyMS45NDMxODc1LDUuMDQyODEzMzUgMjEuMTA0MDc4MSw0LjE5MTc2NjMgTDE4LjI4MDQzNzUsMS4zMjgyNjI4OCBDMTcuNDQxMjI2NiwwLjQ3NzIxNTgyOSAxNi4zMDkxMDk0LDAgMTUuMTI5MzU5NCwwIEw4Ljk2NTUzMTI1LDAgTDIuNjg5Njc5NjksMCBDMS4yMDQyMjY1Niw3LjQwNTE1OTIzZS0xNiAwLDEuMjM1NzE2OTkgMCwyLjc2MDAxNDU5IEwwLDguMjgwMDQzNzcgTDAsOS4yMDAwODMzNyBMMCw0My4yMzk5ODU0IEMwLDQ0Ljc2NDI4MyAxLjIwNDIyNjU2LDQ2IDIuNjg5Njc5NjksNDYgTDQ5LjMxMDMyMDMsNDYgQzUwLjc5NTc3MzQsNDYgNTIsNDQuNzY0MjgzIDUyLDQzLjIzOTk4NTQgTDUyLDguMjgwMDQzNzcgQzUyLDYuNzU1NjQxOTUgNTAuNzk1NzczNCw1LjUyMDAyOTE4IDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMNDkuMzEwMzIwMyw1LjUyMDAyOTE4IFoiIGlkPSJTaGFwZSIgZmlsbD0iI0ZGRTA2NiI+PC9wYXRoPiAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8ZyBpZD0iR3JvdXAtNSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTYuMDAwMDAwLCAxNS4wMDAwMDApIiBmaWxsPSIjRjc5MTJBIj4gICAgICAgICAgICAgICAgPHBhdGggZD0iTTEwLDIuNzc3MDUzNjEgTDIuNjQ1NDU5NTgsNi40NzI0OTI4NyBMMy4wOTU2OTA0OSwxNC4zMTU5ODk5IEwxMCwxOS4wNzAyNDUzIEwxNi45MDQzMDk1LDE0LjMxNTk4OTkgTDE3LjM1NDU0MDQsNi40NzI0OTI4NyBMMTAsMi43NzcwNTM2MSBaIE0xMC40NDg5Nzg3LDAuMTA2MDUxOTIzIEwxOS40NDg5Mzk4LDQuNjI4MjY2NDcgQzE5LjgwNTI4MTIsNC44MDczMTc0NyAyMC4wMjExNzE3LDUuMTgwOTc1NTggMTkuOTk4MzE3Nyw1LjU3OTExNjQxIEwxOS40NDM3Mzc4LDE1LjI0MDQ4MjQgQzE5LjQyNjAzOTcsMTUuNTQ4ODAyNiAxOS4yNjY4NzgxLDE1LjgzMTY0ODIgMTkuMDEyNTIwOSwxNi4wMDY3OTY2IEwxMC41NjcxMzk3LDIxLjgyMjIyMjQgQzEwLjIyNTYxNTIsMjIuMDU3MzkzNiA5Ljc3NDM4NDc3LDIyLjA1NzM5MzYgOS40MzI4NjAzNSwyMS44MjIyMjI0IEwwLjk4NzQ3OTA5OCwxNi4wMDY3OTY2IEMwLjczMzEyMTk0NywxNS44MzE2NDgyIDAuNTczOTYwMzA2LDE1LjU0ODgwMjYgMC41NTYyNjIxNzMsMTUuMjQwNDgyNCBMMC4wMDE2ODIyOTQ2OSw1LjU3OTExNjQxIEMtMC4wMjExNzE3MDg3LDUuMTgwOTc1NTggMC4xOTQ3MTg4MjcsNC44MDczMTc0NyAwLjU1MTA2MDE4Myw0LjYyODI2NjQ3IEw5LjU1MTAyMTMxLDAuMTA2MDUxOTIzIEM5LjgzMzUxMjMxLC0wLjAzNTg5MTQ1NTcgMTAuMTY2NDg3NywtMC4wMzU4OTE0NTU3IDEwLjQ0ODk3ODcsMC4xMDYwNTE5MjMgWiIgaWQ9IlBvbHlnb24iIGZpbGwtcnVsZT0ibm9uemVybyI+PC9wYXRoPiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgeD0iOC41IiB5PSIxMSIgd2lkdGg9IjMiIGhlaWdodD0iOSI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNi4wODAxMjcsIDguNzk5MDM4KSByb3RhdGUoMTIwLjAwMDAwMCkgdHJhbnNsYXRlKC02LjA4MDEyNywgLTguNzk5MDM4KSAiIHg9IjQuNTgwMTI3MDIiIHk9IjMuNzk5MDM4MTEiIHdpZHRoPSIzIiBoZWlnaHQ9IjEwIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMyIgZmlsbC1ydWxlPSJldmVub2RkIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNC4wODAxMjcsIDguNzk5MDM4KSBzY2FsZSgtMSwgMSkgcm90YXRlKDEyMC4wMDAwMDApIHRyYW5zbGF0ZSgtMTQuMDgwMTI3LCAtOC43OTkwMzgpICIgeD0iMTIuNTgwMTI3IiB5PSIzLjc5OTAzODExIiB3aWR0aD0iMyIgaGVpZ2h0PSIxMCI+PC9yZWN0PiAgICAgICAgICAgIDwvZz4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==) no-repeat center;}
-.files-grid .icon-execution {background: url(data:image/svg+xml; base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5Hcm91cCA5PC90aXRsZT4gICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+ICAgIDxkZWZzPjwvZGVmcz4gICAgPGcgaWQ9IlBhZ2UtMiIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iR3JvdXAtOSI+ICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwLUNvcHkiPiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMjEuMDQ1Njg5MSw0LjI3MDIzNTQyIEMyMS45NjE4MDU5LDUuMTA3MjAzNjUgMjMuMDIyNzAwNCw1LjU1Nzk2NjU5IDI0LjM2ODg5NDQsNS41MjUwMTIxOCBMMjYuMTYwMjM4LDUuNTI1MDEyMTggTDMwLjgxMjEwMTEsNS41MjUwMTIxOCBDMjkuNjAwOTEwOSw1LjUyNTAxMjE4IDI4LjQzODUxODYsNS4wMzU3NTExMyAyNy41NzcwNDcsNC4xODU4OTU5MyBMMjQuNjc4MTU2NiwxLjMyNjQwMjcxIEMyMy44MTY1ODA4LDAuNDc2NTQ3NTExIDIyLjY1NDI5MjcsMCAyMS40NDMxMDI1LDAgTDE1LjExNDkwNDYsMCBMMTUsMCBDMTYuMjI2ODY3OSwwLjAzOTQzNzA4MDUgMTcuMzAyMDU1NywwLjU1Njg2NTA4NyAxOC4xNjM1MjczLDEuNDA2NjE2MjIgTDIxLjA0NTY4OTEsNC4yNzAyMzU0MiBaIiBpZD0iU2hhcGUiIGZpbGw9IiNGRkM4NUEiPjwvcGF0aD4gICAgICAgICAgICAgICAgPHBhdGggZD0iTTQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMMzguNTUxNzAzMSw1LjUyMDAyOTE4IEwzNi44MDY4NTk0LDUuNTIwMDI5MTggTDMyLjI3NTc1LDUuNTIwMDI5MTggTDMwLjUzMDkwNjMsNS41MjAwMjkxOCBMMjYsNS41MjAwMjkxOCBMMjQuMjU1MTU2Miw1LjUyMDAyOTE4IEMyMy4wNzU0MDYzLDUuNTIwMDI5MTggMjEuOTQzMTg3NSw1LjA0MjgxMzM1IDIxLjEwNDA3ODEsNC4xOTE3NjYzIEwxOC4yODA0Mzc1LDEuMzI4MjYyODggQzE3LjQ0MTIyNjYsMC40NzcyMTU4MjkgMTYuMzA5MTA5NCwwIDE1LjEyOTM1OTQsMCBMOC45NjU1MzEyNSwwIEwyLjY4OTY3OTY5LDAgQzEuMjA0MjI2NTYsNy40MDUxNTkyM2UtMTYgMCwxLjIzNTcxNjk5IDAsMi43NjAwMTQ1OSBMMCw4LjI4MDA0Mzc3IEwwLDkuMjAwMDgzMzcgTDAsNDMuMjM5OTg1NCBDMCw0NC43NjQyODMgMS4yMDQyMjY1Niw0NiAyLjY4OTY3OTY5LDQ2IEw0OS4zMTAzMjAzLDQ2IEM1MC43OTU3NzM0LDQ2IDUyLDQ0Ljc2NDI4MyA1Miw0My4yMzk5ODU0IEw1Miw4LjI4MDA0Mzc3IEM1Miw2Ljc1NTY0MTk1IDUwLjc5NTc3MzQsNS41MjAwMjkxOCA0OS4zMTAzMjAzLDUuNTIwMDI5MTggTDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBaIiBpZD0iU2hhcGUiIGZpbGw9IiNGRkUwNjYiPjwvcGF0aD4gICAgICAgICAgICA8L2c+ICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwLTUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE2LjAwMDAwMCwgMTQuMDAwMDAwKSIgZmlsbD0iI0Y3OTEyQSI+ICAgICAgICAgICAgICAgIDxnPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIuMzAyMjI4ODIsOCBMMi44ODU4ODIzNSw4IEwyLjg4NTg4MjM1LDcuNzAxMjY5NDIgTDIuMzAyMjI4ODIsOCBaIE0yLjg4NTg4MjM1LDcuNzAxMjY5NDIgTDEwLDQuMDYwMDYwNDcgTDE3LjExNDExNzYsNy43MDEyNjk0MiBMMTcuMTE0MTE3Niw2LjcyNzgzMzQ5IEMxNy4xMTQxMTc2LDcuMjMzMTgzNTMgMTcuMzUzNDc1OCw3LjcwMjUzNDMzIDE3Ljc0OTA5MTcsOCBMMjAsOCBMMjAsNi43Mjc4MzM0OSBDMjAsNi4yNDIwNDU1MSAxOS43Mjc5NDE1LDUuNzk3MTc0ODUgMTkuMjk1NTA0OSw1LjU3NTg0MTQgTDEwLjU4OTYyMjUsMS4xMTk5MjE3MyBDMTAuMjE5Mzc5OSwwLjkzMDQyMDk5MyA5Ljc4MDYyMDA2LDAuOTMwNDIwOTkzIDkuNDEwMzc3NDksMS4xMTk5MjE3MyBMMC43MDQ0OTUxMzYsNS41NzU4NDE0IEMwLjI3MjA1ODQ3NSw1Ljc5NzE3NDg1IDcuMDg5NzYzNzJlLTE0LDYuMjQyMDQ1NTEgNy4wOTU3MTI5MWUtMTQsNi43Mjc4MzM0OSBMNy4wOTU3MTI5MWUtMTQsOCBMMi4yNTA5MDgyNyw4IEMyLjY0NjUyNDIsNy43MDI1MzQzMyAyLjg4NTg4MjM1LDcuMjMzMTgzNTMgMi44ODU4ODIzNSw2LjcyNzgzMzQ5IEwyLjg4NTg4MjM1LDcuNzAxMjY5NDIgWiBNMTAuNzI1MjM1NywzLjY4ODg2NDEgQzEwLjI2OTgzNzMsMy45MjE5NTAwMSA5LjczMDE2MjY3LDMuOTIxOTUwMDEgOS4yNzQ3NjQzMSwzLjY4ODg2NDEgTDEwLDQuMDYwMDYwNDcgTDEwLjcyNTIzNTcsMy42ODg4NjQxIFogTTE3LjY5Nzc3MTIsOCBMMTcuMTE0MTE3Niw4IEwxNy4xMTQxMTc2LDcuNzAxMjY5NDIgTDE3LjY5Nzc3MTIsOCBaIE0xNy42OTc3NzEyLDggTDE3LjExNDExNzYsOCBMMTcuMTE0MTE3Niw3LjcwMTI2OTQyIEwxNy42OTc3NzEyLDggWiBNMTcuMTE0MTE3Niw2LjcyNzgzMzQ5IEMxNy4xMTQxMTc2LDcuMjMzMTgzNTMgMTcuMzUzNDc1OCw3LjcwMjUzNDMzIDE3Ljc0OTA5MTcsOCBMMjAsOCBMMjAsNi43Mjc4MzM0OSBDMjAsNi4yNDIwNDU1MSAxOS43Mjc5NDE1LDUuNzk3MTc0ODUgMTkuMjk1NTA0OSw1LjU3NTg0MTQgTDEwLjU4OTYyMjUsMS4xMTk5MjE3MyBDMTAuMjE5Mzc5OSwwLjkzMDQyMDk5MyA5Ljc4MDYyMDA2LDAuOTMwNDIwOTkzIDkuNDEwMzc3NDksMS4xMTk5MjE3MyBMMC43MDQ0OTUxMzYsNS41NzU4NDE0IEMwLjI3MjA1ODQ3NSw1Ljc5NzE3NDg1IDcuMDg5NzYzNzJlLTE0LDYuMjQyMDQ1NTEgNy4wOTU3MTI5MWUtMTQsNi43Mjc4MzM0OSBMNy4wOTU3MTI5MWUtMTQsOCBMMi4yNTA5MDgyNyw4IEMyLjY0NjUyNDIsNy43MDI1MzQzMyAyLjg4NTg4MjM1LDcuMjMzMTgzNTMgMi44ODU4ODIzNSw2LjcyNzgzMzQ5IEwyLjg4NTg4MjM1LDcuNzAxMjY5NDIgTDEwLDQuMDYwMDYwNDcgTDE3LjExNDExNzYsNy43MDEyNjk0MiBMMTcuMTE0MTE3Niw2LjcyNzgzMzQ5IFogTTEwLjcyNTIzNTcsMy42ODg4NjQxIEMxMC4yNjk4MzczLDMuOTIxOTUwMDEgOS43MzAxNjI2NywzLjkyMTk1MDAxIDkuMjc0NzY0MzEsMy42ODg4NjQxIEwxMCw0LjA2MDA2MDQ3IEwxMC43MjUyMzU3LDMuNjg4ODY0MSBaIE0yLjg4NTg4MjM1LDggTDIuMzAyMjI4ODIsOCBMMi44ODU4ODIzNSw3LjcwMTI2OTQyIEwyLjg4NTg4MjM1LDggWiIgaWQ9IlBvbHlnb24iIGZpbGwtcnVsZT0ibm9uemVybyI+PC9wYXRoPiAgICAgICAgICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCwgNS4yMzUyOTQpIj4gICAgICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNOS40NTU1ODQ1OSw3LjczNTcwNDIgTDAsMi43NjQ3MDU4OCBMMS41NDIyMjMxNywwLjM0MDc0OTg1NSBMMi4yNDk5MTAzNCwwLjY4MjUzOTMzNyBMMTAuMDYzNDk0Niw0Ljg3MDgyMzIxIEwxOC40NjEwOTQ5LDAuMzMzNDQ4ODE5IEwyMCwyLjc2NDcwNTg4IEwxMC42NjU3OTQ1LDcuNzMyNjI3NzggQzEwLjI4Nzc0OTcsNy45MzM4MzM2MyA5LjgzNDY0NzQxLDcuOTM0OTg1NDUgOS40NTU1ODQ1OSw3LjczNTcwNDIgWiIgaWQ9IkNvbWJpbmVkLVNoYXBlIj48L3BhdGg+ICAgICAgICAgICAgICAgICAgICA8L2c+ICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNOS40NjgwMDk5MywyMi44MzM4ODE0IEwwLjEwNTQ1MjQ3NCwxNy43NTcxMDAxIEwxLjY0MDY4NDI3LDE1LjMzMzE0NCBMMi4zNDUxNjMyNywxNS42NzQ5MzM1IEwxMC4xMjMzMjYyLDIwLjAwNDcyMiBMMTguNDgyODU3NiwxNS40NjczNDc2IEwyMC4wMTQ3ODYzLDE3Ljg5ODYwNDcgTDEwLjc3Njg3MTIsMjIuODM3NjY4NSBDMTAuNTcxNjk3NSwyMi45NDczNjQ4IDEwLjM0NDIwMzUsMjMuMDAxNDUzNSAxMC4xMTcwNDQ3LDIzIEM5Ljg5MzE0MjMzLDIyLjk5ODU2NzMgOS42Njk1NjU2NCwyMi45NDMxNzM1IDkuNDY4MDA5OTMsMjIuODMzODgxNCBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4gICAgICAgICAgICAgICAgICAgIDxnIGlkPSJHcm91cCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC4wMDAwMDAsIDkuNDExNzY1KSI+ICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTkuMzk3MTI0OSw4LjQ2OTc0MjA4IEwwLjExMDQ5OTM5NSwzLjM3NzQ4OTg4IEwxLjYyODY1MzgsMC45NTM1MzM4NDggTDIuMzI1Mjk2NDIsMS4yOTUzMjMzMyBMMTAuMDE2OTM3Nyw1LjYyNTExMTgzIEwxOC4yODM0ODA1LDEuMDg3NzM3NDQgTDE5Ljc5ODM2ODYsMy41MTg5OTQ1IEwxMC42MzQ4MjUxLDguNDczNDA2NTcgQzEwLjI0ODM3OTcsOC42ODIzNDQyOCA5Ljc4MjMyNjMzLDguNjgwOTY0NDIgOS4zOTcxMjQ5LDguNDY5NzQyMDggWiIgaWQ9IkNvbWJpbmVkLVNoYXBlIj48L3BhdGg+ICAgICAgICAgICAgICAgICAgICA8L2c+ICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=) no-repeat center;}
+.files-grid .icon-folder {background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5pY29uLWJpZy1mb2xkZXJpY29uLWJpZy1mb2xkZXI8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJ3ZWItbWF4IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTA5NS4wMDAwMDAsIC02OTUuMDAwMDAwKSI+ICAgICAgICAgICAgPGcgaWQ9Ijgt5paH5qGjIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMDkwLjAwMDAwMCwgNTgzLjAwMDAwMCkiPiAgICAgICAgICAgICAgICA8ZyBpZD0iaWNvbi1iaWctZm9sZGVyIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1LjAwMDAwMCwgMTEyLjAwMDAwMCkiPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIxLjA0NTY4OTEsNC4yNzAyMzU0MiBDMjEuOTYxODA1OSw1LjEwNzIwMzY1IDIzLjAyMjcwMDQsNS41NTc5NjY1OSAyNC4zNjg4OTQ0LDUuNTI1MDEyMTggTDI2LjE2MDIzOCw1LjUyNTAxMjE4IEwzMC44MTIxMDExLDUuNTI1MDEyMTggQzI5LjYwMDkxMDksNS41MjUwMTIxOCAyOC40Mzg1MTg2LDUuMDM1NzUxMTMgMjcuNTc3MDQ3LDQuMTg1ODk1OTMgTDI0LjY3ODE1NjYsMS4zMjY0MDI3MSBDMjMuODE2NTgwOCwwLjQ3NjU0NzUxMSAyMi42NTQyOTI3LDAgMjEuNDQzMTAyNSwwIEwxNS4xMTQ5MDQ2LDAgTDE1LDAgQzE2LjIyNjg2NzksMC4wMzk0MzcwODA1IDE3LjMwMjA1NTcsMC41NTY4NjUwODcgMTguMTYzNTI3MywxLjQwNjYxNjIyIEwyMS4wNDU2ODkxLDQuMjcwMjM1NDIgWiIgaWQ9IlNoYXBlLUNvcHktNyIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMMzguNTUxNzAzMSw1LjUyMDAyOTE4IEwzNi44MDY4NTk0LDUuNTIwMDI5MTggTDMyLjI3NTc1LDUuNTIwMDI5MTggTDMwLjUzMDkwNjMsNS41MjAwMjkxOCBMMjYsNS41MjAwMjkxOCBMMjQuMjU1MTU2Miw1LjUyMDAyOTE4IEMyMy4wNzU0MDYzLDUuNTIwMDI5MTggMjEuOTQzMTg3NSw1LjA0MjgxMzM1IDIxLjEwNDA3ODEsNC4xOTE3NjYzIEwxOC4yODA0Mzc1LDEuMzI4MjYyODggQzE3LjQ0MTIyNjYsMC40NzcyMTU4MjkgMTYuMzA5MTA5NCwwIDE1LjEyOTM1OTQsMCBMOC45NjU1MzEyNSwwIEwyLjY4OTY3OTY5LDAgQzEuMjA0MjI2NTYsNy40MDUxNTkyM2UtMTYgMCwxLjIzNTcxNjk5IDAsMi43NjAwMTQ1OSBMMCw4LjI4MDA0Mzc3IEwwLDkuMjAwMDgzMzcgTDAsNDMuMjM5OTg1NCBDMCw0NC43NjQyODMgMS4yMDQyMjY1Niw0NiAyLjY4OTY3OTY5LDQ2IEw0OS4zMTAzMjAzLDQ2IEM1MC43OTU3NzM0LDQ2IDUyLDQ0Ljc2NDI4MyA1Miw0My4yMzk5ODU0IEw1Miw4LjI4MDA0Mzc3IEM1Miw2Ljc1NTY0MTk1IDUwLjc5NTc3MzQsNS41MjAwMjkxOCA0OS4zMTAzMjAzLDUuNTIwMDI5MTggTDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBaIiBpZD0iU2hhcGUtQ29weS04IiBmaWxsPSIjRkZFMDY2Ij48L3BhdGg+ICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=) no-repeat center;}
+.files-grid .icon-paper-clip {background:url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNTJweCIgaGVpZ2h0PSI0NnB4IiB2aWV3Qm94PSIwIDAgNTIgNDYiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDQ5LjEgKDUxMTQ3KSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5pY29uLWJpZy1lbmNsb3NlaWNvbi1iaWctZW5jbG9zZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJQYWdlLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmiYDmnIlJQ09OIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQwNC4wMDAwMDAsIC02OTUuMDAwMDAwKSI+CiAgICAgICAgICAgIDxnIGlkPSI4LeaWh+ahoyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTA5MC4wMDAwMDAsIDU4My4wMDAwMDApIj4KICAgICAgICAgICAgICAgIDxnIGlkPSJHcm91cC03LUNvcHkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDMxNC4wMDAwMDAsIDExMi4wMDAwMDApIj4KICAgICAgICAgICAgICAgICAgICA8ZyBpZD0iaWNvbi1iaWctZm9sZGVyIj4KICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIxLjA0NTY4OTEsNC4yNzAyMzU0MiBDMjEuOTYxODA1OSw1LjEwNzIwMzY1IDIzLjAyMjcwMDQsNS41NTc5NjY1OSAyNC4zNjg4OTQ0LDUuNTI1MDEyMTggTDI2LjE2MDIzOCw1LjUyNTAxMjE4IEwzMC44MTIxMDExLDUuNTI1MDEyMTggQzI5LjYwMDkxMDksNS41MjUwMTIxOCAyOC40Mzg1MTg2LDUuMDM1NzUxMTMgMjcuNTc3MDQ3LDQuMTg1ODk1OTMgTDI0LjY3ODE1NjYsMS4zMjY0MDI3MSBDMjMuODE2NTgwOCwwLjQ3NjU0NzUxMSAyMi42NTQyOTI3LDAgMjEuNDQzMTAyNSwwIEwxNS4xMTQ5MDQ2LDAgTDE1LDAgQzE2LjIyNjg2NzksMC4wMzk0MzcwODA1IDE3LjMwMjA1NTcsMC41NTY4NjUwODcgMTguMTYzNTI3MywxLjQwNjYxNjIyIEwyMS4wNDU2ODkxLDQuMjcwMjM1NDIgWiIgaWQ9IlNoYXBlLUNvcHktNyIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPgogICAgICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNNDkuMzEwMzIwMyw1LjUyMDAyOTE4IEwzOC41NTE3MDMxLDUuNTIwMDI5MTggTDM2LjgwNjg1OTQsNS41MjAwMjkxOCBMMzIuMjc1NzUsNS41MjAwMjkxOCBMMzAuNTMwOTA2Myw1LjUyMDAyOTE4IEwyNiw1LjUyMDAyOTE4IEwyNC4yNTUxNTYyLDUuNTIwMDI5MTggQzIzLjA3NTQwNjMsNS41MjAwMjkxOCAyMS45NDMxODc1LDUuMDQyODEzMzUgMjEuMTA0MDc4MSw0LjE5MTc2NjMgTDE4LjI4MDQzNzUsMS4zMjgyNjI4OCBDMTcuNDQxMjI2NiwwLjQ3NzIxNTgyOSAxNi4zMDkxMDk0LDAgMTUuMTI5MzU5NCwwIEw4Ljk2NTUzMTI1LDAgTDIuNjg5Njc5NjksMCBDMS4yMDQyMjY1Niw3LjQwNTE1OTIzZS0xNiAwLDEuMjM1NzE2OTkgMCwyLjc2MDAxNDU5IEwwLDguMjgwMDQzNzcgTDAsOS4yMDAwODMzNyBMMCw0My4yMzk5ODU0IEMwLDQ0Ljc2NDI4MyAxLjIwNDIyNjU2LDQ2IDIuNjg5Njc5NjksNDYgTDQ5LjMxMDMyMDMsNDYgQzUwLjc5NTc3MzQsNDYgNTIsNDQuNzY0MjgzIDUyLDQzLjIzOTk4NTQgTDUyLDguMjgwMDQzNzcgQzUyLDYuNzU1NjQxOTUgNTAuNzk1NzczNCw1LjUyMDAyOTE4IDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMNDkuMzEwMzIwMyw1LjUyMDAyOTE4IFoiIGlkPSJTaGFwZS1Db3B5LTgiIGZpbGw9IiNGRkUwNjYiPjwvcGF0aD4KICAgICAgICAgICAgICAgICAgICA8L2c+CiAgICAgICAgICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgyNi41MDAwMDAsIDI2LjUwMDAwMCkgcm90YXRlKDQ1LjAwMDAwMCkgdHJhbnNsYXRlKC0yNi41MDAwMDAsIC0yNi41MDAwMDApIHRyYW5zbGF0ZSgyMC4wMDAwMDAsIDE0LjAwMDAwMCkiIGZpbGw9IiNGRkE5MjkiIGZpbGwtcnVsZT0ibm9uemVybyI+CiAgICAgICAgICAgICAgICAgICAgICAgIDxwYXRoIGQ9Ik0yLjUsMTguMjUgQzIuNSwxOC45NDAzNTU5IDEuOTQwMzU1OTQsMTkuNSAxLjI1LDE5LjUgQzAuNTU5NjQ0MDYzLDE5LjUgMCwxOC45NDAzNTU5IDAsMTguMjUgTDAsNi4yNSBDMCwyLjc5ODIyMDMxIDIuNzk4MjIwMzEsMCA2LjI1LDAgQzkuNzAxNzc5NjksMCAxMi41LDIuNzk4MjIwMzEgMTIuNSw2LjI1IEwxMi41LDIwLjI1IEMxMi41LDIwLjk0MDM1NTkgMTEuOTQwMzU1OSwyMS41IDExLjI1LDIxLjUgQzEwLjU1OTY0NDEsMjEuNSAxMCwyMC45NDAzNTU5IDEwLDIwLjI1IEwxMCw2LjI1IEMxMCw0LjE3ODkzMjE5IDguMzIxMDY3ODEsMi41IDYuMjUsMi41IEM0LjE3ODkzMjE5LDIuNSAyLjUsNC4xNzg5MzIxOSAyLjUsNi4yNSBMMi41LDE4LjI1IFoiIGlkPSJSZWN0YW5nbGUtMzciPjwvcGF0aD4KICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTYsNS43NSBDNiw1LjA1OTY0NDA2IDYuNTU5NjQ0MDYsNC41IDcuMjUsNC41IEM3Ljk0MDM1NTk0LDQuNSA4LjUsNS4wNTk2NDQwNiA4LjUsNS43NSBMOC41LDIwLjI1IEM4LjUsMjIuNTk3MjEwMiA2LjU5NzIxMDE5LDI0LjUgNC4yNSwyNC41IEMxLjkwMjc4OTgxLDI0LjUgMCwyMi41OTcyMTAyIDAsMjAuMjUgTDAsOC4yNSBDMCw3LjU1OTY0NDA2IDAuNTU5NjQ0MDYzLDcgMS4yNSw3IEMxLjk0MDM1NTk0LDcgMi41LDcuNTU5NjQ0MDYgMi41LDguMjUgTDIuNSwyMC4yNSBDMi41LDIxLjIxNjQ5ODMgMy4yODM1MDE2OSwyMiA0LjI1LDIyIEM1LjIxNjQ5ODMxLDIyIDYsMjEuMjE2NDk4MyA2LDIwLjI1IEw2LDUuNzUgWiIgaWQ9IlJlY3RhbmdsZS0zNy1Db3B5Ij48L3BhdGg+CiAgICAgICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=') no-repeat center;}
+.files-grid .icon-product {background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5Hcm91cCA4PC90aXRsZT4gICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+ICAgIDxkZWZzPjwvZGVmcz4gICAgPGcgaWQ9IlBhZ2UtMiIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iR3JvdXAtOCI+ICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwLUNvcHktMiI+ICAgICAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMS4wNDU2ODkxLDQuMjcwMjM1NDIgQzIxLjk2MTgwNTksNS4xMDcyMDM2NSAyMy4wMjI3MDA0LDUuNTU3OTY2NTkgMjQuMzY4ODk0NCw1LjUyNTAxMjE4IEwyNi4xNjAyMzgsNS41MjUwMTIxOCBMMzAuODEyMTAxMSw1LjUyNTAxMjE4IEMyOS42MDA5MTA5LDUuNTI1MDEyMTggMjguNDM4NTE4Niw1LjAzNTc1MTEzIDI3LjU3NzA0Nyw0LjE4NTg5NTkzIEwyNC42NzgxNTY2LDEuMzI2NDAyNzEgQzIzLjgxNjU4MDgsMC40NzY1NDc1MTEgMjIuNjU0MjkyNywwIDIxLjQ0MzEwMjUsMCBMMTUuMTE0OTA0NiwwIEwxNSwwIEMxNi4yMjY4Njc5LDAuMDM5NDM3MDgwNSAxNy4zMDIwNTU3LDAuNTU2ODY1MDg3IDE4LjE2MzUyNzMsMS40MDY2MTYyMiBMMjEuMDQ1Njg5MSw0LjI3MDIzNTQyIFoiIGlkPSJTaGFwZSIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNNDkuMzEwMzIwMyw1LjUyMDAyOTE4IEwzOC41NTE3MDMxLDUuNTIwMDI5MTggTDM2LjgwNjg1OTQsNS41MjAwMjkxOCBMMzIuMjc1NzUsNS41MjAwMjkxOCBMMzAuNTMwOTA2Myw1LjUyMDAyOTE4IEwyNiw1LjUyMDAyOTE4IEwyNC4yNTUxNTYyLDUuNTIwMDI5MTggQzIzLjA3NTQwNjMsNS41MjAwMjkxOCAyMS45NDMxODc1LDUuMDQyODEzMzUgMjEuMTA0MDc4MSw0LjE5MTc2NjMgTDE4LjI4MDQzNzUsMS4zMjgyNjI4OCBDMTcuNDQxMjI2NiwwLjQ3NzIxNTgyOSAxNi4zMDkxMDk0LDAgMTUuMTI5MzU5NCwwIEw4Ljk2NTUzMTI1LDAgTDIuNjg5Njc5NjksMCBDMS4yMDQyMjY1Niw3LjQwNTE1OTIzZS0xNiAwLDEuMjM1NzE2OTkgMCwyLjc2MDAxNDU5IEwwLDguMjgwMDQzNzcgTDAsOS4yMDAwODMzNyBMMCw0My4yMzk5ODU0IEMwLDQ0Ljc2NDI4MyAxLjIwNDIyNjU2LDQ2IDIuNjg5Njc5NjksNDYgTDQ5LjMxMDMyMDMsNDYgQzUwLjc5NTc3MzQsNDYgNTIsNDQuNzY0MjgzIDUyLDQzLjIzOTk4NTQgTDUyLDguMjgwMDQzNzcgQzUyLDYuNzU1NjQxOTUgNTAuNzk1NzczNCw1LjUyMDAyOTE4IDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMNDkuMzEwMzIwMyw1LjUyMDAyOTE4IFoiIGlkPSJTaGFwZSIgZmlsbD0iI0ZGRTA2NiI+PC9wYXRoPiAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8ZyBpZD0iR3JvdXAtNSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTYuMDAwMDAwLCAxNS4wMDAwMDApIiBmaWxsPSIjRjc5MTJBIj4gICAgICAgICAgICAgICAgPHBhdGggZD0iTTEwLDIuNzc3MDUzNjEgTDIuNjQ1NDU5NTgsNi40NzI0OTI4NyBMMy4wOTU2OTA0OSwxNC4zMTU5ODk5IEwxMCwxOS4wNzAyNDUzIEwxNi45MDQzMDk1LDE0LjMxNTk4OTkgTDE3LjM1NDU0MDQsNi40NzI0OTI4NyBMMTAsMi43NzcwNTM2MSBaIE0xMC40NDg5Nzg3LDAuMTA2MDUxOTIzIEwxOS40NDg5Mzk4LDQuNjI4MjY2NDcgQzE5LjgwNTI4MTIsNC44MDczMTc0NyAyMC4wMjExNzE3LDUuMTgwOTc1NTggMTkuOTk4MzE3Nyw1LjU3OTExNjQxIEwxOS40NDM3Mzc4LDE1LjI0MDQ4MjQgQzE5LjQyNjAzOTcsMTUuNTQ4ODAyNiAxOS4yNjY4NzgxLDE1LjgzMTY0ODIgMTkuMDEyNTIwOSwxNi4wMDY3OTY2IEwxMC41NjcxMzk3LDIxLjgyMjIyMjQgQzEwLjIyNTYxNTIsMjIuMDU3MzkzNiA5Ljc3NDM4NDc3LDIyLjA1NzM5MzYgOS40MzI4NjAzNSwyMS44MjIyMjI0IEwwLjk4NzQ3OTA5OCwxNi4wMDY3OTY2IEMwLjczMzEyMTk0NywxNS44MzE2NDgyIDAuNTczOTYwMzA2LDE1LjU0ODgwMjYgMC41NTYyNjIxNzMsMTUuMjQwNDgyNCBMMC4wMDE2ODIyOTQ2OSw1LjU3OTExNjQxIEMtMC4wMjExNzE3MDg3LDUuMTgwOTc1NTggMC4xOTQ3MTg4MjcsNC44MDczMTc0NyAwLjU1MTA2MDE4Myw0LjYyODI2NjQ3IEw5LjU1MTAyMTMxLDAuMTA2MDUxOTIzIEM5LjgzMzUxMjMxLC0wLjAzNTg5MTQ1NTcgMTAuMTY2NDg3NywtMC4wMzU4OTE0NTU3IDEwLjQ0ODk3ODcsMC4xMDYwNTE5MjMgWiIgaWQ9IlBvbHlnb24iIGZpbGwtcnVsZT0ibm9uemVybyI+PC9wYXRoPiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgeD0iOC41IiB5PSIxMSIgd2lkdGg9IjMiIGhlaWdodD0iOSI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNi4wODAxMjcsIDguNzk5MDM4KSByb3RhdGUoMTIwLjAwMDAwMCkgdHJhbnNsYXRlKC02LjA4MDEyNywgLTguNzk5MDM4KSAiIHg9IjQuNTgwMTI3MDIiIHk9IjMuNzk5MDM4MTEiIHdpZHRoPSIzIiBoZWlnaHQ9IjEwIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMyIgZmlsbC1ydWxlPSJldmVub2RkIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNC4wODAxMjcsIDguNzk5MDM4KSBzY2FsZSgtMSwgMSkgcm90YXRlKDEyMC4wMDAwMDApIHRyYW5zbGF0ZSgtMTQuMDgwMTI3LCAtOC43OTkwMzgpICIgeD0iMTIuNTgwMTI3IiB5PSIzLjc5OTAzODExIiB3aWR0aD0iMyIgaGVpZ2h0PSIxMCI+PC9yZWN0PiAgICAgICAgICAgIDwvZz4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==) no-repeat center;}
+.files-grid .icon-execution {background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5Hcm91cCA5PC90aXRsZT4gICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+ICAgIDxkZWZzPjwvZGVmcz4gICAgPGcgaWQ9IlBhZ2UtMiIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iR3JvdXAtOSI+ICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwLUNvcHkiPiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMjEuMDQ1Njg5MSw0LjI3MDIzNTQyIEMyMS45NjE4MDU5LDUuMTA3MjAzNjUgMjMuMDIyNzAwNCw1LjU1Nzk2NjU5IDI0LjM2ODg5NDQsNS41MjUwMTIxOCBMMjYuMTYwMjM4LDUuNTI1MDEyMTggTDMwLjgxMjEwMTEsNS41MjUwMTIxOCBDMjkuNjAwOTEwOSw1LjUyNTAxMjE4IDI4LjQzODUxODYsNS4wMzU3NTExMyAyNy41NzcwNDcsNC4xODU4OTU5MyBMMjQuNjc4MTU2NiwxLjMyNjQwMjcxIEMyMy44MTY1ODA4LDAuNDc2NTQ3NTExIDIyLjY1NDI5MjcsMCAyMS40NDMxMDI1LDAgTDE1LjExNDkwNDYsMCBMMTUsMCBDMTYuMjI2ODY3OSwwLjAzOTQzNzA4MDUgMTcuMzAyMDU1NywwLjU1Njg2NTA4NyAxOC4xNjM1MjczLDEuNDA2NjE2MjIgTDIxLjA0NTY4OTEsNC4yNzAyMzU0MiBaIiBpZD0iU2hhcGUiIGZpbGw9IiNGRkM4NUEiPjwvcGF0aD4gICAgICAgICAgICAgICAgPHBhdGggZD0iTTQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMMzguNTUxNzAzMSw1LjUyMDAyOTE4IEwzNi44MDY4NTk0LDUuNTIwMDI5MTggTDMyLjI3NTc1LDUuNTIwMDI5MTggTDMwLjUzMDkwNjMsNS41MjAwMjkxOCBMMjYsNS41MjAwMjkxOCBMMjQuMjU1MTU2Miw1LjUyMDAyOTE4IEMyMy4wNzU0MDYzLDUuNTIwMDI5MTggMjEuOTQzMTg3NSw1LjA0MjgxMzM1IDIxLjEwNDA3ODEsNC4xOTE3NjYzIEwxOC4yODA0Mzc1LDEuMzI4MjYyODggQzE3LjQ0MTIyNjYsMC40NzcyMTU4MjkgMTYuMzA5MTA5NCwwIDE1LjEyOTM1OTQsMCBMOC45NjU1MzEyNSwwIEwyLjY4OTY3OTY5LDAgQzEuMjA0MjI2NTYsNy40MDUxNTkyM2UtMTYgMCwxLjIzNTcxNjk5IDAsMi43NjAwMTQ1OSBMMCw4LjI4MDA0Mzc3IEwwLDkuMjAwMDgzMzcgTDAsNDMuMjM5OTg1NCBDMCw0NC43NjQyODMgMS4yMDQyMjY1Niw0NiAyLjY4OTY3OTY5LDQ2IEw0OS4zMTAzMjAzLDQ2IEM1MC43OTU3NzM0LDQ2IDUyLDQ0Ljc2NDI4MyA1Miw0My4yMzk5ODU0IEw1Miw4LjI4MDA0Mzc3IEM1Miw2Ljc1NTY0MTk1IDUwLjc5NTc3MzQsNS41MjAwMjkxOCA0OS4zMTAzMjAzLDUuNTIwMDI5MTggTDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBaIiBpZD0iU2hhcGUiIGZpbGw9IiNGRkUwNjYiPjwvcGF0aD4gICAgICAgICAgICA8L2c+ICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwLTUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE2LjAwMDAwMCwgMTQuMDAwMDAwKSIgZmlsbD0iI0Y3OTEyQSI+ICAgICAgICAgICAgICAgIDxnPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIuMzAyMjI4ODIsOCBMMi44ODU4ODIzNSw4IEwyLjg4NTg4MjM1LDcuNzAxMjY5NDIgTDIuMzAyMjI4ODIsOCBaIE0yLjg4NTg4MjM1LDcuNzAxMjY5NDIgTDEwLDQuMDYwMDYwNDcgTDE3LjExNDExNzYsNy43MDEyNjk0MiBMMTcuMTE0MTE3Niw2LjcyNzgzMzQ5IEMxNy4xMTQxMTc2LDcuMjMzMTgzNTMgMTcuMzUzNDc1OCw3LjcwMjUzNDMzIDE3Ljc0OTA5MTcsOCBMMjAsOCBMMjAsNi43Mjc4MzM0OSBDMjAsNi4yNDIwNDU1MSAxOS43Mjc5NDE1LDUuNzk3MTc0ODUgMTkuMjk1NTA0OSw1LjU3NTg0MTQgTDEwLjU4OTYyMjUsMS4xMTk5MjE3MyBDMTAuMjE5Mzc5OSwwLjkzMDQyMDk5MyA5Ljc4MDYyMDA2LDAuOTMwNDIwOTkzIDkuNDEwMzc3NDksMS4xMTk5MjE3MyBMMC43MDQ0OTUxMzYsNS41NzU4NDE0IEMwLjI3MjA1ODQ3NSw1Ljc5NzE3NDg1IDcuMDg5NzYzNzJlLTE0LDYuMjQyMDQ1NTEgNy4wOTU3MTI5MWUtMTQsNi43Mjc4MzM0OSBMNy4wOTU3MTI5MWUtMTQsOCBMMi4yNTA5MDgyNyw4IEMyLjY0NjUyNDIsNy43MDI1MzQzMyAyLjg4NTg4MjM1LDcuMjMzMTgzNTMgMi44ODU4ODIzNSw2LjcyNzgzMzQ5IEwyLjg4NTg4MjM1LDcuNzAxMjY5NDIgWiBNMTAuNzI1MjM1NywzLjY4ODg2NDEgQzEwLjI2OTgzNzMsMy45MjE5NTAwMSA5LjczMDE2MjY3LDMuOTIxOTUwMDEgOS4yNzQ3NjQzMSwzLjY4ODg2NDEgTDEwLDQuMDYwMDYwNDcgTDEwLjcyNTIzNTcsMy42ODg4NjQxIFogTTE3LjY5Nzc3MTIsOCBMMTcuMTE0MTE3Niw4IEwxNy4xMTQxMTc2LDcuNzAxMjY5NDIgTDE3LjY5Nzc3MTIsOCBaIE0xNy42OTc3NzEyLDggTDE3LjExNDExNzYsOCBMMTcuMTE0MTE3Niw3LjcwMTI2OTQyIEwxNy42OTc3NzEyLDggWiBNMTcuMTE0MTE3Niw2LjcyNzgzMzQ5IEMxNy4xMTQxMTc2LDcuMjMzMTgzNTMgMTcuMzUzNDc1OCw3LjcwMjUzNDMzIDE3Ljc0OTA5MTcsOCBMMjAsOCBMMjAsNi43Mjc4MzM0OSBDMjAsNi4yNDIwNDU1MSAxOS43Mjc5NDE1LDUuNzk3MTc0ODUgMTkuMjk1NTA0OSw1LjU3NTg0MTQgTDEwLjU4OTYyMjUsMS4xMTk5MjE3MyBDMTAuMjE5Mzc5OSwwLjkzMDQyMDk5MyA5Ljc4MDYyMDA2LDAuOTMwNDIwOTkzIDkuNDEwMzc3NDksMS4xMTk5MjE3MyBMMC43MDQ0OTUxMzYsNS41NzU4NDE0IEMwLjI3MjA1ODQ3NSw1Ljc5NzE3NDg1IDcuMDg5NzYzNzJlLTE0LDYuMjQyMDQ1NTEgNy4wOTU3MTI5MWUtMTQsNi43Mjc4MzM0OSBMNy4wOTU3MTI5MWUtMTQsOCBMMi4yNTA5MDgyNyw4IEMyLjY0NjUyNDIsNy43MDI1MzQzMyAyLjg4NTg4MjM1LDcuMjMzMTgzNTMgMi44ODU4ODIzNSw2LjcyNzgzMzQ5IEwyLjg4NTg4MjM1LDcuNzAxMjY5NDIgTDEwLDQuMDYwMDYwNDcgTDE3LjExNDExNzYsNy43MDEyNjk0MiBMMTcuMTE0MTE3Niw2LjcyNzgzMzQ5IFogTTEwLjcyNTIzNTcsMy42ODg4NjQxIEMxMC4yNjk4MzczLDMuOTIxOTUwMDEgOS43MzAxNjI2NywzLjkyMTk1MDAxIDkuMjc0NzY0MzEsMy42ODg4NjQxIEwxMCw0LjA2MDA2MDQ3IEwxMC43MjUyMzU3LDMuNjg4ODY0MSBaIE0yLjg4NTg4MjM1LDggTDIuMzAyMjI4ODIsOCBMMi44ODU4ODIzNSw3LjcwMTI2OTQyIEwyLjg4NTg4MjM1LDggWiIgaWQ9IlBvbHlnb24iIGZpbGwtcnVsZT0ibm9uemVybyI+PC9wYXRoPiAgICAgICAgICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCwgNS4yMzUyOTQpIj4gICAgICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNOS40NTU1ODQ1OSw3LjczNTcwNDIgTDAsMi43NjQ3MDU4OCBMMS41NDIyMjMxNywwLjM0MDc0OTg1NSBMMi4yNDk5MTAzNCwwLjY4MjUzOTMzNyBMMTAuMDYzNDk0Niw0Ljg3MDgyMzIxIEwxOC40NjEwOTQ5LDAuMzMzNDQ4ODE5IEwyMCwyLjc2NDcwNTg4IEwxMC42NjU3OTQ1LDcuNzMyNjI3NzggQzEwLjI4Nzc0OTcsNy45MzM4MzM2MyA5LjgzNDY0NzQxLDcuOTM0OTg1NDUgOS40NTU1ODQ1OSw3LjczNTcwNDIgWiIgaWQ9IkNvbWJpbmVkLVNoYXBlIj48L3BhdGg+ICAgICAgICAgICAgICAgICAgICA8L2c+ICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNOS40NjgwMDk5MywyMi44MzM4ODE0IEwwLjEwNTQ1MjQ3NCwxNy43NTcxMDAxIEwxLjY0MDY4NDI3LDE1LjMzMzE0NCBMMi4zNDUxNjMyNywxNS42NzQ5MzM1IEwxMC4xMjMzMjYyLDIwLjAwNDcyMiBMMTguNDgyODU3NiwxNS40NjczNDc2IEwyMC4wMTQ3ODYzLDE3Ljg5ODYwNDcgTDEwLjc3Njg3MTIsMjIuODM3NjY4NSBDMTAuNTcxNjk3NSwyMi45NDczNjQ4IDEwLjM0NDIwMzUsMjMuMDAxNDUzNSAxMC4xMTcwNDQ3LDIzIEM5Ljg5MzE0MjMzLDIyLjk5ODU2NzMgOS42Njk1NjU2NCwyMi45NDMxNzM1IDkuNDY4MDA5OTMsMjIuODMzODgxNCBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4gICAgICAgICAgICAgICAgICAgIDxnIGlkPSJHcm91cCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC4wMDAwMDAsIDkuNDExNzY1KSI+ICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTkuMzk3MTI0OSw4LjQ2OTc0MjA4IEwwLjExMDQ5OTM5NSwzLjM3NzQ4OTg4IEwxLjYyODY1MzgsMC45NTM1MzM4NDggTDIuMzI1Mjk2NDIsMS4yOTUzMjMzMyBMMTAuMDE2OTM3Nyw1LjYyNTExMTgzIEwxOC4yODM0ODA1LDEuMDg3NzM3NDQgTDE5Ljc5ODM2ODYsMy41MTg5OTQ1IEwxMC42MzQ4MjUxLDguNDczNDA2NTcgQzEwLjI0ODM3OTcsOC42ODIzNDQyOCA5Ljc4MjMyNjMzLDguNjgwOTY0NDIgOS4zOTcxMjQ5LDguNDY5NzQyMDggWiIgaWQ9IkNvbWJpbmVkLVNoYXBlIj48L3BhdGg+ICAgICAgICAgICAgICAgICAgICA8L2c+ICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=) no-repeat center;}
 .files-grid .icon-product:before,
 .files-grid .icon-execution:before,
 .files-grid .icon-paper-clip:before,
@@ -63,11 +63,10 @@
 .main-col > .panel > .panel-body {padding: 5px 10px;}
 .main-col .panel-title a.active {color: #0c64eb;}
 
-.side-col > .cell {overflow: hidden auto; padding: 0; position: relative;}
+.side-col > .cell {overflow: hidden auto; position: relative;}
 .side-col > .cell > header {position: absolute; top: 10px; right: 10px; left: 10px;}
 .side-col > .cell > header > .c-sm {padding-right: 20px; width: 60px;}
 .side-col .docsTree {position: absolute; top: 53px; left: 0; right: 0; bottom: 0; overflow: auto; padding: 0 10px 10px;}
-.main-col .block-files > .panel-body {top: 45px; left: 0; right: 0; bottom: 0; overflow: auto;}
 
 td.c-name a {color: #0c60e1;}
 td.c-name a:visited {color: #082999;}
diff --git a/module/doc/css/editlib.css b/module/doc/css/editlib.css
index 31bffbcc89..da498e6a63 100644
--- a/module/doc/css/editlib.css
+++ b/module/doc/css/editlib.css
@@ -1,6 +1,4 @@
 form {margin-right: 30px;}
 
-.chosen-container .chosen-results {max-height: 180px;}
-
 #whiteListBox div.input-group {margin-bottom: 2px;}
 #whiteListBox .input-group:last-child {margin-top: 10px;}
diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index 42e741fb34..743a6d66a0 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -3,5 +3,23 @@
 .addbtn .icon-plus {font-size: 18px; display: block; opacity: 0.5; transition: opacity .2s; text-shadow: 1px 1px 3px rgba(0,0,0,.2);}
 .addbtn:hover .icon-plus {opacity: .9; animation: flash-icon 1s linear alternate infinite;}
 #dropMenu {min-width: 250px; box-sizing: inhert;}
+#dropMenu .table-col .list-group {padding-top: 10px;}
 .main-col .block-files .panel-heading {padding-right: 20px;}
 .main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
+.side-col .action a {margin: 0 auto 3px; display: block; max-width: 200px;}
+.side-col .tips {padding: 0 10px;}
+.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 15px;}
+.main-col .doc-title .title {margin-right: 10px; line-height: 32px; font-size: 25px;}
+.main-col .doc-title .info {flex: 1 1 0;}
+.main-col .doc-title .version a {font-size: 13px; color: #8c8c8c;}
+.main-col .doc-title .version .dropdown-menu a:hover {color: #ffffff;}
+.main-col .doc-title .actions a {margin-right: 8px;}
+.main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
+#sidebar {width: 275px;}
+#sidebar>.cell {width: 100%;}
+#sidebar>.sidebar-toggle {left: 3px; right: auto;}
+.hide-sidebar #sidebar>.cell {left: -270px;}
+.hide-sidebar #sidebar>.sidebar-toggle>.icon:before {content: "\e314";}
+.detail.empty {line-height: 200px;}
+.main-col+.side-col {padding-left: 16px;}
+.main-col iframe {min-height: 380px;}
diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index 35955db5a4..30c81239a0 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -15,7 +15,7 @@
 
 .main-row > .side-col {transition: width .2s;}
 .main-row > .main-col .article-content {transition: max-width; margin: 0 auto !important;}
-.main-row > .side-col > .cell {transition: opacity .2s;}
+.main-row > .side-col > .cell {transition: opacity .2s; margin-bottom: 10px;}
 .doc-fullscreen .main-row > .side-col {width: 0; position: relative; overflow: hidden;}
 .doc-fullscreen .fullscreen-btn > .icon-fullscreen:before {content: '\e972';}
 .right-icon a {color: #1183fb;}
diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js
deleted file mode 100644
index f5427fdb6b..0000000000
--- a/module/doc/js/browse.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Browse by module. */
-function browseByModule()
-{
-    $('.divider').removeClass('hidden');
-    $('#bymoduleTab').addClass('active');
-    $('#allTab').removeClass('active');
-}
-
-function browseBySearch()
-{
-    $('.divider').addClass('hidden');
-    $('#bymoduleTab').removeClass('active');
-    $('#allTab').addClass('active');
-}
-
-$(function()
-{
-    if(browseType == 'bysearch') return;
-    if(browseType == 'byediteddate' || browseType == 'openedbyme' || browseType == 'collectedbyme') 
-    {
-        $('#pageActions ul.dropdown-menu').css('left', '0px');
-    }
-    $('#' + browseType + 'Tab').addClass('active');
-});
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index 19c7943512..fdbeb084ff 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -146,7 +146,9 @@ $(document).ready(function()
                     var deltaX = e.pageX - mouseDownX;
                     setFirstColWidth(startFirstWidth + deltaX);
                     e.preventDefault();
-                } else {
+                }
+                else
+                {
                     $(document).off(documentEventName);
                     $element.removeClass('row-spliting');
                 }
diff --git a/module/doc/js/createlib.js b/module/doc/js/createlib.js
index 94a784e005..9867c1de4e 100644
--- a/module/doc/js/createlib.js
+++ b/module/doc/js/createlib.js
@@ -9,30 +9,72 @@ $(function()
     toggleAcl($('form [name=acl]:checked').val(), 'lib');
 });
 
+/**
+ * Change form by lib type.
+ *
+ * @param  string  libType
+ * @access public
+ * @return void
+ */
 function changeByLibType(libType)
 {
     if(libType == 'product')
     {
         $('table tr.product').removeClass('hidden');
+        $('#product').attr('disabled', false);
+
+        $('table tr.project').addClass('hidden');
+        $('#project').attr('disabled', true);
+
         $('table tr.execution').addClass('hidden');
+        $('#execution').attr('disabled', true);
+
+        changeDoclibAcl(libType);
+    }
+    else if(libType == 'project')
+    {
+        $('table tr.project').removeClass('hidden');
+        $('#project').attr('disabled', false);
+
+        $('table tr.product').addClass('hidden');
+        $('#product').attr('disabled', true);
+
+        $('table tr.execution').addClass('hidden');
+        $('#execution').attr('disabled', true);
+
         changeDoclibAcl(libType);
     }
     else if(libType == 'execution')
     {
-        $('table tr.product').addClass('hidden');
         $('table tr.execution').removeClass('hidden');
+        $('#execution').attr('disabled', false);
+
+        $('table tr.product').addClass('hidden');
+        $('#product').attr('disabled', true);
+
+        $('table tr.project').addClass('hidden');
+        $('#project').attr('disabled', true);
+
         changeDoclibAcl(libType);
     }
     else
     {
         $('table tr.product').addClass('hidden');
+        $('#product').attr('disabled', true);
+
+        $('table tr.project').addClass('hidden');
+        $('#project').attr('disabled', true);
+
         $('table tr.execution').addClass('hidden');
+        $('#execution').attr('disabled', true);
+
         changeDoclibAcl(libType);
     }
 
     var acl    = $('form [name=acl]').val();
     var notice = typeof(noticeAcl[libType][acl]) != 'undefined' ? noticeAcl[libType][acl] : '';
     $('#noticeAcl').html(notice);
+    $('#whiteListBox').addClass('hidden');
 }
 
 function changeDoclibAcl(libType)
diff --git a/module/doc/js/edit.js b/module/doc/js/edit.js
index 39e5b0b754..35a6e4f1d1 100644
--- a/module/doc/js/edit.js
+++ b/module/doc/js/edit.js
@@ -20,4 +20,6 @@ $(function()
             $('#urlBox').removeClass('hidden');
         }
     });
+
+    $('#subNavbar li[data-id="doc"]').addClass('active');
 })
diff --git a/module/doc/js/objectlibs.js b/module/doc/js/objectlibs.js
new file mode 100644
index 0000000000..fae47aeda7
--- /dev/null
+++ b/module/doc/js/objectlibs.js
@@ -0,0 +1,10 @@
+function ajaxDeleteDoc(link, replaceID, notice)
+{
+    if(confirm(notice))
+    {
+        $.get(link, function(data)
+        {
+            location.href = JSON.parse(data).locate;
+        })
+    }
+}
diff --git a/module/doc/js/x.view.js b/module/doc/js/x.view.js
index e5eda36b22..e017faf97b 100644
--- a/module/doc/js/x.view.js
+++ b/module/doc/js/x.view.js
@@ -1,7 +1,7 @@
 $(function()
 {
     $('.main-actions-holder').css('height', '0px');
-    var $xuanAction = "<div class='xuancard-actions fixed'>";
+    var xuanAction = "<div class='xuancard-actions fixed'>";
     $('.main-col div.main-actions .btn-toolbar a').each(function(){
         var $that    = $(this);
 
@@ -17,10 +17,10 @@ $(function()
         url = 'xxc:openUrlInDialog/' + encodeURIComponent(sysurl + href);
         target = " target='_blank'";
 
-        $xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
+        xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
     });
 
-    $xuanAction += '</div>';
-    $('#footer').replaceWith($xuanAction);
+    xuanAction += '</div>';
+    $('body').append(xuanAction);
     $('.xuancard-actions a.iframe').modalTrigger();
 })
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 6656732f4b..bc590436f5 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -48,12 +48,15 @@ $lang->doc->item           = ' Einträge';
 $lang->doc->num            = 'Doks';
 $lang->doc->searchResult   = 'Suchergebnis';
 $lang->doc->mailto         = 'Mailto';
+$lang->doc->noModule       = 'No document in this lib, please create it';
+$lang->doc->noChapter      = 'No chapters or articles in this book. Please add chapters and articles.';
 
 $lang->doc->moduleDoc      = 'Nach Modulen';
 $lang->doc->searchDoc      = 'Suche';
 $lang->doc->fast           = 'Schnelleintrag';
 $lang->doc->allDoc         = 'Alle Doks';
 $lang->doc->openedByMe     = 'Meine';
+$lang->doc->editedByMe     = 'Edited By Me';
 $lang->doc->orderByOpen    = 'Zuletzt hinzugefügt';
 $lang->doc->orderByEdit    = 'Zuletzt bearbeitet';
 $lang->doc->orderByVisit   = 'Zuletzt angesehen';
@@ -67,6 +70,7 @@ $lang->doc->index            = 'Home';
 $lang->doc->create           = 'Dokument hinzufügen';
 $lang->doc->edit             = 'Bearbeiten';
 $lang->doc->delete           = 'Löschen';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Liste';
 $lang->doc->view             = 'Details';
 $lang->doc->diff             = 'Diff';
@@ -77,6 +81,7 @@ $lang->doc->editType         = 'Bearbeiten';
 $lang->doc->deleteType       = 'Löschen';
 $lang->doc->addType          = 'Hinzufügen';
 $lang->doc->childType        = 'Child';
+$lang->doc->catalogName      = 'Catalog Name';
 $lang->doc->collect          = 'Favorit hinzufügen';
 $lang->doc->cancelCollection = 'Favorit entfernen';
 $lang->doc->deleteFile       = 'Delete File';
@@ -156,27 +161,33 @@ $lang->doc->mail->edit   = new stdclass();
 $lang->doc->mail->create->title = "%s created document #%s:%s";
 $lang->doc->mail->edit->title   = "%s edited document #%s:%s";
 
-$lang->doc->confirmDelete      = "Möchten Sie dieses Dokument löschen?";
-$lang->doc->confirmDeleteLib   = "Möchten Sie diese Bibliothek löschen?";
-$lang->doc->errorEditSystemDoc = "System Dokumentenbibliothek darf nicht geändert werden.";
-$lang->doc->errorEmptyProduct  = "Kein {$lang->productCommon}. Kann nicht erstellt werden.";
-$lang->doc->errorEmptyProject  = "Kein {$lang->executionCommon}. Kann nicht erstellt werden.";
-$lang->doc->errorMainSysLib    = "Diese Bibliothek kann nicht gelöscht werden.";
-$lang->doc->accessDenied       = "Zugriff verweigert!";
-$lang->doc->versionNotFount    = 'Existiert nicht in diesem Build.';
-$lang->doc->noDoc              = 'Keine Dokumente. ';
-$lang->doc->cannotCreateOffice = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
-$lang->doc->notSetOffice       = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
-$lang->doc->noSearchedDoc      = 'Nichts gesucht.';
-$lang->doc->noEditedDoc        = 'Sie haben kein Dokument bearbeitet.';
-$lang->doc->noOpenedDoc        = 'Sie haben kein Dokument erstellt.';
-$lang->doc->noCollectedDoc     = 'Sie haben kein Dokument gesammelt.';
-$lang->doc->errorEmptyLib      = 'No data in document library.';
+$lang->doc->confirmDelete        = "Möchten Sie dieses Dokument löschen?";
+$lang->doc->confirmDeleteLib     = "Möchten Sie diese Bibliothek löschen?";
+$lang->doc->confirmDeleteChapter = "Do you want to delete this chapter?";
+$lang->doc->errorEditSystemDoc   = "System Dokumentenbibliothek darf nicht geändert werden.";
+$lang->doc->errorEmptyProduct    = "Kein {$lang->productCommon}. Kann nicht erstellt werden.";
+$lang->doc->errorEmptyProject    = "Kein {$lang->executionCommon}. Kann nicht erstellt werden.";
+$lang->doc->errorMainSysLib      = "Diese Bibliothek kann nicht gelöscht werden.";
+$lang->doc->accessDenied         = "Zugriff verweigert!";
+$lang->doc->versionNotFount      = 'Existiert nicht in diesem Build.';
+$lang->doc->noDoc                = 'Keine Dokumente. ';
+$lang->doc->noArticle            = 'No articles.';
+$lang->doc->noLib                = 'No libraries. ';
+$lang->doc->noBook               = 'The WIKI library has not created a manual, please create a new one :)';
+$lang->doc->cannotCreateOffice   = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
+$lang->doc->notSetOffice         = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
+$lang->doc->noSearchedDoc        = 'Nichts gesucht.';
+$lang->doc->noEditedDoc          = 'Sie haben kein Dokument bearbeitet.';
+$lang->doc->noOpenedDoc          = 'Sie haben kein Dokument erstellt.';
+$lang->doc->noCollectedDoc       = 'Sie haben kein Dokument gesammelt.';
+$lang->doc->errorEmptyLib        = 'No data in document library.';
 
 $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']['execution']['default'] = 'Users who can access the selected execution can access it.';
-$lang->doc->noticeAcl['lib']['execution']['custom']  = 'Users who can access the selected execution 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']['custom']    = 'Users who can access the selected project or users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['execution']['default'] = "Users who can access the selected {$lang->executionCommon} can access it.";
+$lang->doc->noticeAcl['lib']['execution']['custom']  = "Users who can access the selected {$lang->executionCommon} or users in the whiltelist can access it.";
 $lang->doc->noticeAcl['lib']['custom']['open']       = 'All users can access it.';
 $lang->doc->noticeAcl['lib']['custom']['custom']     = 'Users in the whitelist can access it.';
 $lang->doc->noticeAcl['lib']['custom']['private']    = 'Only the one who created it can access it.';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 86bb860b2b..bd75818948 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -10,63 +10,68 @@
  * @link        http://www.zentao.net
  */
 /* Fields. */
-$lang->doc->common         = 'Document';
-$lang->doc->id             = 'ID';
-$lang->doc->product        = $lang->productCommon;
-$lang->doc->execution      = $lang->executionCommon;
-$lang->doc->lib            = 'Library';
-$lang->doc->module         = 'Category';
-$lang->doc->title          = 'Name';
-$lang->doc->digest         = 'Summary';
-$lang->doc->comment        = 'Comment';
-$lang->doc->type           = 'Type';
-$lang->doc->content        = 'Text';
-$lang->doc->keywords       = 'Tags';
-$lang->doc->url            = 'URL';
-$lang->doc->files          = 'Files';
-$lang->doc->addedBy        = 'Author';
-$lang->doc->addedDate      = 'Added';
-$lang->doc->editedBy       = 'UpdatedBy';
-$lang->doc->editedDate     = 'UpdatedDate';
-$lang->doc->version        = 'Version';
-$lang->doc->basicInfo      = 'Basic Info';
-$lang->doc->deleted        = 'Deleted';
-$lang->doc->fileObject     = 'Dependent Item';
-$lang->doc->whiteList      = 'White List';
-$lang->doc->contentType    = 'Format';
-$lang->doc->separator      = "<i class='icon-angle-right'></i>";
-$lang->doc->fileTitle      = 'File Name';
-$lang->doc->filePath       = 'File Path';
-$lang->doc->extension      = 'Extension';
-$lang->doc->size           = 'Size';
-$lang->doc->download       = 'Download';
-$lang->doc->acl            = 'Right';
-$lang->doc->fileName       = 'Files';
-$lang->doc->groups         = 'Groups';
-$lang->doc->users          = 'Users';
-$lang->doc->item           = ' Items';
-$lang->doc->num            = 'Documents';
-$lang->doc->searchResult   = 'Search Result';
-$lang->doc->mailto         = 'Mailto';
+$lang->doc->common       = 'Document';
+$lang->doc->id           = 'ID';
+$lang->doc->product      = $lang->productCommon;
+$lang->doc->project      = 'Project';
+$lang->doc->execution    = $lang->executionCommon;
+$lang->doc->lib          = 'Library';
+$lang->doc->module       = 'Catalog';
+$lang->doc->title        = 'Name';
+$lang->doc->digest       = 'Summary';
+$lang->doc->comment      = 'Comment';
+$lang->doc->type         = 'Type';
+$lang->doc->content      = 'Text';
+$lang->doc->keywords     = 'Tags';
+$lang->doc->url          = 'URL';
+$lang->doc->files        = 'Files';
+$lang->doc->addedBy      = 'Author';
+$lang->doc->addedDate    = 'Added';
+$lang->doc->editedBy     = 'UpdatedBy';
+$lang->doc->editedDate   = 'UpdatedDate';
+$lang->doc->version      = 'Version';
+$lang->doc->basicInfo    = 'Basic Info';
+$lang->doc->deleted      = 'Deleted';
+$lang->doc->fileObject   = 'Dependent Item';
+$lang->doc->whiteList    = 'White List';
+$lang->doc->contentType  = 'Format';
+$lang->doc->separator    = "<i class='icon-angle-right'></i>";
+$lang->doc->fileTitle    = 'File Name';
+$lang->doc->filePath     = 'File Path';
+$lang->doc->extension    = 'Extension';
+$lang->doc->size         = 'Size';
+$lang->doc->download     = 'Download';
+$lang->doc->acl          = 'Right';
+$lang->doc->fileName     = 'Files';
+$lang->doc->groups       = 'Groups';
+$lang->doc->users        = 'Users';
+$lang->doc->item         = ' Items';
+$lang->doc->num          = 'Documents';
+$lang->doc->searchResult = 'Search Result';
+$lang->doc->mailto       = 'Mailto';
+$lang->doc->noModule     = 'No document in this lib, please create it';
+$lang->doc->noChapter    = 'No chapters or articles in this book. Please add chapters and articles.';
 
-$lang->doc->moduleDoc      = 'By Module';
-$lang->doc->searchDoc      = 'Search';
-$lang->doc->fast           = 'Quick Entry';
-$lang->doc->allDoc         = 'All Documents';
-$lang->doc->openedByMe     = 'My';
-$lang->doc->orderByOpen    = 'Recent Added';
-$lang->doc->orderByEdit    = 'Recent Updated';
-$lang->doc->orderByVisit   = 'Last Visited';
-$lang->doc->todayEdited    = 'Updated Today';
-$lang->doc->pastEdited     = 'Total Updated';
-$lang->doc->myDoc          = 'My Documents';
-$lang->doc->myCollection   = 'My Favorites';
+$lang->doc->moduleDoc    = 'By Module';
+$lang->doc->searchDoc    = 'Search';
+$lang->doc->fast         = 'Quick Entry';
+$lang->doc->allDoc       = 'All Documents';
+$lang->doc->openedByMe   = 'My';
+$lang->doc->editedByMe   = 'Edited By Me';
+$lang->doc->orderByOpen  = 'Recent Added';
+$lang->doc->orderByEdit  = 'Recent Updated';
+$lang->doc->orderByVisit = 'Last Visited';
+$lang->doc->todayEdited  = 'Updated Today';
+$lang->doc->pastEdited   = 'Total Updated';
+$lang->doc->myDoc        = 'My Documents';
+$lang->doc->myCollection = 'My Favorites';
 
 /* Methods list */
 $lang->doc->index            = 'Document Home';
 $lang->doc->create           = 'Create Document';
 $lang->doc->edit             = 'Edit Document';
 $lang->doc->delete           = 'Delete Document';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Document List';
 $lang->doc->view             = 'Document Detail';
 $lang->doc->diff             = 'Diff';
@@ -76,30 +81,35 @@ $lang->doc->manageType       = 'Manage Category';
 $lang->doc->editType         = 'Edit';
 $lang->doc->deleteType       = 'Delete';
 $lang->doc->addType          = 'Add';
-$lang->doc->childType        = 'Categories';
+$lang->doc->childType        = 'Catalog';
+$lang->doc->catalogName      = 'Catalog Name';
 $lang->doc->collect          = 'Add Favorite';
 $lang->doc->cancelCollection = 'Remove Favorite';
 $lang->doc->deleteFile       = 'Delete File';
 
+$lang->doc->collectAction = 'Add Favorite';
+
 $lang->doc->libName        = 'Document Library';
 $lang->doc->libType        = 'Category';
 $lang->doc->custom         = 'Custom Document Library';
 $lang->doc->customAB       = 'Custom Doc Lib';
-$lang->doc->createlib      = 'Create Document Library';
+$lang->doc->createLib      = 'Create Document Library';
 $lang->doc->allLibs        = 'Library List';
 $lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon} Libraries";
 $lang->doc->showFiles      = 'Attachments';
-$lang->doc->editlib        = 'Edit Document Library';
+$lang->doc->editLib        = 'Edit Document Library';
 $lang->doc->deleteLib      = 'Delete Document Library';
 $lang->doc->fixedMenu      = 'Fix to Menu';
 $lang->doc->removeMenu     = 'Remove from Menu';
 $lang->doc->search         = 'Search';
 
+global $config;
 /* Query condition list. */
 $lang->doc->allProduct    = 'All' . $lang->productCommon . 's';
 $lang->doc->allExecutions = 'All' . $lang->executionCommon . 's';
 
 $lang->doc->libTypeList['product']   = $lang->productCommon . ' Library';
+if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = 'Project Library';
 $lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Library';
 $lang->doc->libTypeList['custom']    = 'Custom Library';
 
@@ -156,27 +166,33 @@ $lang->doc->mail->edit   = new stdclass();
 $lang->doc->mail->create->title = "%s created document #%s:%s";
 $lang->doc->mail->edit->title   = "%s edited document #%s:%s";
 
-$lang->doc->confirmDelete      = "Do you want to delete this document?";
-$lang->doc->confirmDeleteLib   = "Do you want to delete this document library?";
-$lang->doc->errorEditSystemDoc = "You don't have to change system document library.";
-$lang->doc->errorEmptyProduct  = "No {$lang->productCommon}. It cannot be created.";
-$lang->doc->errorEmptyProject  = "No {$lang->executionCommon}. It cannot be created.";
-$lang->doc->errorMainSysLib    = "This library cannot be deleted.";
-$lang->doc->accessDenied       = "Access is denied!";
-$lang->doc->versionNotFount    = 'It does not exist in this build.';
-$lang->doc->noDoc              = 'No documents. ';
-$lang->doc->cannotCreateOffice = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
-$lang->doc->notSetOffice       = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
-$lang->doc->noSearchedDoc      = 'No documents found.';
-$lang->doc->noEditedDoc        = 'You have not edited any documents.';
-$lang->doc->noOpenedDoc        = 'You have not created any documents.';
-$lang->doc->noCollectedDoc     = 'You have not favorited any documents.';
-$lang->doc->errorEmptyLib      = 'No data in document library.';
+$lang->doc->confirmDelete        = "Do you want to delete this document?";
+$lang->doc->confirmDeleteLib     = "Do you want to delete this document library?";
+$lang->doc->confirmDeleteChapter = "Do you want to delete this chapter?";
+$lang->doc->errorEditSystemDoc   = "You don't have to change system document library.";
+$lang->doc->errorEmptyProduct    = "No {$lang->productCommon}. It cannot be created.";
+$lang->doc->errorEmptyProject    = "No {$lang->executionCommon}. It cannot be created.";
+$lang->doc->errorMainSysLib      = "This library cannot be deleted.";
+$lang->doc->accessDenied         = "Access is denied!";
+$lang->doc->versionNotFount      = 'It does not exist in this build.';
+$lang->doc->noDoc                = 'No documents. ';
+$lang->doc->noArticle            = 'No articles.';
+$lang->doc->noLib                = 'No libraries. ';
+$lang->doc->noBook               = 'The WIKI library has not created a manual, please create a new one :)';
+$lang->doc->cannotCreateOffice   = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
+$lang->doc->notSetOffice         = "<p>To create a %s document, you need to configure <a href='%s'>office convert</a>.<p>";
+$lang->doc->noSearchedDoc        = 'No documents found.';
+$lang->doc->noEditedDoc          = 'You have not edited any documents.';
+$lang->doc->noOpenedDoc          = 'You have not created any documents.';
+$lang->doc->noCollectedDoc       = 'You have not favorited any documents.';
+$lang->doc->errorEmptyLib        = 'No data in document library.';
 
 $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']['execution']['default'] = 'Users who can access the selected execution can access it.';
-$lang->doc->noticeAcl['lib']['execution']['custom']  = 'Users who can access the selected execution 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']['custom']    = 'Users who can access the selected project or users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['execution']['default'] = "Users who can access the selected {$lang->executionCommon} can access it.";
+$lang->doc->noticeAcl['lib']['execution']['custom']  = "Users who can access the selected {$lang->executionCommon} or users in the whiltelist can access it.";
 $lang->doc->noticeAcl['lib']['custom']['open']       = 'All users can access it.';
 $lang->doc->noticeAcl['lib']['custom']['custom']     = 'Users in the whitelist can access it.';
 $lang->doc->noticeAcl['lib']['custom']['private']    = 'Only the one who created it can access it.';
@@ -211,6 +227,7 @@ $lang->doclib->create['execution'] = 'Create ' . $lang->executionCommon . ' Libr
 $lang->doclib->create['custom']    = 'Create Custom Library';
 
 $lang->doclib->main['product']   = 'Primary Library';
+$lang->doclib->main['project']   = 'Primary Library';
 $lang->doclib->main['execution'] = 'Primary Library';
 
 $lang->doclib->tabList['product']   = $lang->productCommon;
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 2bb67bd317..30aca919f7 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -48,12 +48,15 @@ $lang->doc->item           = ' Objets';
 $lang->doc->num            = 'Documents';
 $lang->doc->searchResult   = 'Résultat de Recherche';
 $lang->doc->mailto         = 'Mailto';
+$lang->doc->noModule       = 'No document in this lib, please create it';
+$lang->doc->noChapter      = 'No chapters or articles in this book. Please add chapters and articles.';
 
 $lang->doc->moduleDoc      = 'Par Module';
 $lang->doc->searchDoc      = 'Rechercher';
 $lang->doc->fast           = 'Saisie rapide';
 $lang->doc->allDoc         = 'Tous les Documents';
 $lang->doc->openedByMe     = 'Mes';
+$lang->doc->editedByMe     = 'Edited By Me';
 $lang->doc->orderByOpen    = 'Récemment Ajoutés';
 $lang->doc->orderByEdit    = 'Récemment Mis à Jour';
 $lang->doc->orderByVisit   = 'Dernière Visite';
@@ -67,6 +70,7 @@ $lang->doc->index            = 'Accueil Documents';
 $lang->doc->create           = 'Ajouter Document';
 $lang->doc->edit             = 'Editer Document';
 $lang->doc->delete           = 'Supprimer Document';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Liste Documents';
 $lang->doc->view             = 'Détail Document';
 $lang->doc->diff             = 'Diff';
@@ -77,6 +81,7 @@ $lang->doc->editType         = 'Editer';
 $lang->doc->deleteType       = 'Supprimer';
 $lang->doc->addType          = 'Ajouter';
 $lang->doc->childType        = 'Catégories';
+$lang->doc->catalogName      = 'Catalog Name';
 $lang->doc->collect          = 'Ajouter aux Favoris';
 $lang->doc->cancelCollection = 'Retirer des Favoris';
 $lang->doc->deleteFile       = 'Supprimer Fichier';
@@ -156,27 +161,33 @@ $lang->doc->mail->edit   = new stdclass();
 $lang->doc->mail->create->title = "%s created document #%s:%s";
 $lang->doc->mail->edit->title   = "%s edited document #%s:%s";
 
-$lang->doc->confirmDelete      = "Voulez-vous supprimer ce document ?";
-$lang->doc->confirmDeleteLib   = "Voulez-vous supprimer cette Bibliothèque ?";
-$lang->doc->errorEditSystemDoc = "Vous n'avez pas besoin de changer de système de Bibliothèque.";
-$lang->doc->errorEmptyProduct  = "Aucun {$lang->productCommon}. Il ne peut pas être créé.";
-$lang->doc->errorEmptyProject  = "Aucun {$lang->executionCommon}. Il ne peut pas être créé.";
-$lang->doc->errorMainSysLib    = "Cette Bibliothèque ne peut pas être supprimée.";
-$lang->doc->accessDenied       = "Access is denied !";
-$lang->doc->versionNotFount    = "N'existe pas dans ce build.";
-$lang->doc->noDoc              = 'Aucun documents. ';
-$lang->doc->cannotCreateOffice = 'Désolé, %s peut seulement être créé dans ZenTao Enterprise. Contactez Zentao à renee@easysoft.ltd pour essayer ZenTao Enterprise.';
-$lang->doc->notSetOffice       = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
-$lang->doc->noSearchedDoc      = 'Aucun documents trouvé.';
-$lang->doc->noEditedDoc        = "Vous n'avez pas mis à jour de documents.";
-$lang->doc->noOpenedDoc        = "Vous n'avez pas ajouté de documents.";
-$lang->doc->noCollectedDoc     = "Vous avez aucun document dans vos favoris.";
-$lang->doc->errorEmptyLib      = 'No data in document library.';
+$lang->doc->confirmDelete        = "Voulez-vous supprimer ce document ?";
+$lang->doc->confirmDeleteLib     = "Voulez-vous supprimer cette Bibliothèque ?";
+$lang->doc->confirmDeleteChapter = "Do you want to delete this chapter?";
+$lang->doc->errorEditSystemDoc   = "Vous n'avez pas besoin de changer de système de Bibliothèque.";
+$lang->doc->errorEmptyProduct    = "Aucun {$lang->productCommon}. Il ne peut pas être créé.";
+$lang->doc->errorEmptyProject    = "Aucun {$lang->executionCommon}. Il ne peut pas être créé.";
+$lang->doc->errorMainSysLib      = "Cette Bibliothèque ne peut pas être supprimée.";
+$lang->doc->accessDenied         = "Access is denied !";
+$lang->doc->versionNotFount      = "N'existe pas dans ce build.";
+$lang->doc->noDoc                = 'Aucun documents. ';
+$lang->doc->noArticle            = 'No articles.';
+$lang->doc->noLib                = 'No libraries. ';
+$lang->doc->noBook               = 'The WIKI library has not created a manual, please create a new one :)';
+$lang->doc->cannotCreateOffice   = 'Désolé, %s peut seulement être créé dans ZenTao Enterprise. Contactez Zentao à renee@easysoft.ltd pour essayer ZenTao Enterprise.';
+$lang->doc->notSetOffice         = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
+$lang->doc->noSearchedDoc        = 'Aucun documents trouvé.';
+$lang->doc->noEditedDoc          = "Vous n'avez pas mis à jour de documents.";
+$lang->doc->noOpenedDoc          = "Vous n'avez pas ajouté de documents.";
+$lang->doc->noCollectedDoc       = "Vous avez aucun document dans vos favoris.";
+$lang->doc->errorEmptyLib        = 'No data in document library.';
 
 $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']['execution']['default'] = 'Les utilisateurs qui ont accès au Projet peuvent y accéder.';
-$lang->doc->noticeAcl['lib']['execution']['custom']  = 'Les utilisateurs qui ont accès au Projet 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']['custom']    = 'Les utilisateurs qui ont accès au Projet ou les utilisateurs de la Liste Blanche peuvent y accéder.';
+$lang->doc->noticeAcl['lib']['execution']['default'] = "Les utilisateurs qui ont accès au {$lang->executionCommon} peuvent y accéder.";
+$lang->doc->noticeAcl['lib']['execution']['custom']  = "Les utilisateurs qui ont accès au {$lang->executionCommon} ou les utilisateurs de la Liste Blanche peuvent y accéder.";
 $lang->doc->noticeAcl['lib']['custom']['open']       = 'Tous les utilisateurs peuvent y accéder.';
 $lang->doc->noticeAcl['lib']['custom']['custom']     = 'Les utilisateurs de la Liste Blanche peuvent y accéder.';
 $lang->doc->noticeAcl['lib']['custom']['private']    = 'Seulement le créateur de la Bibliothèque peut y accéder.';
diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php
index 5615bb9553..6a82a7cd24 100644
--- a/module/doc/lang/vi.php
+++ b/module/doc/lang/vi.php
@@ -48,12 +48,15 @@ $lang->doc->item         = ' Items';
 $lang->doc->num          = 'Documents';
 $lang->doc->searchResult = 'Search kết quả';
 $lang->doc->mailto       = 'Mailto';
+$lang->doc->noModule     = 'No document in this lib, please create it';
+$lang->doc->noChapter    = 'No chapters or articles in this book. Please add chapters and articles.';
 
 $lang->doc->moduleDoc    = 'By Module';
 $lang->doc->searchDoc    = 'Tìm kiếm';
 $lang->doc->fast         = 'Quick Entry';
 $lang->doc->allDoc       = 'Tất cả tài liệu';
 $lang->doc->openedByMe   = 'Của bạn';
+$lang->doc->editedByMe   = 'Edited By Me';
 $lang->doc->orderByOpen  = 'Recent Added';
 $lang->doc->orderByEdit  = 'Recent Updated';
 $lang->doc->orderByVisit = 'Last Visited';
@@ -67,6 +70,7 @@ $lang->doc->index            = 'Document Home';
 $lang->doc->create           = 'Tạo tài liệu';
 $lang->doc->edit             = 'Sửa tài liệu';
 $lang->doc->delete           = 'Xóa tài liệu';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Document danh sách';
 $lang->doc->view             = 'Document Detail';
 $lang->doc->diff             = 'Diff';
@@ -77,6 +81,7 @@ $lang->doc->editType         = 'Sửa';
 $lang->doc->deleteType       = 'Xóa';
 $lang->doc->addType          = 'Thêm';
 $lang->doc->childType        = 'Categories';
+$lang->doc->catalogName      = 'Catalog Name';
 $lang->doc->collect          = 'Thêm Favorite';
 $lang->doc->cancelCollection = 'Remove Favorite';
 $lang->doc->deleteFile       = 'Xóa File';
@@ -156,27 +161,33 @@ $lang->doc->mail->edit   = new stdclass();
 $lang->doc->mail->create->title = "%s created document #%s:%s";
 $lang->doc->mail->edit->title   = "%s edited document #%s:%s";
 
-$lang->doc->confirmDelete      = "Bạn có muốn xóa this document?";
-$lang->doc->confirmDeleteLib   = "Bạn có muốn xóa this document library?";
-$lang->doc->errorEditSystemDoc = "You don't have to change system document library.";
-$lang->doc->errorEmptyProduct  = "Không có {$lang->productCommon}. It cannot be created.";
-$lang->doc->errorEmptyProject  = "Không có {$lang->executionCommon}. It cannot be created.";
-$lang->doc->errorMainSysLib    = "This library không thể xóa.";
-$lang->doc->accessDenied       = "Access bị từ chối!";
-$lang->doc->versionNotFount    = 'Nó does not exist in bản dựng này.';
-$lang->doc->noDoc              = 'Không có documents. ';
-$lang->doc->cannotCreateOffice = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
-$lang->doc->notSetOffice       = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
-$lang->doc->noSearchedDoc      = 'Không có documents found.';
-$lang->doc->noEditedDoc        = 'Bạn có not edited any documents.';
-$lang->doc->noOpenedDoc        = 'Bạn chưa tạo any documents.';
-$lang->doc->noCollectedDoc     = 'Bạn có not favorited any documents.';
-$lang->doc->errorEmptyLib      = 'No data in document library.';
+$lang->doc->confirmDelete        = "Bạn có muốn xóa this document?";
+$lang->doc->confirmDeleteLib     = "Bạn có muốn xóa this document library?";
+$lang->doc->confirmDeleteChapter = "Do you want to delete this chapter?";
+$lang->doc->errorEditSystemDoc   = "You don't have to change system document library.";
+$lang->doc->errorEmptyProduct    = "Không có {$lang->productCommon}. It cannot be created.";
+$lang->doc->errorEmptyProject    = "Không có {$lang->executionCommon}. It cannot be created.";
+$lang->doc->errorMainSysLib      = "This library không thể xóa.";
+$lang->doc->accessDenied         = "Access bị từ chối!";
+$lang->doc->versionNotFount      = 'Nó does not exist in bản dựng này.';
+$lang->doc->noDoc                = 'Không có documents. ';
+$lang->doc->noArticle            = 'No articles.';
+$lang->doc->noLib                = 'No libraries. ';
+$lang->doc->noBook               = 'The WIKI library has not created a manual, please create a new one :)';
+$lang->doc->cannotCreateOffice   = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
+$lang->doc->notSetOffice         = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
+$lang->doc->noSearchedDoc        = 'Không có documents found.';
+$lang->doc->noEditedDoc          = 'Bạn có not edited any documents.';
+$lang->doc->noOpenedDoc          = 'Bạn chưa tạo any documents.';
+$lang->doc->noCollectedDoc       = 'Bạn có not favorited any documents.';
+$lang->doc->errorEmptyLib        = 'No data in document library.';
 
 $lang->doc->noticeAcl['lib']['product']['default']   = 'Users who can access the selected product có thể truy cập nó.';
 $lang->doc->noticeAcl['lib']['product']['custom']    = 'Users who can access the selected product or users in the whiltelist có thể truy cập nó.';
-$lang->doc->noticeAcl['lib']['execution']['default'] = 'Users who can access the selected execution có thể truy cập nó.';
-$lang->doc->noticeAcl['lib']['execution']['custom']  = 'Users who can access the selected execution or users in the whiltelist có thể truy cập nó.';
+$lang->doc->noticeAcl['lib']['project']['default']   = 'Users who can access the selected project có thể truy cập nó.';
+$lang->doc->noticeAcl['lib']['project']['custom']    = 'Users who can access the selected project or users in the whiltelist có thể truy cập nó.';
+$lang->doc->noticeAcl['lib']['execution']['default'] = "Users who can access the selected {$lang->executionCommon} có thể truy cập nó.";
+$lang->doc->noticeAcl['lib']['execution']['custom']  = "Users who can access the selected {$lang->executionCommon} or users in the whiltelist có thể truy cập nó.";
 $lang->doc->noticeAcl['lib']['custom']['open']       = 'Tất cả users có thể truy cập nó.';
 $lang->doc->noticeAcl['lib']['custom']['custom']     = 'Users in the whitelist có thể truy cập nó.';
 $lang->doc->noticeAcl['lib']['custom']['private']    = 'Chỉ the one who created it có thể truy cập nó.';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 618877c5f7..9065012fd4 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -10,96 +10,106 @@
  * @link        http://www.zentao.net
  */
 /* 字段列表。*/
-$lang->doc->common         = '文档';
-$lang->doc->id             = '文档编号';
-$lang->doc->product        = '所属' . $lang->productCommon;
-$lang->doc->execution      = '所属' . $lang->executionCommon;
-$lang->doc->lib            = '所属文档库';
-$lang->doc->module         = '所属分类';
-$lang->doc->title          = '文档标题';
-$lang->doc->digest         = '文档摘要';
-$lang->doc->comment        = '文档备注';
-$lang->doc->type           = '文档类型';
-$lang->doc->content        = '文档正文';
-$lang->doc->keywords       = '关键字';
-$lang->doc->url            = '文档URL';
-$lang->doc->files          = '附件';
-$lang->doc->addedBy        = '由谁添加';
-$lang->doc->addedDate      = '添加时间';
-$lang->doc->editedBy       = '由谁更新';
-$lang->doc->editedDate     = '更新时间';
-$lang->doc->version        = '版本号';
-$lang->doc->basicInfo      = '基本信息';
-$lang->doc->deleted        = '已删除';
-$lang->doc->fileObject     = '所属对象';
-$lang->doc->whiteList      = '白名单';
-$lang->doc->contentType    = '文档格式';
-$lang->doc->separator      = "<i class='icon-angle-right'></i>";
-$lang->doc->fileTitle      = '附件名';
-$lang->doc->filePath       = '地址';
-$lang->doc->extension      = '类型';
-$lang->doc->size           = '大小';
-$lang->doc->download       = '下载';
-$lang->doc->acl            = '权限';
-$lang->doc->fileName       = '附件';
-$lang->doc->groups         = '分组';
-$lang->doc->users          = '用户';
-$lang->doc->item           = '项';
-$lang->doc->num            = '文档数量';
-$lang->doc->searchResult   = '搜索结果';
-$lang->doc->mailto         = '抄送给';
+$lang->doc->common       = '文档';
+$lang->doc->id           = '文档编号';
+$lang->doc->product      = '所属' . $lang->productCommon;
+$lang->doc->project      = '所属项目';
+$lang->doc->execution    = '所属' . $lang->executionCommon;
+$lang->doc->lib          = '所属文档库';
+$lang->doc->module       = '所属目录';
+$lang->doc->title        = '文档标题';
+$lang->doc->digest       = '文档摘要';
+$lang->doc->comment      = '文档备注';
+$lang->doc->type         = '文档类型';
+$lang->doc->content      = '文档正文';
+$lang->doc->keywords     = '关键字';
+$lang->doc->url          = '文档URL';
+$lang->doc->files        = '附件';
+$lang->doc->addedBy      = '由谁添加';
+$lang->doc->addedDate    = '添加时间';
+$lang->doc->editedBy     = '由谁更新';
+$lang->doc->editedDate   = '更新时间';
+$lang->doc->version      = '版本号';
+$lang->doc->basicInfo    = '基本信息';
+$lang->doc->deleted      = '已删除';
+$lang->doc->fileObject   = '所属对象';
+$lang->doc->whiteList    = '白名单';
+$lang->doc->contentType  = '文档格式';
+$lang->doc->separator    = "<i class='icon-angle-right'></i>";
+$lang->doc->fileTitle    = '附件名';
+$lang->doc->filePath     = '地址';
+$lang->doc->extension    = '类型';
+$lang->doc->size         = '大小';
+$lang->doc->download     = '下载';
+$lang->doc->acl          = '权限';
+$lang->doc->fileName     = '附件';
+$lang->doc->groups       = '分组';
+$lang->doc->users        = '用户';
+$lang->doc->item         = '项';
+$lang->doc->num          = '文档数量';
+$lang->doc->searchResult = '搜索结果';
+$lang->doc->mailto       = '抄送给';
+$lang->doc->noModule     = '文档库下没有目录和文档，请维护目录或者创建文档';
+$lang->doc->noChapter    = '手册下没有章节和文章，请维护手册';
 
-$lang->doc->moduleDoc      = '按模块浏览';
-$lang->doc->searchDoc      = '搜索';
-$lang->doc->fast           = '快速访问';
-$lang->doc->allDoc         = '所有文档';
-$lang->doc->openedByMe     = '由我创建';
-$lang->doc->orderByOpen    = '最近添加';
-$lang->doc->orderByEdit    = '最近更新';
-$lang->doc->orderByVisit   = '最近访问';
-$lang->doc->todayEdited    = '今日更新';
-$lang->doc->pastEdited     = '往日更新';
-$lang->doc->myDoc          = '我的文档';
-$lang->doc->myCollection   = '我的收藏';
+$lang->doc->moduleDoc    = '按模块浏览';
+$lang->doc->searchDoc    = '搜索';
+$lang->doc->fast         = '快速访问';
+$lang->doc->allDoc       = '所有文档';
+$lang->doc->openedByMe   = '由我创建';
+$lang->doc->editedByMe   = '由我编辑';
+$lang->doc->orderByOpen  = '最近添加';
+$lang->doc->orderByEdit  = '最近更新';
+$lang->doc->orderByVisit = '最近访问';
+$lang->doc->todayEdited  = '今日更新';
+$lang->doc->pastEdited   = '往日更新';
+$lang->doc->myDoc        = '我的文档';
+$lang->doc->myCollection = '我的收藏';
 
 /* 方法列表。*/
 $lang->doc->index            = '文档主页';
 $lang->doc->create           = '创建文档';
 $lang->doc->edit             = '编辑文档';
 $lang->doc->delete           = '删除文档';
+$lang->doc->createBook       = '创建手册';
 $lang->doc->browse           = '文档列表';
 $lang->doc->view             = '文档详情';
 $lang->doc->diff             = '对比';
 $lang->doc->diffAction       = '对比文档';
 $lang->doc->sort             = '文档排序';
-$lang->doc->manageType       = '维护分类';
-$lang->doc->editType         = '编辑分类';
-$lang->doc->deleteType       = '删除分类';
-$lang->doc->addType          = '增加分类';
-$lang->doc->childType        = '子分类';
+$lang->doc->manageType       = '维护目录';
+$lang->doc->editType         = '编辑目录';
+$lang->doc->deleteType       = '删除目录';
+$lang->doc->addType          = '增加目录';
+$lang->doc->childType        = '子目录';
+$lang->doc->catalogName      = '目录名称';
 $lang->doc->collect          = '收藏';
 $lang->doc->cancelCollection = '取消收藏';
 $lang->doc->deleteFile       = '删除附件';
 
+$lang->doc->collectAction = '收藏文档';
+
 $lang->doc->libName        = '文档库名称';
 $lang->doc->libType        = '文档库类型';
 $lang->doc->custom         = '自定义文档库';
 $lang->doc->customAB       = '自定义库';
-$lang->doc->createlib      = '创建文档库';
+$lang->doc->createLib      = '创建文档库';
 $lang->doc->allLibs        = '文档库列表';
 $lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon}库列表";
 $lang->doc->showFiles      = '附件库';
-$lang->doc->editlib        = '编辑文档库';
+$lang->doc->editLib        = '编辑文档库';
 $lang->doc->deleteLib      = '删除文档库';
 $lang->doc->fixedMenu      = '固定到菜单栏';
 $lang->doc->removeMenu     = '从菜单栏移除';
 $lang->doc->search         = '搜索';
 
+global $config;
 /* 查询条件列表 */
 $lang->doc->allProduct    = '所有' . $lang->productCommon;
 $lang->doc->allExecutions = '所有' . $lang->executionCommon;
 
 $lang->doc->libTypeList['product']   = $lang->productCommon . '文档库';
+if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = '项目文档库';
 $lang->doc->libTypeList['execution'] = $lang->executionCommon . '文档库';
 $lang->doc->libTypeList['custom']    = '自定义文档库';
 
@@ -156,25 +166,31 @@ $lang->doc->mail->edit   = new stdclass();
 $lang->doc->mail->create->title = "%s创建了文档 #%s:%s";
 $lang->doc->mail->edit->title   = "%s编辑了文档 #%s:%s";
 
-$lang->doc->confirmDelete      = "您确定删除该文档吗？";
-$lang->doc->confirmDeleteLib   = "您确定删除该文档库吗？";
-$lang->doc->errorEditSystemDoc = "系统文档库无需修改。";
-$lang->doc->errorEmptyProduct  = "没有{$lang->productCommon}，无法创建文档";
-$lang->doc->errorEmptyProject  = "没有{$lang->executionCommon}，无法创建文档";
-$lang->doc->errorMainSysLib    = "该系统文档库不能删除！";
-$lang->doc->accessDenied       = "您没有权限访问！";
-$lang->doc->versionNotFount    = '该版本文档不存在';
-$lang->doc->noDoc              = '暂时没有文档。';
-$lang->doc->cannotCreateOffice = '<p>对不起，企业版才能创建%s文档。<p><p>试用企业版，请联系我们：4006-8899-23 &nbsp; 0532-86893032。</p>';
-$lang->doc->notSetOffice       = "<p>创建%s文档，需要配置<a href='%s' target='_parent'>Office转换设置</a>。<p>";
-$lang->doc->noSearchedDoc      = '没有搜索到任何文档。';
-$lang->doc->noEditedDoc        = '您还没有编辑任何文档。';
-$lang->doc->noOpenedDoc        = '您还没有创建任何文档。';
-$lang->doc->noCollectedDoc     = '您还没有收藏任何文档。';
-$lang->doc->errorEmptyLib      = '文档库暂无数据。';
+$lang->doc->confirmDelete        = "您确定删除该文档吗？";
+$lang->doc->confirmDeleteLib     = "您确定删除该文档库吗？";
+$lang->doc->confirmDeleteChapter = "您确定删除该章节吗？";
+$lang->doc->errorEditSystemDoc   = "系统文档库无需修改。";
+$lang->doc->errorEmptyProduct    = "没有{$lang->productCommon}，无法创建文档";
+$lang->doc->errorEmptyProject    = "没有{$lang->executionCommon}，无法创建文档";
+$lang->doc->errorMainSysLib      = "该系统文档库不能删除！";
+$lang->doc->accessDenied         = "您没有权限访问！";
+$lang->doc->versionNotFount      = '该版本文档不存在';
+$lang->doc->noDoc                = '暂时没有文档。';
+$lang->doc->noArticle            = '暂时没有文章。';
+$lang->doc->noLib                = '暂时没有文档库。';
+$lang->doc->noBook               = 'WIKI库还未创建手册，请新建 ：）';
+$lang->doc->cannotCreateOffice   = '<p>对不起，企业版才能创建%s文档。<p><p>试用企业版，请联系我们：4006-8899-23 &nbsp; 0532-86893032。</p>';
+$lang->doc->notSetOffice         = "<p>创建%s文档，需要配置<a href='%s'>Office转换设置</a>。<p>";
+$lang->doc->noSearchedDoc        = '没有搜索到任何文档。';
+$lang->doc->noEditedDoc          = '您还没有编辑任何文档。';
+$lang->doc->noOpenedDoc          = '您还没有创建任何文档。';
+$lang->doc->noCollectedDoc       = '您还没有收藏任何文档。';
+$lang->doc->errorEmptyLib        = '文档库暂无数据。';
 
 $lang->doc->noticeAcl['lib']['product']['default']   = '有所选产品访问权限的用户可以访问。';
 $lang->doc->noticeAcl['lib']['product']['custom']    = '有所选产品访问权限或白名单里的用户可以访问。';
+$lang->doc->noticeAcl['lib']['project']['default']   = "有所选项目访问权限的用户可以访问。";
+$lang->doc->noticeAcl['lib']['project']['custom']    = "有所选项目访问权限或白名单里的用户可以访问。";
 $lang->doc->noticeAcl['lib']['execution']['default'] = "有所选{$lang->executionCommon}访问权限的用户可以访问。";
 $lang->doc->noticeAcl['lib']['execution']['custom']  = "有所选{$lang->executionCommon}访问权限或白名单里的用户可以访问。";
 $lang->doc->noticeAcl['lib']['custom']['open']       = '所有人都可以访问。';
@@ -211,6 +227,7 @@ $lang->doclib->create['execution'] = '创建' . $lang->executionCommon . '文档
 $lang->doclib->create['custom']    = '创建自定义文档库';
 
 $lang->doclib->main['product']   = $lang->productCommon . '主库';
+$lang->doclib->main['project']   = '项目主库';
 $lang->doclib->main['execution'] = $lang->executionCommon . '主库';
 
 $lang->doclib->tabList['product']   = $lang->productCommon;
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 8eccd0392e..9e57b56b51 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -10,105 +10,115 @@
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
-$lang->doc->common         = '文檔';
-$lang->doc->id             = '文檔編號';
-$lang->doc->product        = '所屬' . $lang->productCommon;
-$lang->doc->project        = '所屬' . $lang->executionCommon;
-$lang->doc->lib            = '所屬文檔庫';
-$lang->doc->module         = '所屬分類';
-$lang->doc->title          = '文檔標題';
-$lang->doc->digest         = '文檔摘要';
-$lang->doc->comment        = '文檔備註';
-$lang->doc->type           = '文檔類型';
-$lang->doc->content        = '文檔正文';
-$lang->doc->keywords       = '關鍵字';
-$lang->doc->url            = '文檔URL';
-$lang->doc->files          = '附件';
-$lang->doc->addedBy        = '由誰添加';
-$lang->doc->addedDate      = '添加時間';
-$lang->doc->editedBy       = '由誰更新';
-$lang->doc->editedDate     = '更新時間';
-$lang->doc->version        = '版本號';
-$lang->doc->basicInfo      = '基本信息';
-$lang->doc->deleted        = '已刪除';
-$lang->doc->fileObject     = '所屬對象';
-$lang->doc->whiteList      = '白名單';
-$lang->doc->contentType    = '文檔格式';
-$lang->doc->separator      = "<i class='icon-angle-right'></i>";
-$lang->doc->fileTitle      = '附件名';
-$lang->doc->filePath       = '地址';
-$lang->doc->extension      = '類型';
-$lang->doc->size           = '大小';
-$lang->doc->download       = '下載';
-$lang->doc->acl            = '權限';
-$lang->doc->fileName       = '附件';
-$lang->doc->groups         = '分組';
-$lang->doc->users          = '用戶';
-$lang->doc->item           = '項';
-$lang->doc->num            = '文檔數量';
-$lang->doc->searchResult   = '搜索結果';
-$lang->doc->mailto         = '抄送給';
+$lang->doc->common       = '文檔';
+$lang->doc->id           = '文檔編號';
+$lang->doc->product      = '所屬' . $lang->productCommon;
+$lang->doc->project      = '所屬項目';
+$lang->doc->execution    = '所屬' . $lang->executionCommon;
+$lang->doc->lib          = '所屬文檔庫';
+$lang->doc->module       = '所屬目錄';
+$lang->doc->title        = '文檔標題';
+$lang->doc->digest       = '文檔摘要';
+$lang->doc->comment      = '文檔備註';
+$lang->doc->type         = '文檔類型';
+$lang->doc->content      = '文檔正文';
+$lang->doc->keywords     = '關鍵字';
+$lang->doc->url          = '文檔URL';
+$lang->doc->files        = '附件';
+$lang->doc->addedBy      = '由誰添加';
+$lang->doc->addedDate    = '添加時間';
+$lang->doc->editedBy     = '由誰更新';
+$lang->doc->editedDate   = '更新時間';
+$lang->doc->version      = '版本號';
+$lang->doc->basicInfo    = '基本信息';
+$lang->doc->deleted      = '已刪除';
+$lang->doc->fileObject   = '所屬對象';
+$lang->doc->whiteList    = '白名單';
+$lang->doc->contentType  = '文檔格式';
+$lang->doc->separator    = "<i class='icon-angle-right'></i>";
+$lang->doc->fileTitle    = '附件名';
+$lang->doc->filePath     = '地址';
+$lang->doc->extension    = '類型';
+$lang->doc->size         = '大小';
+$lang->doc->download     = '下載';
+$lang->doc->acl          = '權限';
+$lang->doc->fileName     = '附件';
+$lang->doc->groups       = '分組';
+$lang->doc->users        = '用戶';
+$lang->doc->item         = '項';
+$lang->doc->num          = '文檔數量';
+$lang->doc->searchResult = '搜索結果';
+$lang->doc->mailto       = '抄送給';
+$lang->doc->noModule     = '文檔庫下沒有目錄和文檔，請維護目錄或者創建文檔';
+$lang->doc->noChapter    = '手冊下沒有章節和文章，請維護手冊';
 
-$lang->doc->moduleDoc      = '按模組瀏覽';
-$lang->doc->searchDoc      = '搜索';
-$lang->doc->fast           = '快速訪問';
-$lang->doc->allDoc         = '所有文檔';
-$lang->doc->openedByMe     = '由我創建';
-$lang->doc->orderByOpen    = '最近添加';
-$lang->doc->orderByEdit    = '最近更新';
-$lang->doc->orderByVisit   = '最近訪問';
-$lang->doc->todayEdited    = '今日更新';
-$lang->doc->pastEdited     = '往日更新';
-$lang->doc->myDoc          = '我的文檔';
-$lang->doc->myCollection   = '我的收藏';
+$lang->doc->moduleDoc    = '按模組瀏覽';
+$lang->doc->searchDoc    = '搜索';
+$lang->doc->fast         = '快速訪問';
+$lang->doc->allDoc       = '所有文檔';
+$lang->doc->openedByMe   = '由我創建';
+$lang->doc->editedByMe   = '由我編輯';
+$lang->doc->orderByOpen  = '最近添加';
+$lang->doc->orderByEdit  = '最近更新';
+$lang->doc->orderByVisit = '最近訪問';
+$lang->doc->todayEdited  = '今日更新';
+$lang->doc->pastEdited   = '往日更新';
+$lang->doc->myDoc        = '我的文檔';
+$lang->doc->myCollection = '我的收藏';
 
 /* 方法列表。*/
 $lang->doc->index            = '文檔主頁';
 $lang->doc->create           = '創建文檔';
 $lang->doc->edit             = '編輯文檔';
 $lang->doc->delete           = '刪除文檔';
+$lang->doc->createBook       = '創建手冊';
 $lang->doc->browse           = '文檔列表';
 $lang->doc->view             = '文檔詳情';
 $lang->doc->diff             = '對比';
 $lang->doc->diffAction       = '對比文檔';
 $lang->doc->sort             = '文檔排序';
-$lang->doc->manageType       = '維護分類';
-$lang->doc->editType         = '編輯分類';
-$lang->doc->deleteType       = '刪除分類';
-$lang->doc->addType          = '增加分類';
-$lang->doc->childType        = '子分類';
+$lang->doc->manageType       = '維護目錄';
+$lang->doc->editType         = '編輯目錄';
+$lang->doc->deleteType       = '刪除目錄';
+$lang->doc->addType          = '增加目錄';
+$lang->doc->childType        = '子目錄';
+$lang->doc->catalogName      = '目錄名稱';
 $lang->doc->collect          = '收藏';
 $lang->doc->cancelCollection = '取消收藏';
 $lang->doc->deleteFile       = '刪除附件';
 
+$lang->doc->collectAction = '收藏文檔';
+
 $lang->doc->libName        = '文檔庫名稱';
 $lang->doc->libType        = '文檔庫類型';
 $lang->doc->custom         = '自定義文檔庫';
 $lang->doc->customAB       = '自定義庫';
-$lang->doc->createlib      = '創建文檔庫';
+$lang->doc->createLib      = '創建文檔庫';
 $lang->doc->allLibs        = '文檔庫列表';
 $lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon}庫列表";
 $lang->doc->showFiles      = '附件庫';
-$lang->doc->editlib        = '編輯文檔庫';
+$lang->doc->editLib        = '編輯文檔庫';
 $lang->doc->deleteLib      = '刪除文檔庫';
 $lang->doc->fixedMenu      = '固定到菜單欄';
 $lang->doc->removeMenu     = '從菜單欄移除';
 $lang->doc->search         = '搜索';
 
+global $config;
 /* 查詢條件列表 */
-$lang->doc->allProduct     = '所有' . $lang->productCommon;
-$lang->doc->allProject     = '所有' . $lang->executionCommon;
+$lang->doc->allProduct    = '所有' . $lang->productCommon;
+$lang->doc->allExecutions = '所有' . $lang->executionCommon;
 
-$lang->doc->libTypeList['product'] = $lang->productCommon . '文檔庫';
-$lang->doc->libTypeList['project'] = $lang->executionCommon . '文檔庫';
-$lang->doc->libTypeList['custom']  = '自定義文檔庫';
+$lang->doc->libTypeList['product']   = $lang->productCommon . '文檔庫';
+if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = '項目文檔庫';
+$lang->doc->libTypeList['execution'] = $lang->executionCommon . '文檔庫';
+$lang->doc->libTypeList['custom']    = '自定義文檔庫';
 
-$lang->doc->libIconList['product'] = 'icon-product';
-$lang->doc->libIconList['project'] = 'icon-stack';
-$lang->doc->libIconList['custom']  = 'icon-folder-o';
+$lang->doc->libIconList['product']   = 'icon-product';
+$lang->doc->libIconList['execution'] = 'icon-stack';
+$lang->doc->libIconList['custom']    = 'icon-folder-o';
 
-$lang->doc->systemLibs['product'] = $lang->productCommon;
-$lang->doc->systemLibs['project'] = $lang->executionCommon;
+$lang->doc->systemLibs['product']   = $lang->productCommon;
+$lang->doc->systemLibs['execution'] = $lang->executionCommon;
 
 $lang->doc->aclList['open']    = '公開';
 $lang->doc->aclList['custom']  = '自定義';
@@ -156,30 +166,36 @@ $lang->doc->mail->edit   = new stdclass();
 $lang->doc->mail->create->title = "%s創建了文檔 #%s:%s";
 $lang->doc->mail->edit->title   = "%s編輯了文檔 #%s:%s";
 
-$lang->doc->confirmDelete      = "您確定刪除該文檔嗎？";
-$lang->doc->confirmDeleteLib   = "您確定刪除該文檔庫嗎？";
-$lang->doc->errorEditSystemDoc = "系統文檔庫無需修改。";
-$lang->doc->errorEmptyProduct  = "沒有{$lang->productCommon}，無法創建文檔";
-$lang->doc->errorEmptyProject  = "沒有{$lang->executionCommon}，無法創建文檔";
-$lang->doc->errorMainSysLib    = "該系統文檔庫不能刪除！";
-$lang->doc->accessDenied       = "您沒有權限訪問！";
-$lang->doc->versionNotFount    = '該版本文檔不存在';
-$lang->doc->noDoc              = '暫時沒有文檔。';
-$lang->doc->cannotCreateOffice = '<p>對不起，企業版才能創建%s文檔。<p><p>試用企業版，請聯繫我們：4006-8899-23 &nbsp; 0532-86893032。</p>';
-$lang->doc->notSetOffice       = "<p>創建%s文檔，需要配置<a href='%s' target='_parent'>Office轉換設置</a>。<p>";
-$lang->doc->noSearchedDoc      = '沒有搜索到任何文檔。';
-$lang->doc->noEditedDoc        = '您還沒有編輯任何文檔。';
-$lang->doc->noOpenedDoc        = '您還沒有創建任何文檔。';
-$lang->doc->noCollectedDoc     = '您還沒有收藏任何文檔。';
-$lang->doc->errorEmptyLib      = '文檔庫暫無數據。';
+$lang->doc->confirmDelete        = "您確定刪除該文檔嗎？";
+$lang->doc->confirmDeleteLib     = "您確定刪除該文檔庫嗎？";
+$lang->doc->confirmDeleteChapter = "您確定刪除該章節嗎？";
+$lang->doc->errorEditSystemDoc   = "系統文檔庫無需修改。";
+$lang->doc->errorEmptyProduct    = "沒有{$lang->productCommon}，無法創建文檔";
+$lang->doc->errorEmptyProject    = "沒有{$lang->executionCommon}，無法創建文檔";
+$lang->doc->errorMainSysLib      = "該系統文檔庫不能刪除！";
+$lang->doc->accessDenied         = "您沒有權限訪問！";
+$lang->doc->versionNotFount      = '該版本文檔不存在';
+$lang->doc->noDoc                = '暫時沒有文檔。';
+$lang->doc->noArticle            = '暫時沒有文章。';
+$lang->doc->noLib                = '暫時沒有文檔庫。';
+$lang->doc->noBook               = 'WIKI庫還未創建手冊，請新建 ：）';
+$lang->doc->cannotCreateOffice   = '<p>對不起，企業版才能創建%s文檔。<p><p>試用企業版，請聯繫我們：4006-8899-23 &nbsp; 0532-86893032。</p>';
+$lang->doc->notSetOffice         = "<p>創建%s文檔，需要配置<a href='%s'>Office轉換設置</a>。<p>";
+$lang->doc->noSearchedDoc        = '沒有搜索到任何文檔。';
+$lang->doc->noEditedDoc          = '您還沒有編輯任何文檔。';
+$lang->doc->noOpenedDoc          = '您還沒有創建任何文檔。';
+$lang->doc->noCollectedDoc       = '您還沒有收藏任何文檔。';
+$lang->doc->errorEmptyLib        = '文檔庫暫無數據。';
 
-$lang->doc->noticeAcl['lib']['product']['default'] = '有所選產品訪問權限的用戶可以訪問。';
-$lang->doc->noticeAcl['lib']['product']['custom']  = '有所選產品訪問權限或白名單裡的用戶可以訪問。';
-$lang->doc->noticeAcl['lib']['project']['default'] = "有所選{$lang->executionCommon}訪問權限的用戶可以訪問。";
-$lang->doc->noticeAcl['lib']['project']['custom']  = "有所選{$lang->executionCommon}訪問權限或白名單裡的用戶可以訪問。";
-$lang->doc->noticeAcl['lib']['custom']['open']     = '所有人都可以訪問。';
-$lang->doc->noticeAcl['lib']['custom']['custom']   = '白名單的用戶可以訪問。';
-$lang->doc->noticeAcl['lib']['custom']['private']  = '只有創建者自己可以訪問。';
+$lang->doc->noticeAcl['lib']['product']['default']   = '有所選產品訪問權限的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['product']['custom']    = '有所選產品訪問權限或白名單裡的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['project']['default']   = "有所選項目訪問權限的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['project']['custom']    = "有所選項目訪問權限或白名單裡的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['execution']['default'] = "有所選{$lang->executionCommon}訪問權限的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['execution']['custom']  = "有所選{$lang->executionCommon}訪問權限或白名單裡的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['custom']['open']       = '所有人都可以訪問。';
+$lang->doc->noticeAcl['lib']['custom']['custom']     = '白名單的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['custom']['private']    = '只有創建者自己可以訪問。';
 
 $lang->doc->noticeAcl['doc']['open']    = '有文檔所屬文檔庫訪問權限的，都可以訪問。';
 $lang->doc->noticeAcl['doc']['custom']  = '白名單的用戶可以訪問。';
@@ -189,15 +205,15 @@ $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = '相應的連結地址';
 
 $lang->doclib = new stdclass();
-$lang->doclib->name    = '文檔庫名稱';
-$lang->doclib->control = '訪問控制';
-$lang->doclib->group   = '分組';
-$lang->doclib->user    = '用戶';
-$lang->doclib->files   = '附件庫';
-$lang->doclib->all     = '所有文檔庫';
-$lang->doclib->select  = '選擇文檔庫';
-$lang->doclib->project = $lang->executionCommon . '庫';
-$lang->doclib->product = $lang->productCommon . '庫';
+$lang->doclib->name      = '文檔庫名稱';
+$lang->doclib->control   = '訪問控制';
+$lang->doclib->group     = '分組';
+$lang->doclib->user      = '用戶';
+$lang->doclib->files     = '附件庫';
+$lang->doclib->all       = '所有文檔庫';
+$lang->doclib->select    = '選擇文檔庫';
+$lang->doclib->execution = $lang->executionCommon . '庫';
+$lang->doclib->product   = $lang->productCommon . '庫';
 
 $lang->doclib->aclListA['default'] = '預設';
 $lang->doclib->aclListA['custom']  = '自定義';
@@ -206,15 +222,16 @@ $lang->doclib->aclListB['open']    = '公開';
 $lang->doclib->aclListB['custom']  = '自定義';
 $lang->doclib->aclListB['private'] = '私有';
 
-$lang->doclib->create['product'] = '創建' . $lang->productCommon . '文檔庫';
-$lang->doclib->create['project'] = '創建' . $lang->executionCommon . '文檔庫';
-$lang->doclib->create['custom']  = '創建自定義文檔庫';
+$lang->doclib->create['product']   = '創建' . $lang->productCommon . '文檔庫';
+$lang->doclib->create['execution'] = '創建' . $lang->executionCommon . '文檔庫';
+$lang->doclib->create['custom']    = '創建自定義文檔庫';
 
-$lang->doclib->main['product'] = $lang->productCommon . '主庫';
-$lang->doclib->main['project'] = $lang->executionCommon . '主庫';
+$lang->doclib->main['product']   = $lang->productCommon . '主庫';
+$lang->doclib->main['project']   = '項目主庫';
+$lang->doclib->main['execution'] = $lang->executionCommon . '主庫';
 
-$lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->executionCommon;
-$lang->doclib->tabList['custom']  = '自定義';
+$lang->doclib->tabList['product']   = $lang->productCommon;
+$lang->doclib->tabList['execution'] = $lang->executionCommon;
+$lang->doclib->tabList['custom']    = '自定義';
 
 $lang->doclib->nameList['custom'] = '自定義文檔庫名稱';
diff --git a/module/doc/model.php b/module/doc/model.php
index 26cd3069b0..cdf01db255 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -13,122 +13,6 @@
 <?php
 class docModel extends model
 {
-    /**
-     * Set menus
-     *
-     * @param  array  $libs
-     * @param  int    $libID
-     * @param  string $moduleID
-     * @param  int    $productID
-     * @param  int    $executionID
-     * @param  string $crumb
-     * @access public
-     * @return void
-     */
-    public function setMenu($type = '', $libID = 0, $moduleID = 0, $productID = 0, $executionID = 0, $crumb = '')
-    {
-        $btnStyle     = $this->lang->navGroup->doc == 'doc' ? 'header-angle-btn' : 'angle-btn';
-        $isLimitWidth = $this->lang->navGroup->doc == 'doc' ? '' : 'btn-limit';
-        $selectHtml   = "<div class='btn-group $btnStyle'>";
-        $selectHtml  .= html::a(helper::createLink('doc', 'index'), $this->lang->doc->index, '', "class='btn'");
-        $selectHtml  .= '</div>';
-
-        if($type)
-        {
-            $fastLib = in_array($type, array_keys($this->lang->doc->fastMenuList)) ? $this->lang->doc->fastMenuList[$type] : $this->lang->doc->fast;
-
-            if($libID)
-            {
-                $lib = $this->getLibById($libID);
-                if(!$this->checkPrivLib($lib))
-                {
-                    echo(js::alert($this->lang->doc->accessDenied));
-                    $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-                    if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(inlink('index')));
-                    die(js::locate('back'));
-                }
-
-                $type = $lib->type;
-            }
-
-            if(isset($this->lang->doc->libTypeList[$type]))
-            {
-                $mainLib     = $this->lang->doc->libTypeList[$type];
-                $selectHtml .= "<div class='btn-group $btnStyle'>";
-                $selectHtml .= "<div class='btn-group'>";
-                $selectHtml .= "<a data-toggle='dropdown' class='btn $isLimitWidth' title=$mainLib>" . $mainLib . " <span class='caret'></span></a>";
-                $selectHtml .= "<ul class='dropdown-menu'>";
-                foreach($this->lang->doc->libTypeList as $libType => $libName)
-                {
-                    $selectHtml .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=$libType"), "<i class='icon {$this->lang->doc->libIconList[$libType]}'></i> {$this->lang->doc->libTypeList[$libType]}") . '</li>';
-                }
-                $selectHtml .='</ul></div></div>';
-            }
-
-            $currentLib = 0;
-            if(in_array($type, array_keys($this->lang->doc->libTypeList)))
-            {
-                if($type == 'product')   $currentLib = $productID;
-                if($type == 'execution') $currentLib = $executionID;
-                if($type != 'product' and $type != 'execution') $currentLib = $libID;
-
-                if($currentLib)
-                {
-                    $allLibGroups  = $this->getAllLibGroups($libID);
-                    $currentGroups = $allLibGroups[$type];
-                    /* Append closed execution. */
-                    if(!isset($currentGroups[$currentLib]) and $type == 'execution')
-                    {
-                        $execution = $this->dao->select('id,name,status')->from(TABLE_EXECUTION)->where('id')->eq($currentLib)->fetch();
-                        $currentGroups[$currentLib] = (array)$execution;
-                    }
-                    $currentLibName = is_array($currentGroups[$currentLib]) ? $currentGroups[$currentLib]['name'] : $currentGroups[$currentLib];
-
-                    $selectHtml .= "<div class='btn-group $btnStyle'>";
-                    $selectHtml .= "<div class='btn-group'>";
-                    $selectHtml .= "<a data-toggle='dropdown' class='btn $isLimitWidth' title=$currentLibName>" . $currentLibName . ' <span class="caret"></span></a>';
-                    $selectHtml .='<ul class="dropdown-menu">';
-                    if($type == 'product' or $type == 'execution')
-                    {
-                        foreach($currentGroups as $groupID => $libGroups)
-                        {
-                            $link = helper::createLink('doc', 'objectLibs', "type=$type&objectID=$groupID");
-                            $icon = $this->lang->doc->libIconList[$type];
-
-                            $active = $currentLib == $groupID ? "class='active'" : '';
-                            $selectHtml .= "<li $active>" . html::a($link, "<i class='icon {$icon}'></i> {$libGroups['name']}") . '</li>';
-                        }
-                    }
-                    else
-                    {
-                        foreach($currentGroups as $groupID => $groupName)
-                        {
-                            $active = $currentLib == $groupID ? "class='active'" : '';
-                            $selectHtml .= "<li $active>" . html::a(helper::createLink('doc', 'browse', "libID=$groupID"), "<i class='icon {$this->lang->doc->libIconList[$type]}'></i> {$groupName}") . '</li>';
-                        }
-                    }
-
-                    $selectHtml .= '</ul></div></div>';
-                }
-            }
-
-            /* Determines whether the doc lib is editable. */
-            $docLib            = new stdClass();
-            $docLib->product   = $productID;
-            $docLib->execution = $executionID;
-            $canBeChanged      = common::canBeChanged('doc', $docLib);
-
-            $lib      = isset($lib) ? $lib : new stdClass();
-            $actions  = $this->setFastMenu($fastLib);
-            $actions .= ($canBeChanged and common::hasPriv('doc', 'createLib', $lib)) ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), "<i class='icon icon-plus'></i> " . $this->lang->doc->createlib, '', "class='btn btn-secondary iframe'") : '';
-
-            $this->lang->TRActions = $actions;
-        }
-
-        //$selectHtml .= $crumb ? $crumb : $this->getCrumbs($libID, $moduleID);
-        $this->lang->modulePageNav     = $selectHtml;
-    }
-
     /**
      * Get library by id.
      *
@@ -147,43 +31,16 @@ class docModel extends model
      * @param  string $type
      * @param  string $extra
      * @param  string $appendLibs
+     * @param  int    $projectID
      * @access public
      * @return array
      */
-    public function getLibs($type = '', $extra = '', $appendLibs = '')
+    public function getLibs($type = '', $extra = '', $appendLibs = '', $objectID = 0)
     {
-        $projectID = $this->session->PRJ;
-        if($type == 'product' or $type == 'project')
+        if($type == 'all' or $type == 'includeDeleted')
         {
-            $idList = array();
-            if($type == 'product') $idList = $this->loadModel('product')->getProductIDByProject($projectID, false);
-            if($type == 'execution')
-            {
-                $status = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'undone' : 'all';
-                $idList = $this->loadModel('execution')->getIdList($projectID, $status);
-            }
-
-            $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
-            $stmt  = $this->dao->select('*')->from(TABLE_DOCLIB)
-                ->where($type)->in($idList)
-                ->andWhere('deleted')->eq('0')
-                ->query();
-        }
-        elseif($type == 'all')
-        {
-            /* If extra have unclosedProject then ignore unclosed project libs. */
-            $status          = (strpos($extra, 'unclosedProject') !== false) ? 'undone' : 'all';
-            $executionIdList = $this->loadModel('execution')->getIdList($projectID, $status);
-            $productIdList   = $this->loadModel('product')->getProductIDByProject($projectID, false);
-
             $stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
-                ->where('deleted')->eq(0)
-                ->andWhere()
-                ->markLeft(1)
-                ->where('`type`')->eq('custom')
-                ->orWhere('execution')->in($executionIdList)
-                ->orWhere('product')->in($productIdList)
-                ->markRight(1)
+                ->beginIF($type == 'all')->where('deleted')->eq(0)->fi()
                 ->orderBy('id_desc')
                 ->query();
         }
@@ -195,11 +52,9 @@ class docModel extends model
                 ->orderBy('`order`, id desc')->query();
         }
 
-        if(strpos($extra, 'withObject') !== false)
-        {
-            $products   = $this->loadModel('product')->getProductPairsByProject($projectID);
-            $executions = $this->loadModel('execution')->getPairs($projectID, 'all', 'noclosed');
-        }
+        $products   = $this->loadModel('product')->getPairs();
+        $projects   = $this->loadModel('project')->getPairsByProgram();
+        $executions = $this->loadModel('execution')->getPairs();
 
         $libPairs = array();
         while($lib = $stmt->fetch())
@@ -209,6 +64,7 @@ class docModel extends model
                 if(strpos($extra, 'withObject') !== false)
                 {
                     if($lib->product   != 0) $lib->name = zget($products, $lib->product, '') . '/' . $lib->name;
+                    if($lib->project   != 0) $lib->name = zget($projects, $lib->project, '') . '/' . $lib->name;
                     if($lib->execution != 0) $lib->name = zget($executions, $lib->execution, '') . '/' . $lib->name;
                 }
 
@@ -281,6 +137,12 @@ class docModel extends model
             ->join('users', ',')
             ->get();
 
+        if($lib->type == 'execution' and $lib->execution)
+        {
+            $execution = $this->loadModel('execution')->getByID($lib->execution);
+            $lib->project = $execution->project;
+        }
+
         if($lib->acl == 'private') $lib->users = $this->app->user->account;
         $this->dao->insert(TABLE_DOCLIB)->data($lib)->autoCheck()
             ->batchCheck($this->config->doc->createlib->requiredFields, 'notempty')
@@ -321,7 +183,6 @@ class docModel extends model
     /**
      * Get docs by browse type.
      *
-     * @param  string $libID
      * @param  string $browseType
      * @param  int    $queryID
      * @param  int    $moduleID
@@ -330,10 +191,10 @@ class docModel extends model
      * @access public
      * @return array
      */
-    public function getDocsByBrowseType($libID, $browseType, $queryID, $moduleID, $sort, $pager)
+    public function getDocsByBrowseType($browseType, $queryID, $moduleID, $sort, $pager)
     {
         $allLibs   = array_keys($this->getLibs('all'));
-        $docIdList = $this->getPrivDocs($libID, $moduleID);
+        $docIdList = $this->getPrivDocs(0, $moduleID);
 
         $files = $this->dao->select('*')->from(TABLE_FILE)
             ->where('objectType')->eq('doc')
@@ -342,13 +203,12 @@ class docModel extends model
 
         if($browseType == "all")
         {
-            $docs = $this->getDocs($libID, 0, $sort, $pager);
+            $docs = $this->getDocs(0, 0, $sort, $pager);
         }
         elseif($browseType == "openedbyme")
         {
             $docs = $this->dao->select('*')->from(TABLE_DOC)
                 ->where('deleted')->eq(0)
-                ->beginIF($libID)->andWhere('lib')->in($libID)->fi()
                 ->andWhere('lib')->in($allLibs)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('addedBy')->eq($this->app->user->account)
@@ -356,6 +216,22 @@ class docModel extends model
                 ->page($pager)
                 ->fetchAll('id');
         }
+        elseif($browseType == 'editedbyme')
+        {
+            $docIDList = $this->dao->select('objectID')->from(TABLE_ACTION)
+                ->where('objectType')->eq('doc')
+                ->andWhere('actor')->eq($this->app->user->account)
+                ->andWhere('action')->eq('edited')
+                ->fetchAll('objectID');
+            $docs = $this->dao->select('*')->from(TABLE_DOC)
+                ->where('deleted')->eq(0)
+                ->andWhere('id')->in(array_keys($docIDList))
+                ->andWhere('lib')->in($allLibs)
+                ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
+                ->orderBy($sort)
+                ->page($pager)
+                ->fetchAll('id');
+        }
         elseif($browseType == 'byediteddate')
         {
             $docs = $this->dao->select('*')->from(TABLE_DOC)
@@ -371,7 +247,6 @@ class docModel extends model
         {
             $docs = $this->dao->select('*')->from(TABLE_DOC)
                 ->where('deleted')->eq(0)
-                ->beginIF($libID)->andWhere('lib')->in($libID)->fi()
                 ->andWhere('lib')->in($allLibs)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('collector')->like("%,{$this->app->user->account},%")
@@ -379,83 +254,6 @@ class docModel extends model
                 ->page($pager)
                 ->fetchAll('id');
         }
-        elseif($browseType == "bymodule")
-        {
-            $modules = 0;
-            if($moduleID)
-            {
-                $modules = array($moduleID => $moduleID);
-                if(strpos($this->config->doc->custom->showLibs, 'children') !== false) $modules = $this->loadModel('tree')->getAllChildId($moduleID);
-            }
-            $docs = $this->getDocs($libID, $modules, $sort, $pager);
-        }
-        elseif($browseType == "bygrid")
-        {
-            $docs = $this->getDocs($libID, 0, $sort, $pager);
-        }
-        elseif($browseType == "bysearch")
-        {
-            if($queryID)
-            {
-                $query = $this->loadModel('search')->getQuery($queryID);
-                if($query)
-                {
-                    $this->session->set('docQuery', $query->sql);
-                    $this->session->set('docForm', $query->form);
-                }
-                else
-                {
-                    $this->session->set('docQuery', ' 1 = 1');
-                }
-            }
-            else
-            {
-                if($this->session->docQuery == false) $this->session->set('docQuery', ' 1 = 1');
-            }
-
-            $libCond    = strpos($this->session->docQuery, "`lib` = ") !== false;
-            $allLibCond = strpos($this->session->docQuery, "`lib` = 'all'") !== false;
-
-            $docQuery  = str_replace("`product` = 'all'", '1', $this->session->docQuery); // Search all product.
-            $docQuery  = str_replace("`execution` = 'all'", '1', $docQuery); // Search all execution.
-            $docQuery  = str_replace("`lib` = 'all'", '1', $docQuery); // Search all lib.
-
-            $docs = $this->dao->select('*')->from(TABLE_DOC)->where($docQuery)
-                ->beginIF(!$libCond and $libID != 0)->andWhere("lib")->eq($libID)->fi()
-                ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
-                ->andWhere('deleted')->eq(0)
-                ->fetchAll('id');
-            foreach($docs as $docID => $doc)
-            {
-                if(!$this->checkPrivDoc($doc)) unset($docs[$docID]);
-            }
-            $docs = $this->dao->select('*')->from(TABLE_DOC)
-                ->where('id')->in(array_keys($docs))
-                ->andWhere('lib')->in($allLibs)
-                ->orderBy($sort)
-                ->page($pager)
-                ->fetchAll('id');
-        }
-        elseif($browseType == 'fastsearch')
-        {
-            if($this->session->searchDoc == false) return array();
-            $docIdList = $this->getPrivDocs($libID, $moduleID);
-            $docs = $this->dao->select('t1.*')->from(TABLE_DOC)->alias('t1')
-                ->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t2.doc = t1.id')
-                ->where('t1.deleted')->eq(0)
-                ->beginIF(!empty($docIdList))->andWhere('t1.id')->in($docIdList)->fi()
-                ->andWhere('t1.title', true)->like("%{$this->session->searchDoc}%")
-                ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
-                ->orWhere('t2.content')->like("%{$this->session->searchDoc}%")->markRight(1)
-                ->andWhere('t1.lib')->in($allLibs)
-                ->orderBy($sort)
-                ->page($pager)
-                ->fetchAll('id');
-            foreach($docs as $doc) $doc->title = str_replace($this->session->searchDoc, "<span style='color:red'>{$this->session->searchDoc}</span>", $doc->title);
-        }
-
-        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'doc', false);
-        if(!$docs) return array();
 
         $docContents = $this->dao->select('*')->from(TABLE_DOCCONTENT)->where('doc')->in(array_keys($docs))->orderBy('version,doc')->fetchAll('doc');
         foreach($docs as $index => $doc)
@@ -634,14 +432,18 @@ class docModel extends model
         /* Fix bug #2929. strip_tags($this->post->contentMarkdown, $this->config->allowedTags)*/
         $doc->contentMarkdown = $this->post->contentMarkdown;
         if($doc->acl == 'private') $doc->users = $this->app->user->account;
-        $condition = "lib = '$doc->lib' AND module = $doc->module";
 
-        $result = $this->loadModel('common')->removeDuplicate('doc', $doc, $condition);
-        if($result['stop']) return array('status' => 'exists', 'id' => $result['duplicate']);
+        if($doc->title)
+        {
+            $condition = "lib = '$doc->lib' AND module = $doc->module";
+            $result = $this->loadModel('common')->removeDuplicate('doc', $doc, $condition);
+            if($result['stop']) return array('status' => 'exists', 'id' => $result['duplicate']);
+        }
 
         $lib = $this->getLibByID($doc->lib);
         $doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->create['id'], $this->post->uid);
         $doc->product   = $lib->product;
+        $doc->project   = $lib->project;
         $doc->execution = $lib->execution;
         if($doc->type == 'url')
         {
@@ -749,7 +551,7 @@ class docModel extends model
             if(isset($doc->digest)) $docContent->digest  = $doc->digest;
             if($files) $docContent->files .= ',' . join(',', array_keys($files));
             $docContent->files   = trim($docContent->files, ',');
-            $this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec();
+            $this->dao->replace(TABLE_DOCCONTENT)->data($docContent)->exec();
         }
         unset($doc->contentType);
 
@@ -779,8 +581,8 @@ class docModel extends model
     {
         $this->config->doc->search['actionURL'] = $actionURL;
         $this->config->doc->search['queryID']   = $queryID;
-        $this->config->doc->search['params']['product']['values']   = array(''=>'') + $this->loadModel('product')->getPairs('nocode', $this->session->PRJ) + array('all'=>$this->lang->doc->allProduct);
-        $this->config->doc->search['params']['execution']['values'] = array(''=>'') + $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'noclosed') + array('all'=>$this->lang->doc->allExecutions);
+        $this->config->doc->search['params']['product']['values']   = array(''=>'') + $this->loadModel('product')->getPairs('nocode', $this->session->project) + array('all'=>$this->lang->doc->allProduct);
+        $this->config->doc->search['params']['execution']['values'] = array(''=>'') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'noclosed') + array('all'=>$this->lang->doc->allExecutions);
         $this->config->doc->search['params']['lib']['values']     = array(''=>'', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
 
         /* Get the modules. */
@@ -833,7 +635,7 @@ class docModel extends model
             ->orderBy($orderBy)
             ->fetchAll('id');
 
-        $docCounts= $this->dao->select("module, count(id) as docCount")->from(TABLE_DOC)
+        $docCounts = $this->dao->select("module, count(id) as docCount")->from(TABLE_DOC)
             ->where('module')->in(array_keys($modules))
             ->andWhere('deleted')->eq(0)
             ->groupBy('module')
@@ -999,7 +801,7 @@ class docModel extends model
             $orderBy = '`order` desc, id desc';
             if($type == 'execution')
             {
-                $project = $this->loadModel('project')->getByID($this->session->PRJ);
+                $project = $this->loadModel('project')->getByID($this->session->project);
                 $orderBy = (isset($project->model) and $project->model) == 'waterfall' ? 'begin_asc,id_asc' : 'begin_desc,id_desc';
             }
 
@@ -1128,7 +930,7 @@ class docModel extends model
             }
 
             $idList          = array();
-            $projectID       = $this->session->PRJ;
+            $projectID       = $this->session->project;
             $executionStatus = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'undone' : 'all';
 
             /* If it is a extension module, query the extension related products. */
@@ -1215,8 +1017,23 @@ class docModel extends model
      */
     public function getLibsByObject($type, $objectID, $mode = '')
     {
-        if($type != 'product' and $type != 'execution') return false;
-        $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->andWhere($type)->eq($objectID)->orderBy('`order`, id')->fetchAll('id');
+        if($type == 'custom' or $type == 'book')
+        {
+            $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB)
+                ->where('deleted')->eq(0)
+                ->andWhere('type')->eq($type)
+                ->beginIF($type == 'custom')->orderBy('`order`, id')->fi()
+                ->beginIF($type == 'book')->orderBy('id_desc')->fi()
+                ->fetchAll('id');
+        }
+        else if($type != 'product' and $type != 'project' and $type != 'execution')
+        {
+            return false;
+        }
+        else
+        {
+            $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->andWhere($type)->eq($objectID)->orderBy('`order`, id')->fetchAll('id');
+        }
 
         if($type == 'product')
         {
@@ -1238,14 +1055,98 @@ class docModel extends model
         $itemCounts = $this->statLibCounts(array_keys($libs));
         foreach($libs as $libID => $lib) $libs[$libID]->allCount = $itemCounts[$libID];
 
-        if(common::hasPriv('doc', 'showFiles'))
+        return $libs;
+    }
+
+    /**
+     * Get ordered objects for dic.
+     *
+     * @param  string $objectType
+     * @access public
+     * @return array
+     */
+    public function getOrderedObjects($objectType = 'product')
+    {
+        $myObjects = $normalObjects = $closedObjects = array();
+        if($objectType == 'product')
         {
-            $libs['files'] = new stdclass();
-            $libs['files']->name = $this->lang->doclib->files;
-            $libs['files']->allCount = count($this->getLibFiles($type, $objectID, 'id_desc'));
+            $products = $this->loadModel('product')->getList();
+            foreach($products as $id => $product)
+            {
+                if($product->status == 'normal' and $product->PO == $this->app->user->account)
+                {
+                    $myObjects[$id] = $product->name;
+                }
+                elseif($product->status == 'normal' and !($product->PO == $this->app->user->account))
+                {
+                    $normalObjects[$id] = $product->name;
+                }
+                elseif($product->status == 'closed')
+                {
+                    $closedObjects[$id] = $product->name;
+                }
+            }
+        }
+        elseif($objectType == 'project')
+        {
+            /* Load module. */
+            $this->loadModel('program');
+
+            /* Sort project. */
+            $orderedProjects = array();
+            $objects         = $this->program->getList('all', 'order_asc', null, true);
+            foreach($objects as $objectID => $object)
+            {
+                if($object->type == 'program') continue;
+                $object->parent = $this->program->getTopByID($object->parent);
+                $orderedProjects[$objectID] = $object;
+                unset($objects[$object->id]);
+            }
+
+            foreach($orderedProjects as $id => $project)
+            {
+                if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
+                {
+                    $myObjects[$id] = $project->name;
+                }
+                else if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
+                {
+                    $normalObjects[$id] = $project->name;
+                }
+                else if($project->status == 'done' or $project->status == 'closed')
+                {
+                    $closedObjects[$id] = $project->name;
+                }
+            }
+        }
+        elseif($objectType == 'execution')
+        {
+            $executions = $this->dao->select('*')->from(TABLE_EXECUTION)
+                ->where('deleted')->eq(0)
+                ->andWhere('type')->in('sprint,stage')
+                ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
+                ->orderBy('order_asc')
+                ->fetchAll('id');
+
+            $orderedExecutions = array();
+            foreach($executions as $id => $execution)
+            {
+                if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM == $this->app->user->account)
+                {
+                    $myObjects[$id] = $execution->name;
+                }
+                else if($execution->status != 'done' and $execution->status != 'closed' and !($execution->PM == $this->app->user->account))
+                {
+                    $normalObjects[$id] = $execution->name;
+                }
+                else if($execution->status == 'done' or $execution->status == 'closed')
+                {
+                    $closedObjects[$id] = $execution->name;
+                }
+            }
         }
 
-        return $libs;
+        return $myObjects + $normalObjects + $closedObjects;
     }
 
     /**
@@ -1301,7 +1202,8 @@ class docModel extends model
      */
     public function getLibFiles($type, $objectID, $orderBy, $pager = null)
     {
-        if($type != 'execution' and $type != 'product') return true;
+        if($type != 'execution' and $type != 'project' and $type != 'product') return true;
+
         $this->loadModel('file');
         $docs = $this->dao->select('*')->from(TABLE_DOC)->where($type)->eq($objectID)->fetchAll('id');
         foreach($docs as $id => $doc)
@@ -1366,6 +1268,39 @@ class docModel extends model
                 ->page($pager)
                 ->fetchAll('id');
         }
+        elseif($type == 'project')
+        {
+            $executionIdList = $this->loadModel('execution')->getIdList($objectID);
+            $taskPairs  = $this->dao->select('id')->from(TABLE_TASK)->where('execution')->in($executionIdList)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id');
+            $taskIdList = 0;
+            if(!empty($taskPairs))
+            {
+                $taskIdList = array_keys($taskPairs);
+                $taskIdList = implode(',', $taskIdList);
+            }
+
+            $buildPairs  = $this->dao->select('id')->from(TABLE_BUILD)->where('execution')->in($executionIdList)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id');
+            $buildIdList = 0;
+            if(!empty($buildPairs))
+            {
+                $buildIdList = array_keys($buildPairs);
+                $buildIdList = implode(',', $buildIdList);
+            }
+
+            $executionIdList = join(',', $executionIdList);
+            $files = $this->dao->select('*')->from(TABLE_FILE)->alias('t1')
+                ->where('size')->gt('0')
+                ->andWhere("(objectType = 'project' and objectID = $objectID)", true)
+                ->orWhere("(objectType = 'execution' and objectID in ($executionIdList))")
+                ->orWhere("(objectType = 'doc' and objectID in ($docIdList))")
+                ->orWhere("(objectType = 'task' and objectID in ($taskIdList))")
+                ->orWhere("(objectType = 'build' and objectID in ($buildIdList))")
+                ->markRight(1)
+                ->beginIF($searchTitle)->andWhere('title')->like("%{$searchTitle}%")->fi()
+                ->orderBy($orderBy)
+                ->page($pager)
+                ->fetchAll('id');
+        }
         elseif($type == 'execution')
         {
             $taskPairs  = $this->dao->select('id')->from(TABLE_TASK)->where('execution')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id');
@@ -1511,7 +1446,7 @@ class docModel extends model
             $executionProduct = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($productID)->andWhere('project')->eq($executionID)->fetch();
             if(empty($executionProduct))
             {
-                setcookie('product', 0, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+                setcookie('product', 0, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
                 return html::a(helper::createLink('doc', 'allLibs', "type=execution"), $this->lang->executionCommon) . $this->lang->doc->separator;
             }
         }
@@ -1587,7 +1522,7 @@ class docModel extends model
     public function getStatisticInfo()
     {
         $libIdList = array();
-        $libIdList = $this->getLibIdListByProject($this->session->PRJ);
+        $libIdList = $this->getLibIdListByProject($this->session->project);
         $docIdList = $this->getPrivDocs($libIdList);
 
         $today  = date('Y-m-d');
@@ -1658,28 +1593,43 @@ class docModel extends model
     /**
      * Build document module index page create document button.
      *
+     * @param  string $objectType
+     * @param  int    $objectID
+     * @param  int    $libID
      * @access public
      * @return string
      */
-    public function buildCreateButton4Doc()
+    public function buildCreateButton4Doc($objectType, $objectID, $libID)
     {
-        $libs  = $this->getLibs('all', strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'unclosedProject' : '');
-        $html  = "";
-        if($libs)
+        if($objectType == 'book')
         {
-            $libID = key($libs);
-            $html .= "<div class='dropdown' id='createDropdown'>";
+            $html = html::a(helper::createLink('doc', 'createLib', "type=$objectType&objectID=$objectID"), '<i class="icon icon-plus"></i>' . $this->lang->doc->createBook, '', 'class="btn btn-secondary iframe"');
+        }
+        elseif($libID)
+        {
+            $html  = "<div class='dropdown' id='createDropdown'>";
             $html .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->create . " <span class='caret'></span></button>";
             $html .= "<ul class='dropdown-menu' style='left:0px'>";
             foreach($this->lang->doc->typeList as $typeKey => $typeName)
             {
                 $class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
                 $html .= "<li>";
-                $html .= html::a(helper::createLink('doc', 'create', "libID=$libID&moduleID=0&type=$typeKey"), $typeName, '', "class='$class'");
+                $html .= html::a(helper::createLink('doc', 'create', "objectType=$objectType&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
                 $html .= "</li>";
+
             }
-            $html .="</ul></div>";
+            if(common::hasPriv('doc', 'createLib'))
+            {
+                $html .= '<li class="divider"></li>';
+                $html .= '<li>' . html::a(helper::createLink('doc', 'createLib', "type=$objectType&objectID=$objectID"), $this->lang->doc->createLib, '', "class='iframe' data-width='70%'") . '</li>';
+            }
+            $html .= "</ul></div>";
         }
+        else
+        {
+            $html = html::a(helper::createLink('doc', 'createLib', "type=$objectType&objectID=$objectID"), '<i class="icon icon-plus"></i>' . $this->lang->doc->createLib, '', 'class="btn btn-secondary iframe"');
+        }
+
         return $html;
     }
 
@@ -1698,7 +1648,7 @@ class docModel extends model
         $actions .= "<ul class='dropdown-menu'>";
         foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
         {
-            $link     = helper::createLink('doc', 'browse', "libID=0&browseTyp={$key}");
+            $link     = helper::createLink('doc', 'browse', "libID=0&browseType={$key}");
             $actions .= '<li>' . html::a($link, "<i class='icon {$this->lang->doc->fastMenuIconList[$key]}'></i> {$fastMenu}") . '</li>';
         }
         $actions .='</ul>';
@@ -1816,24 +1766,142 @@ class docModel extends model
     }
 
     /**
-     * Append the subHeader style.
+     * Create the select code of doc.
      *
+     * @param  string $type
+     * @param  array  $objects
+     * @param  int    $objectID
+     * @param  array  $libs
+     * @param  int    $libID
      * @access public
      * @return string
      */
-    public function appendNavCSS()
+    public function select($type, $objects, $objectID, $libs, $libID = 0)
     {
-        $navCSS = '';
-        if($this->lang->navGroup->doc == 'doc')
+        if($type != 'custom' and $type != 'book' and empty($objects)) return '';
+
+        $output = '';
+
+        if($this->app->openApp == 'doc' and $type != 'custom' and $type != 'book')
         {
-            $navCSS .= <<<EOF
-#subHeader {margin-top: -50px; background: rgba(0,0,0,0);}
-#pageActions .btn-link {color: #fff; font-size: 14px; line-height: 18px; border: #84a2e2 1px solid;}
-.header-angle-btn {padding: 0;}
-.header-angle-btn .btn{padding: 6px 12px;}
-EOF;
-            if($this->app->rawMethod != 'index') $navCSS .= '.header-angle-btn+.header-angle-btn::after, .header-angle-btn+.header-angle-btn::before {top: -50px;}';
+            $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$objects[$objectID]}'><span class='text'>{$objects[$objectID]}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList'>";
+            $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+            $output .= "<div class='table-col'><div class='list-group'>";
+            foreach($objects as $key => $object)
+            {
+                $selected = $key == $objectID ? 'selected' : '';
+                $output  .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "class='$selected' data-app='{$this->app->openApp}'");
+            }
+            $output .= "</div></div></div></div></div>";
         }
-        return $navCSS;
+
+        if(!empty($libs))
+        {
+            $output .= "<div class='btn-group angle-btn'><div class='btn-group'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit'>{$libs[$libID]->name} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList'>";
+            $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+            $output .= "<div class='table-col'><div class='list-group'>";
+            foreach($libs as $key => $lib)
+            {
+                $selected = $key == $libID ? 'selected' : '';
+                $output  .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$key"), $lib->name, '', "class='$selected' data-app='{$this->app->openApp}'");
+            }
+            $output .= "</div></div></div></div></div>";
+        }
+
+        return $output;
+    }
+
+    /**
+     * Get doc tree menu.
+     *
+     * @param  string $type
+     * @param  int    $objectID
+     * @param  int    $rootID
+     * @param  int    $startModule
+     * @access public
+     * @return string
+     */
+    public function getTreeMenu($type, $objectID, $rootID, $startModule = 0, & $docID = 0)
+    {
+        $startModulePath = '';
+        if($startModule > 0)
+        {
+            $startModule = $this->tree->getById($startModule);
+            if($startModule) $startModulePath = $startModule->path . '%';
+        }
+
+        $docs = $this->dao->select('*')->from(TABLE_DOC)->where('lib')->eq($rootID)->andWhere('deleted')->eq(0)->fetchAll();
+        $moduleDocs = array();
+        foreach($docs as $doc)
+        {
+            if(!isset($moduleDocs[$doc->module])) $moduleDocs[$doc->module] = array();
+            $moduleDocs[$doc->module][] = $doc;
+        }
+
+        $treeMenu = array();
+        $query = $this->dao->select('*')->from(TABLE_MODULE)
+            ->where('root')->eq((int)$rootID)
+            ->andWhere('type')->eq('doc')
+            ->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
+            ->andWhere('deleted')->eq(0)
+            ->orderBy('grade desc, `order`')
+            ->get();
+        $stmt = $this->dbh->query($query);
+        while($module = $stmt->fetch())
+        {
+            $this->buildTree($treeMenu, $type, $objectID, $rootID, $module, $moduleDocs, $docID);
+        }
+
+        if(isset($moduleDocs[0]))
+        {
+            if(!isset($treeMenu[0])) $treeMenu[0] = '';
+
+            foreach($moduleDocs[0] as $doc)
+            {
+                if(!$docID) $docID = $doc->id;
+                $treeMenu[0] .= '<li' . ($doc->id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), $doc->title, '', "data-app='{$this->app->openApp}'") . '</li>';
+            }
+        }
+
+        if(empty($treeMenu)) return '';
+
+        $menu = "<ul id='modules' class='tree' data-ride='tree' data-name='tree-lib'>" . $treeMenu[0] . '</ul>';
+        return $menu;
+    }
+
+    /**
+     * Build doc tree menu.
+     *
+     * @param  pointer $treeMenu
+     * @param  string  $type
+     * @param  int     $objectID
+     * @param  int     $libID
+     * @param  object  $module
+     * @param  array   $moduleDocs
+     * @param  int     $docID
+     * @access public
+     * @return string
+     */
+    private function buildTree(& $treeMenu, $type, $objectID, $libID, $module, $moduleDocs, & $docID)
+    {
+        if(!isset($treeMenu[$module->id])) $treeMenu[$module->id] = '';
+
+        if(isset($moduleDocs[$module->id]))
+        {
+            foreach($moduleDocs[$module->id] as $doc)
+            {
+                if(!$docID) $docID = $doc->id;
+                $treeMenu[$module->id] .= '<li' . ($doc->id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), $doc->title, '', "data-app='{$this->app->openApp}'") . '</li>';
+            }
+        }
+
+        $li = '<a>' . $module->name . '</a>';
+        if($treeMenu[$module->id])
+        {
+            $li .= '<ul>' . $treeMenu[$module->id] . '</ul>';
+        }
+
+        if(!isset($treeMenu[$module->parent])) $treeMenu[$module->parent] = '';
+        $treeMenu[$module->parent] .= '<li' . ($treeMenu[$module->id] ? ' class="closed"' : '') . '>' . $li . '</li>';
     }
 }
diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index bb2226b56a..000ce20421 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php include '../../common/view/header.html.php';?>
 <?php $spliter = (empty($this->app->user->feedback) && !$this->cookie->feedbackView) ? true : false;?>
 <div class="main-row <?php if($spliter) echo 'split-row';?> fade" id="mainRow">
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 74e97a0371..2c4a7ad128 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -10,73 +10,18 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('browseType', $browseType);?>
 <?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
-<?php js::set('libID', $libID);?>
-<?php if($this->from != 'doc') js::set('type', 'doc');?>
-
-<?php $spliter = (empty($this->app->user->feedback) && !$this->cookie->feedbackView && $this->from == 'doc') ? true : false;?>
-<div class="main-row fade <?php if($spliter) echo 'split-row';?>" id="mainRow">
-  <?php if($this->from == 'doc') include './side.html.php';?>
-  <?php if($this->cookie->browseType == 'bygrid'):?>
-  <?php include dirname(__FILE__) . '/browsebygrid.html.php';?>
-  <?php else:?>
-  <div class="main-col" data-min-width="400">
-    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox" data-module='doc'></div>
+<div class="main-row fade" id="mainRow">
+  <div id="mainContent">
     <div class="panel block-files block-sm no-margin">
-      <div class="panel-heading">
-        <div class="panel-title font-normal">
-          <?php if($browseType != 'bysearch'):?>
-          <i class="icon icon-folder-open-o text-muted"></i>
-          <?php else:?>
-          <i class="icon icon-search text-muted"></i>
-          <?php endif;?>
-          <?php echo $breadTitle;?>
-        </div>
-        <nav class="panel-actions btn-toolbar">
-          <div class="btn-group">
-            <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
-            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
-          </div>
-          <?php if($libID and common::canBeChanged('doc', $currentLib)):?>
-          <div class="dropdown">
-            <button class="btn" type="button" data-toggle="dropdown"><i class='icon-cog'></i> <span class="caret"></span></button>
-            <ul class='dropdown-menu'>
-              <li><?php common::printLink('tree', 'browse', "libID=$libID&viewType=doc&currentModuleID=0&branch=0&from=$from", "<i class='icon icon-cog'></i>" . $lang->doc->manageType);?></li>
-              <li><?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>" . $lang->doc->editlib, '', "class='iframe'");?></li>
-              <li><?php common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>" . $lang->doc->deleteLib, 'hiddenwin');?></li>
-            </ul>
-          </div>
-          <?php if(common::hasPriv('doc', 'create')):?>
-          <div class="dropdown" id='createDropdown'>
-            <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $lang->doc->create;?> <span class='caret'></span></button>
-            <ul class='dropdown-menu'>
-              <?php foreach($lang->doc->typeList as $typeKey => $typeName):?>
-              <?php $class = strpos($config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';?>
-              <li><?php echo html::a($this->createLink('doc', 'create', "libID=$libID&moduleID=$moduleID&type=$typeKey&from={$lang->navGroup->doc}"), $typeName, '', "class='$class'");?></li>
-              <?php endforeach;?>
-            </ul>
-          </div>
-          <?php endif;?>
-          <?php endif;?>
-        </nav>
-      </div>
-      <?php if(empty($docs) and $browseType == 'bysearch'):?>
-      <div class="table-empty-tip">
-        <p><span class="text-muted"><?php echo $lang->doc->noSearchedDoc;?></span></p>
-      </div>
-      <?php elseif(empty($docs) and empty($modules) and empty($libs) and empty($attachLibs)):?>
+      <?php if(empty($docs)):?>
       <div class="table-empty-tip">
         <p>
-          <?php if($libID):?>
           <span class="text-muted"><?php echo $lang->doc->noDoc;?></span>
-          <?php if(common::hasPriv('doc', 'create') and common::canBeChanged('doc', $currentLib)):?>
-          <?php echo html::a($this->createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID&type=&from={$lang->navGroup->doc}"), "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?>
-          <?php endif;?>
-          <?php elseif($browseType == 'byediteddate'):?>
+          <?php if($browseType == 'byediteddate'):?>
           <span class="text-muted"><?php echo $lang->doc->noEditedDoc;?></span>
           <?php elseif($browseType == 'openedbyme'):?>
           <span class="text-muted"><?php echo $lang->doc->noOpenedDoc;?></span>
@@ -99,65 +44,11 @@
             </tr>
           </thead>
           <tbody>
-            <?php if(!empty($libs) and $browseType != 'bysearch'):?>
-            <?php foreach($libs as $lib):?>
-            <?php $star = strpos($lib->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-            <?php $collectTitle = strpos($lib->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
-            <tr>
-              <td class="c-name"><?php echo html::a(inlink('browse', "libID={$lib->id}&browseType=all&param=0&orderBy=$orderBy&from=$from"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $lib->name);?></td>
-              <td class="c-num"></td>
-              <td class="c-user"></td>
-              <td class="c-datetime"></td>
-              <td class="c-datetime"></td>
-              <td>
-                <?php if(common::hasPriv('doc', 'collect')):?>
-                <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$lib->id&objectType=doclib");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
-                <?php endif;?>
-                <?php common::printLink('doc', 'editLib', "libID=$lib->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
-                <?php common::printLink('tree', 'browse', "rootID=$lib->id&viewType=doc&currentModuleID=0&branch=0&from=$from", "<i class='icon icon-cog'></i>", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
-              </td>
-            </tr>
-            <?php endforeach;?>
-            <?php endif;?>
-            <?php if(!empty($attachLibs) and $browseType != 'bysearch'):?>
-            <?php foreach($attachLibs as $libType => $attachLib):?>
-            <tr>
-              <?php if($libType == 'execution'):?>
-              <td class="c-name"><?php echo html::a(inlink('allLibs', "type=execution&product={$currentLib->product}"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $attachLib->name);?></td>
-              <?php elseif($libType == 'files'):?>
-              <td class="c-name"><?php echo html::a(inlink('showFiles', "type=$type&objectID={$currentLib->$type}&from=$from"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $attachLib->name);?></td>
-              <?php endif;?>
-              <td class="c-num"></td>
-              <td class="c-user"></td>
-              <td class="c-datetime"></td>
-              <td class="c-datetime"></td>
-              <td></td>
-            </tr>
-            <?php endforeach;?>
-            <?php endif;?>
-            <?php if(isset($modules) and $browseType != 'bysearch'):?>
-            <?php foreach($modules as $module):?>
-            <?php $star = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-            <?php $collectTitle = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
-            <tr>
-              <td class="c-name"><?php echo html::a(inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $module->name);?></td>
-              <td class="c-num"></td>
-              <td class="c-user"></td>
-              <td class="c-datetime"></td>
-              <td class="c-datetime"></td>
-              <td class="c-actions">
-                <?php if(common::hasPriv('doc', 'collect')):?>
-                <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$module->id&objectType=module");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
-                <?php endif;?>
-              </td>
-            </tr>
-            <?php endforeach;?>
-            <?php endif;?>
             <?php foreach($docs as $doc):?>
             <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
             <?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
             <tr>
-              <td class="c-name"><?php echo html::a(inlink('view', "docID=$doc->id&version=0&from={$lang->navGroup->doc}"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title={$doc->title}");?></td>
+              <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0", '', true), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title={$doc->title} class='iframe' data-width='90%'");?></td>
               <td class="c-num"><?php echo $doc->fileSize ? $doc->fileSize : '-';?></td>
               <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
               <td class="c-datetime"><?php echo formatTime($doc->addedDate, 'y-m-d');?></td>
@@ -167,8 +58,8 @@
                 <?php if(common::hasPriv('doc', 'collect')):?>
                 <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
                 <?php endif;?>
-                <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false&from={$lang->navGroup->doc}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
-                <?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no&from={$lang->navGroup->doc}", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
+                <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'", true, true)?>
+                <?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
                 <?php endif;?>
               </td>
             </tr>
@@ -182,6 +73,5 @@
       <?php endif;?>
     </div>
   </div>
-  <?php endif;?>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index e2f015de43..00ee23b6ea 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -68,7 +68,7 @@
         <?php foreach($libs as $lib):?>
         <?php $star = strpos($lib->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
         <div class="col">
-          <a class="file" href="<?php echo inlink('browse', "libID=$lib->id&browseType=all&param=0&orderBy=$orderBy&from=$from");?>">
+          <a class="file" href="<?php echo inlink('browse', "browseType=all");?>">
             <i class="file-icon icon icon-folder text-yellow"></i>
             <div class="file-name"><?php echo (strpos($lib->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $lib->name;?></div>
             <div class="text-primary file-info"><?php echo zget($itemCounts, $lib->id, 0) . $lang->doc->item;?></div>
@@ -109,7 +109,7 @@
         <?php foreach($modules as $module):?>
         <?php $star = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
         <div class="col">
-          <?php $browseLink = inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from");?>
+          <?php $browseLink = inlink('browse', "browseType=all");?>
           <a class="file" href="<?php echo $browseLink;?>">
             <i class="file-icon icon icon-folder text-yellow"></i>
             <div class="file-name"><?php echo (strpos($module->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $module->name;?></div>
@@ -137,8 +137,8 @@
             <?php if(common::hasPriv('doc', 'collect')):?>
             <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID={$doc->id}&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
             <?php endif;?>
-            <?php common::printLink('doc', 'edit', "docID={$doc->id}&comment=false&from={$lang->navGroup->doc}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
-            <?php common::printLink('doc', 'delete', "docID={$doc->id}&confirm=no&from={$lang->navGroup->doc}", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
+            <?php common::printLink('doc', 'edit', "docID={$doc->id}&comment=false", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
+            <?php common::printLink('doc', 'delete', "docID={$doc->id}&confirm=no", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
             <?php endif;?>
           </div>
         </div>
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
new file mode 100644
index 0000000000..a4ac5c600a
--- /dev/null
+++ b/module/doc/view/content.html.php
@@ -0,0 +1,173 @@
+<?php js::set('confirmDelete', $lang->doc->confirmDelete);?>
+<?php
+$sessionString  = $config->requestType == 'PATH_INFO' ? '?' : '&';
+$sessionString .= session_name() . '=' . session_id();
+?>
+<div id="mainContent" class="main-row">
+  <div class="main-col col-8">
+    <div class="cell">
+      <div class="detail no-padding">
+        <div class="detail-title no-padding doc-title">
+          <div class="title"><?php echo $doc->title;?></div>
+          <div class="info">
+            <div class="version">
+              <div class='btn-group'>
+              <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;">
+                #<?php echo $version ? $version : $doc->version;?>
+                <span class="caret"></span>
+              </a>
+                <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
+                <?php
+                for($version = $doc->version; $version > 0; $version--)
+                {
+                    echo "<li>" . html::a($this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$object->id&libID=$libID&docID=$doc->id&version=$version"), '#' . $version, '', "data-app='{$this->app->openApp}'") . "</li>";
+                }
+                ?>
+                </ul>
+              </div>
+            </div>
+            <div class="user"></div>
+            <div class="time"></div>
+          </div>
+          <div class="actions">
+            <?php
+            if(common::hasPriv('doc', 'edit')) echo html::a(inlink('edit', "docID=$doc->id&comment=false&objectType=$objectType&objectID=$object->id&libID=$libID"), '<i class="icon-edit"></i>', '', "title='{$lang->doc->edit}' class='btn btn-link' data-app='{$this->app->openApp}'");
+            if(common::hasPriv('doc', 'delete'))
+            {
+                $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes&from=lib");
+                echo html::a("javascript:ajaxDeleteDoc(\"$deleteURL\", \"docList\", confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->doc->delete}' class='btn btn-link'");
+            }
+            ?>
+            <?php if(common::hasPriv('doc', 'collect')):?>
+            <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+            <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='ajaxCollect btn btn-link'><i class='icon <?php echo $star;?>'></i></a>
+            <?php endif;?>
+          </div>
+        </div>
+        <div class="detail-content article-content">
+          <?php
+          if($doc->type == 'url')
+          {
+              $url = $doc->content;
+              if(!preg_match('/^https?:\/\//', $doc->content)) $url = 'http://' . $url;
+              $urlIsHttps = strpos($url, 'https://') === 0;
+              $serverIsHttps = ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') or (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) and strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https'));
+              if(($urlIsHttps and $serverIsHttps) or (!$urlIsHttps and !$serverIsHttps))
+              {
+                  echo "<iframe width='100%' id='urlIframe' src='$url'></iframe>";
+              }
+              else
+              {
+                  $parsedUrl = parse_url($url);
+                  $urlDomain = $parsedUrl['scheme'] . '://' . $parsedUrl['host'];
+
+                  $title    = '';
+                  $response = common::http($url);
+                  preg_match_all('/<title>(.*)<\/title>/Ui', $response, $out);
+                  if(isset($out[1][0])) $title = $out[1][0];
+
+                  echo "<div id='urlCard'>";
+                  echo "<div class='url-icon'><img src='{$urlDomain}/favicon.ico' width='45' height='45' /></div>";
+                  echo "<div class='url-content'>";
+                  echo "<div class='url-title'>{$title}</div>";
+                  echo "<div class='url-href'>" . html::a($url, $url, '_target') . "</div>";
+                  echo "</div></div>";
+              }
+          }
+          else
+          {
+              echo $doc->content;
+          }
+          ?>
+          <?php foreach($doc->files as $file):?>
+          <?php if(in_array($file->extension, $config->file->imageExtensions)):?>
+          <div class='file-image'>
+            <a href="<?php echo $file->webPath?>" target="_blank">
+              <img onload="setImageSize(this, 0)" src="<?php echo $this->createLink('file', 'read', "fileID={$file->id}");?>" alt="<?php echo $file->title?>" title="<?php echo $file->title;?>">
+            </a>
+            <span class='right-icon'>
+              <?php if(common::hasPriv('file', 'download')) echo html::a($this->createLink('file', 'download', 'fileID=' . $file->id) . $sessionString, "<i class='icon icon-export'></i>", '', "class='btn-icon' style='margin-right: 10px;' title=\"{$lang->doc->download}\"");?>
+              <?php if(common::hasPriv('doc', 'deleteFile')) echo html::a('###', "<i class='icon icon-trash'></i>", '', "class='btn-icon' title=\"{$lang->doc->deleteFile}\" onclick='deleteFile($file->id)'");?>
+            </span>
+          </div>
+          <?php unset($doc->files[$file->id]);?>
+          <?php endif;?>
+          <?php endforeach;?>
+        </div>
+      </div>
+      <?php echo $this->fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'true', 'object' => $doc));?>
+    </div>
+    <div class='cell'>
+      <?php
+      $canBeChanged = common::canBeChanged('doc', $doc);
+      if($canBeChanged) $actionFormLink = $this->createLink('action', 'comment', "objectType=doc&objectID=$doc->id");
+      ?>
+      <?php include '../../common/view/action.html.php';?>
+    </div>
+  </div>
+  <div class="side-col col-4" id="sidebar">
+    <div class="sidebar-toggle"><i class="icon icon-angle-right"></i></div>
+    <?php if(!empty($doc->digest)):?>
+    <div class="cell">
+      <details class="detail" open>
+        <summary class="detail-title"><?php echo $lang->doc->digest;?></summary>
+        <div class="detail-content">
+          <?php echo !empty($doc->digest) ? $doc->digest : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
+        </div>
+      </details>
+    </div>
+    <?php endif;?>
+    <div class="cell">
+      <details class="detail" open>
+        <summary class="detail-title"><?php echo $lang->doc->keywords;?></summary>
+        <div class="detail-content">
+          <?php echo !empty($doc->keywords) ? $doc->keywords : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
+        </div>
+      </details>
+    </div>
+    <div class="cell">
+      <details class="detail" open>
+        <summary class="detail-title"><?php echo $lang->doc->basicInfo;?></summary>
+        <div class="detail-content">
+          <table class="table table-data">
+            <tbody>
+              <?php if($doc->productName):?>
+              <tr>
+                <th class='w-90px'><?php echo $lang->doc->product;?></th>
+                <td><?php echo $doc->productName;?></td>
+              </tr>
+              <?php endif;?>
+              <?php if($doc->executionName):?>
+              <tr>
+                <th class='w-80px'><?php echo $lang->doc->execution;?></th>
+                <td><?php echo $doc->executionName;?></td>
+              </tr>
+              <?php endif;?>
+              <tr>
+                <th class='w-80px'><?php echo $lang->doc->lib;?></th>
+                <td><?php echo $lib->name;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->doc->module;?></th>
+                <td><?php echo $doc->moduleName ? $doc->moduleName : '/';?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->doc->addedDate;?></th>
+                <td><?php echo $doc->addedDate;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->doc->editedBy;?></th>
+                <td><?php echo zget($users, $doc->editedBy);?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->doc->editedDate;?></th>
+                <td><?php echo $doc->editedDate;?></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </details>
+    </div>
+  </div>
+</div>
+<?php include '../../common/view/syntaxhighlighter.html.php';?>
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index 264e7f8236..ff7c892de7 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php if($docType != '' and strpos($config->doc->officeTypes, $docType) !== false):?>
 <?php include '../../common/view/header.lite.html.php';?>
 <div id="mainContent" class="main-content">
@@ -19,7 +18,9 @@
       <h2><?php echo $lang->doc->create;?></h2>
     </div>
     <?php if(isset($this->config->bizVersion)):?>
-    <div class='alert alert-warning strong'><?php printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');?></div>
+    <div class='alert alert-warning strong'>
+      <?php printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');?>
+    </div>
     <?php else:?>
     <div class='alert alert-warning strong'><?php printf($lang->doc->cannotCreateOffice, zget($lang->doc->typeList, $docType));?></div>
     <?php endif;?>
@@ -39,26 +40,26 @@
       <h2><?php echo $lang->doc->create;?></h2>
     </div>
     <form class="load-indicator main-form form-ajax" id="dataform" method='post' enctype='multipart/form-data'>
-      <table class='table table-form'> 
+      <table class='table table-form'>
         <tbody>
           <tr>
             <th class='w-110px'><?php echo $lang->doc->lib;?></th>
             <td> <?php echo html::select('lib', $libs, $libID, "class='form-control chosen' onchange=loadDocModule(this.value)");?> </td><td></td>
-          </tr>  
+          </tr>
           <tr>
             <th><?php echo $lang->doc->module;?></th>
             <td>
               <span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></span>
             </td><td></td>
-          </tr>  
+          </tr>
           <tr>
             <th><?php echo $lang->doc->title;?></th>
             <td colspan='2'><?php echo html::input('title', '', "class='form-control' required");?></td>
-          </tr> 
+          </tr>
           <tr>
             <th><?php echo $lang->doc->keywords;?></th>
             <td colspan='2'><?php echo html::input('keywords', '', "class='form-control'");?></td>
-          </tr>  
+          </tr>
           <tr>
             <th><?php echo $lang->doc->type;?></th>
             <?php
@@ -66,7 +67,7 @@
             foreach($lang->doc->types as $typeKey => $typeName) $typeKeyList[$typeKey] = $typeKey;
             ?>
             <td><?php echo html::radio('type', $lang->doc->types, zget($typeKeyList, $docType, 'text'));?></td>
-          </tr> 
+          </tr>
           <tr id='contentBox'>
             <th><?php echo $lang->doc->content;?></th>
             <td colspan='2'>
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index b62f0bd177..ea36e6efe4 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -17,18 +17,30 @@
     <div id='mainContent' class='main-content'>
       <div class='center-block'>
         <div class='main-header'>
-          <h2><?php echo $lang->doc->createlib;?></h2>
+          <h2><?php echo $lang->doc->createLib;?></h2>
         </div>
         <form method='post' target='hiddenwin' >
           <table class='table table-form'>
             <tr>
               <th class='w-110px'><?php echo $lang->doc->libType?></th>
+              <?php if($this->app->openApp != 'doc'):?>
+              <?php
+              foreach($libTypeList as $key => $libType)
+              {
+                  if($this->app->openApp != $key) unset($libTypeList[$key]);
+              }
+              ?>
+              <?php endif;?>
               <td><?php echo html::radio('type', $libTypeList, $type ? $type : key($libTypeList))?></td>
             </tr>
             <tr class='product'>
               <th><?php echo $lang->doc->product?></th>
               <td><?php echo html::select('product', $products, $type == 'product' ? $objectID : '', "class='form-control chosen' data-drop_direction='down'")?></td>
             </tr>
+            <tr class='project hidden'>
+              <th><?php echo $lang->doc->project?></th>
+              <td><?php echo html::select('project', $projects, $type == 'project' ? $objectID : '', "class='form-control chosen' data-drop_direction='down'")?></td>
+            </tr>
             <tr class='execution hidden'>
               <th><?php echo $lang->doc->execution?></th>
               <td><?php echo html::select('execution', $executions, $type == 'execution' ? $objectID : '', "class='form-control chosen' data-drop_direction='down'")?></td>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index 8e5e663c3f..e9ce3e1968 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php include '../../common/view/header.html.php';?>
 <?php if($doc->contentType == 'html')     include '../../common/view/kindeditor.html.php';?>
 <?php if($doc->contentType == 'markdown') include '../../common/view/markdown.html.php';?>
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index 4b4a8e44c8..74cac9150b 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -12,15 +12,20 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <?php include '../../common/view/chosen.html.php';?>
+<?php if($lib->type == 'product'):?>
+<style> .chosen-container .chosen-results {max-height: 180px;}</style>
+<?php else:?>
+<style> .chosen-container .chosen-results {max-height: 145px;}</style>
+<?php endif;?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
     <h2>
       <span class='prefix'><?php echo html::icon($lang->icons['doclib']);?></span>
-      <?php echo $lang->doc->editlib;?>
+      <?php echo $lib->type != 'book' ? $lang->doc->editLib : $lang->doc->editBook;?>
     </h2>
   </div>
-  <form method='post' target='hiddenwin'>
+  <form method='post' class='form-ajax'>
     <table class='table table-form'>
       <?php if(!empty($lib->product)):?>
       <tr>
@@ -35,7 +40,7 @@
       </tr>
       <?php endif;?>
       <tr>
-        <th class='w-130px'><?php echo $lang->doc->libName?></th>
+        <th class='w-130px'><?php echo $lib->type != 'book' ? $lang->doc->libName : $lang->doc->bookName;?></th>
         <td>
           <?php echo html::input('name', $lib->name, "class='form-control'");?>
           <span class='hidden'><?php echo html::radio('type', $lang->doc->libTypeList, $lib->type);?></span>
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index 43ca8af252..12b5b8353a 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -10,11 +10,9 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php include '../../common/view/header.html.php';?>
 <div class='main-row split-row fade' id='mainRow'>
-  <?php include './side.html.php';?>
-  <div class="main-col" data-min-width="400">
+  <div id="mainContent">
   <div class="cell" id="queryBox" data-module='doc'></div>
     <div class="row">
       <div class="col-sm-7">
@@ -22,7 +20,7 @@
           <div class="panel-heading">
           <div class="panel-title"><?php echo $lang->doc->orderByEdit;?></div>
             <nav class="panel-actions nav nav-default">
-              <li><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseTyp=byediteddate"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
+              <li><?php echo html::a($this->createLink('doc', 'browse', "browseType=byediteddate"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
             </nav>
           </div>
           <div class="panel-body has-table">
@@ -37,8 +35,8 @@
               </thead>
               <tbody>
                 <?php foreach($latestEditedDocs as $doc):?>
-                <tr data-url="<?php echo $this->createLink('doc', 'view', "docID={$doc->id}");?>">
-                  <td class="c-name" title="<?php echo $doc->title?>"><?php echo $doc->title;?></td>
+                <tr>
+                  <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID={$doc->id}", '', true), $doc->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'")?></a></td>
                   <td class="c-num text-right"><?php echo $doc->fileSize ? $doc->fileSize : '-';?></td>
                   <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
                   <td class="c-datetime"><?php echo helper::isZeroDate($doc->editedDate) ? formatTime($doc->addedDate, 'Y-m-d') : formatTime($doc->editedDate, 'Y-m-d');?></td>
@@ -126,26 +124,28 @@
       <div class="col-sm-7">
         <div class="panel block-files block-sm" style="height: 290px;">
           <div class="panel-heading">
-            <div class="panel-title"><?php echo $lang->execution->undone . (common::checkNotCN() ? "{$lang->executionCommon}s" : "$lang->executionCommon");?></div>
+          <div class="panel-title"><?php echo $lang->doc->myDoc;?></div>
             <nav class="panel-actions nav nav-default">
-              <li><?php echo html::a($this->createLink('doc', 'allLibs', 'type=execution'), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
+              <li><?php echo html::a($this->createLink('doc', 'browse', "browseType=openedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
             </nav>
           </div>
           <div class="panel-body has-table">
             <table class="table table-borderless table-fixed-head table-hover">
               <thead>
                 <tr>
-                  <th class="c-name"><?php echo $lang->execution->name;?></th>
-                  <th class="c-date"><?php echo $lang->execution->begin;?></th>
-                  <th class="c-date"><?php echo $lang->execution->end;?></th>
+                  <th class="c-name"><?php echo $lang->doc->title;?></th>
+                  <th class="c-num text-right"><?php echo $lang->doc->size;?></th>
+                  <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
+                  <th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
                 </tr>
               </thead>
               <tbody>
-                <?php foreach($doingExecutions as $execution):?>
-                <tr data-url="<?php echo $this->createLink('doc', 'objectLibs', "type=execution&objectID={$execution->id}")?>">
-                  <td class="c-name"><i class="icon icon-folder text-yellow"></i> <?php echo $execution->name;?></td>
-                  <td class="c-datetime"><?php echo formatTime($execution->begin);?></td>
-                  <td class="c-datetime"><?php echo formatTime($execution->end);?></td>
+                <?php foreach($myDocs as $doc):?>
+                <tr>
+                  <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID={$doc->id}", '', true), $doc->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'")?></a></td>
+                  <td class="c-num text-right"><?php echo $doc->fileSize ? $doc->fileSize : '-';?></td>
+                  <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
+                  <td class="c-datetime"><?php echo formatTime($doc->editedDate) ? formatTime($doc->editedDate, 'Y-m-d') : formatTime($doc->addedDate, 'y-m-d');?></td>
                 </tr>
                 <?php endforeach;?>
               </tbody>
@@ -156,9 +156,9 @@
       <div class="col-sm-5">
         <div class="panel block-files block-sm" style="height: 290px;">
           <div class="panel-heading">
-          <div class="panel-title"><?php echo $lang->doc->myDoc;?></div>
+          <div class="panel-title"><?php echo $lang->doc->myCollection;?></div>
             <nav class="panel-actions nav nav-default">
-              <li><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseTyp=openedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
+              <li><?php echo html::a($this->createLink('doc', 'browse', "browseType=collectedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
             </nav>
           </div>
           <div class="panel-body has-table">
@@ -171,9 +171,9 @@
                 </tr>
               </thead>
               <tbody>
-                <?php foreach($myDocs as $doc):?>
-                <tr data-url="<?php echo $this->createLink('doc', 'view', "docID={$doc->id}");?>">
-                  <td class="c-name" title="<?php echo $doc->title;?>"><?php echo $doc->title;?></td>
+                <?php foreach($collectedDocs as $doc):?>
+                <tr>
+                  <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID={$doc->id}", '', true), $doc->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'")?></a></td>
                   <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
                   <td class="c-datetime"><?php echo formatTime($doc->editedDate) ? formatTime($doc->editedDate, 'Y-m-d') : formatTime($doc->addedDate, 'y-m-d');?></td>
                 </tr>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 8d59d06fde..80c98aeba6 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -10,71 +10,44 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php include '../../common/view/header.html.php';?>
-<?php if($this->from == 'execution'):;?>
+<?php if($app->openApp == 'execution'):;?>
 <style>.panel-body{min-height: 180px}</style>
 <?php endif;?>
-<div class="fade main-row <?php if($this->from == 'doc') echo 'split-row';?>" id="mainRow">
-  <?php if($this->from == 'doc'):?>
-  <?php include './side.html.php';?>
-  <?php endif;?>
-  <?php if($this->cookie->browseType == 'bylist'):?>
-  <?php include dirname(__FILE__) . '/objectlibsbylist.html.php';?>
-  <?php else:?>
-  <div class="main-col" data-min-width="400">
-  <div class="cell" id="queryBox" data-module='doc'></div>
-    <div class="panel block-files block-sm no-margin">
-      <div class="panel-heading">
-        <div class="panel-title font-normal">
-          <i class="icon icon-folder-open-o text-muted"></i> <?php echo $this->from == 'doc' ? $object->name : $object->name . $lang->doc->common;?>
-          <div class="btn-group pull-right">
-            <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
-            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
-          </div>
+<div class="fade main-row split-row" id="mainRow">
+  <?php if($libID):?>
+    <?php include './side.html.php';?>
+    <div class="main-col" data-min-width="400">
+      <?php if($docID):?>
+        <?php include './content.html.php';?>
+      <?php else:?>
+      <div class="cell">
+        <div class="detail empty text-center">
+        <?php echo $type == 'book' ? $lang->doc->noArticle : $lang->doc->noDoc;?>
         </div>
       </div>
-      <div class='panel-body'>
-        <div class="row row-grid files-grid" data-size="300">
-          <?php foreach($libs as $libID => $lib):?>
-          <?php if($libID == 'execution' and $from != 'doc') continue;?>
-          <?php if(strpos($config->doc->custom->objectLibs, 'files') === false && $libID == 'files') continue;?>
-          <?php if(strpos($config->doc->custom->objectLibs, 'customFiles') === false && isset($lib->main) && !$lib->main) continue;?>
-
-          <?php $libLink = inlink('browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc&from=$from");?>
-          <?php if($libID == 'execution') $libLink = inlink('allLibs', "type=execution&product=$object->id");?>
-          <?php if($libID == 'files')   $libLink = inlink('showFiles', "type=$type&objectID=$object->id&from=$from");?>
-
-          <?php $icon = 'icon-folder text-yellow';?>
-          <?php if($libID == 'files') $icon = 'icon-paper-clip text-brown';?>
-
-          <div class="col">
-              <a class="file" href="<?php echo $libLink;?>" data-group=<?php echo $from;?>>
-              <i class="file-icon icon <?php echo $icon;?>"></i>
-              <div class="file-name"><?php echo ($libID != 'execution' && $libID != 'files' && strpos($lib->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $lib->name;?></div>
-              <div class="text-primary file-info"><?php echo  $lib->allCount . $lang->doc->item;?></div>
-            </a>
-            <?php if($libID != 'execution' and $libID != 'files'):?>
-            <?php $star = strpos($lib->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-            <?php $collectTitle = strpos($lib->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
-            <div class="actions">
-              <?php if($canBeChanged):?>
-              <?php if(common::hasPriv('doc', 'collect')):?>
-              <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$libID&objectType=doclib");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
-              <?php endif;?>
-              <?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
-              <?php if(empty($lib->main)) common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
-              <?php common::printLink('tree', 'browse', "rootID=$libID&viewType=doc&currentModuleID=0&branch=0&from=$from", "<i class='icon icon-cog'></i>", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
-              <?php endif;?>
-            </div>
-            <?php endif;?>
-          </div>
-          <?php endforeach;?>
-        </div>
+      <?php endif;?>
+    </div>
+  <?php else:?>
+    <div class="cell">
+      <div class="detail empty text-center">
+        <?php echo $type == 'book' ? $lang->doc->noBook : $lang->doc->noLib;?>
+        <?php if($type != 'book') echo html::a($this->createLink('doc', 'createLib', "type={$objectType}&objectID=$object->id"), "<i class='icon icon-plus'></i> " . $lang->doc->createLib, '', "class='btn btn-info iframe'");?>
       </div>
     </div>
-  </div>
   <?php endif;?>
 </div>
 <?php js::set('type', 'doc');?>
+<script>
+$('#pageNav .btn-group.angle-btn').click(function()
+{
+    if($(this).hasClass('opened')) return;
+    $(this).addClass('opened');
+
+    setTimeout(function()
+    {
+        scrollToSelected();
+    }, 100);
+})
+</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
deleted file mode 100644
index 8fd2b79889..0000000000
--- a/module/doc/view/objectlibsbylist.html.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="main-col" data-min-width="400">
-<div class="cell" id="queryBox" data-module='doc'></div>
-  <div class="panel block-files block-sm no-margin">
-    <div class="panel-heading">
-      <div class="panel-title font-normal">
-        <i class="icon icon-folder-open-o text-muted"></i> <?php echo $this->from == 'doc' ? $object->name : $object->name . $lang->doc->common;?>
-        <div class="btn-group pull-right">
-          <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
-          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
-        </div>
-      </div>
-    </div>
-    <div class='panel-body'>
-      <table class="table table-borderless table-hover table-files table-fixed no-margin">
-        <thead>
-          <tr>
-            <th class="c-name"><?php echo $lang->doc->libName;?></th>
-            <th class="c-num"><?php echo $lang->doc->num;?></th>
-            <th class="w-90px text-center"><?php echo $lang->actions;?></th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php foreach($libs as $libID => $lib):?>
-          <?php if($libID == 'execution' and $from != 'doc') continue;?>
-          <?php if(strpos($config->doc->custom->objectLibs, 'files') === false && $libID == 'files') continue;?>
-          <?php if(strpos($config->doc->custom->objectLibs, 'customFiles') === false && isset($lib->main) && !$lib->main) continue;?>
-
-          <?php $libLink = inlink('browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc&from=$from");?>
-          <?php if($libID == 'execution') $libLink = inlink('allLibs', "type=execution&product=$object->id");?>
-          <?php if($libID == 'files')     $libLink = inlink('showFiles', "type=$type&objectID=$object->id&from=$from");?>
-          <tr>
-            <td class="c-name"><?php echo html::a($libLink, $lib->name);?></td>
-            <td class="c-num"><?php echo  $lib->allCount . $lang->doc->item;?></td>
-            <td class="c-actions">
-              <?php if($canBeChanged and $libID != 'execution' and $libID != 'files'):?>
-              <?php $star = strpos($lib->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-              <?php $collectTitle = strpos($lib->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
-              <?php if(common::hasPriv('doc', 'collect')):?>
-              <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$libID&objectType=doclib");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
-              <?php endif;?>
-              <?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
-              <?php if(empty($lib->main)) common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
-              <?php common::printLink('tree', 'browse', "rootID=$libID&viewType=doc&currentModuleID=0&branch=0&from=$from", "<i class='icon icon-cog'></i>", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
-              <?php endif;?>
-            </td>
-          </tr>
-          <?php endforeach;?>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
deleted file mode 100644
index eabaedbeea..0000000000
--- a/module/doc/view/showfiles.html.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * The showFiles view file of doc 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     doc
- * @version     $Id$
- * @link        http://www.zentao.net
- */
-?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
-<?php include '../../common/view/header.html.php';?>
-<div class="main-row fade <?php if($this->from == 'doc') echo 'split-row';?>" id="mainRow">
-  <?php if($this->from == 'doc'):?>
-  <?php include './side.html.php';?>
-  <div class="col-spliter"></div>
-  <?php endif;?>
-  <div class="main-col" data-min-width="400">
-    <div class="panel block-files block-sm no-margin">
-      <div class="panel-heading">
-        <div class="panel-title font-normal"><i class="icon icon-folder-open-o text-muted"></i> <?php echo $lang->doclib->files;?></div>
-        <nav class="panel-actions btn-toolbar">
-          <div class="btn-group">
-            <form class='input-control has-icon-right table-col' method='get'>
-              <?php
-              if($config->requestType == 'GET')
-              {
-                  echo html::hidden('m',          'doc');
-                  echo html::hidden('f',          'showFiles');
-                  echo html::hidden('type',       $type);
-                  echo html::hidden('objectID',   $object->id);
-                  echo html::hidden('viewType',   ($viewType == 'list' ? 'list' : 'card'));
-                  echo html::hidden('recTotal',   isset($this->get->recTotal) ? $this->get->recTotal : 0);
-                  echo html::hidden('recPerPage', isset($this->get->recPerPage) ? $this->get->recPerPage : 0);
-                  echo html::hidden('pageID',     isset($this->get->pageID) ? $this->get->pageID : 0);
-              }
-              ?>
-              <?php echo html::hidden('onlybody', isonlybody() ? 'yes' : 'no');?>
-              <?php echo html::input('title', $this->get->title, "class='form-control' placeholder='{$lang->doc->fileTitle}'");?>
-              <?php echo html::submitButton("<i class='icon icon-search'></i>", '', "btn  btn-icon btn-link input-control-icon-right");?>
-            </form>
-          </div>
-          <div class="btn-group">
-            <?php $from = $lang->navGroup->doc;?>
-            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&from=$from&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon" . ($viewType != 'list' ? ' text-primary' : '') . "'");?>
-            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&from=$from&viewType=list"), "<i class='icon icon-bars'></i>" , '',  "title={$lang->doc->browseTypeList['list']} class='btn btn-icon" . ($viewType == 'list' ? ' text-primary' : '') . "'");?>
-          </div>
-        </nav>
-      </div>
-
-      <?php if($viewType == 'list'):?>
-      <div class="panel-body">
-        <table class="table table-borderless table-hover table-files table-fixed no-margin">
-          <thead>
-            <tr class="text-center">
-              <th class="w-80px"><?php echo $lang->doc->id;?></th>
-              <th class='text-left'><?php echo $lang->doc->fileTitle;?></th>
-              <th class='text-left'><?php echo $lang->doc->filePath;?></th>
-              <th class="w-80px"><?php echo $lang->doc->extension;?></th>
-              <th class="w-60px"><?php echo $lang->doc->size;?></th>
-              <th class="w-100px"><?php echo $lang->doc->addedBy;?></th>
-              <th class="w-160px"><?php echo $lang->doc->addedDate;?></th>
-              <th class="w-80px"><?php echo $lang->actions;?></th>
-            </tr>
-          </thead>
-          <tbody>
-            <?php foreach($files as $file):?>
-            <?php if(empty($file->pathname)) continue;?>
-              <tr>
-                <td class="text-center"><?php echo sprintf('%03d', $file->id);?></td>
-                <td class="c-url">
-                  <?php
-                  if($type == 'execution' && in_array($file->objectType, array('task', 'build')))
-                  {
-                      $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ);
-                  }
-                  if($type == 'product' && in_array($file->objectType, array('bug', 'release', 'testcase', 'testreport')))
-                  {
-                      $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ);
-                  }
-                  else
-                  {
-                      $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID");
-                  }
-                  ?>
-                  <a href='<?php echo $objectLink;?>'><?php echo $file->title . ' [' . strtoupper($file->objectType) . ' #' . $file->objectID . ']';?></a>
-                </td>
-                <td> <?php echo $file->pathname;?> </td>
-                <td class="text-center"><?php echo $file->extension;?></td>
-                <td><?php echo number_format($file->size / 1024 , 1) . 'K';?></td>
-                <td class="text-center"><?php echo isset($file->addedBy) ? zget($users, $file->addedBy) : '';?></td>
-                <td class="text-center"><?php echo isset($file->addedDate) ? substr($file->addedDate, 0, 10) : '';?></td>
-                <td class="c-actions">
-                  <?php
-                  common::printLink('file', 'download', "fileID=$file->id", '<i class="icon-import"></i>', "data-toggle='modal'", "class='btn' title={$lang->doc->download}", true, false, $file);
-                  if($canBeChanged) common::printLink('file', 'delete',   "fileID=$file->id", '<i class="icon-trash"></i>', 'hiddenwin', "class='btn' title={$lang->delete}", true, false, $file);
-                  ?>
-                </td>
-              </tr>
-            <?php endforeach;?>
-          </tbody>
-        </table>
-        <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
-      </div>
-      <?php else:?>
-      <div class="panel-body">
-        <div class="row row-grid files-grid" data-size="300">
-          <?php foreach($files as $file):?>
-          <?php if(empty($file->pathname)) continue;?>
-          <div class='col'>
-            <div class='lib-file'>
-              <?php
-              $imageWidth = 0;
-              if(stripos('jpg|jpeg|gif|png|bmp', $file->extension) !== false and file_exists($file->realPath))
-              {
-                  $imageSize  = getimagesize($file->realPath);
-                  $imageWidth = $imageSize ? $imageSize[0] : 0;
-              }
-
-              $sessionString  = $config->requestType == 'PATH_INFO' ? '?' : '&';
-              $sessionString .= session_name() . '=' . session_id();
-              $fileID         = $file->id;
-              $url            = helper::createLink('file', 'download', 'fileID=' . $fileID) . $sessionString ;
-              ?>
-              <div class='file'>
-                <a href='<?php echo $url;?>' title='<?php echo $file->title;?>' target='_blank' onclick="return downloadFile(<?php echo $file->id?>, '<?php echo $file->extension?>', <?php echo $imageWidth?>)">
-                <?php
-                $downloadLink = $this->createLink('file', 'download', "fileID=$file->id&mouse=left");
-                if(in_array($file->extension, $config->file->imageExtensions))
-                {
-                    echo "<div class='img-holder' style='background-image: url($file->webPath)'><img src='$file->webPath'/></div>";
-                }
-                else
-                {
-                    $iconClass = 'icon-file';
-                    if(strpos('zip,tar,gz,bz2,rar', $file->extension) !== false) $iconClass = 'icon-file-archive';
-                    else if(strpos('csv,xls,xlsx', $file->extension) !== false) $iconClass = 'icon-file-excel';
-                    else if(strpos('doc,docx', $file->extension) !== false) $iconClass = 'icon-file-word';
-                    else if(strpos('ppt,pptx', $file->extension) !== false) $iconClass = 'icon-file-powerpoint';
-                    else if(strpos('pdf', $file->extension) !== false) $iconClass = 'icon-file-pdf';
-                    else if(strpos('mp3,ogg,wav', $file->extension) !== false) $iconClass = 'icon-file-audio';
-                    else if(strpos('avi,mp4,mov', $file->extension) !== false) $iconClass = 'icon-file-video';
-                    else if(strpos('txt,md', $file->extension) !== false) $iconClass = 'icon-file-text';
-                    else if(strpos('html,htm', $file->extension) !== false) $iconClass = 'icon-globe';
-                    echo "<i class='file-icon icon $iconClass'></i>";
-                }
-                ?>
-                </a>
-                <?php
-                if($type == 'execution' && in_array($file->objectType, array('task', 'build')))
-                {
-                    $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ);
-                }
-                else
-                {
-                    $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID");
-                }
-                ?>
-                <div class='file-name'><a href='<?php echo $objectLink;?>' title='<?php echo substr($file->addedDate, 0, 10)?>'><?php echo $file->title . ' [' . strtoupper($file->objectType) . ' #' . $file->objectID . ']';?></a></div>
-              </div>
-              <div class='actions'>
-                <?php if(common::hasPriv('file', 'delete') and $canBeChanged): ?>
-                <a href='<?php echo $this->createLink('file', 'delete', "fileID=$file->id"); ?>' target='hiddenwin' title='<?php echo $lang->delete?>' class='delete btn btn-link'><i class='icon icon-trash'></i></a>
-                <?php endif?>
-              </div>
-            </div>
-          </div>
-          <?php endforeach;?>
-        </div>
-        <?php if(!empty($files)):?>
-        <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
-        <?php else:?>
-        <div class='table-empty-tip text-muted'><?php echo $lang->pager->noRecord;?></div>
-        <?php endif?>
-        </div>
-      </div>
-      <?php endif?>
-    </div>
-  </div>
-</div>
-
-<?php js::set('type', 'doc');?>
-<script>
-<?php
-$sessionString  = $config->requestType == 'PATH_INFO' ? '?' : '&';
-$sessionString .= session_name() . '=' . session_id();
-?>
-function downloadFile(fileID, extension, imageWidth)
-{
-    if(!fileID) return;
-    var fileTypes     = 'txt,jpg,jpeg,gif,png,bmp';
-    var sessionString = '<?php echo $sessionString;?>';
-    var windowWidth   = $(window).width();
-    var url           = createLink('file', 'download', 'fileID=' + fileID + '&mouse=left') + sessionString;
-    width = (windowWidth > imageWidth) ? ((imageWidth < windowWidth*0.5) ? windowWidth*0.5 : imageWidth) : windowWidth;
-    if(fileTypes.indexOf(extension) >= 0)
-    {
-        $('<a>').modalTrigger({url: url, type: 'iframe', width: width}).trigger('click');
-    }
-    else
-    {
-        window.open(url, '_blank');
-    }
-    return false;
-}
-</script>
-<?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 4d9f54a3c5..7c34571ec3 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -15,193 +15,36 @@ if(empty($type)) $type = 'product';
 $sideWidth = common::checkNotCN() ? '270' : '238';
 ?>
 <div class="side-col" style="width:<?php echo $sideWidth;?>px" data-min-width="<?php echo $sideWidth;?>">
-  <div class="cell">
-    <div class="tabs">
-      <ul class='nav nav-tabs'>
-        <?php foreach($lang->doclib->tabList as $tabValue => $tabName):?>
-        <?php $activeClass = $tabValue == $type ? 'active' : '';?>
-        <li class='<?php echo $activeClass;?>'><?php echo html::a("#{$tabValue}", $tabName, '', "data-tab");?></li>
-        <?php endforeach;?>
-      </ul>
-      <div class="tab-content">
-        <?php foreach($lang->doclib->tabList as $tabValue => $tabName):?>
-        <?php $activeClass = $tabValue == $type ? 'active' : '';?>
-        <div class="tab-pane <?php echo $activeClass;?>" id="<?php echo "$tabValue";?>">
-          <ul data-name="docsTree" data-ride="tree" data-initial-state="preserve" class="tree no-margin">
-            <?php if(isset($sideSubLibs[$tabValue])):?>
-            <?php if(empty($sideLibs[$tabValue])):?>
-            <li>
-            <?php
-            if($lang->navGroup->doc == 'doc' and $tabValue == 'execution')
-            {
-                echo $lang->noData;
-            }
-            else
-            {
-                $text = zget($lang->doclib->create, $tabValue, '');
-                if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create', ''), $text, '', "class='text-ellipsis'");
-            }
-            ?>
-            </li>
-            <?php else:?>
-            <?php foreach($sideLibs[$tabValue] as $tabMenuID => $tabMenuName):?>
-            <?php
-            $customLibCount = 0;
-            $mainLibID      = 0;
-            if(isset($sideSubLibs[$tabValue][$tabMenuID]))
-            {
-                foreach($sideSubLibs[$tabValue][$tabMenuID] as $subLibID => $subLibName)
-                {
-                    if(is_numeric($subLibID) and !empty($mainLibID)) $customLibCount += 1;
-                    if(is_numeric($subLibID) and empty($mainLibID)) $mainLibID = $subLibID;
-                }
-            }
-
-            $icon        = $tabValue == 'product' ? "<i class='icon icon-product'></i> " : "<i class='icon icon-stack'></i> ";
-            $activeClass = ($this->methodName == 'objectlibs' && $type == $tabValue && $object->id == $tabMenuID) ? 'active' : '';
-            $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $mainLibID) ? 'active' : $activeClass;
-            ?>
-            <li <?php echo "class='$activeClass'";?>>
-              <?php if($customLibCount > 0):?>
-              <?php echo html::a($this->createLink('doc', 'objectLibs', "type=$tabValue&objectID=$tabMenuID"), $icon . $tabMenuName, '', "class='text-ellipsis' title='{$tabMenuName}'");?>
-              <?php else:?>
-              <?php echo html::a($this->createLink('doc', 'browse', "libID=$mainLibID"), $icon . $tabMenuName, '', "class='text-ellipsis' title='{$tabMenuName}'");?>
-              <?php endif;?>
-              <?php if(isset($sideSubLibs[$tabValue][$tabMenuID])):?>
-              <ul>
-                <?php foreach($sideSubLibs[$tabValue][$tabMenuID] as $subLibID => $subLibName):?>
-                <?php
-                if($subLibID == 'execution')
-                {
-                    $subLibLink  = inlink('allLibs', "type=execution&product=$tabMenuID");
-                    $activeClass = ($this->methodName == 'alllibs' && $type == 'execution' && $$tabValue == $tabMenuID) ? "class='active'" : '';
-                    $icon        = 'icon-stack';
-                }
-                elseif($subLibID == 'files')
-                {
-                    $subLibLink  = inlink('showFiles', "type=$tabValue&objectID=$tabMenuID");
-                    $activeClass = ($this->methodName == 'showfiles' && $type == $tabValue && $object->id == $tabMenuID) ? "class='active'" : '';
-                    $icon        = 'icon-paper-clip';
-                }
-                else
-                {
-                    $subLibLink  = inlink('browse', "libID=$subLibID");
-                    $activeClass = ($this->methodName == 'browse' && $browseType != 'bymodule' && $subLibID == $libID) ? "class='active'" : '';
-                    $icon        = 'icon-folder-outline';
-                }
-                ?>
-                <?php if($customLibCount > 0):?>
-                <li <?php echo $activeClass;?>>
-                <?php echo html::a($subLibLink, "<i class='icon {$icon}'></i> " . $subLibName, '', "class='text-ellipsis' title='{$subLibName}'");?>
-                <?php endif;?>
-                  <?php if(isset($allModules[$subLibID])):?>
-                  <?php if($customLibCount > 0):?>
-                  <ul>
-                  <?php endif;?>
-                  <?php foreach($allModules[$subLibID] as $module):?>
-                  <?php if($module->parent != 0) continue;?>
-                    <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
-                      <?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?>
-                      <?php $this->doc->printChildModule($module, $subLibID, $this->methodName, $browseType, $moduleID);?>
-                    </li>
-                    <?php endforeach;?>
-                  <?php if($customLibCount > 0):?>
-                  </ul>
-                  <?php endif;?>
-                  <?php endif;?>
-                <?php if($customLibCount > 0):?>
-                </li>
-                <?php endif;?>
-                <?php if($customLibCount == 0 and !is_numeric($subLibID)):?>
-                <li <?php echo $activeClass;?>>
-                <?php echo html::a($subLibLink, "<i class='icon {$icon}'></i> " . $subLibName, '', "class='text-ellipsis' title='{$subLibName}'");?>
-                </li>
-                <?php endif;?>
-                <?php endforeach;?>
-              </ul>
-              <?php endif;?>
-            </li>
-            <?php endforeach;?>
-            <?php endif;?>
-            <?php else:?>
-
-            <?php if(empty($sideLibs[$tabValue])):?>
-            <li>
-            <?php
-            $text = zget($lang->doclib->create, $tabValue, '');
-            if($text and common::hasPriv('doc', 'createLib')) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}"), $text, '', "class='iframe' data-width='70%'");
-            ?>
-            </li>
-            <?php else:?>
-            <?php foreach($sideLibs[$tabValue] as $sideLibID => $sideLibName):?>
-              <?php if($tabValue == 'book'):?>
-              <?php include './bookside.html.php';?>
-              <?php else:?>
-              <?php
-              $activeClass = ($this->methodName == 'objectlibs' && $type == $tabValue && $object->id == $sideLibID) ? 'active' : '';
-              $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $sideLibID) ? 'active' : $activeClass;
-              ?>
-              <li <?php echo "class='$activeClass'";?>>
-                <?php echo html::a($this->createLink('doc', 'browse', "libID=$sideLibID"), "<i class='icon icon-folder-o'></i> " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?>
-                <?php if(isset($allModules[$sideLibID])):?>
-                <ul>
-                  <?php foreach($allModules[$sideLibID] as $module):?>
-                  <?php if($module->parent != 0) continue;?>
-                  <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
-                    <?php echo html::a($this->createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?>
-                    <?php $this->doc->printChildModule($module, $sideLibID, $this->methodName, $browseType, $moduleID);?>
-                  </li>
-                  <?php endforeach;?>
-                </ul>
-                <?php endif;?>
-              </li>
-              <?php endif;?>
-            <?php endforeach;?>
-
-            <?php endif;?>
-            <?php endif;?>
-          </ul>
-        </div>
-        <?php endforeach;?>
+    <div class="cell" id="<?php echo $type;?>">
+      <?php if(!$moduleTree):?>
+      <hr class="space">
+      <div class="text-center text-muted tips">
+        <?php echo $type == 'book' ? $lang->doc->noChapter : $lang->doc->noModule;?>
+      </div>
+      <hr class="space">
+      <?php endif;?>
+      <?php if($type == 'book'):?>
+      <?php include './bookside.html.php';?>
+      <?php else:?>
+      <?php echo $moduleTree;?>
+      <?php endif;?>
+      <div class="text-center action">
+        <?php
+        if($type == 'book')
+        {
+            common::printLink('doc', 'editLib', "rootID=$libID", $lang->doc->editBook, '', "class='btn btn-info btn-wide iframe'", '', true);
+            common::printLink('doc', 'manageBook', "bookID=$libID", $lang->doc->manageBook, '', "class='btn btn-info btn-wide'");
+        }
+        else
+        {
+            common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType, '', "class='btn btn-info btn-wide iframe'", '', true);
+            common::printLink('doc', 'editLib', "rootID=$libID", $lang->doc->editLib, '', "class='btn btn-info btn-wide iframe'", '', true);
+            common::printLink('doc', 'deleteLib', "rootID=$libID", $lang->doc->deleteLib, 'hiddenwin', "class='btn btn-info btn-wide'");
+        }
+        ?>
+        <hr class="space-sm" />
       </div>
     </div>
-    <div class='side-footer clearfix'>
-      <span id='customShowLibsBox'>
-      <?php echo html::a('###', "<i class='icon-cog'></i> {$lang->doc->customShowLibs}", '', "class='setting text-secondary small' data-target='#settingModal' data-toggle='modal'");?>
-      </span>
-      <span id='orderBox'>
-      <?php
-      if(common::hasPriv('doc', 'sort'))
-      {
-          echo html::a('###', "<i class='icon-sort'></i> {$lang->doc->orderLib}", '', "id='orderLib' class='text-secondary small " . (($type != 'product' and $type !='execution') ? '' : 'hidden') . "' style='padding-left:5px;'");
-          echo html::a('javascript:saveOrder()', "<i class='icon-checked'></i> {$lang->save}", '', "id='saveOrder' class='text-secondary small hidden' style='padding-left:10px;'");
-      }
-      ?>
-      </span>
-    </div>
-  </div>
-  <div class='modal fade' id='settingModal' aria-hidden="true">
-    <div class='modal-dialog mw-400px'>
-      <div class='modal-content'>
-        <div class='modal-header'>
-          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only"><?php echo $lang->close;?></span></button>
-          <strong><?php echo $lang->doc->customShowLibs;?></strong>
-        </div>
-        <div class='modal-body'>
-          <form action='<?php echo $this->createLink('custom', 'ajaxSetDoc');?>' target='hiddenwin' method='post'>
-            <table class='table table-form'>
-              <tr>
-                <td><?php echo html::checkbox('showLibs', $lang->doc->customShowLibsList, $config->doc->custom->showLibs);?></td>
-              </tr>
-              <tr>
-                <td><?php echo html::submitButton();?></td>
-              </tr>
-            </table>
-          </form>
-        </div>
-      </div>
-    </div>
-  </div>
 <script>
 $(function()
 {
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 9345278252..ca4f0ac048 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -10,12 +10,11 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php echo css::internal($keTableCSS);?>
 <style>.detail-content .file-image {padding: 0 50px 0 10px;}</style>
-<?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse');?>
+<?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse', 'browseType=byediteddate');?>
 <?php
 $sessionString  = $config->requestType == 'PATH_INFO' ? '?' : '&';
 $sessionString .= session_name() . '=' . session_id();
@@ -149,8 +148,8 @@ js::set('docID', $doc->id);
         <?php
         if(!$doc->deleted)
         {
-            common::printIcon('doc', 'edit', "docID=$doc->id&comment=false&from={$lang->navGroup->doc}", $doc);
-            common::printIcon('doc', 'delete', "docID=$doc->id&confirm=no&from={$lang->navGroup->doc}", $doc, 'button', 'trash', 'hiddenwin');
+            common::printIcon('doc', 'edit', "docID=$doc->id", $doc);
+            common::printIcon('doc', 'delete', "docID=$doc->id&confirm=no", $doc, 'button', 'trash', 'hiddenwin');
         }
         ?>
       </div>
diff --git a/module/entry/control.php b/module/entry/control.php
index 225c1fe48a..e5055a82c0 100644
--- a/module/entry/control.php
+++ b/module/entry/control.php
@@ -5,19 +5,19 @@
  * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Gang Liu <liugang@cnezsoft.com>
- * @package     entry 
+ * @package     entry
  * @version     $Id$
  * @link        http://www.zentao.net
  */
 class entry extends control
 {
     /**
-     * Browse entries. 
-     * 
-     * @param  string $orderBy 
-     * @param  int    $recTotal 
-     * @param  int    $recPerPage 
-     * @param  int    $pageID 
+     * Browse entries.
+     *
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
@@ -36,8 +36,8 @@ class entry extends control
     }
 
     /**
-     * Create an entry. 
-     * 
+     * Create an entry.
+     *
      * @access public
      * @return void
      */
@@ -49,6 +49,7 @@ class entry extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             $this->loadModel('action')->create('entry', $id, 'created');
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $id));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
@@ -61,9 +62,9 @@ class entry extends control
     }
 
     /**
-     * Edit an entry. 
-     * 
-     * @param  int    $id 
+     * Edit an entry.
+     *
+     * @param  int    $id
      * @access public
      * @return void
      */
@@ -93,9 +94,9 @@ class entry extends control
     }
 
     /**
-     * Delete an entry. 
-     * 
-     * @param  int    $id 
+     * Delete an entry.
+     *
+     * @param  int    $id
      * @access public
      * @return void
      */
@@ -108,13 +109,13 @@ class entry extends control
     }
 
     /**
-     * Browse logs of an entry. 
-     * 
-     * @param  int    $id 
-     * @param  string $orderBy 
-     * @param  int    $recTotal 
-     * @param  int    $recPerPage 
-     * @param  int    $pageID 
+     * Browse logs of an entry.
+     *
+     * @param  int    $id
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
diff --git a/module/entry/view/header.html.php b/module/entry/view/header.html.php
index 78638c14dd..ba427ff7ec 100644
--- a/module/entry/view/header.html.php
+++ b/module/entry/view/header.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 common::printAdminSubMenu('dev');?></div>
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('dev');?></div>
   <div class='btn-toolbar pull-right'>
     <?php echo html::a($this->createLink('entry', 'create'), "<i class='icon icon-plus'></i> {$lang->entry->create}", '', "class='btn btn-primary'"); ?>
   </div>
diff --git a/module/execution/config.php b/module/execution/config.php
index d676890ad2..c7c4a3e23e 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -16,7 +16,7 @@ $app->loadLang('task');
 $config->execution->task   = new stdclass();
 $config->execution->create = new stdclass();
 $config->execution->edit   = new stdclass();
-$config->execution->create->requiredFields = 'project,name,code,begin,end';
+$config->execution->create->requiredFields = 'name,code,begin,end';
 $config->execution->edit->requiredFields   = 'name,code,begin,end';
 
 $config->execution->customBatchEditFields = 'days,type,teamname,status,desc,PO,QD,PM,RD';
diff --git a/module/execution/control.php b/module/execution/control.php
index 2fa7cfc67d..410a91ba47 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -40,7 +40,7 @@ class execution extends control
 
         $this->loadModel('project');
 
-        if(!in_array($this->methodName, array('computeburn', 'ajaxgetrecentexecutions')))
+        if(!in_array($this->methodName, array('computeburn', 'ajaxgetdropmenu')) and $this->app->openApp == 'execution')
         {
             $this->executions = $this->execution->getPairs(0, 'all', 'nocode');
             if(!$this->executions and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('execution', 'create'));
@@ -59,7 +59,6 @@ class execution extends control
      */
     public function index($locate = 'auto', $executionID = 0)
     {
-        $this->lang->execution->menu = $this->lang->execution->homeMenu;
         if($locate == 'yes') $this->locate($this->createLink('execution', 'task'));
 
         $this->commonAction($executionID);
@@ -105,7 +104,7 @@ class execution extends control
         $actions         = $this->loadModel('action')->getList('execution', $executionID);
 
         /* Set menu. */
-        $this->execution->setMenu($this->executions, $executionID, $buildID = 0, $extra);
+        $this->execution->setMenu($executionID, $buildID = 0, $extra);
 
         /* Assign. */
         $this->view->executions      = $this->executions;
@@ -138,7 +137,7 @@ class execution extends control
         $this->loadModel('datatable');
         $this->loadModel('setting');
 
-        if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create', ''), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
+        if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
 
         /* Set browse type. */
         $browseType = strtolower($status);
@@ -187,9 +186,7 @@ class execution extends control
 
         /* Save to session. */
         $uri = $this->app->getURI(true);
-        $this->app->session->set('taskList',    $uri);
-        $this->app->session->set('storyList',   $uri);
-        $this->app->session->set('executionList', $uri);
+        $this->app->session->set('taskList', $uri, 'execution');
 
         /* Process the order by field. */
         if(!$orderBy) $orderBy = $this->cookie->executionTaskOrder ? $this->cookie->executionTaskOrder : 'status,id_desc';
@@ -261,18 +258,17 @@ class execution extends control
      *
      * @param  int    $executionID
      * @param  string $groupBy    the field to group by
+     * @param  string $filter
      * @access public
      * @return void
      */
     public function grouptask($executionID = 0, $groupBy = 'story', $filter = '')
     {
-        $this->showModuleMenu();
         $execution   = $this->commonAction($executionID);
         $executionID = $execution->id;
 
         /* Save session. */
-        $this->app->session->set('taskList',  $this->app->getURI(true));
-        $this->app->session->set('storyList', $this->app->getURI(true));
+        $this->app->session->set('taskList',  $this->app->getURI(true), 'execution');
 
         /* Header and session. */
         $this->view->title      = $execution->name . $this->lang->colon . $this->lang->execution->task;
@@ -447,7 +443,7 @@ class execution extends control
         $this->view->browseType  = 'group';
         $this->view->groupBy     = $groupBy;
         $this->view->orderBy     = $groupBy;
-        $this->view->executionID   = $executionID;
+        $this->view->executionID = $executionID;
         $this->view->users       = $users;
         $this->view->moduleID    = 0;
         $this->view->moduleName  = $this->lang->tree->all;
@@ -476,7 +472,7 @@ class execution extends control
         $toExecution = $execution->id;
         $branches    = $this->execution->getBranches($toExecution);
         $tasks       = $this->execution->getTasks2Imported($toExecution, $branches);
-        $executions  = $this->execution->getsToImport(array_keys($tasks), $execution->type);
+        $executions  = $this->execution->getToImport(array_keys($tasks), $execution->type);
         unset($executions[$toExecution]);
         unset($tasks[$toExecution]);
 
@@ -494,13 +490,12 @@ class execution extends control
         }
 
         /* Save session. */
-        $this->app->session->set('taskList',  $this->app->getURI(true));
-        $this->app->session->set('storyList', $this->app->getURI(true));
+        $this->app->session->set('taskList',  $this->app->getURI(true), 'execution');
 
-        $this->view->title          = $execution->name . $this->lang->colon . $this->lang->execution->importTask;
-        $this->view->position[]     = html::a(inlink('browse', "executionID=$toExecution"), $execution->name);
-        $this->view->position[]     = $this->lang->execution->importTask;
-        $this->view->tasks2Imported = $tasks2Imported;
+        $this->view->title            = $execution->name . $this->lang->colon . $this->lang->execution->importTask;
+        $this->view->position[]       = html::a(inlink('browse', "executionID=$toExecution"), $execution->name);
+        $this->view->position[]       = $this->lang->execution->importTask;
+        $this->view->tasks2Imported   = $tasks2Imported;
         $this->view->executions       = $executions;
         $this->view->executionID      = $execution->id;
         $this->view->fromExecution    = $fromExecution;
@@ -534,15 +529,9 @@ class execution extends control
         $browseType = strtolower($browseType);
         $queryID    = ($browseType == 'bysearch') ? (int)$param : 0;
 
-        /* Save to session. */
-        $uri = $this->app->getURI(true);
-        $this->app->session->set('bugList',    $uri);
-        $this->app->session->set('storyList',   $uri);
-        $this->app->session->set('executionList', $uri);
-
         $this->loadModel('bug');
-        $executions = $this->execution->getPairs($this->session->PRJ, 'all', 'nocode');
-        $this->execution->setMenu($executions, $executionID);
+        $executions = $this->execution->getPairs(0, 'all', 'nocode');
+        $this->execution->setMenu($executionID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -553,7 +542,7 @@ class execution extends control
         $position[] = $this->lang->execution->importBug;
 
         /* Get users, products and executions.*/
-        $users    = $this->execution->getTeamMemberPairs($executionID, 'nodeleted');
+        $users    = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted');
         $products = $this->dao->select('t1.product, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')
             ->on('t1.product = t2.id')
@@ -678,9 +667,12 @@ class execution extends control
         /* Load these models. */
         $this->loadModel('story');
         $this->loadModel('user');
+        $this->loadModel('datatable');
         $this->app->loadLang('testcase');
 
-        $type = strtolower($type);
+        $type      = strtolower($type);
+        $param     = $param;
+        $productID = 0;
         setcookie('storyPreExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         if($this->cookie->storyPreExecutionID != $executionID)
         {
@@ -691,20 +683,21 @@ class execution extends control
         }
         if($type == 'bymodule')
         {
-            $_COOKIE['storyModuleParam']  = (int)$param;
+            $_COOKIE['storyModuleParam']  = $param;
             $_COOKIE['storyProductParam'] = 0;
             $_COOKIE['storyBranchParam']  = 0;
-            setcookie('storyModuleParam', (int)$param, 0, $this->config->webRoot, '', false, true);
+            setcookie('storyModuleParam', $param, 0, $this->config->webRoot, '', false, true);
             setcookie('storyProductParam', 0, 0, $this->config->webRoot, '', false, true);
             setcookie('storyBranchParam',  0, 0, $this->config->webRoot, '', false, true);
         }
         elseif($type == 'byproduct')
         {
+            $productID = $param;
             $_COOKIE['storyModuleParam']  = 0;
-            $_COOKIE['storyProductParam'] = (int)$param;
+            $_COOKIE['storyProductParam'] = $param;
             $_COOKIE['storyBranchParam']  = 0;
             setcookie('storyModuleParam',  0, 0, $this->config->webRoot, '', false, true);
-            setcookie('storyProductParam', (int)$param, 0, $this->config->webRoot, '', false, true);
+            setcookie('storyProductParam', $param, 0, $this->config->webRoot, '', false, true);
             setcookie('storyBranchParam',  0, 0, $this->config->webRoot, '', false, true);
         }
         elseif($type == 'bybranch')
@@ -722,7 +715,7 @@ class execution extends control
         }
 
         /* Save session. */
-        $this->app->session->set('storyList', $this->app->getURI(true));
+        $this->app->session->set('storyList', $this->app->getURI(true), 'execution');
 
         /* Process the order by field. */
         if(!$orderBy) $orderBy = $this->cookie->executionStoryOrder ? $this->cookie->executionStoryOrder : 'pri';
@@ -731,7 +724,7 @@ class execution extends control
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
-        $queryID   = ($type == 'bysearch') ? (int)$param : 0;
+        $queryID     = ($type == 'bysearch') ? $param : 0;
         $execution   = $this->commonAction($executionID);
         $executionID = $execution->id;
 
@@ -742,10 +735,10 @@ class execution extends control
         $stories = $this->story->getExecutionStories($executionID, 0, 0, $sort, $type, $param, 'story', '', $pager);
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
-        $users   = $this->user->getPairs('noletter');
+        $users = $this->user->getPairs('noletter');
 
         /* Build the search form. */
-        $modules  = array();
+        $modules = array();
         $executionModules = $this->loadModel('tree')->getTaskTreeModules($executionID, true);
         $products = $this->execution->getProducts($executionID);
         foreach($products as $product)
@@ -772,27 +765,28 @@ class execution extends control
         $storyBugs   = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $executionID);
         $storyCases  = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList);
 
-        $plans = $this->execution->getPlans($products);
+        $plans    = $this->execution->getPlans($products);
         $allPlans = array('' => '');
         if(!empty($plans))
         {
-            foreach($plans as $productID => $plan) $allPlans += $plan;
+            foreach($plans as $plan) $allPlans += $plan;
         }
 
         if($this->cookie->storyModuleParam)  $this->view->module  = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
         if($this->cookie->storyProductParam) $this->view->product = $this->loadModel('product')->getById($this->cookie->storyProductParam);
         if($this->cookie->storyBranchParam)
         {
-            $productID = 0;
-            $branchID  = $this->cookie->storyBranchParam;
+            $branchID = $this->cookie->storyBranchParam;
             if(strpos($branchID, ',') !== false) list($productID, $branchID) = explode(',', $branchID);
             $this->view->branch  = $this->loadModel('branch')->getById($branchID, $productID);
         }
 
         /* Get execution's product. */
-        $productID    = 0;
         $productPairs = $this->loadModel('product')->getProductPairsByProject($executionID);
-        if($productPairs) $productID = key($productPairs);
+
+        if(empty($productID)) $productID = key($productPairs);
+        $showModule  = !empty($this->config->datatable->executionStory->showModule) ? $this->config->datatable->executionStory->showModule : '';
+        $modulePairs = $showModule ? $this->tree->getModulePairs($type == 'byproduct' ? $param : 0, 'story', $showModule) : array();
 
         /* Assign. */
         $this->view->title        = $title;
@@ -805,13 +799,15 @@ class execution extends control
         $this->view->orderBy      = $orderBy;
         $this->view->type         = $this->session->executionStoryBrowseType;
         $this->view->param        = $param;
-        $this->view->moduleTree   = $this->loadModel('tree')->getExecutionStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink'));
+        $this->view->moduleTree   = $this->loadModel('tree')->getProjectStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createStoryLink'));
+        $this->view->modulePairs  = $modulePairs;
         $this->view->tabID        = 'story';
         $this->view->storyTasks   = $storyTasks;
         $this->view->storyBugs    = $storyBugs;
         $this->view->storyCases   = $storyCases;
         $this->view->users        = $users;
         $this->view->pager        = $pager;
+        $this->view->setModule    = true;
         $this->view->branchGroups = $branchGroups;
         $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
@@ -819,7 +815,7 @@ class execution extends control
     }
 
     /**
-     * Exectuion qa dashboard.
+     * Execution qa dashboard.
      *
      * @param  int $executionID
      * @access public
@@ -827,7 +823,6 @@ class execution extends control
      */
     public function qa($executionID = 0)
     {
-        $this->showModuleMenu();
         $this->commonAction($executionID);
         $this->view->title = $this->lang->execution->qa;
         $this->display();
@@ -837,6 +832,7 @@ class execution extends control
      * Browse bugs of a execution.
      *
      * @param  int    $executionID
+     * @param  int    $productID
      * @param  string $orderBy
      * @param  int    $build
      * @param  string $type
@@ -847,24 +843,26 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function bug($executionID = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function bug($executionID = 0, $productID = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->showModuleMenu();
-
         /* Load these two models. */
         $this->loadModel('bug');
         $this->loadModel('user');
+        $this->loadModel('product');
 
         /* Save session. */
-        $this->session->set('bugList', $this->app->getURI(true));
+        $this->session->set('bugList', $this->app->getURI(true), 'execution');
 
-        $type      = strtolower($type);
-        $queryID   = ($type == 'bysearch') ? (int)$param : 0;
+        $type        = strtolower($type);
+        $queryID     = ($type == 'bysearch') ? (int)$param : 0;
         $execution   = $this->commonAction($executionID);
         $executionID = $execution->id;
-        $products  = $this->execution->getProducts($execution->id);
-        $productID = key($products);    // Get the first product for creating bug.
-        $branchID  = isset($products[$productID]) ? $products[$productID]->branch : 0;
+        $products    = $this->execution->getProducts($execution->id);
+        $branchID    = isset($products[$productID]) ? $products[$productID]->branch : 0;
+
+        $productPairs = array('0' => $this->lang->product->all);
+        foreach($products as $product) $productPairs[$product->id] = $product->name;
+        $this->lang->modulePageNav = $this->product->select($productPairs, $productID, 'execution', 'bug', '', $branchID, 0, '', false);
 
         /* Header and position. */
         $title      = $execution->name . $this->lang->colon . $this->lang->execution->bug;
@@ -875,7 +873,7 @@ class execution extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
         $sort  = $this->loadModel('common')->appendOrder($orderBy);
-        $bugs  = $this->bug->getExecutionBugs($executionID, $build, $type, $param, $sort, '', $pager);
+        $bugs  = $this->bug->getExecutionBugs($executionID, $productID, $build, $type, $param, $sort, '', $pager);
         $users = $this->user->getPairs('noletter');
 
         /* team member pairs. */
@@ -887,7 +885,7 @@ class execution extends control
         }
 
         /* Build the search form. */
-        $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
+        $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
         $this->execution->buildBugSearchForm($products, $queryID, $actionURL);
 
         /* Assign. */
@@ -925,8 +923,8 @@ class execution extends control
     {
         $this->loadModel('testcase');
         $this->loadModel('testtask');
-        $this->showModuleMenu();
         $this->commonAction($executionID);
+        $this->session->set('caseList', $this->app->getURI(true), 'execution');
 
         $products  = $this->execution->getProducts($executionID);
         $productID = key($products);    // Get the first product for creating testcase.
@@ -936,7 +934,9 @@ class execution extends control
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         $cases = $this->loadModel('testcase')->getExecutionCases($executionID, $orderBy, $pager, $type);
-        $cases = $this->testcase->appendData($cases, 'run');
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
+
+        $cases = $this->testcase->appendData($cases, 'case');
 
         $this->view->title       = $this->lang->execution->testcase;
         $this->view->executionID = $executionID;
@@ -951,6 +951,25 @@ class execution extends control
         $this->display();
     }
 
+    /**
+     * List of test reports for the execution.
+     *
+     * @param  int    $executionID
+     * @param  string $objectType   project|execution|product
+     * @param  string $extra
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function testreport($executionID = 0, $objectType = 'execution', $extra = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($this->session->project);
+        echo $this->fetch('testreport', 'browse', "objectID=$executionID&objectType=$objectType&extra=$extra&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+    }
+
     /**
      * Browse builds of a execution.
      *
@@ -964,7 +983,7 @@ class execution extends control
     {
         /* Load module and set session. */
         $this->loadModel('testtask');
-        $this->session->set('buildList', $this->app->getURI(true));
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
 
         $execution   = $this->commonAction($executionID);
         $executionID = $execution->id;
@@ -982,7 +1001,7 @@ class execution extends control
         /* Get builds. */
         if($type == 'bysearch')
         {
-            $builds = $this->loadModel('build')->getBuildsBySearch((int)$executionID, $queryID);
+            $builds = $this->loadModel('build')->getExecutionBuildsBySearch((int)$executionID, $queryID);
         }
         else
         {
@@ -1025,11 +1044,12 @@ class execution extends control
      */
     public function testtask($executionID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->showModuleMenu();
-
         $this->loadModel('testtask');
+        $this->app->loadLang('testreport');
+
         /* Save session. */
-        $this->session->set('testtaskList', $this->app->getURI(true));
+        $this->session->set('testtaskList', $this->app->getURI(true), 'execution');
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
 
         $execution   = $this->commonAction($executionID);
         $executionID = $execution->id;
@@ -1043,18 +1063,18 @@ class execution extends control
         $tasks = $this->testtask->getExecutionTasks($executionID, $orderBy, $pager);
         foreach($tasks as $key => $task) $productTasks[$task->product][] = $task;
 
-        $this->view->title        = $this->executions[$executionID] . $this->lang->colon . $this->lang->testtask->common;
-        $this->view->position[]   = html::a($this->createLink('execution', 'testtask', "executionID=$executionID"), $this->executions[$executionID]);
-        $this->view->position[]   = $this->lang->testtask->common;
-        $this->view->execution      = $execution;
-        $this->view->executionID    = $executionID;
-        $this->view->executionName  = $this->executions[$executionID];
-        $this->view->pager        = $pager;
-        $this->view->orderBy      = $orderBy;
-        $this->view->tasks        = $productTasks;
-        $this->view->users        = $this->loadModel('user')->getPairs('noclosed|noletter');
-        $this->view->products     = $this->loadModel('product')->getPairs('', $this->session->PRJ);
-        $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
+        $this->view->title         = $this->executions[$executionID] . $this->lang->colon . $this->lang->testtask->common;
+        $this->view->position[]    = html::a($this->createLink('execution', 'testtask', "executionID=$executionID"), $this->executions[$executionID]);
+        $this->view->position[]    = $this->lang->testtask->common;
+        $this->view->execution     = $execution;
+        $this->view->executionID   = $executionID;
+        $this->view->executionName = $this->executions[$executionID];
+        $this->view->pager         = $pager;
+        $this->view->orderBy       = $orderBy;
+        $this->view->tasks         = $productTasks;
+        $this->view->users         = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->products      = $this->loadModel('product')->getPairs('', 0);
+        $this->view->canBeChanged  = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
     }
@@ -1089,16 +1109,16 @@ class execution extends control
         foreach($dayList as $key => $val) $dayList[$key] = $this->lang->execution->interval . ($key + 1) . $this->lang->day;
 
         /* Assign. */
-        $this->view->title       = $title;
-        $this->view->position    = $position;
-        $this->view->tabID       = 'burn';
-        $this->view->burnBy      = $burnBy;
+        $this->view->title         = $title;
+        $this->view->position      = $position;
+        $this->view->tabID         = 'burn';
+        $this->view->burnBy        = $burnBy;
         $this->view->executionID   = $executionID;
         $this->view->executionName = $execution->name;
-        $this->view->type        = $type;
-        $this->view->interval    = $interval;
-        $this->view->chartData   = $chartData;
-        $this->view->dayList     = array('full' => $this->lang->execution->interval . '1' . $this->lang->day) + $dayList;
+        $this->view->type          = $type;
+        $this->view->interval      = $interval;
+        $this->view->chartData     = $chartData;
+        $this->view->dayList       = array('full' => $this->lang->execution->interval . '1' . $this->lang->day) + $dayList;
 
         unset($this->lang->TRActions);
         $this->display();
@@ -1149,9 +1169,6 @@ class execution extends control
      */
     public function team($executionID = 0)
     {
-        $moduleIndex = array_search('execution', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
         $execution   = $this->commonAction($executionID);
         $executionID = $execution->id;
 
@@ -1161,6 +1178,7 @@ class execution extends control
 
         $this->view->title        = $title;
         $this->view->position     = $position;
+        $this->view->deptUsers    = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
         $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
@@ -1169,23 +1187,40 @@ class execution extends control
     /**
      * Create a execution.
      *
-     * @param string $productID
+     * @param string $projectID
      * @param string $executionID
      * @param string $copyExecutionID
      * @param int    $planID
      * @param string $confirm
+     * @param string $productID
      *
      * @access public
      * @return void
      */
-    public function create($productID = '', $executionID = '', $copyExecutionID = '', $planID = 0, $confirm = 'no')
+    public function create($projectID = '', $executionID = '', $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0)
     {
+        /* Set menu. */
+        if($this->app->openApp == 'project')
+        {
+            if(!empty($copyExecutionID)) $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($copyExecutionID)->fetch('project');
+
+            $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
+            $this->project->setMenu($projectID);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $selectedExecutionID = $executionID;
+            if($this->config->systemMode == 'new') $selectedExecutionID = key($this->executions);
+            $this->execution->setMenu($selectedExecutionID);
+        }
+
         $this->app->loadLang('program');
         $this->app->loadLang('stage');
         $this->app->loadLang('programplan');
         if($executionID)
         {
-            if(!empty($planID))
+            $execution = $this->execution->getById($executionID);
+            if(!empty($planID) and $execution->lifetime != 'ops')
             {
                 if($confirm == 'yes')
                 {
@@ -1193,12 +1228,14 @@ class execution extends control
                 }
                 else
                 {
-                    die(js::confirm($this->lang->execution->importPlanStory, inlink('create', "productID=&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "productID=&executionID=$executionID"), 'parent', 'parent'));
+                    die(js::confirm($this->lang->execution->importPlanStory, inlink('create', "projectID=$projectID&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "projectID=$projectID&executionID=$executionID")));
                 }
             }
+
             $this->view->title       = $this->lang->execution->tips;
             $this->view->tips        = $this->fetch('execution', 'tips', "executionID=$executionID");
             $this->view->executionID = $executionID;
+            $this->view->projectID   = $projectID;
             $this->display();
             exit;
         }
@@ -1220,6 +1257,7 @@ class execution extends control
             $team        = $copyExecution->team;
             $acl         = $copyExecution->acl;
             $whitelist   = $copyExecution->whitelist;
+            $projectID   = $copyExecution->project;
             $products    = $this->execution->getProducts($copyExecutionID);
             foreach($products as $product)
             {
@@ -1250,6 +1288,13 @@ class execution extends control
 
             $this->executeHooks($executionID);
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $executionID));
+
+            if($this->app->openApp == 'doc')
+            {
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'objectLibs', "type=execution")));
+            }
+
             $planID = '';
             if(isset($_POST['plans']))
             {
@@ -1258,45 +1303,36 @@ class execution extends control
                     if(!empty($planID)) break;
                 }
             }
+
             if(!empty($planID))
             {
-                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "productID=&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=no")));
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "projectID=$projectID&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=no")));
             }
             else
             {
-                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "productID=&executionID=$executionID")));
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "projectID=$projectID&executionID=$executionID")));
             }
         }
 
-        $isSprint = true;
-        if($this->config->systemMode == 'new')
+        if(!empty($project->model) and $project->model == 'waterfall')
         {
-            $project = $this->project->getById($this->session->PRJ);
-            if($project->model == 'scrum')
-            {
-                unset($this->lang->execution->endList[62]);
-                unset($this->lang->execution->endList[93]);
-                unset($this->lang->execution->endList[186]);
-                unset($this->lang->execution->endList[365]);
-            }
+            $this->lang->execution->type = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->execution->type);
         }
 
-        $executionID = key($this->executions);
-        $this->execution->setMenu($this->executions, $executionID);
-
-        $this->view->title           = $this->lang->execution->create;
+        $this->view->title           = (($this->app->openApp == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
         $this->view->position[]      = $this->view->title;
-        $this->view->executions      = array('' => '') + $this->execution->getList();
+        $this->view->executions      = array('' => '') + $this->execution->getList($projectID);
         $this->view->groups          = $this->loadModel('group')->getPairs();
-        $this->view->allProducts     = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $this->view->allProducts     = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID);
         $this->view->acl             = $acl;
         $this->view->plan            = $plan;
         $this->view->name            = $name;
         $this->view->code            = $code;
         $this->view->team            = $team;
-        $this->view->allProjects     = array('' => '') + $this->project->getPairsByModel();
+        $this->view->allProjects     = array(0 => '') + $this->project->getPairsByModel();
         $this->view->executionID     = $executionID;
         $this->view->productID       = $productID;
+        $this->view->projectID       = $projectID;
         $this->view->products        = $products;
         $this->view->productPlan     = array(0 => '') + $productPlan;
         $this->view->productPlans    = array(0 => '') + $productPlans;
@@ -1304,7 +1340,7 @@ class execution extends control
         $this->view->copyExecutionID = $copyExecutionID;
         $this->view->branchGroups    = $this->loadModel('branch')->getByProducts(array_keys($products));
         $this->view->users           = $this->loadModel('user')->getPairs('nodeleted|noclosed');
-        $this->view->isSprint        = $isSprint;
+        $this->view->from            = $this->app->openApp;
         $this->display();
     }
 
@@ -1320,8 +1356,6 @@ class execution extends control
      */
     public function edit($executionID, $action = 'edit', $extra = '')
     {
-        $this->showModuleMenu();
-
         /* Load language files and get browseExecutionLink. */
         $this->app->loadLang('program');
         $this->app->loadLang('stage');
@@ -1330,6 +1364,13 @@ class execution extends control
 
         if(!empty($_POST))
         {
+            $oldPlans       = $this->dao->select('plan')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($executionID)->fetchPairs('plan');
+            $oldPlanStories = $this->dao->select('t1.story')->from(TABLE_PROJECTSTORY)->alias('t1')
+                ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.project=t2.project')
+                ->where('t1.project')->eq($executionID)
+                ->andWhere('t2.plan')->in(array_keys($oldPlans))
+                ->fetchAll('story');
+
             $oldProducts = $this->execution->getProducts($executionID);
             $changes     = $this->execution->update($executionID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -1355,12 +1396,22 @@ class execution extends control
                 $actionID = $this->loadModel('action')->create($this->objectType, $executionID, 'edited', '', $products);
                 $this->action->logHistory($actionID, $changes);
             }
+
+            /* Link the plan stories. */
+            $diffResult = array_diff($oldPlans, $_POST['plans']);
+            if(!empty($_POST['plans']) and !empty($diffResult))
+            {
+                $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
+                $this->loadModel('productplan')->linkProject($executionID, $_POST['plans'], $oldPlanStories);
+                $this->loadModel('productplan')->linkProject($projectID, $_POST['plans']);
+            }
+
             $this->executeHooks($executionID);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "executionID=$executionID")));
         }
 
         /* Set menu. */
-        $this->execution->setMenu($this->executions, $executionID);
+        $this->execution->setMenu($executionID);
 
         $executions = array('' => '') + $this->executions;
         $execution  = $this->execution->getById($executionID);
@@ -1401,23 +1452,6 @@ class execution extends control
             $productPlans[$product->id] = $this->productplan->getPairs($product->id);
         }
 
-        $isSprint = true;
-        if($this->config->systemMode == 'new')
-        {
-            $project = $this->project->getById($this->session->PRJ);
-            if($project->model == 'scrum')
-            {
-                unset($this->lang->execution->endList[62]);
-                unset($this->lang->execution->endList[93]);
-                unset($this->lang->execution->endList[186]);
-                unset($this->lang->execution->endList[365]);
-            }
-            else
-            {
-                $isSprint = false;
-            }
-        }
-
         $this->loadModel('user');
         $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $execution->PO, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
@@ -1433,8 +1467,8 @@ class execution extends control
 
         $this->view->title                = $title;
         $this->view->position             = $position;
-        $this->view->executions             = $executions;
-        $this->view->execution              = $execution;
+        $this->view->executions           = $executions;
+        $this->view->execution            = $execution;
         $this->view->poUsers              = $poUsers;
         $this->view->pmUsers              = $pmUsers;
         $this->view->qdUsers              = $qdUsers;
@@ -1446,7 +1480,6 @@ class execution extends control
         $this->view->unmodifiableProducts = $unmodifiableProducts;
         $this->view->productPlans         = $productPlans;
         $this->view->branchGroups         = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
-        $this->view->isSprint             = $isSprint;
         $this->display();
     }
 
@@ -1459,8 +1492,6 @@ class execution extends control
      */
     public function batchEdit($executionID = 0)
     {
-        $this->lang->execution->menu = $this->lang->execution->homeMenu;
-
         $this->app->loadLang('stage');
 
         if($this->post->names)
@@ -1479,7 +1510,14 @@ class execution extends control
             die(js::locate($this->session->executionList, 'parent'));
         }
 
-        $this->execution->setMenu($this->executions, $executionID);
+        if($this->app->openApp == 'project')
+        {
+            $this->project->setMenu($this->session->project);
+        }
+        else
+        {
+            $this->execution->setMenu($executionID);
+        }
 
         $executionIDList = $this->post->executionIDList ? $this->post->executionIDList : die(js::locate($this->session->executionList, 'parent'));
         $executions      = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id');
@@ -1511,8 +1549,6 @@ class execution extends control
         $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
-        $project = $this->project->getById($this->session->PRJ);
-
         $this->view->title           = $this->lang->execution->batchEdit;
         $this->view->position[]      = $this->lang->execution->batchEdit;
         $this->view->executionIDList = $executionIDList;
@@ -1521,7 +1557,7 @@ class execution extends control
         $this->view->poUsers         = $poUsers;
         $this->view->qdUsers         = $qdUsers;
         $this->view->rdUsers         = $rdUsers;
-        $this->view->isStage         = $project->model == 'waterfall' ? true : false;
+        $this->view->from            = $this->app->openApp;
         $this->display();
     }
 
@@ -1716,16 +1752,14 @@ class execution extends control
      */
     public function view($executionID)
     {
-        $this->showModuleMenu();
-
-        $execution = $this->execution->getById($executionID, true);
+        $executionID = (int)$executionID;
+        $execution   = $this->execution->getById($executionID, true);
         if(empty($execution) || strpos('stage,sprint', $execution->type) === false) die(js::error($this->lang->notFound) . js::locate('back'));
 
         $this->app->loadLang('program');
-        $this->session->PRJ = $execution->project;
 
         /* Execution not found to prevent searching for .*/
-        if(!isset($this->executions[$execution->id])) $this->executions = $this->execution->getPairs($execution->execution, 'all', 'nocode');
+        if(!isset($this->executions[$execution->id])) $this->executions = $this->execution->getPairs($execution->project, 'all', 'nocode');
 
         $products = $this->execution->getProducts($execution->id);
         $linkedBranches = array();
@@ -1735,7 +1769,7 @@ class execution extends control
         }
 
         /* Set menu. */
-        $this->execution->setMenu($this->executions, $execution->id);
+        $this->execution->setMenu($execution->id);
         $this->app->loadLang('bug');
 
         list($dateList, $interval) = $this->execution->getDateList($execution->begin, $execution->end, 'noweekend', 0, 'Y-m-d');
@@ -1756,7 +1790,7 @@ class execution extends control
         $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), '', $linkedBranches);
         $this->view->planGroups   = $this->execution->getPlans($products);
         $this->view->actions      = $this->loadModel('action')->getList('execution', $executionID);
-        $this->view->dynamics     = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $executionID);
+        $this->view->dynamics     = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', 'all', $executionID);
         $this->view->users        = $this->loadModel('user')->getPairs('noletter');
         $this->view->teamMembers  = $this->execution->getTeamMembers($executionID);
         $this->view->docLibs      = $this->loadModel('doc')->getLibsByObject('execution', $executionID);
@@ -1780,14 +1814,13 @@ class execution extends control
     {
         /* Save to session. */
         $uri = $this->app->getURI(true);
-        $this->app->session->set('taskList',  $uri);
-        $this->app->session->set('storyList', $uri);
-        $this->app->session->set('bugList',   $uri);
+        $this->app->session->set('taskList',  $uri, 'execution');
+        $this->app->session->set('bugList',   $uri, 'qa');
 
         /* Compatibility IE8*/
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
-        $this->execution->setMenu($this->executions, $executionID);
+        $this->execution->setMenu($executionID);
         $execution = $this->loadModel('execution')->getById($executionID);
         $tasks   = $this->execution->getKanbanTasks($executionID, "id");
         $bugs    = $this->loadModel('bug')->getExecutionBugs($executionID);
@@ -1806,9 +1839,9 @@ class execution extends control
         $this->view->realnames     = $this->loadModel('user')->getPairs('noletter');
         $this->view->storyOrder    = $orderBy;
         $this->view->orderBy       = 'id_asc';
-        $this->view->executionID     = $executionID;
+        $this->view->executionID   = $executionID;
         $this->view->browseType    = '';
-        $this->view->execution       = $execution;
+        $this->view->execution     = $execution;
         $this->view->type          = $type;
         $this->view->kanbanGroup   = $kanbanGroup;
         $this->view->kanbanColumns = $this->execution->getKanbanColumns($kanbanSetting);
@@ -1831,29 +1864,28 @@ class execution extends control
      */
     public function tree($executionID, $type = 'task')
     {
-        $this->showModuleMenu();
+        $this->execution->setMenu($executionID);
 
-        $this->execution->setMenu($this->executions, $executionID);
         $execution = $this->loadModel('execution')->getById($executionID);
-        $tree    = $this->execution->getTree($executionID);
+        $tree      = $this->execution->getTree($executionID);
 
         /* Save to session. */
         $uri = $this->app->getURI(true);
-        $this->app->session->set('taskList',    $uri);
-        $this->app->session->set('storyList',   $uri);
-        $this->app->session->set('executionList', $uri);
-        $this->app->session->set('caseList', $uri);
-        $this->app->session->set('bugList', $uri);
+        $this->app->session->set('taskList', $uri, 'execution');
+        $this->app->session->set('storyList', $uri, 'execution');
+        $this->app->session->set('executionList', $uri, 'execution');
+        $this->app->session->set('caseList', $uri, 'qa');
+        $this->app->session->set('bugList', $uri, 'qa');
 
         if($type === 'json') die(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
 
         $this->view->title      = $this->lang->execution->tree;
         $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
-        $this->view->position[] = $this->lang->execution->tree;
-        $this->view->execution    = $execution;
-        $this->view->executionID  = $executionID;
-        $this->view->level      = $type;
-        $this->view->tree       = $this->execution->printTree($tree);
+        $this->view->position[]  = $this->lang->execution->tree;
+        $this->view->execution   = $execution;
+        $this->view->executionID = $executionID;
+        $this->view->level       = $type;
+        $this->view->tree        = $this->execution->printTree($tree);
         $this->display();
     }
 
@@ -1872,14 +1904,14 @@ class execution extends control
 
         if($_POST)
         {
-            $stories    = $this->loadModel('story')->getStories($executionID, 0, 0, $orderBy);
+            $stories    = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, $orderBy);
             $storySpecs = $this->story->getStorySpecs(array_keys($stories));
 
             $order = 1;
             foreach($stories as $story) $story->order = $order++;
 
             $kanbanTasks = $this->execution->getKanbanTasks($executionID, "id");
-            $kanbanBugs  = $this->loadModel('bug')->getBugs($executionID);
+            $kanbanBugs  = $this->loadModel('bug')->getExecutionBugs($executionID);
 
             $users       = array();
             $taskAndBugs = array();
@@ -1911,7 +1943,7 @@ class execution extends control
             unset($this->lang->story->stageList['']);
             unset($this->lang->story->stageList['wait']);
             unset($this->lang->story->stageList['planned']);
-            unset($this->lang->story->stageList['executioned']);
+            unset($this->lang->story->stageList['projected']);
             unset($this->lang->story->stageList['released']);
             unset($this->lang->task->statusList['']);
             unset($this->lang->task->statusList['wait']);
@@ -1949,7 +1981,7 @@ class execution extends control
 
             $this->view->hasBurn    = $hasBurn;
             $this->view->datas      = $datas;
-            $this->view->chartData  = $chartData;
+            $this->view->chartData  = isset($chartData) ? $chartData : array();
             $this->view->storySpecs = $storySpecs;
             $this->view->realnames  = $this->loadModel('user')->getRealNameAndEmails($users);
             $this->view->executionID  = $executionID;
@@ -1958,7 +1990,7 @@ class execution extends control
 
         }
 
-        $this->execution->setMenu($this->executions, $executionID);
+        $this->execution->setMenu($executionID);
         $execution = $this->execution->getById($executionID);
 
         $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
@@ -1975,16 +2007,12 @@ class execution extends control
      */
     public function storyKanban($executionID)
     {
-        /* Save to session. */
-        $uri = $this->app->getURI(true);
-        $this->app->session->set('storyList', $uri);
-
         /* Compatibility IE8*/
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
-        $this->execution->setMenu($this->executions, $executionID);
+        $this->execution->setMenu($executionID);
         $execution = $this->loadModel('execution')->getById($executionID);
-        $stories = $this->loadModel('story')->getStories($executionID);
+        $stories = $this->loadModel('story')->getExecutionStories($executionID);
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
 
         /* Get execution's product. */
@@ -1997,8 +2025,8 @@ class execution extends control
         $this->view->position[]   = $this->lang->execution->storyKanban;
         $this->view->stories      = $this->story->getKanbanGroupData($stories);
         $this->view->realnames    = $this->loadModel('user')->getPairs('noletter');
-        $this->view->executionID    = $executionID;
-        $this->view->execution      = $execution;
+        $this->view->executionID  = $executionID;
+        $this->view->execution    = $execution;
         $this->view->productID    = $productID;
         $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
@@ -2036,6 +2064,13 @@ class execution extends control
             if($unresolvedBugs->count)  $tips .= sprintf($this->lang->execution->unresolvedBug,  $unresolvedBugs->count);
             if($tips)                   $tips  = $this->lang->execution->unfinishedExecution . $tips;
 
+            $type = $this->dao->select('type')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('type');
+            if($type == 'stage')
+            {
+                if($tips) $tips = str_replace($this->lang->executionCommon, $this->lang->project->stage, $tips);
+                $this->lang->execution->confirmDelete = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->execution->confirmDelete);
+            }
+
             echo js::confirm($tips . sprintf($this->lang->execution->confirmDelete, $this->executions[$executionID]), $this->createLink('execution', 'delete', "executionID=$executionID&confirm=yes"));
             exit;
         }
@@ -2043,12 +2078,12 @@ class execution extends control
         {
             /* Delete execution. */
             $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->eq($executionID)->exec();
-            $this->loadModel('action')->create($this->objectType, $executionID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
-            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('execution')->eq($executionID)->exec();
+            $this->loadModel('action')->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
             $this->execution->updateUserView($executionID);
+
             $this->session->set('execution', '');
             $this->executeHooks($executionID);
-            die(js::locate(inlink('index'), 'parent'));
+            die(js::reload('parent'));
         }
     }
 
@@ -2062,14 +2097,14 @@ class execution extends control
      */
     public function manageProducts($executionID, $from = '')
     {
-        $moduleIndex = array_search('execution', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
         /* use first execution if executionID does not exist. */
         if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
 
         $browseExecutionLink = $this->createLink('execution', 'browse', "executionID=$executionID");
 
+        $this->loadModel('product');
+        $execution  = $this->execution->getById($executionID);
+
         if(!empty($_POST))
         {
             /* Get executionType and determine whether a product is linked with the stage. */
@@ -2094,14 +2129,15 @@ class execution extends control
             $diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
             if($diffProducts) $this->loadModel('action')->create($this->objectType, $executionID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
 
-            die(js::locate($browseExecutionLink));
+            if(isonlybody())
+            {
+                unset($_GET['onlybody']);
+                die(js::locate($this->createLink('build', 'create', "executionID=$executionID&productID=0&projectID=$execution->project"), 'parent'));
+            }
         }
 
-        $this->loadModel('product');
-        $execution  = $this->execution->getById($executionID);
-
         /* Set menu. */
-        $this->execution->setMenu($this->executions, $execution->id);
+        $this->execution->setMenu($execution->id);
 
         /* Title and position. */
         $title      = $this->lang->execution->manageProducts . $this->lang->colon . $execution->name;
@@ -2150,11 +2186,10 @@ class execution extends control
      */
     public function manageMembers($executionID = 0, $team2Import = 0, $dept = 0)
     {
-        $this->showModuleMenu();
-
         if(!empty($_POST))
         {
             $this->execution->manageMembers($executionID);
+            $this->loadModel('action')->create('team', $executionID, 'managedTeam');
             die(js::locate($this->createLink('execution', 'team', "executionID=$executionID"), 'parent'));
         }
 
@@ -2182,7 +2217,7 @@ class execution extends control
         $roles = $this->user->getUserRoles(array_keys($users));
 
         /* Set menu. */
-        $this->execution->setMenu($this->executions, $execution->id);
+        $this->execution->setMenu($execution->id);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["accounts[]"] = $this->config->user->moreLink;
 
         $title      = $this->lang->execution->manageMembers . $this->lang->colon . $execution->name;
@@ -2221,6 +2256,7 @@ class execution extends control
         $account = $user->account;
 
         $this->execution->unlinkMember($executionID, $account);
+        if(!dao::isError()) $this->loadModel('action')->create('team', $executionID, 'managedTeam');
 
         /* if ajax request, send result. */
         if($this->server->ajax)
@@ -2243,7 +2279,7 @@ class execution extends control
     /**
      * Link stories to an execution.
      *
-     * @param  int    $executionID
+     * @param  int    $objectID
      * @param  string $browseType
      * @param  int    $param
      * @param  int    $recTotal
@@ -2252,33 +2288,41 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function linkStory($executionID = 0, $browseType = '', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
+    public function linkStory($objectID = 0, $browseType = '', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
     {
         $this->loadModel('story');
         $this->loadModel('product');
 
-        /* Get executions and products. */
-        $execution  = $this->execution->getById($executionID);
-        $products   = $this->execution->getProducts($executionID);
-        $browseLink = $this->createLink('execution', 'story', "executionID=$executionID");
-        if($execution->type == 'project') $browseLink = $this->createLink('projectstory', 'story');
+        /* Get projects, executions and products. */
+        $object     = $this->project->getByID($objectID, $this->app->openApp == 'project' ? 'project' : 'sprint,stage');
+        $products   = $this->project->getProducts($objectID);
+        $browseLink = $this->createLink($this->app->openApp == 'project' ? 'projectstory' : 'execution', 'story', "objectID=$objectID");
 
-        $this->session->set('storyList', $this->app->getURI(true)); // Save session.
-        if($execution->type != 'execution') $this->execution->setMenu($this->executions, $execution->id);     // Set menu.
+        $this->session->set('storyList', $this->app->getURI(true), $this->app->openApp); // Save session.
 
+        /* Only execution can have no products. */
         if(empty($products))
         {
             echo js::alert($this->lang->execution->errorNoLinkedProducts);
-            die(js::locate($this->createLink('execution', 'manageproducts', "executionID=$executionID")));
+            die(js::locate($this->createLink('execution', 'manageproducts', "executionID=$objectID")));
         }
 
         if(!empty($_POST))
         {
-            $this->execution->linkStory($executionID);
-            if($execution->project != 0) $this->execution->linkStory($execution->project);
+            $this->execution->linkStory($objectID);
+            if($object->type != 'project' and $object->project != 0) $this->execution->linkStory($object->project);
             die(js::locate($browseLink));
         }
 
+        if($object->type == 'project')
+        {
+            $this->project->setMenu($object->id);
+        }
+        else if($object->type == 'sprint' or $object->type == 'stage')
+        {
+            $this->execution->setMenu($object->id);
+        }
+
         $queryID = ($browseType == 'bySearch') ? (int)$param : 0;
 
         /* Set modules and branches. */
@@ -2303,28 +2347,24 @@ class execution extends control
         }
 
         /* Build the search form. */
-        $actionURL    = $this->createLink($this->app->rawModule, 'linkStory', "executionID=$executionID&browseType=bySearch&queryID=myQueryID");
+        $actionURL    = $this->createLink($this->app->rawModule, 'linkStory', "objectID=$objectID&browseType=bySearch&queryID=myQueryID");
         $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
         $this->execution->buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, 'linkStory');
 
         if($browseType == 'bySearch')
         {
-            $allStories = $this->story->getBySearch('', 0, $queryID, 'id', $executionID);
+            $allStories = $this->story->getBySearch('', 0, $queryID, 'id', $objectID);
         }
         else
         {
             $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
         }
 
-        if($execution->project != 0) $projectStories = $this->story->getExecutionStoryPairs($execution->project);
-
-        $executionStories = $this->story->getExecutionStoryPairs($executionID);
+        $linkedStories = $this->story->getExecutionStoryPairs($objectID);
         foreach($allStories as $id => $story)
         {
-            if(isset($executionStories[$story->id])) unset($allStories[$id]);
-
+            if(isset($linkedStories[$story->id])) unset($allStories[$id]);
             if($story->parent < 0) unset($allStories[$id]);
-            if(!empty($projectStories) and !isset($projectStories[$story->id])) unset($allStories[$id]);
         }
 
         /* Pager. */
@@ -2334,20 +2374,19 @@ class execution extends control
         $allStories = array_chunk($allStories, $pager->recPerPage);
 
         /* Assign. */
-        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->execution->linkStory;
-        $this->view->position[] = html::a($browseLink, $execution->name);
+        $this->view->title      = $object->name . $this->lang->colon . $this->lang->execution->linkStory;
+        $this->view->position[] = html::a($browseLink, $object->name);
         $this->view->position[] = $this->lang->execution->linkStory;
 
-        $this->view->execution          = $execution;
-        $this->view->products         = $products;
-        $this->view->executionStories = empty($executionStories) ? '' : $executionStories;
-        $this->view->allStories       = empty($allStories) ? $allStories : $allStories[$pageID - 1];;
-        $this->view->pager            = $pager;
-        $this->view->browseType       = $browseType;
-        $this->view->productType      = $productType;
-        $this->view->modules          = $modules;
-        $this->view->users            = $this->loadModel('user')->getPairs('noletter');
-        $this->view->branchGroups     = $branchGroups;
+        $this->view->object       = $object;
+        $this->view->products     = $products;
+        $this->view->allStories   = empty($allStories) ? $allStories : $allStories[$pageID - 1];
+        $this->view->pager        = $pager;
+        $this->view->browseType   = $browseType;
+        $this->view->productType  = $productType;
+        $this->view->modules      = $modules;
+        $this->view->users        = $this->loadModel('user')->getPairs('noletter');
+        $this->view->branchGroups = $branchGroups;
 
         $this->display();
     }
@@ -2433,16 +2472,16 @@ class execution extends control
     {
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('executionList',   $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
 
         /* use first execution if executionID does not exist. */
         if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
@@ -2452,7 +2491,7 @@ class execution extends control
         $sort    = $this->loadModel('common')->appendOrder($orderBy);
 
         /* Set the menu. If the executionID = 0, use the indexMenu instead. */
-        $this->execution->setMenu($this->executions, $executionID);
+        $this->execution->setMenu($executionID);
         if($executionID == 0)
         {
             $this->executions = array('0' => $this->lang->execution->selectExecution) + $this->executions;
@@ -2474,7 +2513,7 @@ class execution extends control
         }
         $period  = $type == 'account' ? 'all'  : $type;
         $date    = empty($date) ? '' : date('Y-m-d', $date);
-        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', $executionID, $date, $direction);
+        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', 'all', $executionID, $date, $direction);
 
         /* The header and position. */
         $execution = $this->execution->getByID($executionID);
@@ -2482,7 +2521,7 @@ class execution extends control
         $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
         $this->view->position[] = $this->lang->execution->dynamic;
 
-        $this->view->userIdPairs  = $this->execution->getTeamMemberPairs($executionID, 'nodeleted|useid');
+        $this->view->userIdPairs  = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted|useid');
         $this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
 
         /* Assign. */
@@ -2520,7 +2559,7 @@ class execution extends control
      */
     public function ajaxGetMembers($executionID, $assignedTo = '')
     {
-        $users = $this->execution->getTeamMemberPairs($executionID);
+        $users = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
         if($this->app->getViewType() === 'json')
         {
             die(json_encode($users));
@@ -2550,59 +2589,64 @@ class execution extends control
      * Drop menu page.
      *
      * @param  int    $executionID
-     * @param  int    $module
-     * @param  int    $method
-     * @param  int    $extra
+     * @param  string $module
+     * @param  string $method
+     * @param  mix    $extra
      * @access public
      * @return void
      */
     public function ajaxGetDropMenu($executionID, $module, $method, $extra)
     {
-        $execution = $this->execution->getByID($executionID);
+        $orderedExecutions = array();
 
-        $this->view->link        = $this->execution->getLink($module, $method, $extra);
-        $this->view->executionID = $executionID;
-        $this->view->module      = $module;
-        $this->view->method      = $method;
-        $this->view->extra       = $extra;
-        $this->view->projects    = $this->project->getPairsByModel();
-        $this->view->executions  = $this->execution->getList();
-        $this->display();
-    }
+        $projects = $this->loadModel('program')->getProjectList(0, 'all', 0, 'order_asc');
+        $executionGroups = $this->dao->select('*')->from(TABLE_EXECUTION)
+            ->where('deleted')->eq(0)
+            ->andWhere('type')->in('sprint,stage')
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
+            ->beginIF($this->config->systemMode == 'new')->andWhere('project')->in(array_keys($projects))->fi()
+            ->orderBy('id_desc')
+            ->fetchGroup('project', 'id');
 
-    /**
-     * Get recent executions.
-     *
-     * @access public
-     * @return void
-     */
-    public function ajaxGetRecentExecutions()
-    {
-        $allExecutions = $this->execution->getRecentExecutions();
-        if(!empty($allExecutions))
+        $teams = $this->dao->select('root,account')->from(TABLE_TEAM)
+            ->where('root')->in($this->app->user->view->sprints)
+            ->andWhere('type')->eq('execution')
+            ->fetchGroup('root', 'account');
+
+        if($this->config->systemMode == 'new')
         {
-            foreach($allExecutions as $type => $executionList)
+            foreach($projects as $project)
             {
-                echo '<div class="heading">'. $this->lang->execution->$type . '</div>';
-                $color          = $type == 'recent' ? 'text-brown' : '';
-                $executions     = $allExecutions[$type];
-                $executionsName = array();
-                foreach($executions as $execution) $executionsName[] = $execution->name;
-                $executionsPinYin = common::convert2Pinyin($executionsName);
+                $executions = zget($executionGroups, $project->id, array());
+
                 foreach($executions as $execution)
                 {
-                    $link = helper::createLink('execution', 'task', 'executionID=' . $execution->id, '', false, $execution->project);
-                    $execution->code = empty($execution->code) ? $execution->name : $execution->code;
-                    $dataKey = 'date-key="' . zget($executionsPinYin, $execution->name, $execution->name) . '"';
-                    $class   = "class='search-list-item $color' title='$execution->name' $dataKey";
-                    echo html::a($link, '<i class="icon icon-' . $this->lang->icons[$execution->type] . '"></i> ' . $execution->name, '', $class);
+                    if(isset($orderedExecutions[$execution->parent])) unset($orderedExecutions[$execution->parent]);
+                    $execution->teams = zget($teams, $execution->id, array());
+                    $orderedExecutions[$execution->id] = $execution;
                 }
             }
         }
         else
         {
-            echo '<div class="table-empty-tip">' . $this->lang->noData . '</div>';
+            foreach($executionGroups as $projectID => $executions)
+            {
+                foreach($executions as $execution)
+                {
+                    $execution->teams = zget($teams, $execution->id, array());
+                    $orderedExecutions[$execution->id] = $execution;
+                }
+            }
         }
+
+        $this->view->link        = $this->execution->getLink($module, $method, $extra);
+        $this->view->module      = $module;
+        $this->view->method      = $method;
+        $this->view->executionID = $executionID;
+        $this->view->extra       = $extra;
+        $this->view->projects    = $this->project->getPairsByModel();
+        $this->view->executions  = $orderedExecutions;
+        $this->display();
     }
 
     /**
@@ -2646,6 +2690,44 @@ class execution extends control
         }
     }
 
+    /**
+     * Story estimate.
+     *
+     * @param  int    $executionID
+     * @param  int    $storyID
+     * @param  int    $round
+     * @access public
+     * @return void
+     */
+    public function storyEstimate($executionID, $storyID, $round = 0)
+    {
+        $this->loadModel('story');
+
+        if($_POST)
+        {
+            $this->story->saveEstimateInfo($storyID);
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+                $this->send($response);
+            }
+
+            $this->loadModel('action')->create('story', $storyID, 'estimated', '', $executionID);
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('execution', 'storyEstimate', "executionID=$executionID&storyID=$storyID")));
+        }
+        $estimateInfo = $this->story->getEstimateInfo($storyID, $round);
+
+        $this->view->estimateInfo = $estimateInfo;
+        $this->view->round        = !empty($estimateInfo->round) ? $estimateInfo->round : 0;
+        $this->view->rounds       = $this->story->getEstimateRounds($storyID);
+        $this->view->users        = $this->loadModel('user')->getPairs('noletter');
+        $this->view->team         = $this->execution->getTeamMembers($executionID);
+        $this->view->executionID  = $executionID;
+        $this->view->storyID      = $storyID;
+        $this->display();
+    }
+
     /**
      * All execution.
      *
@@ -2659,16 +2741,26 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function all($status = 'all', $projectID = 0, $from = 'execution', $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
+    public function all($status = 'all', $projectID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
     {
-        $this->lang->execution->menu = $this->lang->execution->homeMenu;
-
         $this->app->loadLang('my');
         $this->app->loadLang('product');
         $this->app->loadLang('programplan');
 
-        if($from == 'execution') $this->session->set('executionList', $this->app->getURI(true));
-        if($from == 'project') $this->lang->navGroup->execution = 'project';
+        $from = $this->app->openApp;
+        if($from == 'execution') $this->session->set('executionList', $this->app->getURI(true), 'execution');
+        if($from == 'project')
+        {
+            $projects  = $this->project->getPairsByProgram();
+            $projectID = $this->project->saveState($projectID, $projects);
+            $this->project->setMenu($projectID);
+        }
+
+        if($this->app->viewType == 'mhtml')
+        {
+            $executionID = $this->execution->saveState(0, $this->executions);
+            $this->execution->setMenu($executionID);
+        }
 
         /* Load pager and get tasks. */
         $this->app->loadClass('pager', $static = true);
@@ -2686,7 +2778,6 @@ class execution extends control
         $this->view->users          = $this->loadModel('user')->getPairs('noletter');
         $this->view->status         = $status;
         $this->view->from           = $from;
-        $this->view->projectTree    = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list');
 
         $this->display();
     }
@@ -2706,14 +2797,11 @@ class execution extends control
      */
     public function whitelist($executionID = 0, $module='execution', $objectType = 'sprint', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $moduleIndex = array_search('execution', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
         /* use first execution if executionID does not exist. */
         if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
 
         /* Set the menu. If the executionID = 0, use the indexMenu instead. */
-        $this->execution->setMenu($this->executions, $executionID);
+        $this->execution->setMenu($executionID);
 
         echo $this->fetch('personnel', 'whitelist', "objectID=$executionID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
@@ -2728,13 +2816,11 @@ class execution extends control
      */
     public function addWhitelist($executionID = 0, $deptID = 0)
     {
-        $this->showModuleMenu();
-
         /* use first execution if executionID does not exist. */
         if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
 
         /* Set the menu. If the executionID = 0, use the indexMenu instead. */
-        $this->execution->setMenu($this->executions, $executionID);
+        $this->execution->setMenu($executionID);
 
         echo $this->fetch('personnel', 'addWhitelist', "objectID=$executionID&dept=$deptID&objectType=sprint&module=execution");
     }
@@ -2778,9 +2864,9 @@ class execution extends control
                 unset($fields[$key]);
             }
 
-            $projectID = $from == 'project' ? $this->session->PRJ : 0;
+            $projectID = $from == 'project' ? $this->session->project : 0;
             $executionStats = $this->project->getStats($projectID, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'id_asc');
-            $users        = $this->loadModel('user')->getPairs('noletter');
+            $users = $this->loadModel('user')->getPairs('noletter');
             foreach($executionStats as $i => $execution)
             {
                 $execution->PM            = zget($users, $execution->PM);
@@ -2804,6 +2890,12 @@ class execution extends control
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }
 
+        $this->loadModel('project');
+        $project = $this->project->getByID($this->session->project);
+        if($project->model == 'waterfall') $this->lang->executionCommon = $this->lang->project->stage;
+
+        $this->view->fileName = (in_array($status, array('all', 'undone')) ? $this->lang->execution->$status : $this->lang->execution->statusList[$status]) . $this->lang->executionCommon;
+
         $this->display();
     }
 
@@ -2908,7 +3000,7 @@ class execution extends control
             }
             $planStories = array_keys($planStory);
             $this->execution->linkStory($executionID, $planStories, $planProducts);
-            if($executionID != $this->session->PRJ) $this->execution->linkStory($this->session->PRJ, $planStories, $planProducts);
+            if($executionID != $this->session->project) $this->execution->linkStory($this->session->project, $planStories, $planProducts);
         }
 
         $moduleName = 'execution';
@@ -2916,7 +3008,7 @@ class execution extends control
         if($execution->type == 'project')
         {
             $moduleName = 'projectstory';
-            $param      = "productID=$productID";
+            $param      = "projectID=$executionID";
         }
         if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate($this->createLink($moduleName, 'story', $param));
         die(js::locate(helper::createLink($moduleName, 'story', $param), 'parent'));
@@ -2953,7 +3045,7 @@ class execution extends control
         $this->view->cases      = $cases;
         $this->view->story      = $story;
         $this->view->users      = $users;
-        $this->view->executions = $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'nocode');
+        $this->view->executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
         $this->view->actions    = $this->loadModel('action')->getList('story', $storyID);
         $this->view->modulePath = $modulePath;
         $this->view->version    = $version == 0 ? $story->version : $version;
@@ -3005,16 +3097,4 @@ class execution extends control
         $this->view->users   = $this->loadModel('user')->getPairs('noletter');
         $this->display();
     }
-
-    /**
-     * Show module menu for some module.
-     *
-     * @access public
-     * @return void
-     */
-    public function showModuleMenu()
-    {
-        $moduleIndex = array_search('execution', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-    }
 }
diff --git a/module/execution/css/story.css b/module/execution/css/story.css
index f92f123804..1155892628 100644
--- a/module/execution/css/story.css
+++ b/module/execution/css/story.css
@@ -1,7 +1,9 @@
 #linkButton {border-radius: 4px !important;}
 tbody > tr > td > .btn-icon {margin-right: 4px;}
+.table td.c-estimate {padding-right: 12px;}
 #modules a.active {color: #0c64eb;}
 @media (max-width: 1200px) {#storyList .c-user, #storyList .c-estimate {display: none !important;};}
 @media (max-width: 1000px) {#storyList .c-status, #storyList .c-pri {display: none !important;};}
 @media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none !important;};}
 #batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;}
+th.c-pri{width:50px;}
diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index 03ab54a640..c821cffd61 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -2,6 +2,7 @@ td.delayed {background: #e84e0f !important; color: white;}
 #int-dropdown {margin-left: -8px; border-radius: 4px; border: 1px solid #0c64eb;}
 #projectTaskForm table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 th.c-deadline {text-align: center;}
+.table td.c-estimate, .table td.c-consumed, .table td.c-left {padding-right: 12px;}
 .c-estimate {text-align: right;}
 .c-consumed {text-align: right;}
 .c-left {text-align: right;}
diff --git a/module/execution/js/build.js b/module/execution/js/build.js
index 63c872731a..928bea0fc4 100644
--- a/module/execution/js/build.js
+++ b/module/execution/js/build.js
@@ -7,6 +7,6 @@
  */
 function changeProduct(productID)
 {
-    link = createLink('project', 'build', 'projectID=' + projectID + '&type=product&param=' + productID);
+    link = createLink('execution', 'build', 'executionID=' + executionID + '&type=product&param=' + productID);
     location.href = link;
 }
diff --git a/module/execution/js/burn.js b/module/execution/js/burn.js
index 6b4a64966f..85e78025cf 100644
--- a/module/execution/js/burn.js
+++ b/module/execution/js/burn.js
@@ -3,7 +3,7 @@ $(function()
     initBurnChar();
     $('#interval').change(function()
     {
-        location.href = createLink('project', 'burn', 'projectID=' + projectID + '&type=' + type + '&interval=' + $(this).val());
+        location.href = createLink('execution', 'burn', 'executionID=' + executionID + '&type=' + type + '&interval=' + $(this).val());
     });
 })
 
@@ -40,7 +40,7 @@ function downloadBurn()
         var $canvas  = $('#cloneCanvas #burnCanvas');
         var imgSrc   = $canvas.get(0).toDataURL("image/png");
         var imgData  = imgSrc.replace(type,'image/octet-stream');
-        var filename = projectName + '.' + type;
+        var filename = executionName + '.' + type;
         saveFile(imgData,filename);
         $('#burnWrapper #cloneCanvas').remove();
     }, 500);
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 3d2311b7d5..e3290b67ff 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -1,6 +1,6 @@
 function setCopyProject(executionID)
 {
-    location.href = createLink('execution', 'create', 'productID=&executionID=0&copyExecutionID=' + executionID);
+    location.href = createLink('execution', 'create', 'projectID=&executionID=0&copyExecutionID=' + executionID);
 }
 
 $(function()
@@ -38,7 +38,7 @@ $(function()
 
     var adjustMainCol = function()
     {
-        if(isSprint) $('.main-form .col-main').css('width', Math.max(250, Math.floor(($('#productsBox').outerWidth() - 50)/3) + 10));
+        if(!isStage) $('.main-form .col-main').css('width', Math.max(250, Math.floor(($('#productsBox').outerWidth() - 50)/3) + 10));
     };
     adjustMainCol();
     $(window).on('resize', adjustMainCol);
@@ -57,3 +57,14 @@ function showLifeTimeTips()
     }
 }
 
+/**
+ * Refresh page.
+ *
+ * @param  object $projectID
+ * @access public
+ * @return void
+ */
+function refreshPage(projectID)
+{
+    location.href = createLink('execution', 'create', 'projectID=' + projectID);
+}
diff --git a/module/execution/js/importtask.js b/module/execution/js/importtask.js
index 7b76460b86..47b2dca33d 100644
--- a/module/execution/js/importtask.js
+++ b/module/execution/js/importtask.js
@@ -1,5 +1,5 @@
 function reload(toProject, fromProject)
-{ 
-    link = createLink('project','importtask','toProject='+toProject + '&fromProject='+fromProject);
+{
+    link = createLink('execution','importtask','toProject='+toProject + '&fromProject='+fromProject);
     location.href = link;
 }
diff --git a/module/execution/js/managemembers.js b/module/execution/js/managemembers.js
index db7fa3260f..20888acb49 100644
--- a/module/execution/js/managemembers.js
+++ b/module/execution/js/managemembers.js
@@ -39,14 +39,14 @@ function deleteItem(obj)
 
 function setDeptUsers(obj)
 {
-    dept = $(obj).val();//Get dept ID.
-    link = createLink('project', 'manageMembers', 'projectID=' + projectID + '&team2Import=' + team2Import + '&dept=' + dept);//Create manageMembers link.
+    dept = $(obj).val(); // Get dept ID.
+    link = createLink('execution', 'manageMembers', 'executionID=' + executionID + '&team2Import=' + team2Import + '&dept=' + dept); // Create manageMembers link.
     location.href=link;
 }
 
 function choseTeam2Copy(obj)
 {
     team = $(obj).val();
-    link = createLink('project', 'manageMembers', 'projectID=' + projectID + '&team2Import=' + team);
+    link = createLink('execution', 'manageMembers', 'executionID=' + executionID + '&team2Import=' + team);
     location.href=link;
 }
diff --git a/module/execution/js/storyestimate.js b/module/execution/js/storyestimate.js
new file mode 100644
index 0000000000..98b0e4c576
--- /dev/null
+++ b/module/execution/js/storyestimate.js
@@ -0,0 +1,48 @@
+$('.new-estimate input').keyup(function()
+{
+    computeAverage();
+})
+
+$(function()
+{
+    $('#round_chosen').click(function()
+    {
+        var maxHeight = $(window).height() - 150;
+        $('.chosen-container .chosen-results').attr('style', 'max-height: ' + maxHeight + 'px !important;');
+    })
+})
+
+function computeAverage()
+{
+    var summary = 0;
+    var count   = 0;
+    var average = 0;
+    $('.new-estimate').each(function()
+    {
+        var value = $(this).find('input').val();
+        if(value)
+        {
+            value = parseFloat(value);
+            if(isNaN(value)) value = 0;
+            summary += value;
+            count   += 1;
+        }
+    })
+
+    if(count) average = summary / count;
+    $('#average').val(average.toFixed(2));
+    $('#showAverage').html(average.toFixed(2));
+}
+
+function showNewEstimate()
+{
+    $('.th-new-estimate').removeClass('hide');
+    $('.new-estimate').removeClass('hide');
+    $('.form-actions').removeClass('hide');
+    $('.empty-th').addClass('hide');
+}
+
+function selectRound(round)
+{
+    location.href = createLink('execution', 'storyEstimate', 'executionID=' + executionID + '&storyID=' + storyID + '&round=' + round);
+}
diff --git a/module/execution/js/task.js b/module/execution/js/task.js
index ae8f1a4439..032f77cbbe 100644
--- a/module/execution/js/task.js
+++ b/module/execution/js/task.js
@@ -10,7 +10,27 @@ $(function()
     });
 
     toggleFold('#projectTaskForm', unfoldTasks, executionID, 'project');
+
+    adjustTableFooter();
+    $('body').on('click', '#toggleFold', adjustTableFooter);
+    $('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter);
 });
 
 $('#module' + moduleID).closest('li').addClass('active');
 $('#product' + productID).closest('li').addClass('active');
+
+/**
+ * Adjust the table footer style.
+ *
+ * @access public
+ * @return void
+ */
+function adjustTableFooter()
+{
+    if($('.main-col').height() < $(window).height())
+    {
+        $('.table.with-footer-fixed').css('margin-bottom', '0');
+        $('.table-footer').removeClass('fixed-footer');
+        $('.table-footer').css({"left":"0", "bottom":"0", "width":"unset"});
+    }
+}
diff --git a/module/execution/js/team.js b/module/execution/js/team.js
new file mode 100644
index 0000000000..d58ba42f6b
--- /dev/null
+++ b/module/execution/js/team.js
@@ -0,0 +1,4 @@
+function checkUserDept(userID)
+{
+    alert(noAccess);
+}
diff --git a/module/execution/js/tree.js b/module/execution/js/tree.js
index d275f294da..85a1a70f6c 100644
--- a/module/execution/js/tree.js
+++ b/module/execution/js/tree.js
@@ -155,7 +155,10 @@ $(function()
         stopPropagation(e);
     });
 
-    $itemContent.on('click', stopPropagation);
+    $itemContent.on('click', function(event)
+    {
+        if(!$(event.target).closest('a[data-app]').length) event.stopPropagation();
+    });
     $taskTree.on('click', stopPropagation);
     $(window).on('resize scroll', adjustSidePosition);
 
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 679eb88cf7..1cd443fa34 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -10,78 +10,92 @@
  * @link        http://www.zentao.net
  */
 /* Fields. */
-$lang->execution->common         = $lang->executionCommon;
-$lang->execution->allExecutions  = 'Alle';
-$lang->execution->id             = $lang->executionCommon . ' ID';
-$lang->execution->type           = 'Typ';
-$lang->execution->name           = 'Name';
-$lang->execution->code           = 'Alias';
-$lang->execution->project        = 'Project';
-$lang->execution->statge         = 'Stage';
-$lang->execution->pri            = 'Priorität';
-$lang->execution->openedBy       = 'OpenedBy';
-$lang->execution->openedDate     = 'OpenedDate';
-$lang->execution->closedBy       = 'ClosedBy';
-$lang->execution->closedDate     = 'ClosedDate';
-$lang->execution->canceledBy     = 'CanceledBy';
-$lang->execution->canceledDate   = 'CanceledDate';
-$lang->execution->begin          = 'Start';
-$lang->execution->end            = 'Ende';
-$lang->execution->dateRange      = 'Dauer';
-$lang->execution->to             = 'An';
-$lang->execution->days           = 'Manntage';
-$lang->execution->day            = 'Tag';
-$lang->execution->workHour       = 'Stunden';
-$lang->execution->workHourUnit   = 'H';
-$lang->execution->totalHours     = 'Arbeitsstunden';
-$lang->execution->totalDays      = 'Arbeitstage';
-$lang->execution->status         = 'Status';
-$lang->execution->subStatus      = 'Sub Status';
-$lang->execution->desc           = 'Beschreibung';
-$lang->execution->owner          = 'Besitzer';
-$lang->execution->PO             = 'PO';
-$lang->execution->PM             = 'PM';
-$lang->execution->QD             = 'QS Manager';
-$lang->execution->RD             = 'Release Manager';
-$lang->execution->release        = 'Release';
-$lang->execution->acl            = 'Zugriffskontrolle';
-$lang->execution->teamname       = 'Team Name';
-$lang->execution->order          = "Sortierung {$lang->executionCommon}";
-$lang->execution->orderAB        = "Rank";
-$lang->execution->products       = "Verknüpfung {$lang->productCommon}";
-$lang->execution->whitelist      = 'Whitelist';
-$lang->execution->addWhitelist   = 'Add Whitelist';
+$lang->execution->allExecutions   = 'Alle';
+$lang->execution->allExecutionAB  = 'All Executions';
+$lang->execution->id              = $lang->executionCommon . ' ID';
+$lang->execution->type            = 'Typ';
+$lang->execution->name            = 'Name';
+$lang->execution->code            = 'Alias';
+$lang->execution->project         = 'Project';
+$lang->execution->execName        = 'Execution Name';
+$lang->execution->execCode        = 'Execution Code';
+$lang->execution->execType        = 'Execution Type';
+$lang->execution->stage           = 'Stage';
+$lang->execution->pri             = 'Priorität';
+$lang->execution->openedBy        = 'OpenedBy';
+$lang->execution->openedDate      = 'OpenedDate';
+$lang->execution->closedBy        = 'ClosedBy';
+$lang->execution->closedDate      = 'ClosedDate';
+$lang->execution->canceledBy      = 'CanceledBy';
+$lang->execution->canceledDate    = 'CanceledDate';
+$lang->execution->begin           = 'Start';
+$lang->execution->end             = 'Ende';
+$lang->execution->dateRange       = 'Dauer';
+$lang->execution->to              = 'An';
+$lang->execution->days            = 'Manntage';
+$lang->execution->day             = 'Tag';
+$lang->execution->workHour        = 'Stunden';
+$lang->execution->workHourUnit    = 'H';
+$lang->execution->totalHours      = 'Arbeitsstunden';
+$lang->execution->totalDays       = 'Arbeitstage';
+$lang->execution->status          = 'Status';
+$lang->execution->execStatus      = 'Status';
+$lang->execution->subStatus       = 'Sub Status';
+$lang->execution->desc            = 'Beschreibung';
+$lang->execution->execDesc        = 'Description';
+$lang->execution->owner           = 'Besitzer';
+$lang->execution->PO              = "{$lang->executionCommon} Owner";
+$lang->execution->PM              = "{$lang->executionCommon} Manager";
+$lang->execution->execPM          = "Execution Manager";
+$lang->execution->QD              = 'Test Manager';
+$lang->execution->RD              = 'Release Manager';
+$lang->execution->release         = 'Release';
+$lang->execution->acl             = 'Zugriffskontrolle';
+$lang->execution->teamname        = 'Team Name';
+$lang->execution->order           = "Sortierung {$lang->executionCommon}";
+$lang->execution->orderAB         = "Rank";
+$lang->execution->products        = "Verknüpfung {$lang->productCommon}";
+$lang->execution->whitelist       = 'Whitelist';
+$lang->execution->addWhitelist    = 'Add Whitelist';
 $lang->execution->unbindWhitelist = 'Remove Whitelist';
-$lang->execution->totalEstimate  = 'Geplant';
-$lang->execution->totalConsumed  = 'Genutzt';
-$lang->execution->totalLeft      = 'Rest';
-$lang->execution->progress       = 'Fortschritt';
-$lang->execution->hours          = '%s geplant, %s verbraucht, %s Rest.';
-$lang->execution->viewBug        = 'Bugs';
-$lang->execution->noProduct      = "Kein {$lang->productCommon}";
-$lang->execution->createStory    = "Story erstellen";
-$lang->execution->storyTitle     = "Story Name";
-$lang->execution->all            = 'Alle';
-$lang->execution->undone         = 'Unabgeschlossen ';
-$lang->execution->unclosed       = 'Geschlossen';
-$lang->execution->typeDesc       = "Keine {$lang->SRCommon}, Bug, Build, Testaufgabe oder ist bei OPS erlaubt";
-$lang->execution->mine           = 'Meine Zuständigkeit: ';
-$lang->execution->other          = 'Andere:';
-$lang->execution->deleted        = 'Gelöscht';
-$lang->execution->delayed        = 'Verspätet';
-$lang->execution->product        = $lang->execution->products;
-$lang->execution->readjustTime   = 'Start und Ende anpassen';
-$lang->execution->readjustTask   = 'Fälligkeit der Aufgabe anpassen';
-$lang->execution->effort         = 'Aufwand';
-$lang->execution->relatedMember  = 'Teammitglieder';
-$lang->execution->watermark      = 'Exported by ZenTao';
-$lang->execution->burnXUnit      = '(Date)';
-$lang->execution->burnYUnit      = '(Hours)';
-$lang->execution->waitTasks      = 'Waiting Tasks';
-$lang->execution->viewByUser     = 'By User';
-$lang->execution->oneProduct     = "Only one stage can be linked {$lang->productCommon}";
-$lang->execution->noLinkProduct  = "Stage not linked {$lang->productCommon}";
-$lang->execution->recent         = 'Recent visits: ';
+$lang->execution->totalEstimate   = 'Geplant';
+$lang->execution->totalConsumed   = 'Genutzt';
+$lang->execution->totalLeft       = 'Rest';
+$lang->execution->progress        = 'Fortschritt';
+$lang->execution->hours           = '%s geplant, %s verbraucht, %s Rest.';
+$lang->execution->viewBug         = 'Bugs';
+$lang->execution->noProduct       = "Kein {$lang->productCommon}";
+$lang->execution->createStory     = "Story erstellen";
+$lang->execution->storyTitle      = "Story Name";
+$lang->execution->all             = 'Alle';
+$lang->execution->undone          = 'Unabgeschlossen ';
+$lang->execution->unclosed        = 'Geschlossen';
+$lang->execution->typeDesc        = "Keine {$lang->SRCommon}, Bug, Build, Testaufgabe oder ist bei OPS erlaubt";
+$lang->execution->mine            = 'Meine Zuständigkeit: ';
+$lang->execution->involved        = 'Mine: ';
+$lang->execution->other           = 'Andere:';
+$lang->execution->deleted         = 'Gelöscht';
+$lang->execution->delayed         = 'Verspätet';
+$lang->execution->product         = $lang->execution->products;
+$lang->execution->readjustTime    = 'Start und Ende anpassen';
+$lang->execution->readjustTask    = 'Fälligkeit der Aufgabe anpassen';
+$lang->execution->effort          = 'Aufwand';
+$lang->execution->storyEstimate   = 'Story Estimate';
+$lang->execution->newEstimate     = 'New Estimate';
+$lang->execution->reestimate      = 'Reestimate';
+$lang->execution->selectRound     = 'Select Round';
+$lang->execution->average         = 'Average';
+$lang->execution->relatedMember   = 'Teammitglieder';
+$lang->execution->watermark       = 'Exported by ZenTao';
+$lang->execution->burnXUnit       = '(Date)';
+$lang->execution->burnYUnit       = '(Hours)';
+$lang->execution->waitTasks       = 'Waiting Tasks';
+$lang->execution->viewByUser      = 'By User';
+$lang->execution->oneProduct      = "Only one stage can be linked {$lang->productCommon}";
+$lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
+$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->start    = 'Start';
 $lang->execution->activate = 'Aktivieren';
@@ -98,6 +112,10 @@ $lang->execution->endList[93]  = '3 Monate';
 $lang->execution->endList[186] = '6 Monate';
 $lang->execution->endList[365] = '1 Jahr';
 
+$lang->execution->lifeTimeList['short'] = "Short-Term";
+$lang->execution->lifeTimeList['long']  = "Long-Term";
+$lang->execution->lifeTimeList['ops']   = "DevOps";
+
 $lang->team = new stdclass();
 $lang->team->account    = 'Konto';
 $lang->team->role       = 'Rolle';
@@ -144,6 +162,7 @@ $lang->execution->groupTask         = 'Nach Gruppen';
 $lang->execution->story             = 'Storys';
 $lang->execution->qa                = 'QA';
 $lang->execution->bug               = 'Bugs';
+$lang->execution->testcase          = 'Testcase List';
 $lang->execution->dynamic           = 'Verlauf';
 $lang->execution->latestDynamic     = 'Letzter Verlauf';
 $lang->execution->build             = 'Builds';
@@ -163,25 +182,30 @@ $lang->execution->unlinkStoryTasks  = 'Verknüpfung aufheben';
 $lang->execution->linkedProducts    = 'Verküpfte Produkte';
 $lang->execution->unlinkedProducts  = 'Produkt verknüpfung aufheben';
 $lang->execution->view              = "Übersicht";
-$lang->execution->startAction       = "Start {$lang->executionCommon}";
-$lang->execution->activateAction    = "Activate {$lang->executionCommon}";
-$lang->execution->delayAction       = "Delay {$lang->executionCommon}";
-$lang->execution->suspendAction     = "Suspend {$lang->executionCommon}";
-$lang->execution->closeAction       = "Close {$lang->executionCommon}";
-$lang->execution->testtaskAction    = "{$lang->executionCommon} Request";
-$lang->execution->teamAction        = "{$lang->executionCommon} Members";
-$lang->execution->kanbanAction      = "{$lang->executionCommon} Kanban";
+$lang->execution->startAction       = "Start Execution";
+$lang->execution->activateAction    = "Activate Execution";
+$lang->execution->delayAction       = "Delay Execution";
+$lang->execution->suspendAction     = "Suspend Execution";
+$lang->execution->closeAction       = "Close Execution";
+$lang->execution->testtaskAction    = "Execution Request";
+$lang->execution->teamAction        = "Execution Members";
+$lang->execution->kanbanAction      = "Execution Kanban";
 $lang->execution->printKanbanAction = "Print Kanban";
-$lang->execution->treeAction        = "{$lang->executionCommon} Tree View";
-$lang->execution->exportAction      = "Export {$lang->executionCommon}";
+$lang->execution->treeAction        = "Execution Tree View";
+$lang->execution->exportAction      = "Export Execution";
 $lang->execution->computeBurnAction = "Compute Burn";
 $lang->execution->create            = "Erstelle Projekt";
+$lang->execution->createExec        = "Create Execution";
+$lang->execution->copyExec          = "Copy Execution";
 $lang->execution->copy              = "Kopiere {$lang->executionCommon}";
 $lang->execution->delete            = "Lösche";
+$lang->execution->deleteAB          = "Lösche Execution";
 $lang->execution->browse            = "Durchsuchen";
 $lang->execution->list              = "{$lang->executionCommon} List";
 $lang->execution->edit              = "Bearbeiten";
+$lang->execution->editAB            = "Bearbeiten";
 $lang->execution->batchEdit         = "Mehere bearbeiten";
+$lang->execution->batchEditAB       = "Mehere bearbeiten";
 $lang->execution->manageMembers     = 'Teams verwalten';
 $lang->execution->unlinkMember      = 'Mitgliefer entfernen';
 $lang->execution->unlinkStory       = 'Story entfernen';
@@ -190,7 +214,6 @@ $lang->execution->batchUnlinkStory  = 'Mehere Storys entfernen';
 $lang->execution->importTask        = 'Importiere Aufgaben';
 $lang->execution->importPlanStories = 'Verknüpfe Story aus Plan';
 $lang->execution->importBug         = 'Importiere Bugs';
-$lang->execution->updateOrder       = 'Sortierung';
 $lang->execution->tree              = 'Baum';
 $lang->execution->treeTask          = 'Aufgabe anzeigen';
 $lang->execution->treeStory         = 'Story anzeigen';
@@ -243,10 +266,7 @@ $lang->execution->aboveAllExecution = "Alle oberen {$lang->executionCommon}";
 /* 页面提示。*/
 $lang->execution->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}.";
 $lang->execution->selectExecution       = "Auswahl {$lang->executionCommon}";
-$lang->execution->selectExecution     = "Select Execution";
 $lang->execution->beginAndEnd         = 'Dauer';
-$lang->execution->begin               = 'Start';
-$lang->execution->end                 = 'Ende';
 $lang->execution->lblStats            = 'Mannstunden Summe(h) : ';
 $lang->execution->stats               = '<strong>%s</strong> Verfügbar, <strong>%s</strong> geplant, <strong>%s</strong> genutzt, <strong>%s</strong> Rest.';
 $lang->execution->taskSummary         = "Aufgaben auf dieser Seite: <strong>%s</strong> Total, <strong>%s</strong> Wartend, <strong>%s</strong> In Arbeit;  &nbsp;&nbsp;&nbsp;  Stunden : <strong>%s</strong> geplant., <strong>%s</strong> genutzt, <strong>%s</strong> Rest.";
@@ -263,7 +283,7 @@ $lang->execution->howToUpdateBurn     = "<a href='http://api.zentao.net/goto.php
 $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->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->haveDraft           = "There are %s draft stories can't be linked.";
-$lang->execution->doneExecutions        = 'Erledigt';
+$lang->execution->doneExecutions      = 'Erledigt';
 $lang->execution->selectDept          = 'Abteilung wählen';
 $lang->execution->selectDeptTitle     = 'Abteilung wählen';
 $lang->execution->copyTeam            = 'Team kopieren';
@@ -271,12 +291,13 @@ $lang->execution->copyFromTeam        = "Kopieren von {$lang->executionCommon} T
 $lang->execution->noMatched           = "$lang->executionCommon mit '%s' konnte nicht gefunden werden.";
 $lang->execution->copyTitle           = "Wählen Sie ein {$lang->executionCommon} zum Kopieren.";
 $lang->execution->copyTeamTitle       = "Wählen Sie ein {$lang->executionCommon} Team zum Kopieren.";
-$lang->execution->copyNoExecution       = "{$lang->executionCommon} kann nicht kopiert werden.";
-$lang->execution->copyFromExecution     = "Kopie von {$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "{$lang->executionCommon} kann nicht kopiert werden.";
+$lang->execution->copyFromExecution   = "Kopie von {$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = 'Kopieren abbrechen';
 $lang->execution->byPeriod            = 'Nach Zeit';
 $lang->execution->byUser              = 'Nach Benutzer';
-$lang->execution->noExecution           = 'Keine Projekte. ';
+$lang->execution->noExecution         = 'Keine Projekte. ';
+$lang->execution->noExecutions        = "No {$lang->execution->common}.";
 $lang->execution->noMembers           = 'Keine Mitglieder. ';
 $lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 $lang->execution->linkPRJStoryTip     = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)";
@@ -291,6 +312,8 @@ $lang->execution->notAllowedUnlinkStory     = "This {$lang->SRCommon} is linked
 $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->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->accessDenied              = "Zugriff zu {$lang->executionCommon} verweigert!";
 $lang->execution->tips                      = 'Hinweis';
 $lang->execution->afterInfo                 = "{$lang->executionCommon} wurde erstellt. Als nächstes können Sie ";
@@ -305,12 +328,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->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   = "The linked {$lang->productCommon}s are %s.";
+$lang->execution->projectNotEmpty           = 'Project cannot be empty.';
 
 /* 统计。*/
 $lang->execution->charts = new stdclass();
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 4162b7fee2..aed49d6f34 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -10,78 +10,92 @@
  * @link        http://www.zentao.net
  */
 /* Fields. */
-$lang->executionCommon         = $lang->executionCommon;
-$lang->execution->allExecutions  = 'All ' . $lang->executionCommon . 's';
-$lang->execution->id             = $lang->executionCommon . ' ID';
-$lang->execution->type           = 'Type';
-$lang->execution->name           = "{$lang->executionCommon} Name";
-$lang->execution->code           = 'Code';
-$lang->execution->project        = 'Project';
-$lang->execution->statge         = 'Stage';
-$lang->execution->pri            = 'Priority';
-$lang->execution->openedBy       = 'OpenedBy';
-$lang->execution->openedDate     = 'OpenedDate';
-$lang->execution->closedBy       = 'ClosedBy';
-$lang->execution->closedDate     = 'ClosedDate';
-$lang->execution->canceledBy     = 'CanceledBy';
-$lang->execution->canceledDate   = 'CanceledDate';
-$lang->execution->begin          = 'Begin';
-$lang->execution->end            = 'End';
-$lang->execution->dateRange      = 'Duration';
-$lang->execution->to             = 'To';
-$lang->execution->days           = 'Available Days';
-$lang->execution->day            = ' Days';
-$lang->execution->workHour       = ' Hours';
-$lang->execution->workHourUnit   = 'H';
-$lang->execution->totalHours     = 'Available Hours';
-$lang->execution->totalDays      = 'Available Days';
-$lang->execution->status         = 'Status';
-$lang->execution->subStatus      = 'Sub Status';
-$lang->execution->desc           = 'Description';
-$lang->execution->owner          = 'Owner';
-$lang->execution->PO             = "{$lang->executionCommon} Owner";
-$lang->execution->PM             = "{$lang->executionCommon} Manager";
-$lang->execution->QD             = 'Test Manager';
-$lang->execution->RD             = 'Release Manager';
-$lang->execution->release        = 'Release';
-$lang->execution->acl            = 'Access Control';
-$lang->execution->teamname       = 'Team Name';
-$lang->execution->order          = "Rank {$lang->executionCommon}";
-$lang->execution->orderAB        = "Rank";
-$lang->execution->products       = "Link {$lang->productCommon}";
-$lang->execution->whitelist      = 'Whitelist';
-$lang->execution->addWhitelist   = 'Add Whitelist';
+$lang->execution->allExecutions   = 'All ' . $lang->executionCommon . 's';
+$lang->execution->allExecutionAB  = 'All Executions';
+$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->project         = 'Project';
+$lang->execution->execName        = 'Execution Name';
+$lang->execution->execCode        = 'Execution Code';
+$lang->execution->execType        = 'Execution Type';
+$lang->execution->stage           = 'Stage';
+$lang->execution->pri             = 'Priority';
+$lang->execution->openedBy        = 'OpenedBy';
+$lang->execution->openedDate      = 'OpenedDate';
+$lang->execution->closedBy        = 'ClosedBy';
+$lang->execution->closedDate      = 'ClosedDate';
+$lang->execution->canceledBy      = 'CanceledBy';
+$lang->execution->canceledDate    = 'CanceledDate';
+$lang->execution->begin           = 'Begin';
+$lang->execution->end             = 'End';
+$lang->execution->dateRange       = 'Duration';
+$lang->execution->to              = 'To';
+$lang->execution->days            = 'Available Days';
+$lang->execution->day             = ' Days';
+$lang->execution->workHour        = ' Hours';
+$lang->execution->workHourUnit    = 'H';
+$lang->execution->totalHours      = 'Available Hours';
+$lang->execution->totalDays       = 'Available Days';
+$lang->execution->status          = $lang->executionCommon . 'Status';
+$lang->execution->execStatus      = 'Status';
+$lang->execution->subStatus       = 'Sub Status';
+$lang->execution->desc            = $lang->executionCommon . 'Description';
+$lang->execution->execDesc        = 'Description';
+$lang->execution->owner           = 'Owner';
+$lang->execution->PO              = "{$lang->executionCommon} Owner";
+$lang->execution->PM              = "{$lang->executionCommon} Manager";
+$lang->execution->execPM          = "Execution Manager";
+$lang->execution->QD              = 'Test Manager';
+$lang->execution->RD              = 'Release Manager';
+$lang->execution->release         = 'Release';
+$lang->execution->acl             = 'Access Control';
+$lang->execution->teamname        = 'Team Name';
+$lang->execution->order           = "Rank {$lang->executionCommon}";
+$lang->execution->orderAB         = "Rank";
+$lang->execution->products        = "Link {$lang->productCommon}";
+$lang->execution->whitelist       = 'Whitelist';
+$lang->execution->addWhitelist    = 'Add Whitelist';
 $lang->execution->unbindWhitelist = 'Remove Whitelist';
-$lang->execution->totalEstimate  = 'Estimates';
-$lang->execution->totalConsumed  = 'Cost';
-$lang->execution->totalLeft      = 'Left';
-$lang->execution->progress       = ' Progress';
-$lang->execution->hours          = 'Estimates: %s, Cost: %s, Left: %s.';
-$lang->execution->viewBug        = 'Bugs';
-$lang->execution->noProduct      = "No {$lang->productCommon} yet.";
-$lang->execution->createStory    = "Create Story";
-$lang->execution->storyTitle     = "Story Name";
-$lang->execution->all            = "All {$lang->executionCommon}s";
-$lang->execution->undone         = 'Unfinished ';
-$lang->execution->unclosed       = 'Unclosed';
-$lang->execution->typeDesc       = "OPS {$lang->executionCommon} has no {$lang->SRCommon}, Bug, Build, or Test features.";
-$lang->execution->mine           = 'Mine: ';
-$lang->execution->other          = 'Others:';
-$lang->execution->deleted        = 'Deleted';
-$lang->execution->delayed        = 'Delayed';
-$lang->execution->product        = $lang->execution->products;
-$lang->execution->readjustTime   = "Adjust {$lang->executionCommon} Begin and End";
-$lang->execution->readjustTask   = 'Adjust Task Begin and End';
-$lang->execution->effort         = 'Effort';
-$lang->execution->relatedMember  = 'Team';
-$lang->execution->watermark      = 'Exported by ZenTao';
-$lang->execution->burnXUnit      = '(Date)';
-$lang->execution->burnYUnit      = '(Hours)';
-$lang->execution->waitTasks      = 'Waiting Tasks';
-$lang->execution->viewByUser     = 'By User';
-$lang->execution->oneProduct     = "Only one stage can be linked {$lang->productCommon}";
-$lang->execution->noLinkProduct  = "Stage not linked {$lang->productCommon}";
-$lang->execution->recent         = 'Recent visits: ';
+$lang->execution->totalEstimate   = 'Estimates';
+$lang->execution->totalConsumed   = 'Cost';
+$lang->execution->totalLeft       = 'Left';
+$lang->execution->progress        = ' Progress';
+$lang->execution->hours           = 'Estimates: %s, Cost: %s, Left: %s.';
+$lang->execution->viewBug         = 'Bugs';
+$lang->execution->noProduct       = "No {$lang->productCommon} yet.";
+$lang->execution->createStory     = "Create Story";
+$lang->execution->storyTitle      = "Story Name";
+$lang->execution->all             = "All {$lang->executionCommon}s";
+$lang->execution->undone          = 'Unfinished ';
+$lang->execution->unclosed        = 'Unclosed';
+$lang->execution->typeDesc        = "OPS {$lang->executionCommon} has no {$lang->SRCommon}, Bug, Build, or Test features.";
+$lang->execution->mine            = 'Mine: ';
+$lang->execution->involved        = 'Mine: ';
+$lang->execution->other           = 'Others:';
+$lang->execution->deleted         = 'Deleted';
+$lang->execution->delayed         = 'Delayed';
+$lang->execution->product         = $lang->execution->products;
+$lang->execution->readjustTime    = "Adjust {$lang->executionCommon} Begin and End";
+$lang->execution->readjustTask    = 'Adjust Task Begin and End';
+$lang->execution->effort          = 'Effort';
+$lang->execution->storyEstimate   = 'Story Estimate';
+$lang->execution->newEstimate     = 'New Estimate';
+$lang->execution->reestimate      = 'Reestimate';
+$lang->execution->selectRound     = 'Select Round';
+$lang->execution->average         = 'Average';
+$lang->execution->relatedMember   = 'Team';
+$lang->execution->watermark       = 'Exported by ZenTao';
+$lang->execution->burnXUnit       = '(Date)';
+$lang->execution->burnYUnit       = '(Hours)';
+$lang->execution->waitTasks       = 'Waiting Tasks';
+$lang->execution->viewByUser      = 'By User';
+$lang->execution->oneProduct      = "Only one stage can be linked {$lang->productCommon}";
+$lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
+$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->start    = 'Start';
 $lang->execution->activate = 'Activate';
@@ -148,6 +162,7 @@ $lang->execution->groupTask         = 'Group View';
 $lang->execution->story             = 'Story List';
 $lang->execution->qa                = 'QA';
 $lang->execution->bug               = 'Bug List';
+$lang->execution->testcase          = 'Testcase List';
 $lang->execution->dynamic           = 'Dynamics';
 $lang->execution->latestDynamic     = 'Dynamics';
 $lang->execution->build             = 'Build List';
@@ -166,27 +181,30 @@ $lang->execution->linkPlan          = 'Linked Plan';
 $lang->execution->unlinkStoryTasks  = 'Unlink';
 $lang->execution->linkedProducts    = "Linked {$lang->productCommon}s";
 $lang->execution->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
-$lang->execution->view              = "{$lang->executionCommon} Detail";
-$lang->execution->startAction       = "Start {$lang->executionCommon}";
-$lang->execution->activateAction    = "Activate {$lang->executionCommon}";
-$lang->execution->delayAction       = "Delay {$lang->executionCommon}";
-$lang->execution->suspendAction     = "Suspend {$lang->executionCommon}";
-$lang->execution->closeAction       = "Close {$lang->executionCommon}";
-$lang->execution->testtaskAction    = "{$lang->executionCommon} Request";
-$lang->execution->teamAction        = "{$lang->executionCommon} Members";
-$lang->execution->kanbanAction      = "{$lang->executionCommon} Kanban";
+$lang->execution->view              = "Execution Detail";
+$lang->execution->startAction       = "Start Execution";
+$lang->execution->activateAction    = "Activate Execution";
+$lang->execution->delayAction       = "Delay Execution";
+$lang->execution->suspendAction     = "Suspend Execution";
+$lang->execution->closeAction       = "Close Execution";
+$lang->execution->testtaskAction    = "Execution Request";
+$lang->execution->teamAction        = "Execution Members";
+$lang->execution->kanbanAction      = "Execution Kanban";
 $lang->execution->printKanbanAction = "Print Kanban";
-$lang->execution->treeAction        = "{$lang->executionCommon} Tree View";
-$lang->execution->exportAction      = "Export {$lang->executionCommon}";
+$lang->execution->treeAction        = "Execution Tree View";
+$lang->execution->exportAction      = "Export Execution";
 $lang->execution->computeBurnAction = "Update Burndown";
 $lang->execution->create            = "Create {$lang->executionCommon}";
-$lang->execution->createExec        = "Create execution";
+$lang->execution->createExec        = "Create Execution";
+$lang->execution->copyExec          = "Copy Execution";
 $lang->execution->copy              = "Copy {$lang->executionCommon}";
 $lang->execution->delete            = "Delete {$lang->executionCommon}";
+$lang->execution->deleteAB          = "Delete Execution";
 $lang->execution->browse            = "{$lang->executionCommon} List";
-$lang->execution->list              = "{$lang->executionCommon} List";
 $lang->execution->edit              = "Edit {$lang->executionCommon}";
+$lang->execution->editAction        = "Edit Execution";
 $lang->execution->batchEdit         = "Edit";
+$lang->execution->batchEditAction   = "Batch Edit";
 $lang->execution->manageMembers     = 'Manage Team';
 $lang->execution->unlinkMember      = 'Remove Member';
 $lang->execution->unlinkStory       = 'Unlink Story';
@@ -195,8 +213,6 @@ $lang->execution->batchUnlinkStory  = 'Batch Unlink Stories';
 $lang->execution->importTask        = 'Transfer Task';
 $lang->execution->importPlanStories = 'Link Stories By Plan';
 $lang->execution->importBug         = 'Import Bug';
-$lang->execution->updateOrder       = "Rank {$lang->executionCommon}";
-$lang->execution->execUpdateOrder   = "Rank execution";
 $lang->execution->tree              = 'Tree';
 $lang->execution->treeTask          = 'Show Task Only';
 $lang->execution->treeStory         = 'Show Story Only';
@@ -208,6 +224,7 @@ $lang->execution->importPlanStory   = $lang->executionCommon . ' is created!\nDo
 $lang->execution->iteration         = 'Iterations';
 $lang->execution->iterationInfo     = '%s Iterations';
 $lang->execution->viewAll           = 'View All';
+$lang->execution->testreport        = 'Test Report';
 
 /* Group browsing. */
 $lang->execution->allTasks     = 'All';
@@ -243,13 +260,12 @@ $lang->execution->byQuery = 'Search';
 
 /* Query condition list. */
 $lang->execution->allExecution      = "All {$lang->executionCommon}s";
-$lang->execution->aboveAllProduct = "All the above {$lang->productCommon}s";
+$lang->execution->aboveAllProduct   = "All the above {$lang->productCommon}s";
 $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->selectExecution       = "Select {$lang->executionCommon}";
-$lang->execution->selectExecution     = "Select Stage/Sprint/Iteration";
+$lang->execution->selectExecution     = "Select {$lang->executionCommon}";
 $lang->execution->beginAndEnd         = 'Duration';
 $lang->execution->lblStats            = 'Efforts';
 $lang->execution->stats               = 'Available: <strong>%s</strong>(h). Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).';
@@ -267,7 +283,7 @@ $lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php
 $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->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->haveDraft           = "%s stories in draft, so they can't be linked.";
-$lang->execution->doneExecutions        = 'Finished';
+$lang->execution->doneExecutions      = 'Finished';
 $lang->execution->selectDept          = 'Select Department';
 $lang->execution->selectDeptTitle     = 'Select User';
 $lang->execution->copyTeam            = 'Copy Team';
@@ -275,15 +291,16 @@ $lang->execution->copyFromTeam        = "Copy from {$lang->executionCommon} Team
 $lang->execution->noMatched           = "No $lang->executionCommon including '%s'can be found.";
 $lang->execution->copyTitle           = "Choose a {$lang->executionCommon} to copy.";
 $lang->execution->copyTeamTitle       = "Choose a {$lang->executionCommon} Team to copy.";
-$lang->execution->copyNoExecution       = "No {$lang->executionCommon} can be copied.";
-$lang->execution->copyFromExecution     = "Copy from {$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "No {$lang->executionCommon} can be copied.";
+$lang->execution->copyFromExecution   = "Copy from {$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = 'Cancel Copy';
 $lang->execution->byPeriod            = 'By Time';
 $lang->execution->byUser              = 'By User';
-$lang->execution->noExecution           = "No {$lang->executionCommon}. ";
+$lang->execution->noExecution         = "No {$lang->executionCommon}. ";
+$lang->execution->noExecutions        = "No {$lang->execution->common}.";
 $lang->execution->noMembers           = 'No team members yet. ';
 $lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
-$lang->execution->linkPRJStoryTip     = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
+// $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)";
 
 /* Interactive prompts. */
@@ -295,6 +312,8 @@ $lang->execution->notAllowedUnlinkStory     = "This {$lang->SRCommon} is linked
 $lang->execution->notAllowRemoveProducts    = "The story 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->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->accessDenied              = "Your access to {$lang->executionCommon} is denied!";
 $lang->execution->tips                      = 'Note';
 $lang->execution->afterInfo                 = "{$lang->executionCommon} is created. Next you can ";
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index fdd04f174e..d03d674887 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -10,77 +10,92 @@
  * @link        https://www.zentao.pm
  */
 /* Fields. */
-$lang->execution->common         = $lang->executionCommon;
-$lang->execution->allExecutions  = 'Tous les ' . $lang->executionCommon . 's';
-$lang->execution->id             = $lang->executionCommon . ' ID';
-$lang->execution->type           = 'Type';
-$lang->execution->name           = "Nom du {$lang->executionCommon}";
-$lang->execution->code           = 'Code';
-$lang->execution->statge         = 'Etape';
-$lang->execution->pri            = 'Priorité';
-$lang->execution->openedBy       = 'Ouvert par';
-$lang->execution->openedDate     = "Date d'ouverture";
-$lang->execution->closedBy       = 'Fermé par';
-$lang->execution->closedDate     = 'Date de fermeture';
-$lang->execution->canceledBy     = 'Annulé par';
-$lang->execution->canceledDate   = "Date d'annulation";
-$lang->execution->begin          = 'Début';
-$lang->execution->end            = 'Fin';
-$lang->execution->dateRange      = 'Durée';
-$lang->execution->to             = 'à';
-$lang->execution->days           = 'Budget Jours';
-$lang->execution->day            = ' Jours';
-$lang->execution->workHour       = ' Heures';
-$lang->execution->workHourUnit   = 'H';
-$lang->execution->totalHours     = 'Budget (Heure)';
-$lang->execution->totalDays      = 'Budget (Jour)';
-$lang->execution->status         = 'Statut';
-$lang->execution->subStatus      = 'Sous-statut';
-$lang->execution->desc           = 'Description';
-$lang->execution->owner          = 'Propriétaire';
-$lang->execution->PO             = "Propriétaire {$lang->executionCommon}";
-$lang->execution->PM             = "Directeur {$lang->executionCommon}";
-$lang->execution->QD             = 'Quality Manager';
-$lang->execution->RD             = 'Release Manager';
-$lang->execution->release        = 'Release';
-$lang->execution->acl            = "Contrôle d'accès";
-$lang->execution->teamname       = "Nom de l'équipe";
-$lang->execution->order          = "Rang du {$lang->executionCommon}";
-$lang->execution->orderAB        = "Rang";
-$lang->execution->products       = "{$lang->productCommon} liés";
-$lang->execution->whitelist      = 'Liste Blanche';
-$lang->execution->addWhitelist   = 'Add Whitelist';
+$lang->execution->allExecutions   = 'Tous les ' . $lang->executionCommon . 's';
+$lang->execution->allExecutionAB  = 'All Executions';
+$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->project         = 'Project';
+$lang->execution->execName        = 'Execution Name';
+$lang->execution->execCode        = 'Execution Code';
+$lang->execution->execType        = 'Execution Type';
+$lang->execution->stage           = 'Etape';
+$lang->execution->pri             = 'Priorité';
+$lang->execution->openedBy        = 'Ouvert par';
+$lang->execution->openedDate      = "Date d'ouverture";
+$lang->execution->closedBy        = 'Fermé par';
+$lang->execution->closedDate      = 'Date de fermeture';
+$lang->execution->canceledBy      = 'Annulé par';
+$lang->execution->canceledDate    = "Date d'annulation";
+$lang->execution->begin           = 'Début';
+$lang->execution->end             = 'Fin';
+$lang->execution->dateRange       = 'Durée';
+$lang->execution->to              = 'à';
+$lang->execution->days            = 'Budget Jours';
+$lang->execution->day             = ' Jours';
+$lang->execution->workHour        = ' Heures';
+$lang->execution->workHourUnit    = 'H';
+$lang->execution->totalHours      = 'Budget (Heure)';
+$lang->execution->totalDays       = 'Budget (Jour)';
+$lang->execution->status          = $lang->executionCommon . 'Status';
+$lang->execution->execStatus      = 'Status';
+$lang->execution->subStatus       = 'Sub Status';
+$lang->execution->desc            = $lang->executionCommon . 'Description';
+$lang->execution->execDesc        = 'Description';
+$lang->execution->owner           = 'Propriétaire';
+$lang->execution->PO              = "Propriétaire {$lang->executionCommon}";
+$lang->execution->PM              = "Directeur {$lang->executionCommon}";
+$lang->execution->execPM          = "Directeur Execution";
+$lang->execution->QD              = 'Test Manager';
+$lang->execution->RD              = 'Release Manager';
+$lang->execution->release         = 'Release';
+$lang->execution->acl             = "Contrôle d'accès";
+$lang->execution->teamname        = "Nom de l'équipe";
+$lang->execution->order           = "Rang du {$lang->executionCommon}";
+$lang->execution->orderAB         = "Rang";
+$lang->execution->products        = "{$lang->productCommon} liés";
+$lang->execution->whitelist       = 'Liste Blanche';
+$lang->execution->addWhitelist    = 'Add Whitelist';
 $lang->execution->unbindWhitelist = 'Remove Whitelist';
-$lang->execution->totalEstimate  = 'Estimé';
-$lang->execution->totalConsumed  = 'Coût';
-$lang->execution->totalLeft      = 'Reste';
-$lang->execution->progress       = ' Progrès';
-$lang->execution->hours          = 'Estimé: %s, Coût: %s, Reste: %s.';
-$lang->execution->viewBug        = 'Bugs';
-$lang->execution->noProduct      = "Aucun {$lang->productCommon} pour l'instant.";
-$lang->execution->createStory    = "Créer une Story";
-$lang->execution->storyTitle     = "Story Name";
-$lang->execution->all            = "Tous les {$lang->executionCommon}s";
-$lang->execution->undone         = 'Non Terminé';
-$lang->execution->unclosed       = 'Non Fermées';
-$lang->execution->typeDesc       = "Aucune {$lang->SRCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible";
-$lang->execution->mine           = 'A Moi: ';
-$lang->execution->other          = 'Autres:';
-$lang->execution->deleted        = 'Supprimé';
-$lang->execution->delayed        = 'Ajourné';
-$lang->execution->product        = $lang->execution->products;
-$lang->execution->readjustTime   = "Ajuster Début et Fin du {$lang->executionCommon}";
-$lang->execution->readjustTask   = 'Ajuster Début et Fin de la Tâche';
-$lang->execution->effort         = 'Effort';
-$lang->execution->relatedMember  = 'Equipe';
-$lang->execution->watermark      = 'Exporté par ZenTao';
-$lang->execution->burnXUnit      = '(Date)';
-$lang->execution->burnYUnit      = '(Hours)';
-$lang->execution->waitTasks      = 'Waiting Tasks';
-$lang->execution->viewByUser     = 'Par Utilisateur';
-$lang->execution->oneProduct     = "Only one stage can be linked {$lang->productCommon}";
-$lang->execution->noLinkProduct  = "Stage not linked {$lang->productCommon}";
-$lang->execution->recent         = 'Recent visits: ';
+$lang->execution->totalEstimate   = 'Estimé';
+$lang->execution->totalConsumed   = 'Coût';
+$lang->execution->totalLeft       = 'Reste';
+$lang->execution->progress        = ' Progrès';
+$lang->execution->hours           = 'Estimé: %s, Coût: %s, Reste: %s.';
+$lang->execution->viewBug         = 'Bugs';
+$lang->execution->noProduct       = "Aucun {$lang->productCommon} pour l'instant.";
+$lang->execution->createStory     = "Créer une Story";
+$lang->execution->storyTitle      = "Story Name";
+$lang->execution->all             = "Tous les {$lang->executionCommon}s";
+$lang->execution->undone          = 'Non Terminé';
+$lang->execution->unclosed        = 'Non Fermées';
+$lang->execution->typeDesc        = "Aucune {$lang->SRCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible";
+$lang->execution->mine            = 'A Moi: ';
+$lang->execution->involved        = 'Mine: ';
+$lang->execution->other           = 'Autres:';
+$lang->execution->deleted         = 'Supprimé';
+$lang->execution->delayed         = 'Delayed';
+$lang->execution->product         = $lang->execution->products;
+$lang->execution->readjustTime    = "Ajuster Début et Fin du {$lang->executionCommon}";
+$lang->execution->readjustTask    = 'Ajuster Début et Fin de la Tâche';
+$lang->execution->effort          = 'Effort';
+$lang->execution->storyEstimate   = 'Story Estimate';
+$lang->execution->newEstimate     = 'New Estimate';
+$lang->execution->reestimate      = 'Reestimate';
+$lang->execution->selectRound     = 'Select Round';
+$lang->execution->average         = 'Average';
+$lang->execution->relatedMember   = 'Equipe';
+$lang->execution->watermark       = 'Exporté par ZenTao';
+$lang->execution->burnXUnit       = '(Date)';
+$lang->execution->burnYUnit       = '(Hours)';
+$lang->execution->waitTasks       = 'Waiting Tasks';
+$lang->execution->viewByUser      = 'Par Utilisateur';
+$lang->execution->oneProduct      = "Only one stage can be linked {$lang->productCommon}";
+$lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
+$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->start    = 'Démarrer';
 $lang->execution->activate = 'Activer';
@@ -97,6 +112,10 @@ $lang->execution->endList[93]  = '3 Mois';
 $lang->execution->endList[186] = '6 Mois';
 $lang->execution->endList[365] = '1 Année';
 
+$lang->execution->lifeTimeList['short'] = "Short-Term";
+$lang->execution->lifeTimeList['long']  = "Long-Term";
+$lang->execution->lifeTimeList['ops']   = "DevOps";
+
 $lang->team = new stdclass();
 $lang->team->account    = 'Utilisateur';
 $lang->team->role       = 'Rôle';
@@ -143,6 +162,7 @@ $lang->execution->groupTask         = 'Vision Groupée';
 $lang->execution->story             = 'Liste Stories';
 $lang->execution->qa                = 'QA';
 $lang->execution->bug               = 'Liste Bugs';
+$lang->execution->testcase          = 'Testcase List';
 $lang->execution->dynamic           = 'Historique';
 $lang->execution->latestDynamic     = 'Historique';
 $lang->execution->build             = 'Liste Builds';
@@ -161,26 +181,31 @@ $lang->execution->linkPlan          = 'Plans liés';
 $lang->execution->unlinkStoryTasks  = 'Dissocier';
 $lang->execution->linkedProducts    = "{$lang->productCommon}s liés à ce {$lang->executionCommon}";
 $lang->execution->unlinkedProducts  = "{$lang->productCommon}s dissociés de ce {$lang->executionCommon}";
-$lang->execution->view              = "Détail du {$lang->executionCommon}";
-$lang->execution->startAction       = "Commencer le {$lang->executionCommon}";
-$lang->execution->activateAction    = "Activer le {$lang->executionCommon}";
-$lang->execution->delayAction       = "Ajourner le {$lang->executionCommon}";
-$lang->execution->suspendAction     = "Suspendre le {$lang->executionCommon}";
-$lang->execution->closeAction       = "Fermer le {$lang->executionCommon}";
-$lang->execution->testtaskAction    = "Recettes du {$lang->executionCommon}";
-$lang->execution->teamAction        = "Membres du {$lang->executionCommon}";
-$lang->execution->kanbanAction      = "Kaban {$lang->executionCommon}";
+$lang->execution->view              = "Détail du Execution";
+$lang->execution->startAction       = "Commencer le "
+$lang->execution->activateAction    = "Activer le Execution";
+$lang->execution->delayAction       = "Ajourner le Execution";
+$lang->execution->suspendAction     = "Suspendre le Execution";
+$lang->execution->closeAction       = "Fermer le Execution";
+$lang->execution->testtaskAction    = "Recettes du Execution";
+$lang->execution->teamAction        = "Membres du Execution";
+$lang->execution->kanbanAction      = "Kaban Execution";
 $lang->execution->printKanbanAction = "Imprimer le Kanban";
-$lang->execution->treeAction        = "Arborescence {$lang->executionCommon}";
-$lang->execution->exportAction      = "Exporter {$lang->executionCommon}";
+$lang->execution->treeAction        = "Arborescence Execution";
+$lang->execution->exportAction      = "Exporter Execution";
 $lang->execution->computeBurnAction = "Calculer Atterrissage";
 $lang->execution->create            = "Créer {$lang->executionCommon}";
+$lang->execution->createExec        = "Create Execution";
+$lang->execution->copyExec          = "Copy Execution";
 $lang->execution->copy              = "Copier {$lang->executionCommon}";
 $lang->execution->delete            = "Supprimer {$lang->executionCommon}";
+$lang->execution->deleteAB          = "Delete Execution";
 $lang->execution->browse            = "Liste du {$lang->executionCommon}";
 $lang->execution->list              = "{$lang->executionCommon} List";
 $lang->execution->edit              = "Editer {$lang->executionCommon}";
+$lang->execution->editAB            = "Edit Execution";
 $lang->execution->batchEdit         = "Edition par lot";
+$lang->execution->batchEditAB       = "Batch Edit";
 $lang->execution->manageMembers     = 'Organiser Equipe';
 $lang->execution->unlinkMember      = 'Retirer le membre';
 $lang->execution->unlinkStory       = 'Dissocier Story';
@@ -189,7 +214,6 @@ $lang->execution->batchUnlinkStory  = 'Dissocier Stories par lot';
 $lang->execution->importTask        = 'Transfert Tâche';
 $lang->execution->importPlanStories = 'Lier Stories Par Plan';
 $lang->execution->importBug         = 'Importer Bug';
-$lang->execution->updateOrder       = "Rang {$lang->executionCommon}";
 $lang->execution->tree              = 'Arboressence';
 $lang->execution->treeTask          = 'Seulement les Tâches';
 $lang->execution->treeStory         = 'Seulement les Stories';
@@ -241,11 +265,8 @@ $lang->execution->aboveAllExecution = "Tous les {$lang->executionCommon}s dépen
 
 /* 页面提示。*/
 $lang->execution->linkStoryByPlanTips = "Cette action va lier toutes les stories incluses dans le plan à ce {$lang->executionCommon}.";
-$lang->execution->selectExecution       = "Sélectionner {$lang->executionCommon}";
-$lang->execution->selectExecution     = "Select Execution";
+$lang->execution->selectExecution     = "Sélectionner {$lang->executionCommon}";
 $lang->execution->beginAndEnd         = 'Durée';
-$lang->execution->begin               = 'Début';
-$lang->execution->end                 = 'Fin';
 $lang->execution->lblStats            = 'Efforts';
 $lang->execution->stats               = 'Disponible: <strong>%s</strong>(h). Estimé: <strong>%s</strong>(h). Coût: <strong>%s</strong>(h). Reste: <strong>%s</strong>(h).';
 $lang->execution->taskSummary         = "Total des tâches de cette page :<strong>%s</strong>. A Faire: <strong>%s</strong>. En cours: <strong>%s</strong>. &nbsp;&nbsp;&nbsp; Estimé: <strong>%s</strong>(h). Coût: <strong>%s</strong>(h). Reste: <strong>%s</strong>(h).";
@@ -262,7 +283,7 @@ $lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php
 $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->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->haveDraft           = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->executionCommon} actuellement.";
-$lang->execution->doneExecutions        = 'Terminé';
+$lang->execution->doneExecutions      = 'Terminé';
 $lang->execution->selectDept          = 'Sélection Compartiment';
 $lang->execution->selectDeptTitle     = 'Sélection Utilisateur';
 $lang->execution->copyTeam            = 'Copier Equipe';
@@ -270,12 +291,13 @@ $lang->execution->copyFromTeam        = "Copié de l'Equipe {$lang->executionCom
 $lang->execution->noMatched           = "Aucun $lang->executionCommon inclus '%s' ne peut être trouvé.";
 $lang->execution->copyTitle           = "Choisissez un {$lang->executionCommon} à copier.";
 $lang->execution->copyTeamTitle       = "Choisissez une Equipe {$lang->executionCommon} à copier.";
-$lang->execution->copyNoExecution       = "Aucun {$lang->executionCommon} ne peut être copié.";
-$lang->execution->copyFromExecution     = "Copié du {$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "Aucun {$lang->executionCommon} ne peut être copié.";
+$lang->execution->copyFromExecution   = "Copié du {$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = 'Annuler la copie';
 $lang->execution->byPeriod            = 'Par Temps';
 $lang->execution->byUser              = 'Par Utilisateur';
-$lang->execution->noExecution           = "Aucun {$lang->executionCommon}. ";
+$lang->execution->noExecution         = "Aucun {$lang->executionCommon}. ";
+$lang->execution->noExecutions        = "Aucun {$lang->execution->common}.";
 $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, and the total workload under the current product is: %s";
 $lang->execution->linkPRJStoryTip     = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)";
@@ -290,6 +312,8 @@ $lang->execution->notAllowedUnlinkStory     = "This {$lang->SRCommon} is linked
 $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->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->accessDenied              = "Votre accès au {$lang->executionCommon} est refusé ! Désolé.";
 $lang->execution->tips                      = 'Note';
 $lang->execution->afterInfo                 = "Le {$lang->executionCommon} a été créé avec succès ! Ensuite vous pouvez ";
@@ -304,12 +328,7 @@ $lang->execution->fixFirstWithLeft          = 'Mettre à jour les heures égalem
 $lang->execution->unfinishedExecution         = "This {$lang->executionCommon} has ";
 $lang->execution->unfinishedTask            = "[%s] unfinished tasks. ";
 $lang->execution->unresolvedBug             = "[%s] unresolved bugs. ";
-
-$lang->execution->action = new stdclass();
-$lang->execution->action->opened  = '$date, créée par <strong>$actor</strong> .' . "\n";
-$lang->execution->action->managed = '$date, gérée par <strong>$actor</strong> .' . "\n";
-$lang->execution->action->edited  = '$date, edited by <strong>$actor</strong> . $extra' . "\n";
-$lang->execution->action->extra   = "Les {$lang->productCommon}s associés sont %s.";
+$lang->execution->projectNotEmpty           = 'Project cannot be empty.';
 
 /* 统计。*/
 $lang->execution->charts = new stdclass();
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index e5ce4dade9..5dcb49b1af 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -10,78 +10,92 @@
  * @link  http://www.zentao.net
  */
 /* Fields. */
-$lang->execution->common         = $lang->executionCommon;
-$lang->execution->allExecutions  = 'Tất cả ' . $lang->executionCommon;
-$lang->execution->id             = 'ID '.$lang->executionCommon;
-$lang->execution->type           = 'Loại';
-$lang->execution->name           = "Tên {$lang->executionCommon}";
-$lang->execution->code           = 'Mã';
-$lang->execution->statge         = 'Giai đoạn';
-$lang->execution->pri            = 'Ưu tiên';
-$lang->execution->openedBy       = 'Mở bởi';
-$lang->execution->openedDate     = 'Ngày mở';
-$lang->execution->closedBy       = 'Người đóng';
-$lang->execution->closedDate     = 'Ngày đóng';
-$lang->execution->canceledBy     = 'Hủy bởi';
-$lang->execution->canceledDate   = 'Ngày hủy';
-$lang->execution->begin          = 'Bắt đầu';
-$lang->execution->end            = 'Kết thúc';
-$lang->execution->dateRange      = 'Thời gian';
-$lang->execution->to             = 'Tới';
-$lang->execution->days           = 'Ngày khả dụng';
-$lang->execution->day            = ' ngày';
-$lang->execution->workHour       = 'giờ';
-$lang->execution->workHourUnit   = 'H';
-$lang->execution->totalHours     = 'Giờ khả dụng';
-$lang->execution->totalDays      = 'Ngày khả dụng';
-$lang->execution->status         = 'Tình trạng';
-$lang->execution->subStatus      = 'Tình trạng con';
-$lang->execution->desc           = 'Mô tả';
-$lang->execution->owner          = 'Sở hữu';
-$lang->execution->PO             = "Sở hữu {$lang->executionCommon}";
-$lang->execution->PM             = "Quản lý {$lang->executionCommon}";
-$lang->execution->QD             = 'Quản lý QA';
-$lang->execution->RD             = 'Quản lý phát hành';
-$lang->execution->qa             = 'QA';
-$lang->execution->release        = 'Phát hành';
-$lang->execution->acl            = 'Quyền truy cập';
-$lang->execution->teamname       = 'Tên đội nhóm';
-$lang->execution->order          = "Đánh giá {$lang->executionCommon}";
-$lang->execution->orderAB        = "Đánh giá";
-$lang->execution->products       = "Liên kết {$lang->productCommon}";
-$lang->execution->whitelist      = 'Danh sách trắng';
-$lang->execution->addWhitelist   = 'Add Whitelist';
+$lang->execution->allExecutions   = 'Tất cả ' . $lang->executionCommon;
+$lang->execution->allExecutionAB  = 'All Executions';
+$lang->execution->id              = 'ID '.$lang->executionCommon;
+$lang->execution->type            = 'Loại';
+$lang->execution->name            = "Tên {$lang->executionCommon}";
+$lang->execution->code            = 'Mã';
+$lang->execution->project         = 'Project';
+$lang->execution->execName        = 'Execution Name';
+$lang->execution->execCode        = 'Execution Code';
+$lang->execution->execType        = 'Execution Type';
+$lang->execution->stage           = 'Giai đoạn';
+$lang->execution->pri             = 'Ưu tiên';
+$lang->execution->openedBy        = 'Mở bởi';
+$lang->execution->openedDate      = 'Ngày mở';
+$lang->execution->closedBy        = 'Người đóng';
+$lang->execution->closedDate      = 'Ngày đóng';
+$lang->execution->canceledBy      = 'Hủy bởi';
+$lang->execution->canceledDate    = 'Ngày hủy';
+$lang->execution->begin           = 'Bắt đầu';
+$lang->execution->end             = 'Kết thúc';
+$lang->execution->dateRange       = 'Thời gian';
+$lang->execution->to              = 'Tới';
+$lang->execution->days            = 'Ngày khả dụng';
+$lang->execution->day             = ' ngày';
+$lang->execution->workHour        = 'giờ';
+$lang->execution->workHourUnit    = 'H';
+$lang->execution->totalHours      = 'Giờ khả dụng';
+$lang->execution->totalDays       = 'Ngày khả dụng';
+$lang->execution->status          = $lang->executionCommon . 'Status';
+$lang->execution->execStatus      = 'Status';
+$lang->execution->subStatus       = 'Tình trạng con';
+$lang->execution->desc            = $lang->executionCommon . 'Description';
+$lang->execution->execDesc        = 'Description';
+$lang->execution->owner           = 'Sở hữu';
+$lang->execution->PO              = "Sở hữu {$lang->executionCommon}";
+$lang->execution->PM              = "Quản lý {$lang->executionCommon}";
+$lang->execution->execPM          = "Quản lý Execution";
+$lang->execution->QD              = 'Quản lý QA';
+$lang->execution->RD              = 'Quản lý phát hành';
+$lang->execution->release         = 'Phát hành';
+$lang->execution->acl             = 'Quyền truy cập';
+$lang->execution->teamname        = 'Tên đội nhóm';
+$lang->execution->order           = "Đánh giá {$lang->executionCommon}";
+$lang->execution->orderAB         = "Đánh giá";
+$lang->execution->products        = "Liên kết {$lang->productCommon}";
+$lang->execution->whitelist       = 'Danh sách trắng';
+$lang->execution->addWhitelist    = 'Add Whitelist';
 $lang->execution->unbindWhitelist = 'Remove Whitelist';
-$lang->execution->totalEstimate  = 'Dự tính';
-$lang->execution->totalConsumed  = 'Đã làm';
-$lang->execution->totalLeft      = 'Còn';
-$lang->execution->progress       = ' Tiến độ';
-$lang->execution->hours          = 'Dự tính: %s, Đã làm: %s, Còn: %s.';
-$lang->execution->viewBug        = 'Bugs';
-$lang->execution->noProduct      = "Không có {$lang->productCommon} nào.";
-$lang->execution->createStory    = "Tạo câu chuyện";
-$lang->execution->storyTitle     = "Story Name";
-$lang->execution->all            = "Tất cả {$lang->executionCommon}";
-$lang->execution->undone         = 'Chưa kết thúc ';
-$lang->execution->unclosed       = 'Chưa đóng';
-$lang->execution->typeDesc       = 'Không có câu chuyện, bug, bản dựng, test, hoặc biểu đồ burndown được phép trong OPS';
-$lang->execution->mine           = 'Của bạn: ';
-$lang->execution->other          = 'Khác:';
-$lang->execution->deleted        = 'Đã xóa';
-$lang->execution->delayed        = 'Tạm ngưng';
-$lang->execution->product        = $lang->execution->products;
-$lang->execution->readjustTime   = "Điều chỉnh {$lang->executionCommon} Thời gian";
-$lang->execution->readjustTask   = 'Điều chỉnh nhiệm vụ Thời gian';
-$lang->execution->effort         = 'Chấm công';
-$lang->execution->relatedMember  = 'Đội nhóm';
-$lang->execution->watermark      = 'Đã xuất bởi ZenTao';
-$lang->execution->burnXUnit      = '(Date)';
-$lang->execution->burnYUnit      = '(Hours)';
-$lang->execution->waitTasks      = 'Waiting Tasks';
-$lang->execution->viewByUser     = 'Theo người dùng';
-$lang->execution->oneProduct     = "Only one stage can be linked {$lang->productCommon}";
-$lang->execution->noLinkProduct  = "Stage not linked {$lang->productCommon}";
-$lang->execution->recent         = 'Recent visits: ';
+$lang->execution->totalEstimate   = 'Dự tính';
+$lang->execution->totalConsumed   = 'Đã làm';
+$lang->execution->totalLeft       = 'Còn';
+$lang->execution->progress        = ' Tiến độ';
+$lang->execution->hours           = 'Dự tính: %s, Đã làm: %s, Còn: %s.';
+$lang->execution->viewBug         = 'Bugs';
+$lang->execution->noProduct       = "Không có {$lang->productCommon} nào.";
+$lang->execution->createStory     = "Tạo câu chuyện";
+$lang->execution->storyTitle      = "Story Name";
+$lang->execution->all             = "Tất cả {$lang->executionCommon}";
+$lang->execution->undone          = 'Chưa kết thúc ';
+$lang->execution->unclosed        = 'Chưa đóng';
+$lang->execution->typeDesc        = 'Không có câu chuyện, bug, bản dựng, test, hoặc biểu đồ burndown được phép trong OPS';
+$lang->execution->mine            = 'Của bạn: ';
+$lang->execution->other           = 'Khác:';
+$lang->execution->deleted         = 'Đã xóa';
+$lang->execution->delayed         = 'Tạm ngưng';
+$lang->execution->delayed         = 'Delayed';
+$lang->execution->product         = $lang->execution->products;
+$lang->execution->readjustTime    = "Điều chỉnh {$lang->executionCommon} Thời gian";
+$lang->execution->readjustTask    = 'Điều chỉnh nhiệm vụ Thời gian';
+$lang->execution->effort          = 'Chấm công';
+$lang->execution->storyEstimate   = 'Story Estimate';
+$lang->execution->newEstimate     = 'New Estimate';
+$lang->execution->reestimate      = 'Reestimate';
+$lang->execution->selectRound     = 'Select Round';
+$lang->execution->average         = 'Average';
+$lang->execution->relatedMember   = 'Đội nhóm';
+$lang->execution->watermark       = 'Đã xuất bởi ZenTao';
+$lang->execution->burnXUnit       = '(Date)';
+$lang->execution->burnYUnit       = '(Hours)';
+$lang->execution->waitTasks       = 'Waiting Tasks';
+$lang->execution->viewByUser      = 'Theo người dùng';
+$lang->execution->oneProduct      = "Only one stage can be linked {$lang->productCommon}";
+$lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
+$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->start    = 'Bắt đầu';
 $lang->execution->activate = 'Kích hoạt';
@@ -98,6 +112,10 @@ $lang->execution->endList[93]  = '3 tháng';
 $lang->execution->endList[186] = '6 tháng';
 $lang->execution->endList[365] = '1 năm';
 
+$lang->execution->lifeTimeList['short'] = "Short-Term";
+$lang->execution->lifeTimeList['long']  = "Long-Term";
+$lang->execution->lifeTimeList['ops']   = "DevOps";
+
 $lang->team = new stdclass();
 $lang->team->account    = 'Người dùng';
 $lang->team->role       = 'Vai trò';
@@ -144,10 +162,11 @@ $lang->execution->groupTask         = 'Xem kiểu nhóm';
 $lang->execution->story             = 'Danh sách câu chuyện';
 $lang->execution->qa                = 'QA';
 $lang->execution->bug               = 'Danh sách Bug';
+$lang->execution->testcase          = 'Testcase List';
 $lang->execution->dynamic           = 'Lịch sử';
 $lang->execution->latestDynamic     = 'Lịch sử';
 $lang->execution->build             = 'Danh sách bản dựng';
-$lang->execution->testtask          = 'Kiểm thử';
+$lang->execution->testtask          = 'Request';
 $lang->execution->burn              = 'Burndown';
 $lang->execution->computeBurn       = 'Cập nhật';
 $lang->execution->burnData          = 'Dữ liệu Burndown';
@@ -162,26 +181,31 @@ $lang->execution->linkPlan          = 'Kế hoạch liên kết';
 $lang->execution->unlinkStoryTasks  = 'Hủy liên kết';
 $lang->execution->linkedProducts    = "{$lang->productCommon} liên kết";
 $lang->execution->unlinkedProducts  = "{$lang->productCommon} đã hủy liên kết";
-$lang->execution->view              = "Chi tiết {$lang->executionCommon}";
-$lang->execution->startAction       = "Bắt đầu {$lang->executionCommon}";
-$lang->execution->activateAction    = "Kích hoạt {$lang->executionCommon}";
-$lang->execution->delayAction       = "Tạm ngưng {$lang->executionCommon}";
-$lang->execution->suspendAction     = "Đình chỉ {$lang->executionCommon}";
-$lang->execution->closeAction       = "Đóng {$lang->executionCommon}";
-$lang->execution->testtaskAction    = "Yêu cầu {$lang->executionCommon}";
-$lang->execution->teamAction        = "Thành viên {$lang->executionCommon}";
-$lang->execution->kanbanAction      = "Kanban {$lang->executionCommon}";
+$lang->execution->view              = "Chi tiết Execution";
+$lang->execution->startAction       = "Bắt đầu Execution";
+$lang->execution->activateAction    = "Kích hoạt Execution";
+$lang->execution->delayAction       = "Tạm ngưng Execution";
+$lang->execution->suspendAction     = "Đình chỉ Execution";
+$lang->execution->closeAction       = "Đóng Execution";
+$lang->execution->testtaskAction    = "Yêu cầu Execution";
+$lang->execution->teamAction        = "Thành viên Execution";
+$lang->execution->kanbanAction      = "Kanban Execution";
 $lang->execution->printKanbanAction = "In Kanban";
-$lang->execution->treeAction        = "Xem cây {$lang->executionCommon}";
-$lang->execution->exportAction      = "Xuất {$lang->executionCommon}";
+$lang->execution->treeAction        = "Xem cây Execution";
+$lang->execution->exportAction      = "Xuất Execution";
 $lang->execution->computeBurnAction = "Tính Burndown";
 $lang->execution->create            = "Tạo {$lang->executionCommon}";
-$lang->execution->copy              = "Sao chép {$lang->executionCommon}";
-$lang->execution->delete            = "Xóa {$lang->executionCommon}";
+$lang->execution->copy              = "Sao chép Execution";
+$lang->execution->delete            = "Xóa Execution";
+$lang->execution->copy              = "Copy {$lang->executionCommon}";
+$lang->execution->delete            = "Delete {$lang->executionCommon}";
+$lang->execution->deleteAB          = "Delete Execution";
 $lang->execution->browse            = "{$lang->executionCommon} List";
 $lang->execution->list              = "{$lang->executionCommon} List";
 $lang->execution->edit              = "Sửa {$lang->executionCommon}";
+$lang->execution->editAB            = "Edit Execution";
 $lang->execution->batchEdit         = "Sửa hàng loạt";
+$lang->execution->batchEditAB       = "Batch Edit";
 $lang->execution->manageMembers     = 'Quản lý đội nhóm';
 $lang->execution->unlinkMember      = 'Gỡ bỏ thành viên';
 $lang->execution->unlinkStory       = 'Hủy liên kết câu chuyện';
@@ -190,7 +214,6 @@ $lang->execution->batchUnlinkStory  = 'Hủy liên kết câu chuyện hàng lo
 $lang->execution->importTask        = 'Chuyển thành nhiệm vụ';
 $lang->execution->importPlanStories = 'Liên kết câu chuyện theo kế hoạch';
 $lang->execution->importBug         = 'Nhập Bug';
-$lang->execution->updateOrder       = "Đánh giá {$lang->executionCommon}";
 $lang->execution->tree              = 'Cây';
 $lang->execution->treeTask          = 'Chỉ hiện nhiệm vụ';
 $lang->execution->treeStory         = 'Chỉ hiện câu chuyện';
@@ -242,11 +265,8 @@ $lang->execution->aboveAllExecution = "Tất cả {$lang->executionCommon} trên
 
 /* Page prompt. */
 $lang->execution->linkStoryByPlanTips = "Hành động này sẽ liên kết tất cả câu chuyện trong kế hoạch này tới {$lang->executionCommon} này.";
-$lang->execution->selectExecution       = "Chọn {$lang->executionCommon}";
-$lang->execution->selectExecution     = "Select Execution";
+$lang->execution->selectExecution     = "Chọn {$lang->executionCommon}";
 $lang->execution->beginAndEnd         = 'Thời gian';
-$lang->execution->begin               = 'Bắt đầu';
-$lang->execution->end                 = 'Kết thúc';
 $lang->execution->lblStats            = 'Chấm công';
 $lang->execution->stats               = 'Khả dụng: <strong>%s</strong>(giờ). Dự tính: <strong>%s</strong>(giờ). Đã làm: <strong>%s</strong>(giờ). Còn: <strong>%s</strong>(giờ).';
 $lang->execution->taskSummary         = "Tổng nhiệm vụ:<strong>%s</strong>. Đang đợi: <strong>%s</strong>. Đang làm: <strong>%s</strong>.  &nbsp;&nbsp;&nbsp;  Dự tính: <strong>%s</strong>(giờ). Đã làm: <strong>%s</strong>(giờ). Còn: <strong>%s</strong>(giờ).";
@@ -263,7 +283,7 @@ $lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php
 $lang->execution->whyNoStories        = "Không có câu chuyện có thể liên kết. Vui lòng kiểm tra có câu chuyện trong {$lang->executionCommon} cái liên kết tới {$lang->productCommon} và chắc chắn nó đã được duyệt.";
 $lang->execution->productStories      = "Câu chuyện liên kết tới {$lang->executionCommon} là tập hợp con của câu chuyện liên kết tới {$lang->productCommon}. Các câu chuyện chỉ có thể liên kết sau khi chúng đã được duyệt. <a href='%s'> Liên kết câu chuyện</a> now.";
 $lang->execution->haveDraft           = "%s câu chuyện đang nháp, bởi vậy chúng không thể liên kết.";
-$lang->execution->doneExecutions        = 'Kết thúc';
+$lang->execution->doneExecutions      = 'Kết thúc';
 $lang->execution->selectDept          = 'Chọn phòng/ban';
 $lang->execution->selectDeptTitle     = 'Chọn người dùng';
 $lang->execution->copyTeam            = 'Copy đội nhóm';
@@ -271,12 +291,13 @@ $lang->execution->copyFromTeam        = "Sao chép từ {$lang->executionCommon}
 $lang->execution->noMatched           = "Không có $lang->executionCommon bao gồm '%s' có thể được tìm thấy.";
 $lang->execution->copyTitle           = "Chọn một {$lang->executionCommon} để sao chép.";
 $lang->execution->copyTeamTitle       = "Chọn một {$lang->executionCommon} đội nhóm để sao chép.";
-$lang->execution->copyNoExecution       = "Không có {$lang->executionCommon} có thể sao chép.";
-$lang->execution->copyFromExecution     = "Sao chép từ {$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "Không có {$lang->executionCommon} có thể sao chép.";
+$lang->execution->copyFromExecution   = "Sao chép từ {$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = 'Hủy sao chép';
 $lang->execution->byPeriod            = 'Theo thời gian';
 $lang->execution->byUser              = 'Theo người dùng';
-$lang->execution->noExecution           = "Không có {$lang->executionCommon} nào";
+$lang->execution->noExecution         = "Không có {$lang->executionCommon} nào";
+$lang->execution->noExecutions        = "Không có {$lang->execution->common} nào";
 $lang->execution->noMembers           = 'Không có thành viên đội nhóm nào';
 $lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 $lang->execution->linkPRJStoryTip     = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)";
@@ -291,6 +312,8 @@ $lang->execution->notAllowedUnlinkStory     = "This {$lang->SRCommon} is linked
 $lang->execution->notAllowRemoveProducts    = "The story of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
 $lang->execution->errorNoLinkedProducts     = "Không có {$lang->productCommon} liên kết tới {$lang->executionCommon}. Bạn sẽ được chuyển tới trang  {$lang->productCommon} để liên kết.";
 $lang->execution->errorSameProducts         = "{$lang->executionCommon} không thể liên kết tới {$lang->productCommon} giống nhau 2 lần.";
+$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->accessDenied              = "Truy cập của bạn tới {$lang->executionCommon} bị từ chối!";
 $lang->execution->tips                      = 'Ghi chú';
 $lang->execution->afterInfo                 = "{$lang->executionCommon} được tạo. Tiếp theo bạn có thể ";
@@ -305,12 +328,7 @@ $lang->execution->fixFirstWithLeft          = 'Cập nhật cả giờ còn lạ
 $lang->execution->unfinishedExecution         = "This {$lang->executionCommon} has ";
 $lang->execution->unfinishedTask            = "[%s] unfinished tasks. ";
 $lang->execution->unresolvedBug             = "[%s] unresolved bugs. ";
-
-$lang->execution->action = new stdclass();
-$lang->execution->action->opened  = '$date, được tạo bởi <strong>$actor</strong>  $extra.' . "\n";
-$lang->execution->action->managed = '$date, quản lý bởi <strong>$actor</strong> . $extra' . "\n";
-$lang->execution->action->edited  = '$date, edited by <strong>$actor</strong> . $extra' . "\n";
-$lang->execution->action->extra   = "{$lang->productCommon} liên kết này là %s.";
+$lang->execution->projectNotEmpty           = 'Project cannot be empty.';
 
 /* Statistics. */
 $lang->execution->charts = new stdclass();
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 6cdcc99e9f..2a438df8e6 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -10,82 +10,92 @@
  * @link        http://www.zentao.net
  */
 /* 字段列表。*/
-$lang->executionCommon           = $lang->executionCommon;
-$lang->execution->common         = $lang->executionCommon . '视图';
-$lang->execution->allExecutions  = '所有' . $lang->executionCommon;
-$lang->execution->id             = $lang->executionCommon . '编号';
-$lang->execution->type           = $lang->executionCommon . '类型';
-$lang->execution->name           = $lang->executionCommon . '名称';
-$lang->execution->code           = $lang->executionCommon . '代号';
-$lang->execution->project        = '所属项目';
-$lang->execution->execName       = '执行名称';
-$lang->execution->execCode       = '执行代号';
-$lang->execution->statge         = '阶段';
-$lang->execution->pri            = '优先级';
-$lang->execution->openedBy       = '由谁创建';
-$lang->execution->openedDate     = '创建日期';
-$lang->execution->closedBy       = '由谁关闭';
-$lang->execution->closedDate     = '关闭日期';
-$lang->execution->canceledBy     = '由谁取消';
-$lang->execution->canceledDate   = '取消日期';
-$lang->execution->begin          = '开始日期';
-$lang->execution->end            = '结束日期';
-$lang->execution->dateRange      = '起始日期';
-$lang->execution->to             = '至';
-$lang->execution->days           = '可用工作日';
-$lang->execution->day            = '天';
-$lang->execution->workHour       = '工时';
-$lang->execution->workHourUnit   = 'H';
-$lang->execution->totalHours     = '可用工时';
-$lang->execution->totalDays      = '可用工日';
-$lang->execution->status         = $lang->executionCommon . '状态';
-$lang->execution->execStatus     = '执行状态';
-$lang->execution->subStatus      = '子状态';
-$lang->execution->desc           = $lang->executionCommon . '描述';
-$lang->execution->owner          = '负责人';
-$lang->execution->PO             = $lang->productCommon . '负责人';
-$lang->execution->PM             = $lang->executionCommon . '负责人';
-$lang->execution->QD             = '测试负责人';
-$lang->execution->RD             = '发布负责人';
-$lang->execution->release        = '发布';
-$lang->execution->acl            = '访问控制';
-$lang->execution->teamname       = '团队名称';
-$lang->execution->order          = $lang->executionCommon . '排序';
-$lang->execution->orderAB        = '排序';
-$lang->execution->products       = '相关' . $lang->productCommon;
-$lang->execution->whitelist      = '白名单';
-$lang->execution->addWhitelist   = '添加白名单';
+$lang->execution->allExecutions   = '所有' . $lang->executionCommon;
+$lang->execution->allExecutionAB  = "所有{$lang->execution->common}";
+$lang->execution->id              = $lang->executionCommon . '编号';
+$lang->execution->type            = $lang->executionCommon . '类型';
+$lang->execution->name            = $lang->executionCommon . '名称';
+$lang->execution->code            = $lang->executionCommon . '代号';
+$lang->execution->project         = '所属项目';
+$lang->execution->execName        = "{$lang->execution->common}名称";
+$lang->execution->execCode        = "{$lang->execution->common}代号";
+$lang->execution->execType        = "{$lang->execution->common}类型";
+$lang->execution->stage           = '阶段';
+$lang->execution->pri             = '优先级';
+$lang->execution->openedBy        = '由谁创建';
+$lang->execution->openedDate      = '创建日期';
+$lang->execution->closedBy        = '由谁关闭';
+$lang->execution->closedDate      = '关闭日期';
+$lang->execution->canceledBy      = '由谁取消';
+$lang->execution->canceledDate    = '取消日期';
+$lang->execution->begin           = '开始日期';
+$lang->execution->end             = '结束日期';
+$lang->execution->dateRange       = '起始日期';
+$lang->execution->to              = '至';
+$lang->execution->days            = '可用工作日';
+$lang->execution->day             = '天';
+$lang->execution->workHour        = '工时';
+$lang->execution->workHourUnit    = 'h';
+$lang->execution->totalHours      = '可用工时';
+$lang->execution->totalDays       = '可用工日';
+$lang->execution->status          = $lang->executionCommon . '状态';
+$lang->execution->execStatus      = "{$lang->execution->common}状态";
+$lang->execution->subStatus       = '子状态';
+$lang->execution->desc            = $lang->executionCommon . '描述';
+$lang->execution->execDesc        = "{$lang->execution->common}描述";
+$lang->execution->owner           = '负责人';
+$lang->execution->PO              = $lang->productCommon . '负责人';
+$lang->execution->PM              = $lang->executionCommon . '负责人';
+$lang->execution->execPM          = "{$lang->execution->common}负责人";
+$lang->execution->QD              = '测试负责人';
+$lang->execution->RD              = '发布负责人';
+$lang->execution->release         = '发布';
+$lang->execution->acl             = '访问控制';
+$lang->execution->teamname        = '团队名称';
+$lang->execution->order           = $lang->executionCommon . '排序';
+$lang->execution->orderAB         = '排序';
+$lang->execution->products        = '相关' . $lang->productCommon;
+$lang->execution->whitelist       = '白名单';
+$lang->execution->addWhitelist    = '添加白名单';
 $lang->execution->unbindWhitelist = '删除白名单';
-$lang->execution->totalEstimate  = '预计';
-$lang->execution->totalConsumed  = '消耗';
-$lang->execution->totalLeft      = '剩余';
-$lang->execution->progress       = '进度';
-$lang->execution->hours          = '预计 %s 消耗 %s 剩余 %s';
-$lang->execution->viewBug        = '查看bug';
-$lang->execution->noProduct      = "无{$lang->executionCommon}";
-$lang->execution->createStory    = "添加{$lang->SRCommon}";
-$lang->execution->storyTitle     = "{$lang->SRCommon}名称";
-$lang->execution->all            = '所有';
-$lang->execution->undone         = '未完成';
-$lang->execution->unclosed       = '未关闭';
-$lang->execution->typeDesc       = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。";
-$lang->execution->mine           = '我负责：';
-$lang->execution->other          = '其他：';
-$lang->execution->deleted        = '已删除';
-$lang->execution->delayed        = '已延期';
-$lang->execution->product        = $lang->execution->products;
-$lang->execution->readjustTime   = "调整{$lang->executionCommon}起止时间";
-$lang->execution->readjustTask   = '顺延任务的起止时间';
-$lang->execution->effort         = '日志';
-$lang->execution->relatedMember  = '相关成员';
-$lang->execution->watermark      = '由禅道导出';
-$lang->execution->burnXUnit      = '(日期)';
-$lang->execution->burnYUnit      = '(工时)';
-$lang->execution->waitTasks      = '待处理';
-$lang->execution->viewByUser     = '按用户查看';
-$lang->execution->oneProduct     = "阶段只能关联一个{$lang->productCommon}";
-$lang->execution->noLinkProduct  = "阶段没有关联{$lang->productCommon}";
-$lang->execution->recent         = '近期访问：';
+$lang->execution->totalEstimate   = '预计';
+$lang->execution->totalConsumed   = '消耗';
+$lang->execution->totalLeft       = '剩余';
+$lang->execution->progress        = '进度';
+$lang->execution->hours           = '预计 %s 消耗 %s 剩余 %s';
+$lang->execution->viewBug         = '查看bug';
+$lang->execution->noProduct       = "无{$lang->executionCommon}";
+$lang->execution->createStory     = "提{$lang->SRCommon}";
+$lang->execution->storyTitle      = "{$lang->SRCommon}名称";
+$lang->execution->all             = '所有';
+$lang->execution->undone          = '未完成';
+$lang->execution->unclosed        = '未关闭';
+$lang->execution->typeDesc        = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。";
+$lang->execution->mine            = '我负责：';
+$lang->execution->involved        = '我参与：';
+$lang->execution->other           = '其他：';
+$lang->execution->deleted         = '已删除';
+$lang->execution->delayed         = '已延期';
+$lang->execution->product         = $lang->execution->products;
+$lang->execution->readjustTime    = "调整{$lang->executionCommon}起止时间";
+$lang->execution->readjustTask    = '顺延任务的起止时间';
+$lang->execution->effort          = '日志';
+$lang->execution->storyEstimate   = '需求估算';
+$lang->execution->newEstimate     = '新一轮估算';
+$lang->execution->reestimate      = '重新估算';
+$lang->execution->selectRound     = '选择轮次';
+$lang->execution->average         = '平均值';
+$lang->execution->relatedMember   = '相关成员';
+$lang->execution->watermark       = '由禅道导出';
+$lang->execution->burnXUnit       = '(日期)';
+$lang->execution->burnYUnit       = '(工时)';
+$lang->execution->waitTasks       = '待处理';
+$lang->execution->viewByUser      = '按用户查看';
+$lang->execution->oneProduct      = "阶段只能关联一个{$lang->productCommon}";
+$lang->execution->noLinkProduct   = "阶段没有关联{$lang->productCommon}";
+$lang->execution->recent          = '近期访问：';
+$lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . '来复制';
+$lang->execution->noTeam          = '暂时没有团队成员';
 
 $lang->execution->start    = "开始";
 $lang->execution->activate = "激活";
@@ -146,7 +156,7 @@ $lang->execution->burnByList['estimate']   = "按计划工时查看";
 $lang->execution->burnByList['storyPoint'] = '按故事点查看';
 
 /* 方法列表。*/
-$lang->execution->index             = "{$lang->executionCommon}主页";
+$lang->execution->index             = "{$lang->execution->common}主页";
 $lang->execution->task              = '任务列表';
 $lang->execution->groupTask         = '分组浏览任务';
 $lang->execution->story             = "{$lang->SRCommon}列表";
@@ -171,27 +181,30 @@ $lang->execution->linkPlan          = "关联计划";
 $lang->execution->unlinkStoryTasks  = "未关联{$lang->SRCommon}任务";
 $lang->execution->linkedProducts    = '已关联';
 $lang->execution->unlinkedProducts  = '未关联';
-$lang->execution->view              = "{$lang->executionCommon}概况";
-$lang->execution->startAction       = "开始{$lang->executionCommon}";
-$lang->execution->activateAction    = "激活{$lang->executionCommon}";
-$lang->execution->delayAction       = "延期{$lang->executionCommon}";
-$lang->execution->suspendAction     = "挂起{$lang->executionCommon}";
-$lang->execution->closeAction       = "关闭{$lang->executionCommon}";
-$lang->execution->testtaskAction    = "{$lang->executionCommon}测试单";
-$lang->execution->teamAction        = "{$lang->executionCommon}团队";
-$lang->execution->kanbanAction      = "{$lang->executionCommon}看板";
+$lang->execution->view              = "{$lang->execution->common}概况";
+$lang->execution->startAction       = "开始{$lang->execution->common}";
+$lang->execution->activateAction    = "激活{$lang->execution->common}";
+$lang->execution->delayAction       = "延期{$lang->execution->common}";
+$lang->execution->suspendAction     = "挂起{$lang->execution->common}";
+$lang->execution->closeAction       = "关闭{$lang->execution->common}";
+$lang->execution->testtaskAction    = "{$lang->execution->common}测试单";
+$lang->execution->teamAction        = "{$lang->execution->common}团队";
+$lang->execution->kanbanAction      = "{$lang->execution->common}看板";
 $lang->execution->printKanbanAction = "打印看板";
-$lang->execution->treeAction        = "{$lang->executionCommon}树状图";
-$lang->execution->exportAction      = "导出{$lang->executionCommon}";
+$lang->execution->treeAction        = "{$lang->execution->common}树状图";
+$lang->execution->exportAction      = "导出{$lang->execution->common}";
 $lang->execution->computeBurnAction = "计算燃尽图";
 $lang->execution->create            = "添加{$lang->executionCommon}";
-$lang->execution->createExec        = "添加执行";
+$lang->execution->createExec        = "添加{$lang->execution->common}";
+$lang->execution->copyExec          = "复制{$lang->execution->common}";
 $lang->execution->copy              = "复制{$lang->executionCommon}";
 $lang->execution->delete            = "删除{$lang->executionCommon}";
-$lang->execution->browse            = "浏览{$lang->executionCommon}";
-$lang->execution->list              = "{$lang->executionCommon}列表";
+$lang->execution->deleteAB          = "删除{$lang->execution->common}";
+$lang->execution->browse            = "浏览{$lang->execution->common}";
 $lang->execution->edit              = "编辑{$lang->executionCommon}";
+$lang->execution->editAction        = "编辑{$lang->execution->common}";
 $lang->execution->batchEdit         = "编辑";
+$lang->execution->batchEditAction   = "批量编辑";
 $lang->execution->manageMembers     = '团队管理';
 $lang->execution->unlinkMember      = '移除成员';
 $lang->execution->unlinkStory       = "移除{$lang->SRCommon}";
@@ -200,8 +213,6 @@ $lang->execution->batchUnlinkStory  = "批量移除{$lang->SRCommon}";
 $lang->execution->importTask        = '转入任务';
 $lang->execution->importPlanStories = "按计划关联{$lang->SRCommon}";
 $lang->execution->importBug         = '导入Bug';
-$lang->execution->updateOrder       = "{$lang->executionCommon}排序";
-$lang->execution->execUpdateOrder   = "执行排序";
 $lang->execution->tree              = '树状图';
 $lang->execution->treeTask          = '只看任务';
 $lang->execution->treeStory         = "只看{$lang->SRCommon}";
@@ -213,6 +224,7 @@ $lang->execution->importPlanStory   = '创建' . $lang->executionCommon . '成
 $lang->execution->iteration         = '版本迭代';
 $lang->execution->iterationInfo     = '迭代%s次';
 $lang->execution->viewAll           = '查看所有';
+$lang->execution->testreport        = '测试报告';
 
 /* 分组浏览。*/
 $lang->execution->allTasks     = '所有';
@@ -248,13 +260,12 @@ $lang->execution->byQuery = '搜索';
 
 /* 查询条件列表。*/
 $lang->execution->allExecution      = "所有{$lang->executionCommon}";
-$lang->execution->aboveAllProduct = "以上所有{$lang->productCommon}";
+$lang->execution->aboveAllProduct   = "以上所有{$lang->productCommon}";
 $lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}";
 
 /* 页面提示。*/
 $lang->execution->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此{$lang->executionCommon}中";
-$lang->execution->selectExecution       = "请选择{$lang->executionCommon}";
-$lang->execution->selectExecution     = "请选择阶段/迭代/冲刺";
+$lang->execution->selectExecution     = "请选择{$lang->execution->common}";
 $lang->execution->beginAndEnd         = '起止时间';
 $lang->execution->lblStats            = '工时统计';
 $lang->execution->stats               = '可用工时 <strong>%s</strong> 工时，总共预计 <strong>%s</strong> 工时，已经消耗 <strong>%s</strong> 工时，预计剩余 <strong>%s</strong> 工时';
@@ -272,7 +283,7 @@ $lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.ph
 $lang->execution->whyNoStories        = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->execution->productStories      = "{$lang->executionCommon}关联的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，并且只有评审通过的{$lang->SRCommon}才能关联。请<a href='%s'>关联{$lang->SRCommon}</a>。";
 $lang->execution->haveDraft           = "有%s条草稿状态的{$lang->SRCommon}无法关联到该{$lang->executionCommon}";
-$lang->execution->doneExecutions        = '已结束';
+$lang->execution->doneExecutions      = '已结束';
 $lang->execution->selectDept          = '选择部门';
 $lang->execution->selectDeptTitle     = '选择一个部门的成员';
 $lang->execution->copyTeam            = '复制团队';
@@ -280,16 +291,17 @@ $lang->execution->copyFromTeam        = "复制自{$lang->executionCommon}团队
 $lang->execution->noMatched           = "找不到包含'%s'的$lang->executionCommon";
 $lang->execution->copyTitle           = "请选择一个{$lang->executionCommon}来复制";
 $lang->execution->copyTeamTitle       = "选择一个{$lang->executionCommon}团队来复制";
-$lang->execution->copyNoExecution       = "没有可用的{$lang->executionCommon}来复制";
-$lang->execution->copyFromExecution     = "复制自{$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "没有可用的{$lang->executionCommon}来复制";
+$lang->execution->copyFromExecution   = "复制自{$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = '取消复制';
 $lang->execution->byPeriod            = '按时间段';
 $lang->execution->byUser              = '按用户';
-$lang->execution->noExecution           = "暂时没有{$lang->executionCommon}。";
+$lang->execution->noExecution         = "暂时没有{$lang->executionCommon}。";
+$lang->execution->noExecutions        = "暂时没有{$lang->execution->common}。";
 $lang->execution->noMembers           = '暂时没有团队成员。';
 $lang->execution->workloadTotal       = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
-$lang->execution->linkPRJStoryTip     = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
-$lang->execution->linkAllStoryTip     = "(项目下还未关联{$lang->SRCommon}，可直接关联该迭代/阶段/冲刺所关联产品的{$lang->SRCommon})";
+// $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
+$lang->execution->linkAllStoryTip     = "(项目下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联产品的{$lang->SRCommon})";
 
 /* 交互提示。*/
 $lang->execution->confirmDelete             = "您确定删除{$lang->executionCommon}[%s]吗？";
@@ -300,6 +312,8 @@ $lang->execution->notAllowedUnlinkStory     = "该{$lang->SRCommon}已经与项
 $lang->execution->notAllowRemoveProducts    = "该{$lang->productCommon}中的{$lang->SRCommon}已与该{$lang->executionCommon}进行了关联，请取消关联后再操作。";
 $lang->execution->errorNoLinkedProducts     = "该{$lang->executionCommon}没有关联的{$lang->productCommon}，系统将转到{$lang->productCommon}关联页面";
 $lang->execution->errorSameProducts         = "{$lang->executionCommon}不能关联多个相同的{$lang->productCommon}。";
+$lang->execution->errorBegin                = "{$lang->executionCommon}的开始时间不能小于所属项目的开始时间%s。";
+$lang->execution->errorEnd                  = "{$lang->executionCommon}的结束时间不能大于所属项目的结束时间%s。";
 $lang->execution->accessDenied              = "您无权访问该{$lang->executionCommon}！";
 $lang->execution->tips                      = '提示';
 $lang->execution->afterInfo                 = "{$lang->executionCommon}添加成功，您现在可以进行以下操作：";
diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php
index 251238a483..41d90ff50b 100644
--- a/module/execution/lang/zh-tw.php
+++ b/module/execution/lang/zh-tw.php
@@ -1,102 +1,120 @@
 <?php
 /**
- * The project module zh-tw file of ZenTaoMS.
+ * The execution module zh-tw file of ZenTaoMS.
  *
  * @copyright   Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     project
+ * @package     execution
  * @version     $Id: zh-tw.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
-$lang->project->common         = $lang->executionCommon . '視圖';
-$lang->project->allProjects    = '所有' . $lang->executionCommon;
-$lang->project->id             = $lang->executionCommon . '編號';
-$lang->project->type           = $lang->executionCommon . '類型';
-$lang->project->name           = $lang->executionCommon . '名稱';
-$lang->project->code           = $lang->executionCommon . '代號';
-$lang->project->statge         = '階段';
-$lang->project->pri            = '優先順序';
-$lang->project->openedBy       = '由誰創建';
-$lang->project->openedDate     = '創建日期';
-$lang->project->closedBy       = '由誰關閉';
-$lang->project->closedDate     = '關閉日期';
-$lang->project->canceledBy     = '由誰取消';
-$lang->project->canceledDate   = '取消日期';
-$lang->project->begin          = '開始日期';
-$lang->project->end            = '結束日期';
-$lang->project->dateRange      = '起始日期';
-$lang->project->to             = '至';
-$lang->project->days           = '可用工作日';
-$lang->project->day            = '天';
-$lang->project->workHour       = '工時';
-$lang->project->workHourUnit   = 'H';
-$lang->project->totalHours     = '可用工時';
-$lang->project->totalDays      = '可用工日';
-$lang->project->status         = $lang->executionCommon . '狀態';
-$lang->project->subStatus      = '子狀態';
-$lang->project->desc           = $lang->executionCommon . '描述';
-$lang->project->owner          = '負責人';
-$lang->project->PO             = $lang->productCommon . '負責人';
-$lang->project->PM             = $lang->executionCommon . '負責人';
-$lang->project->QD             = '測試負責人';
-$lang->project->RD             = '發佈負責人';
-$lang->project->qa             = '測試';
-$lang->project->release        = '發佈';
-$lang->project->acl            = '訪問控制';
-$lang->project->teamname       = '團隊名稱';
-$lang->project->order          = $lang->executionCommon . '排序';
-$lang->project->orderAB        = '排序';
-$lang->project->products       = '相關' . $lang->productCommon;
-$lang->project->whitelist      = '白名單';
-$lang->project->addWhitelist   = '添加白名單';
-$lang->project->unbindWhitelist = '刪除白名單';
-$lang->project->totalEstimate  = '預計';
-$lang->project->totalConsumed  = '消耗';
-$lang->project->totalLeft      = '剩餘';
-$lang->project->progress       = '進度';
-$lang->project->hours          = '預計 %s 消耗 %s 剩餘 %s';
-$lang->project->viewBug        = '查看bug';
-$lang->project->noProduct      = "無{$lang->executionCommon}";
-$lang->project->createStory    = "添加{$lang->SRCommon}";
-$lang->project->storyTitle     = "{$lang->SRCommon}名稱";
-$lang->project->all            = '所有';
-$lang->project->undone         = '未完成';
-$lang->project->unclosed       = '未關閉';
-$lang->project->typeDesc       = "運維{$lang->executionCommon}沒有{$lang->SRCommon}、bug、版本、測試功能。";
-$lang->project->mine           = '我負責：';
-$lang->project->other          = '其他：';
-$lang->project->deleted        = '已刪除';
-$lang->project->delayed        = '已延期';
-$lang->project->product        = $lang->project->products;
-$lang->project->readjustTime   = "調整{$lang->executionCommon}起止時間";
-$lang->project->readjustTask   = '順延任務的起止時間';
-$lang->project->effort         = '日誌';
-$lang->project->relatedMember  = '相關成員';
-$lang->project->watermark      = '由禪道導出';
-$lang->project->burnXUnit      = '(日期)';
-$lang->project->burnYUnit      = '(工時)';
-$lang->project->waitTasks      = '待處理';
-$lang->project->viewByUser     = '按用戶查看';
-$lang->project->oneProduct     = "階段只能關聯一個{$lang->productCommon}";
-$lang->project->noLinkProduct  = "階段沒有關聯{$lang->productCommon}";
-$lang->project->recent         = '近期访问：';
+$lang->execution->allExecutions   = '所有' . $lang->executionCommon;
+$lang->execution->allExecutionAB  = "所有{$lang->execution->common}";
+$lang->execution->id              = $lang->executionCommon . '編號';
+$lang->execution->type            = $lang->executionCommon . '類型';
+$lang->execution->name            = $lang->executionCommon . '名稱';
+$lang->execution->code            = $lang->executionCommon . '代號';
+$lang->execution->project         = '所屬項目';
+$lang->execution->execName        = "{$lang->execution->common}名稱";
+$lang->execution->execCode        = "{$lang->execution->common}代號";
+$lang->execution->execType        = "{$lang->execution->common}類型";
+$lang->execution->stage           = '階段';
+$lang->execution->pri             = '優先順序';
+$lang->execution->openedBy        = '由誰創建';
+$lang->execution->openedDate      = '創建日期';
+$lang->execution->closedBy        = '由誰關閉';
+$lang->execution->closedDate      = '關閉日期';
+$lang->execution->canceledBy      = '由誰取消';
+$lang->execution->canceledDate    = '取消日期';
+$lang->execution->begin           = '開始日期';
+$lang->execution->end             = '結束日期';
+$lang->execution->dateRange       = '起始日期';
+$lang->execution->to              = '至';
+$lang->execution->days            = '可用工作日';
+$lang->execution->day             = '天';
+$lang->execution->workHour        = '工時';
+$lang->execution->workHourUnit    = 'h';
+$lang->execution->totalHours      = '可用工時';
+$lang->execution->totalDays       = '可用工日';
+$lang->execution->status          = $lang->executionCommon . '狀態';
+$lang->execution->execStatus      = "{$lang->execution->common}狀態";
+$lang->execution->subStatus       = '子狀態';
+$lang->execution->desc            = $lang->executionCommon . '描述';
+$lang->execution->execDesc        = "{$lang->execution->common}描述";
+$lang->execution->owner           = '負責人';
+$lang->execution->PO              = $lang->productCommon . '負責人';
+$lang->execution->PM              = $lang->executionCommon . '負責人';
+$lang->execution->execPM          = "{$lang->execution->common}負責人";
+$lang->execution->QD              = '測試負責人';
+$lang->execution->RD              = '發佈負責人';
+$lang->execution->release         = '發佈';
+$lang->execution->acl             = '訪問控制';
+$lang->execution->teamname        = '團隊名稱';
+$lang->execution->order           = $lang->executionCommon . '排序';
+$lang->execution->orderAB         = '排序';
+$lang->execution->products        = '相關' . $lang->productCommon;
+$lang->execution->whitelist       = '白名單';
+$lang->execution->addWhitelist    = '添加白名單';
+$lang->execution->unbindWhitelist = '刪除白名單';
+$lang->execution->totalEstimate   = '預計';
+$lang->execution->totalConsumed   = '消耗';
+$lang->execution->totalLeft       = '剩餘';
+$lang->execution->progress        = '進度';
+$lang->execution->hours           = '預計 %s 消耗 %s 剩餘 %s';
+$lang->execution->viewBug         = '查看bug';
+$lang->execution->noProduct       = "無{$lang->executionCommon}";
+$lang->execution->createStory     = "提{$lang->SRCommon}";
+$lang->execution->storyTitle      = "{$lang->SRCommon}名稱";
+$lang->execution->all             = '所有';
+$lang->execution->undone          = '未完成';
+$lang->execution->unclosed        = '未關閉';
+$lang->execution->typeDesc        = "運維{$lang->executionCommon}沒有{$lang->SRCommon}、bug、版本、測試功能。";
+$lang->execution->mine            = '我負責：';
+$lang->execution->involved        = '我參與：';
+$lang->execution->other           = '其他：';
+$lang->execution->deleted         = '已刪除';
+$lang->execution->delayed         = '已延期';
+$lang->execution->product         = $lang->execution->products;
+$lang->execution->readjustTime    = "調整{$lang->executionCommon}起止時間";
+$lang->execution->readjustTask    = '順延任務的起止時間';
+$lang->execution->effort          = '日誌';
+$lang->execution->storyEstimate   = '需求估算';
+$lang->execution->newEstimate     = '新一輪估算';
+$lang->execution->reestimate      = '重新估算';
+$lang->execution->selectRound     = '選擇輪次';
+$lang->execution->average         = '平均值';
+$lang->execution->relatedMember   = '相關成員';
+$lang->execution->watermark       = '由禪道導出';
+$lang->execution->burnXUnit       = '(日期)';
+$lang->execution->burnYUnit       = '(工時)';
+$lang->execution->waitTasks       = '待處理';
+$lang->execution->viewByUser      = '按用戶查看';
+$lang->execution->oneProduct      = "階段只能關聯一個{$lang->productCommon}";
+$lang->execution->noLinkProduct   = "階段沒有關聯{$lang->productCommon}";
+$lang->execution->recent          = '近期訪問：';
+$lang->execution->copyNoExecution = '沒有可用的' . $lang->executionCommon . '來複制';
+$lang->execution->noTeam          = '暫時沒有團隊成員';
 
-$lang->project->start    = "開始";
-$lang->project->activate = "激活";
-$lang->project->putoff   = "延期";
-$lang->project->suspend  = "掛起";
-$lang->project->close    = "關閉";
-$lang->project->export   = "導出";
+$lang->execution->start    = "開始";
+$lang->execution->activate = "激活";
+$lang->execution->putoff   = "延期";
+$lang->execution->suspend  = "掛起";
+$lang->execution->close    = "關閉";
+$lang->execution->export   = "導出";
 
-$lang->project->endList[7]   = '一星期';
-$lang->project->endList[14]  = '兩星期';
-$lang->project->endList[31]  = '一個月';
-$lang->project->endList[62]  = '兩個月';
-$lang->project->endList[93]  = '三個月';
-$lang->project->endList[186] = '半年';
-$lang->project->endList[365] = '一年';
+$lang->execution->endList[7]   = '一星期';
+$lang->execution->endList[14]  = '兩星期';
+$lang->execution->endList[31]  = '一個月';
+$lang->execution->endList[62]  = '兩個月';
+$lang->execution->endList[93]  = '三個月';
+$lang->execution->endList[186] = '半年';
+$lang->execution->endList[365] = '一年';
+
+$lang->execution->lifeTimeList['short'] = "短期";
+$lang->execution->lifeTimeList['long']  = "長期";
+$lang->execution->lifeTimeList['ops']   = "運維";
 
 $lang->team = new stdclass();
 $lang->team->account    = '用戶';
@@ -110,235 +128,244 @@ $lang->team->limited            = '受限用戶';
 $lang->team->limitedList['yes'] = '是';
 $lang->team->limitedList['no']  = '否';
 
-$lang->project->basicInfo = '基本信息';
-$lang->project->otherInfo = '其他信息';
+$lang->execution->basicInfo = '基本信息';
+$lang->execution->otherInfo = '其他信息';
 
 /* 欄位取值列表。*/
-$lang->project->statusList['wait']      = '未開始';
-$lang->project->statusList['doing']     = '進行中';
-$lang->project->statusList['suspended'] = '已掛起';
-$lang->project->statusList['closed']    = '已關閉';
+$lang->execution->statusList['wait']      = '未開始';
+$lang->execution->statusList['doing']     = '進行中';
+$lang->execution->statusList['suspended'] = '已掛起';
+$lang->execution->statusList['closed']    = '已關閉';
 
-$lang->project->aclList['private'] = "私有（團隊成員和項目負責人、干係人可訪問）";
-$lang->project->aclList['open']    = "繼承項目訪問權限（能訪問當前項目，即可訪問）";
+global $config;
+if($config->systemMode == 'new')
+{
+    $lang->execution->aclList['private'] = "私有（團隊成員和項目負責人、干係人可訪問）";
+    $lang->execution->aclList['open']    = "繼承項目訪問權限（能訪問當前項目，即可訪問）";
+}
+else
+{
+    $lang->execution->aclList['private'] = "私有（團隊成員和{$lang->executionCommon}負責人可訪問）";
+    $lang->execution->aclList['open']    = "公開（有{$lang->executionCommon}視圖權限即可訪問）";
+}
 
-$lang->project->storyPoint = '故事點';
+$lang->execution->storyPoint = '故事點';
 
-$lang->project->burnByList['left']       = '按剩餘工時查看';
-$lang->project->burnByList['estimate']   = "按計劃工時查看";
-$lang->project->burnByList['storyPoint'] = '按故事點查看';
+$lang->execution->burnByList['left']       = '按剩餘工時查看';
+$lang->execution->burnByList['estimate']   = "按計劃工時查看";
+$lang->execution->burnByList['storyPoint'] = '按故事點查看';
 
 /* 方法列表。*/
-$lang->project->index             = "{$lang->executionCommon}主頁";
-$lang->project->task              = '任務列表';
-$lang->project->groupTask         = '分組瀏覽任務';
-$lang->project->story             = "{$lang->SRCommon}列表";
-$lang->project->bug               = 'Bug列表';
-$lang->project->dynamic           = '動態';
-$lang->project->latestDynamic     = '最新動態';
-$lang->project->build             = '所有版本';
-$lang->project->testtask          = '測試單';
-$lang->project->burn              = '燃盡圖';
-$lang->project->computeBurn       = '更新燃盡圖';
-$lang->project->burnData          = '燃盡圖數據';
-$lang->project->fixFirst          = '修改首天工時';
-$lang->project->team              = '團隊成員';
-$lang->project->doc               = '文檔列表';
-$lang->project->doclib            = '文檔庫列表';
-$lang->project->manageProducts    = '關聯' . $lang->productCommon;
-$lang->project->linkStory         = "關聯{$lang->SRCommon}";
-$lang->project->linkStoryByPlan   = "按照計劃關聯";
-$lang->project->linkPlan          = "關聯計劃";
-$lang->project->unlinkStoryTasks  = "未關聯{$lang->SRCommon}任務";
-$lang->project->linkedProducts    = '已關聯';
-$lang->project->unlinkedProducts  = '未關聯';
-$lang->project->view              = "{$lang->executionCommon}概況";
-$lang->project->startAction       = "開始{$lang->executionCommon}";
-$lang->project->activateAction    = "激活{$lang->executionCommon}";
-$lang->project->delayAction       = "延期{$lang->executionCommon}";
-$lang->project->suspendAction     = "掛起{$lang->executionCommon}";
-$lang->project->closeAction       = "關閉{$lang->executionCommon}";
-$lang->project->testtaskAction    = "{$lang->executionCommon}測試單";
-$lang->project->teamAction        = "{$lang->executionCommon}團隊";
-$lang->project->kanbanAction      = "{$lang->executionCommon}看板";
-$lang->project->printKanbanAction = "打印看板";
-$lang->project->treeAction        = "{$lang->executionCommon}樹狀圖";
-$lang->project->exportAction      = "導出{$lang->executionCommon}";
-$lang->project->computeBurnAction = "計算燃盡圖";
-$lang->project->create            = "添加{$lang->executionCommon}";
-$lang->project->copy              = "複製{$lang->executionCommon}";
-$lang->project->delete            = "刪除{$lang->executionCommon}";
-$lang->project->browse            = "瀏覽{$lang->executionCommon}";
-$lang->project->edit              = "編輯{$lang->executionCommon}";
-$lang->project->batchEdit         = "批量編輯";
-$lang->project->manageMembers     = '團隊管理';
-$lang->project->unlinkMember      = '移除成員';
-$lang->project->unlinkStory       = "移除{$lang->SRCommon}";
-$lang->project->unlinkStoryAB     = "移除{$lang->SRCommon}";
-$lang->project->batchUnlinkStory  = "批量移除{$lang->SRCommon}";
-$lang->project->importTask        = '轉入任務';
-$lang->project->importPlanStories = "按計劃關聯{$lang->SRCommon}";
-$lang->project->importBug         = '導入Bug';
-$lang->project->updateOrder       = "{$lang->executionCommon}排序";
-$lang->project->tree              = '樹狀圖';
-$lang->project->treeTask          = '只看任務';
-$lang->project->treeStory         = "只看{$lang->SRCommon}";
-$lang->project->treeOnlyTask      = '樹狀圖只看任務';
-$lang->project->treeOnlyStory     = "樹狀圖只看{$lang->SRCommon}";
-$lang->project->storyKanban       = "{$lang->SRCommon}看板";
-$lang->project->storySort         = "{$lang->SRCommon}排序";
-$lang->project->importPlanStory   = '創建' . $lang->executionCommon . '成功！\n是否導入計劃關聯的相關' . $lang->SRCommon . '？';
-$lang->project->iteration         = '版本迭代';
-$lang->project->iterationInfo     = '迭代%s次';
-$lang->project->viewAll           = '查看所有';
+$lang->execution->index             = "{$lang->execution->common}主頁";
+$lang->execution->task              = '任務列表';
+$lang->execution->groupTask         = '分組瀏覽任務';
+$lang->execution->story             = "{$lang->SRCommon}列表";
+$lang->execution->qa                = '測試儀表盤';
+$lang->execution->bug               = 'Bug列表';
+$lang->execution->testcase          = '用例列表';
+$lang->execution->dynamic           = '動態';
+$lang->execution->latestDynamic     = '最新動態';
+$lang->execution->build             = '所有版本';
+$lang->execution->testtask          = '測試單';
+$lang->execution->burn              = '燃盡圖';
+$lang->execution->computeBurn       = '更新燃盡圖';
+$lang->execution->burnData          = '燃盡圖數據';
+$lang->execution->fixFirst          = '修改首天工時';
+$lang->execution->team              = '團隊成員';
+$lang->execution->doc               = '文檔列表';
+$lang->execution->doclib            = '文檔庫列表';
+$lang->execution->manageProducts    = '關聯' . $lang->productCommon;
+$lang->execution->linkStory         = "關聯{$lang->SRCommon}";
+$lang->execution->linkStoryByPlan   = "按照計劃關聯";
+$lang->execution->linkPlan          = "關聯計劃";
+$lang->execution->unlinkStoryTasks  = "未關聯{$lang->SRCommon}任務";
+$lang->execution->linkedProducts    = '已關聯';
+$lang->execution->unlinkedProducts  = '未關聯';
+$lang->execution->view              = "{$lang->execution->common}概況";
+$lang->execution->startAction       = "開始{$lang->execution->common}";
+$lang->execution->activateAction    = "激活{$lang->execution->common}";
+$lang->execution->delayAction       = "延期{$lang->execution->common}";
+$lang->execution->suspendAction     = "掛起{$lang->execution->common}";
+$lang->execution->closeAction       = "關閉{$lang->execution->common}";
+$lang->execution->testtaskAction    = "{$lang->execution->common}測試單";
+$lang->execution->teamAction        = "{$lang->execution->common}團隊";
+$lang->execution->kanbanAction      = "{$lang->execution->common}看板";
+$lang->execution->printKanbanAction = "打印看板";
+$lang->execution->treeAction        = "{$lang->execution->common}樹狀圖";
+$lang->execution->exportAction      = "導出{$lang->execution->common}";
+$lang->execution->computeBurnAction = "計算燃盡圖";
+$lang->execution->create            = "添加{$lang->executionCommon}";
+$lang->execution->createExec        = "添加{$lang->execution->common}";
+$lang->execution->copyExec          = "複製{$lang->execution->common}";
+$lang->execution->copy              = "複製{$lang->executionCommon}";
+$lang->execution->delete            = "刪除{$lang->executionCommon}";
+$lang->execution->deleteAB          = "刪除{$lang->execution->common}";
+$lang->execution->browse            = "瀏覽{$lang->execution->common}";
+$lang->execution->edit              = "編輯{$lang->executionCommon}";
+$lang->execution->editAction        = "編輯{$lang->execution->common}";
+$lang->execution->batchEdit         = "編輯";
+$lang->execution->batchEditAction   = "批量編輯";
+$lang->execution->manageMembers     = '團隊管理';
+$lang->execution->unlinkMember      = '移除成員';
+$lang->execution->unlinkStory       = "移除{$lang->SRCommon}";
+$lang->execution->unlinkStoryAB     = "移除{$lang->SRCommon}";
+$lang->execution->batchUnlinkStory  = "批量移除{$lang->SRCommon}";
+$lang->execution->importTask        = '轉入任務';
+$lang->execution->importPlanStories = "按計劃關聯{$lang->SRCommon}";
+$lang->execution->importBug         = '導入Bug';
+$lang->execution->tree              = '樹狀圖';
+$lang->execution->treeTask          = '只看任務';
+$lang->execution->treeStory         = "只看{$lang->SRCommon}";
+$lang->execution->treeOnlyTask      = '樹狀圖只看任務';
+$lang->execution->treeOnlyStory     = "樹狀圖只看{$lang->SRCommon}";
+$lang->execution->storyKanban       = "{$lang->SRCommon}看板";
+$lang->execution->storySort         = "{$lang->SRCommon}排序";
+$lang->execution->importPlanStory   = '創建' . $lang->executionCommon . '成功！\n是否導入計劃關聯的相關' . $lang->SRCommon . '？';
+$lang->execution->iteration         = '版本迭代';
+$lang->execution->iterationInfo     = '迭代%s次';
+$lang->execution->viewAll           = '查看所有';
+$lang->execution->testreport        = '測試報告';
 
 /* 分組瀏覽。*/
-$lang->project->allTasks     = '所有';
-$lang->project->assignedToMe = '指派給我';
-$lang->project->myInvolved   = '由我參與';
+$lang->execution->allTasks     = '所有';
+$lang->execution->assignedToMe = '指派給我';
+$lang->execution->myInvolved   = '由我參與';
 
-$lang->project->statusSelects['']             = '更多';
-$lang->project->statusSelects['wait']         = '未開始';
-$lang->project->statusSelects['doing']        = '進行中';
-$lang->project->statusSelects['undone']       = '未完成';
-$lang->project->statusSelects['finishedbyme'] = '我完成';
-$lang->project->statusSelects['done']         = '已完成';
-$lang->project->statusSelects['closed']       = '已關閉';
-$lang->project->statusSelects['cancel']       = '已取消';
+$lang->execution->statusSelects['']             = '更多';
+$lang->execution->statusSelects['wait']         = '未開始';
+$lang->execution->statusSelects['doing']        = '進行中';
+$lang->execution->statusSelects['undone']       = '未完成';
+$lang->execution->statusSelects['finishedbyme'] = '我完成';
+$lang->execution->statusSelects['done']         = '已完成';
+$lang->execution->statusSelects['closed']       = '已關閉';
+$lang->execution->statusSelects['cancel']       = '已取消';
 
-$lang->project->groups['']           = '分組查看';
-$lang->project->groups['story']      = "{$lang->SRCommon}分組";
-$lang->project->groups['status']     = '狀態分組';
-$lang->project->groups['pri']        = '優先順序分組';
-$lang->project->groups['assignedTo'] = '指派給分組';
-$lang->project->groups['finishedBy'] = '完成者分組';
-$lang->project->groups['closedBy']   = '關閉者分組';
-$lang->project->groups['type']       = '類型分組';
+$lang->execution->groups['']           = '分組查看';
+$lang->execution->groups['story']      = "{$lang->SRCommon}分組";
+$lang->execution->groups['status']     = '狀態分組';
+$lang->execution->groups['pri']        = '優先順序分組';
+$lang->execution->groups['assignedTo'] = '指派給分組';
+$lang->execution->groups['finishedBy'] = '完成者分組';
+$lang->execution->groups['closedBy']   = '關閉者分組';
+$lang->execution->groups['type']       = '類型分組';
 
-$lang->project->groupFilter['story']['all']         = '所有';
-$lang->project->groupFilter['story']['linked']      = "已關聯{$lang->SRCommon}的任務";
-$lang->project->groupFilter['pri']['all']           = '所有';
-$lang->project->groupFilter['pri']['noset']         = '未設置';
-$lang->project->groupFilter['assignedTo']['undone'] = '未完成';
-$lang->project->groupFilter['assignedTo']['all']    = '所有';
+$lang->execution->groupFilter['story']['all']         = '所有';
+$lang->execution->groupFilter['story']['linked']      = "已關聯{$lang->SRCommon}的任務";
+$lang->execution->groupFilter['pri']['all']           = '所有';
+$lang->execution->groupFilter['pri']['noset']         = '未設置';
+$lang->execution->groupFilter['assignedTo']['undone'] = '未完成';
+$lang->execution->groupFilter['assignedTo']['all']    = '所有';
 
-$lang->project->byQuery = '搜索';
+$lang->execution->byQuery = '搜索';
 
 /* 查詢條件列表。*/
-$lang->project->allProject      = "所有{$lang->executionCommon}";
-$lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
-$lang->project->aboveAllProject = "以上所有{$lang->executionCommon}";
+$lang->execution->allExecution      = "所有{$lang->executionCommon}";
+$lang->execution->aboveAllProduct   = "以上所有{$lang->productCommon}";
+$lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}";
 
 /* 頁面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此{$lang->executionCommon}中";
-$lang->project->selectProject       = "請選擇{$lang->executionCommon}";
-$lang->project->selectExecution     = "請選擇階段/迭代/衝刺";
-$lang->project->beginAndEnd         = '起止時間';
-$lang->project->begin               = '開始日期';
-$lang->project->end                 = '截止日期';
-$lang->project->lblStats            = '工時統計';
-$lang->project->stats               = '可用工時 <strong>%s</strong> 工時，總共預計 <strong>%s</strong> 工時，已經消耗 <strong>%s</strong> 工時，預計剩餘 <strong>%s</strong> 工時';
-$lang->project->taskSummary         = "本頁共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計 <strong>%s</strong> 工時，已消耗 <strong>%s</strong> 工時，剩餘 <strong>%s</strong> 工時。";
-$lang->project->pageSummary         = "本頁共 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
-$lang->project->checkedSummary      = "選中 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
-$lang->project->memberHoursAB       = "<div>%s有 <strong>%s</strong> 工時</div>";
-$lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工時</div><div class="segment-value">%s</div></div></div></div>';
-$lang->project->countSummary        = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總任務</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">進行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未開始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->project->timeSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總預計</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
-$lang->project->groupSummaryAB      = "<div>總任務 <strong>%s : </strong><span class='text-muted'>未開始</span> %s &nbsp; <span class='text-muted'>進行中</span> %s</div><div>總預計 <strong>%s : </strong><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩餘</span> %s</div>";
-$lang->project->wbs                 = "分解任務";
-$lang->project->batchWBS            = "批量分解";
-$lang->project->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-tw' target='_blank' title='如何更新燃盡圖？' class='btn btn-link'>幫助 <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "看起來沒有{$lang->SRCommon}可以關聯。請檢查下{$lang->executionCommon}關聯的{$lang->productCommon}中有沒有{$lang->SRCommon}，而且要確保它們已經審核通過。";
-$lang->project->productStories      = "{$lang->executionCommon}關聯的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，並且只有評審通過的{$lang->SRCommon}才能關聯。請<a href='%s'>關聯{$lang->SRCommon}</a>。";
-$lang->project->haveDraft           = "有%s條草稿狀態的{$lang->SRCommon}無法關聯到該{$lang->executionCommon}";
-$lang->project->doneProjects        = '已結束';
-$lang->project->selectDept          = '選擇部門';
-$lang->project->selectDeptTitle     = '選擇一個部門的成員';
-$lang->project->copyTeam            = '複製團隊';
-$lang->project->copyFromTeam        = "複製自{$lang->executionCommon}團隊： <strong>%s</strong>";
-$lang->project->noMatched           = "找不到包含'%s'的$lang->executionCommon";
-$lang->project->copyTitle           = "請選擇一個{$lang->executionCommon}來複制";
-$lang->project->copyTeamTitle       = "選擇一個{$lang->executionCommon}團隊來複制";
-$lang->project->copyNoProject       = "沒有可用的{$lang->executionCommon}來複制";
-$lang->project->copyFromProject     = "複製自{$lang->executionCommon} <strong>%s</strong>";
-$lang->project->cancelCopy          = '取消複製';
-$lang->project->byPeriod            = '按時間段';
-$lang->project->byUser              = '按用戶';
-$lang->project->noProject           = "暫時沒有{$lang->executionCommon}。";
-$lang->project->noMembers           = '暫時沒有團隊成員。';
-$lang->project->workloadTotal       = "工作量占比累計不應當超過100, 當前產品下的工作量之和為%s";
-$lang->project->linkPRJStoryTip     = "(關聯{$lang->SRCommon}來源於項目下所關聯的{$lang->SRCommon})";
-$lang->project->linkAllStoryTip     = "(項目下還未關聯{$lang->SRCommon}，可直接關聯該迭代/階段/衝刺所關聯產品的{$lang->SRCommon})";
+$lang->execution->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此{$lang->executionCommon}中";
+$lang->execution->selectExecution     = "請選擇{$lang->execution->common}";
+$lang->execution->beginAndEnd         = '起止時間';
+$lang->execution->lblStats            = '工時統計';
+$lang->execution->stats               = '可用工時 <strong>%s</strong> 工時，總共預計 <strong>%s</strong> 工時，已經消耗 <strong>%s</strong> 工時，預計剩餘 <strong>%s</strong> 工時';
+$lang->execution->taskSummary         = "本頁共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計 <strong>%s</strong> 工時，已消耗 <strong>%s</strong> 工時，剩餘 <strong>%s</strong> 工時。";
+$lang->execution->pageSummary         = "本頁共 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
+$lang->execution->checkedSummary      = "選中 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
+$lang->execution->memberHoursAB       = "<div>%s有 <strong>%s</strong> 工時</div>";
+$lang->execution->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工時</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->countSummary        = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總任務</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">進行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未開始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
+$lang->execution->timeSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總預計</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->groupSummaryAB      = "<div>總任務 <strong>%s : </strong><span class='text-muted'>未開始</span> %s &nbsp; <span class='text-muted'>進行中</span> %s</div><div>總預計 <strong>%s : </strong><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩餘</span> %s</div>";
+$lang->execution->wbs                 = "分解任務";
+$lang->execution->batchWBS            = "批量分解";
+$lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-tw' 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->productStories      = "{$lang->executionCommon}關聯的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，並且只有評審通過的{$lang->SRCommon}才能關聯。請<a href='%s'>關聯{$lang->SRCommon}</a>。";
+$lang->execution->haveDraft           = "有%s條草稿狀態的{$lang->SRCommon}無法關聯到該{$lang->executionCommon}";
+$lang->execution->doneExecutions      = '已結束';
+$lang->execution->selectDept          = '選擇部門';
+$lang->execution->selectDeptTitle     = '選擇一個部門的成員';
+$lang->execution->copyTeam            = '複製團隊';
+$lang->execution->copyFromTeam        = "複製自{$lang->executionCommon}團隊： <strong>%s</strong>";
+$lang->execution->noMatched           = "找不到包含'%s'的$lang->executionCommon";
+$lang->execution->copyTitle           = "請選擇一個{$lang->executionCommon}來複制";
+$lang->execution->copyTeamTitle       = "選擇一個{$lang->executionCommon}團隊來複制";
+$lang->execution->copyNoExecution     = "沒有可用的{$lang->executionCommon}來複制";
+$lang->execution->copyFromExecution   = "複製自{$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->cancelCopy          = '取消複製';
+$lang->execution->byPeriod            = '按時間段';
+$lang->execution->byUser              = '按用戶';
+$lang->execution->noExecution         = "暫時沒有{$lang->executionCommon}。";
+$lang->execution->noExecutions        = "暫時沒有{$lang->execution->common}。";
+$lang->execution->noMembers           = '暫時沒有團隊成員。';
+$lang->execution->workloadTotal       = "工作量占比累計不應當超過100, 當前產品下的工作量之和為%s";
+// $lang->execution->linkProjectStoryTip = "(關聯{$lang->SRCommon}來源於項目下所關聯的{$lang->SRCommon})";
+$lang->execution->linkAllStoryTip     = "(項目下還未關聯{$lang->SRCommon}，可直接關聯該{$lang->execution->common}所關聯產品的{$lang->SRCommon})";
 
 /* 交互提示。*/
-$lang->project->confirmDelete             = "您確定刪除{$lang->executionCommon}[%s]嗎？";
-$lang->project->confirmUnlinkMember       = "您確定從該{$lang->executionCommon}中移除該用戶嗎？";
-$lang->project->confirmUnlinkStory        = "您確定從該{$lang->executionCommon}中移除該{$lang->SRCommon}嗎？";
-$lang->project->confirmUnlinkProjectStory = "您確定從該項目中移除該{$lang->SRCommon}嗎？";
-$lang->project->notAllowedUnlinkStory     = "該{$lang->SRCommon}已經與項目下{$lang->executionCommon}相關聯，請從{$lang->executionCommon}中移除後再操作。";
-$lang->project->notAllowRemoveProducts    = "該產品中的需求已與該{$lang->executionCommon}進行了關聯，請取消關聯後再操作。";
-$lang->project->errorNoLinkedProducts     = "該{$lang->executionCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
-$lang->project->errorSameProducts         = "{$lang->executionCommon}不能關聯多個相同的{$lang->productCommon}。";
-$lang->project->accessDenied              = "您無權訪問該{$lang->executionCommon}！";
-$lang->project->tips                      = '提示';
-$lang->project->afterInfo                 = "{$lang->executionCommon}添加成功，您現在可以進行以下操作：";
-$lang->project->setTeam                   = '設置團隊';
-$lang->project->linkStory                 = "關聯{$lang->SRCommon}";
-$lang->project->createTask                = '創建任務';
-$lang->project->goback                    = "返回任務列表";
-$lang->project->noweekend                 = '去除周末';
-$lang->project->withweekend               = '顯示周末';
-$lang->project->interval                  = '間隔';
-$lang->project->fixFirstWithLeft          = '修改剩餘工時';
-$lang->project->unfinishedProject         = "該{$lang->executionCommon}下還有";
-$lang->project->unfinishedTask            = "[%s]個未完成的任務，";
-$lang->project->unresolvedBug             = "[%s]個未解決的bug，";
-
-$lang->project->action = new stdclass();
-$lang->project->action->opened  = '$date, 由 <strong>$actor</strong> 創建。$extra' . "\n";
-$lang->project->action->managed = '$date, 由 <strong>$actor</strong> 維護。$extra' . "\n";
-$lang->project->action->edited  = '$date, 由 <strong>$actor</strong> 編輯。$extra' . "\n";
-$lang->project->action->extra   = '相關產品為 %s。';
+$lang->execution->confirmDelete             = "您確定刪除{$lang->executionCommon}[%s]嗎？";
+$lang->execution->confirmUnlinkMember       = "您確定從該{$lang->executionCommon}中移除該用戶嗎？";
+$lang->execution->confirmUnlinkStory        = "您確定從該{$lang->executionCommon}中移除該{$lang->SRCommon}嗎？";
+$lang->execution->confirmUnlinkExecutionStory = "您確定從該項目中移除該{$lang->SRCommon}嗎？";
+$lang->execution->notAllowedUnlinkStory     = "該{$lang->SRCommon}已經與項目下{$lang->executionCommon}相關聯，請從{$lang->executionCommon}中移除後再操作。";
+$lang->execution->notAllowRemoveProducts    = "該{$lang->productCommon}中的{$lang->SRCommon}已與該{$lang->executionCommon}進行了關聯，請取消關聯後再操作。";
+$lang->execution->errorNoLinkedProducts     = "該{$lang->executionCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
+$lang->execution->errorSameProducts         = "{$lang->executionCommon}不能關聯多個相同的{$lang->productCommon}。";
+$lang->execution->accessDenied              = "您無權訪問該{$lang->executionCommon}！";
+$lang->execution->tips                      = '提示';
+$lang->execution->afterInfo                 = "{$lang->executionCommon}添加成功，您現在可以進行以下操作：";
+$lang->execution->setTeam                   = '設置團隊';
+$lang->execution->linkStory                 = "關聯{$lang->SRCommon}";
+$lang->execution->createTask                = '創建任務';
+$lang->execution->goback                    = "返回任務列表";
+$lang->execution->noweekend                 = '去除周末';
+$lang->execution->withweekend               = '顯示周末';
+$lang->execution->interval                  = '間隔';
+$lang->execution->fixFirstWithLeft          = '修改剩餘工時';
+$lang->execution->unfinishedExecution         = "該{$lang->executionCommon}下還有";
+$lang->execution->unfinishedTask            = "[%s]個未完成的任務，";
+$lang->execution->unresolvedBug             = "[%s]個未解決的bug，";
+$lang->execution->projectNotEmpty           = '所屬項目不能為空。';
 
 /* 統計。*/
-$lang->project->charts = new stdclass();
-$lang->project->charts->burn = new stdclass();
-$lang->project->charts->burn->graph = new stdclass();
-$lang->project->charts->burn->graph->caption      = "燃盡圖";
-$lang->project->charts->burn->graph->xAxisName    = "日期";
-$lang->project->charts->burn->graph->yAxisName    = "HOUR";
-$lang->project->charts->burn->graph->baseFontSize = 12;
-$lang->project->charts->burn->graph->formatNumber = 0;
-$lang->project->charts->burn->graph->animation    = 0;
-$lang->project->charts->burn->graph->rotateNames  = 1;
-$lang->project->charts->burn->graph->showValues   = 0;
-$lang->project->charts->burn->graph->reference    = '參考';
-$lang->project->charts->burn->graph->actuality    = '實際';
+$lang->execution->charts = new stdclass();
+$lang->execution->charts->burn = new stdclass();
+$lang->execution->charts->burn->graph = new stdclass();
+$lang->execution->charts->burn->graph->caption      = "燃盡圖";
+$lang->execution->charts->burn->graph->xAxisName    = "日期";
+$lang->execution->charts->burn->graph->yAxisName    = "HOUR";
+$lang->execution->charts->burn->graph->baseFontSize = 12;
+$lang->execution->charts->burn->graph->formatNumber = 0;
+$lang->execution->charts->burn->graph->animation    = 0;
+$lang->execution->charts->burn->graph->rotateNames  = 1;
+$lang->execution->charts->burn->graph->showValues   = 0;
+$lang->execution->charts->burn->graph->reference    = '參考';
+$lang->execution->charts->burn->graph->actuality    = '實際';
 
-$lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code      = '團隊內部的簡稱';
-$lang->project->placeholder->totalLeft = "{$lang->executionCommon}開始時的總預計工時";
+$lang->execution->placeholder = new stdclass();
+$lang->execution->placeholder->code      = '團隊內部的簡稱';
+$lang->execution->placeholder->totalLeft = "{$lang->executionCommon}開始時的總預計工時";
 
-$lang->project->selectGroup = new stdclass();
-$lang->project->selectGroup->done = '(已結束)';
+$lang->execution->selectGroup = new stdclass();
+$lang->execution->selectGroup->done = '(已結束)';
 
-$lang->project->orderList['order_asc']  = "{$lang->SRCommon}排序正序";
-$lang->project->orderList['order_desc'] = "{$lang->SRCommon}排序倒序";
-$lang->project->orderList['pri_asc']    = "{$lang->SRCommon}優先順序正序";
-$lang->project->orderList['pri_desc']   = "{$lang->SRCommon}優先順序倒序";
-$lang->project->orderList['stage_asc']  = "{$lang->SRCommon}階段正序";
-$lang->project->orderList['stage_desc'] = "{$lang->SRCommon}階段倒序";
+$lang->execution->orderList['order_asc']  = "{$lang->SRCommon}排序正序";
+$lang->execution->orderList['order_desc'] = "{$lang->SRCommon}排序倒序";
+$lang->execution->orderList['pri_asc']    = "{$lang->SRCommon}優先順序正序";
+$lang->execution->orderList['pri_desc']   = "{$lang->SRCommon}優先順序倒序";
+$lang->execution->orderList['stage_asc']  = "{$lang->SRCommon}階段正序";
+$lang->execution->orderList['stage_desc'] = "{$lang->SRCommon}階段倒序";
 
-$lang->project->kanban        = "看板";
-$lang->project->kanbanSetting = "看板設置";
-$lang->project->resetKanban   = "恢復預設";
-$lang->project->printKanban   = "打印看板";
-$lang->project->bugList       = "Bug列表";
+$lang->execution->kanban        = "看板";
+$lang->execution->kanbanSetting = "看板設置";
+$lang->execution->resetKanban   = "恢復預設";
+$lang->execution->printKanban   = "打印看板";
+$lang->execution->bugList       = "Bug列表";
 
-$lang->project->kanbanHideCols   = '看板隱藏已關閉、已取消列';
-$lang->project->kanbanShowOption = '顯示摺疊信息';
-$lang->project->kanbanColsColor  = '看板列自定義顏色';
+$lang->execution->kanbanHideCols   = '看板隱藏已關閉、已取消列';
+$lang->execution->kanbanShowOption = '顯示摺疊信息';
+$lang->execution->kanbanColsColor  = '看板列自定義顏色';
 
 $lang->kanbanSetting = new stdclass();
 $lang->kanbanSetting->noticeReset     = '是否恢復看板預設設置？';
@@ -355,34 +382,33 @@ $lang->printKanban->taskStatus = '狀態';
 $lang->printKanban->typeList['all']       = '全部';
 $lang->printKanban->typeList['increment'] = '增量';
 
-$lang->project->typeList['']       = '';
-$lang->project->typeList['stage']  = '階段';
-$lang->project->typeList['sprint'] = $lang->executionCommon;
+$lang->execution->typeList['']       = '';
+$lang->execution->typeList['stage']  = '階段';
+$lang->execution->typeList['sprint'] = $lang->executionCommon;
 
-$lang->project->featureBar['task']['all']          = $lang->project->allTasks;
-$lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
-$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
-$lang->project->featureBar['task']['myinvolved']   = $lang->project->myInvolved;
-$lang->project->featureBar['task']['delayed']      = '已延期';
-$lang->project->featureBar['task']['needconfirm']  = "{$lang->SRCommon}變更";
-$lang->project->featureBar['task']['status']       = $lang->project->statusSelects[''];
+$lang->execution->featureBar['task']['all']          = $lang->execution->allTasks;
+$lang->execution->featureBar['task']['unclosed']     = $lang->execution->unclosed;
+$lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assignedToMe;
+$lang->execution->featureBar['task']['myinvolved']   = $lang->execution->myInvolved;
+$lang->execution->featureBar['task']['delayed']      = '已延期';
+$lang->execution->featureBar['task']['needconfirm']  = "{$lang->SRCommon}變更";
+$lang->execution->featureBar['task']['status']       = $lang->execution->statusSelects[''];
 
-$lang->project->featureBar['all']['all']       = $lang->project->all;
-$lang->project->featureBar['all']['undone']    = $lang->project->undone;
-$lang->project->featureBar['all']['wait']      = $lang->project->statusList['wait'];
-$lang->project->featureBar['all']['doing']     = $lang->project->statusList['doing'];
-$lang->project->featureBar['all']['suspended'] = $lang->project->statusList['suspended'];
-$lang->project->featureBar['all']['closed']    = $lang->project->statusList['closed'];
+$lang->execution->featureBar['all']['all']       = $lang->execution->all;
+$lang->execution->featureBar['all']['undone']    = $lang->execution->undone;
+$lang->execution->featureBar['all']['wait']      = $lang->execution->statusList['wait'];
+$lang->execution->featureBar['all']['doing']     = $lang->execution->statusList['doing'];
+$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
+$lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
-$lang->project->treeLevel = array();
-$lang->project->treeLevel['all']   = '全部展開';
-$lang->project->treeLevel['root']  = '全部摺疊';
-$lang->project->treeLevel['task']  = '全部顯示';
-$lang->project->treeLevel['story'] = "只看{$lang->SRCommon}";
+$lang->execution->treeLevel = array();
+$lang->execution->treeLevel['all']   = '全部展開';
+$lang->execution->treeLevel['root']  = '全部摺疊';
+$lang->execution->treeLevel['task']  = '全部顯示';
+$lang->execution->treeLevel['story'] = "只看{$lang->SRCommon}";
 
 $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。';
-
diff --git a/module/execution/model.php b/module/execution/model.php
index 3fb4ce87bf..dada45e9aa 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -53,49 +53,45 @@ class executionModel extends model
     /**
      * Set menu.
      *
-     * @param  array  $executions
      * @param  int    $executionID
      * @param  int    $buildID
      * @param  string $extra
      * @access public
-     * @return bool
+     * @return void
      */
-    public function setMenu($executions, $executionID, $buildID = 0, $extra = '')
+    public function setMenu($executionID, $buildID = 0, $extra = '')
     {
-        if(empty($executions))
-        {
-            $project = $this->loadModel('project')->getByID($this->session->PRJ);
-            if($project->model == 'waterfall')
-            {
-                if(($this->app->moduleName == 'programplan' && $this->app->methodName != 'create') || $this->app->moduleName == 'execution') die(js::locate(helper::createLink('programplan', 'create', "projectID=$project->id")));
-            }
-            else
-            {
-                if($this->app->moduleName == 'execution' && $this->app->methodName != 'create') die(js::locate(helper::createLink('execution', 'create')));
-            }
-        }
-
+        $executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
         if(!$executionID and $this->session->execution) $executionID = $this->session->execution;
         if(!$executionID or !in_array($executionID, array_keys($executions))) $executionID = key($executions);
         $this->session->set('execution', $executionID);
 
         /* Unset story, bug, build and testtask if type is ops. */
         $execution = $this->getByID($executionID);
+
+        if($execution->type == 'stage')
+        {
+            global $lang;
+            $this->app->loadLang('project');
+            $lang->executionCommon = $lang->project->stage;
+            include $this->app->getModulePath('execution') . 'lang/' . $this->app->getClientLang() . '.php';
+        }
+
         if($execution and $execution->lifetime == 'ops')
         {
             unset($this->lang->execution->menu->story);
             unset($this->lang->execution->menu->qa);
-            unset($this->lang->execution->subMenu->qa->bug);
-            unset($this->lang->execution->subMenu->qa->build);
-            unset($this->lang->execution->subMenu->qa->testtask);
+            unset($this->lang->execution->menu->build);
         }
 
         /* Hide story and qa menu when execution is story or design type. */
+        /*
         if($execution and ($execution->attribute == 'story' or $execution->attribute == 'design'))
         {
             unset($this->lang->execution->menu->story);
             unset($this->lang->execution->menu->qa);
         }
+         */
 
         if($executions and (!isset($executions[$executionID]) or !$this->checkPriv($executionID))) $this->accessDenied();
 
@@ -108,43 +104,8 @@ class executionModel extends model
             $this->cookie->executionMode = 'all';
         }
 
-        /* Set execution module page nav. */
-        $label = $this->lang->execution->index;
-        if($methodName == 'all') $label = $this->lang->execution->allExecutions;
-        if($methodName == 'create' and $moduleName == 'execution') $label = $this->lang->execution->create;
-
-        foreach($this->lang->execution->viewMenu as $key => $menu) common::setMenuVars($this->lang->execution->viewMenu, $key, $executionID);
-        foreach($this->lang->execution->qaMenu as $key => $menu) common::setMenuVars($this->lang->execution->qaMenu, $key, $executionID);
-
-        foreach($this->lang->execution->menu as $key => $menu)
-        {
-            common::setMenuVars($this->lang->execution->menu, $key, $executionID);
-
-            if(isset($this->lang->execution->subMenu->$key))
-            {
-                $executionSubMenu = $this->lang->execution->subMenu->$key;
-                $subMenu = common::createSubMenu($this->lang->execution->subMenu->$key, $executionID);
-
-                if(!empty($subMenu))
-                {
-                    foreach($subMenu as $menuKey => $menu)
-                    {
-                        $itemMenu = zget($executionSubMenu, $menuKey, '');
-                        $isActive['method']    = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']));
-                        $isActive['alias']     = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false));
-                        $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false);
-                        if($isActive['method'] or $isActive['alias'] or $isActive['subModule'])
-                        {
-                            $this->lang->execution->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
-                            break;
-                        }
-                    }
-                    $this->lang->execution->menu->{$key}['subMenu'] = $subMenu;
-                }
-            }
-        }
-
-        return true;
+        $this->lang->switcherMenu = $this->getSwitcher($executionID, $this->app->rawModule, $this->app->rawMethod);
+        common::setMenuVars('execution', $executionID);
     }
 
     /**
@@ -182,14 +143,13 @@ class executionModel extends model
             }
         }
 
-        $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "objectID=$executionID&module=$currentModule&method=$currentMethod&extra=$extra");
+        $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "executionID=$executionID&module=$currentModule&method=$currentMethod&extra=$extra");
         $currentExecutionName = '';
         if(isset($currentExecution->name)) $currentExecutionName = $currentExecution->name;
 
         if($this->config->systemMode == 'classic')
         {
-            $this->session->set('moreExecutionLink', $this->app->getURI(true));
-            $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentExecutionName}'><span class='text'><i class='icon icon-sprint'></i> {$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+            $output  = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentExecutionName}'><span class='text'><i class='icon icon-sprint'></i> {$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
             $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
             $output .= "</div></div>";
 
@@ -212,7 +172,7 @@ class executionModel extends model
      */
     public function tree()
     {
-        $products     = $this->loadModel('product')->getPairs('nocode', $this->session->PRJ);
+        $products     = $this->loadModel('product')->getPairs('nocode', 0);
         $productGroup = $this->getProductGroupList();
         $executionTree  = "<ul class='tree tree-lines'>";
         foreach($productGroup as $productID => $executions)
@@ -322,23 +282,32 @@ class executionModel extends model
      */
     public function create($copyExecutionID = '')
     {
+        $type = 'sprint';
         $this->lang->execution->team = $this->lang->execution->teamname;
 
-        if(empty($_POST['project']))
+        if($this->config->systemMode == 'new')
         {
-            dao::$errors['message'][] = $this->lang->execution->projectNotEmpty;
-            return false;
-        }
+            if(empty($_POST['project']))
+            {
+                dao::$errors['message'][] = $this->lang->execution->projectNotEmpty;
+                return false;
+            }
 
-        /* Determine whether to add a sprint or a stage according to the model of the execution. */
-        $project    = $this->getByID($_POST['project']);
-        $sprintType = $this->config->systemMode == 'new' ? zget($this->config->execution->modelList, $project->model, '') : 'sprint';
+            if($this->config->systemMode == 'new') $this->checkBeginAndEndDate($_POST['project'], $_POST['begin'], $_POST['end']);
+            if(dao::isError()) return false;
 
-        /* If the execution model is a stage, determine whether the product is linked. */
-        if($sprintType == 'stage' and empty($this->post->products[0]))
-        {
-            dao::$errors['message'][] = $this->lang->execution->noLinkProduct;
-            return false;
+            /* Determine whether to add a sprint or a stage according to the model of the execution. */
+            $project = $this->loadModel('project')->getByID($_POST['project']);
+            $type = zget($this->config->execution->modelList, $project->model, 'sprint');
+
+            /* If the execution model is a stage, determine whether the product is linked. */
+            if($type == 'stage' and empty($this->post->products[0]))
+            {
+                dao::$errors['message'][] = $this->lang->execution->noLinkProduct;
+                return false;
+            }
+
+            $this->config->execution->create->requiredFields .= ',project';
         }
 
         /* Get the data from the post. */
@@ -349,11 +318,11 @@ class executionModel extends model
             ->setDefault('openedVersion', $this->config->version)
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
-            ->setDefault('team', substr($this->post->name,0, 30))
+            ->setDefault('team', substr($this->post->name, 0, 30))
             ->setIF($this->config->systemMode == 'new', 'parent', $this->post->project)
             ->setIF($this->post->acl == 'open', 'whitelist', '')
             ->join('whitelist', ',')
-            ->add('type', $sprintType)
+            ->add('type', $type)
             ->stripTags($this->config->execution->editor->create['id'], $this->config->allowedTags)
             ->remove('products, workDays, delta, branch, uid, plans')
             ->get();
@@ -369,6 +338,14 @@ class executionModel extends model
         }
 
         $sprint = $this->loadModel('file')->processImgURL($sprint, $this->config->execution->editor->create['id'], $this->post->uid);
+
+        /* Replace required language. */
+        if($this->app->openApp == 'project')
+        {
+            $this->lang->project->name = $this->lang->execution->name;
+            $this->lang->project->code = $this->lang->execution->code;
+        }
+
         $this->dao->insert(TABLE_EXECUTION)->data($sprint)
             ->autoCheck($skipFields = 'begin,end')
             ->batchcheck($this->config->execution->create->requiredFields, 'notempty')
@@ -390,7 +367,7 @@ class executionModel extends model
             $this->file->updateObjectID($this->post->uid, $executionID, 'execution');
 
             /* Update the path. */
-            $this->setTreePath($executionID);
+            if($this->config->systemMode == 'new') $this->setTreePath($executionID);
 
             /* Copy team of execution. */
             if($copyExecutionID != '')
@@ -402,7 +379,7 @@ class executionModel extends model
                     $member->root = $executionID;
                     $member->join = $today;
                     $member->days = $sprint->days;
-                    $member->type = $sprintType;
+                    $member->type = 'execution';
                     $this->dao->insert(TABLE_TEAM)->data($member)->exec();
                     if($member->account == $this->app->user->account) $creatorExists = true;
                 }
@@ -417,22 +394,22 @@ class executionModel extends model
                 $member->account = $this->app->user->account;
                 $member->role    = zget($this->lang->user->roleList, $this->app->user->role, '');
                 $member->join    = $today;
-                $member->type    = $sprintType;
+                $member->type    = 'execution';
                 $member->days    = $sprint->days;
                 $member->hours   = $this->config->execution->defaultWorkhours;
                 $this->dao->insert(TABLE_TEAM)->data($member)->exec();
 
-                $this->addExecutionMembers($sprint->project, array($member));
+                if($this->config->systemMode == 'new') $this->addProjectMembers($sprint->project, array($member));
             }
 
             /* Create doc lib. */
             $this->app->loadLang('doc');
             $lib = new stdclass();
             $lib->execution = $executionID;
-            $lib->name    = $this->lang->doclib->main['execution'];
-            $lib->type    = 'execution';
-            $lib->main    = '1';
-            $lib->acl     = 'default';
+            $lib->name      = $type == 'stage' ? str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->doclib->main['execution']) : $this->lang->doclib->main['execution'];
+            $lib->type      = 'execution';
+            $lib->main      = '1';
+            $lib->acl       = 'default';
             $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
 
             $whitelist = explode(',', $sprint->whitelist);
@@ -471,7 +448,7 @@ class executionModel extends model
         }
 
         /* Get team and language item. */
-        $team = $this->getTeamMemberPairs($executionID);
+        $team = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
         $this->lang->execution->team = $this->lang->execution->teamname;
 
         /* Get the data from the post. */
@@ -487,6 +464,9 @@ class executionModel extends model
             ->remove('products, branch, uid, plans')
             ->get();
 
+        if($this->config->systemMode == 'new') $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end);
+        if(dao::isError()) return false;
+
         /* Child stage inherits parent stage permissions. */
         if(!isset($execution->acl)) $execution->acl = $oldExecution->acl;
         if($execution->acl == 'open') $execution->whitelist = '';
@@ -566,6 +546,23 @@ class executionModel extends model
         $oldExecutions = $this->getByIdList($this->post->executionIDList);
         $nameList    = array();
         $codeList    = array();
+
+        /* Replace required language. */
+        if($this->app->openApp == 'project')
+        {
+            $projectModel = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($this->session->project)->fetch('model');
+            if($projectModel == 'scrum')
+            {
+                $this->lang->project->name = $this->lang->execution->name;
+                $this->lang->project->code = $this->lang->execution->code;
+            }
+            else
+            {
+                $this->lang->project->name = str_replace($this->lang->project->common, $this->lang->project->stage, $this->lang->project->name);
+                $this->lang->project->code = str_replace($this->lang->project->common, $this->lang->project->stage, $this->lang->project->code);
+            }
+        }
+
         foreach($data->executionIDList as $executionID)
         {
             $executionName = $data->names[$executionID];
@@ -604,7 +601,7 @@ class executionModel extends model
         foreach($executions as $executionID => $execution)
         {
             $oldExecution = $oldExecutions[$executionID];
-            $team       = $this->getTeamMemberPairs($executionID);
+            $team         = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
 
             $this->dao->update(TABLE_EXECUTION)->data($execution)
                 ->autoCheck($skipFields = 'begin,end')
@@ -612,7 +609,7 @@ class executionModel extends model
                 ->checkIF($execution->begin != '', 'begin', 'date')
                 ->checkIF($execution->end != '', 'end', 'date')
                 ->checkIF($execution->end != '', 'end', 'gt', $execution->begin)
-                ->check('code', 'unique', "id NOT " . helper::dbIN($data->executionIDList) . " and deleted='0'")
+                ->checkIF($execution->code != '', 'code', 'unique', "id NOT " . helper::dbIN($data->executionIDList) . " and deleted='0'")
                 ->where('id')->eq($executionID)
                 ->limit(1)
                 ->exec();
@@ -688,6 +685,9 @@ class executionModel extends model
             ->remove('comment')
             ->get();
 
+        if($this->config->systemMode == 'new') $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end);
+        if(dao::isError()) return false;
+
         $this->dao->update(TABLE_EXECUTION)->data($execution)
             ->autoCheck()
             ->where('id')->eq((int)$executionID)
@@ -872,21 +872,19 @@ class executionModel extends model
     }
 
     /**
-     * Get execution main menu action.
+     * Check begin and end date.
      *
-     * @param  string $module
-     * @param  string $method
+     * @param  string $begin
+     * @param  string $end
      * @access public
-     * @return string
+     * @return void
      */
-    public function getMainAction($module, $method)
+    public function checkBeginAndEndDate($projectID, $begin, $end)
     {
-        if(in_array($method, array('index', 'all', 'batchedit'))) return;
+        $project = $this->loadModel('project')->getByID($projectID);
+        if($begin < $project->begin) dao::$errors['begin'] = sprintf($this->lang->execution->errorBegin, $project->begin);
 
-        $link = html::a(helper::createLink('execution', 'all'), "<i class='icon icon-list'></i>", '', "style='border: none;'");
-        $html = "<p style='padding-top:5px;'>" . $link . "</p>";
-
-        return common::hasPriv('execution', 'all') ? $html : '';
+        if($end > $project->end) dao::$errors['end'] = sprintf($this->lang->execution->errorEnd, $project->end);
     }
 
     /*
@@ -900,9 +898,7 @@ class executionModel extends model
      */
     public function getSwitcher($executionID, $currentModule, $currentMethod)
     {
-        if(in_array($currentMethod,  array('index', 'all', 'batchedit'))) return;
-
-        $this->session->set('moreExecutionLink', $this->app->getURI(true));
+        if($currentModule == 'execution' and in_array($currentMethod,  array('index', 'all', 'batchedit', 'create'))) return;
 
         $currentExecutionName = $this->lang->execution->common;
         if($executionID)
@@ -911,8 +907,15 @@ class executionModel extends model
             $currentExecutionName = $currentExecution->name;
         }
 
-        $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "objectID=$executionID&module=$currentModule&method=$currentMethod&extra=");
-        $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentExecutionName}'><span class='text'>{$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+        if($this->app->viewType == 'mhtml' and $executionID)
+        {
+            $output  = html::a(helper::createLink('execution', 'index'), $this->lang->executionCommon) . $this->lang->colon;
+            $output .= "<a id='currentItem' href=\"javascript:showSearchMenu('execution', '$executionID', '$currentModule', '$currentMethod', '')\">{$currentExecutionName} <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
+            return $output;
+        }
+
+        $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "executionID=$executionID&module=$currentModule&method=$currentMethod&extra=");
+        $output  = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentExecutionName}'><span class='text'>{$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
         $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
         $output .= "</div></div>";
 
@@ -937,7 +940,7 @@ class executionModel extends model
         if($projectID)
         {
             $executionModel = $this->dao->select('model')->from(TABLE_EXECUTION)->where('id')->eq($projectID)->andWhere('deleted')->eq(0)->fetch('model');
-            $orderBy = $executionModel == 'waterfall' ? 'sortStatus_asc,begin_asc,id_asc' : 'begin_desc';
+            $orderBy = $executionModel == 'waterfall' ? 'sortStatus_asc,begin_asc,id_asc' : 'id_desc';
 
             /* Waterfall execution, when all phases are closed, in reverse order of date. */
             if($executionModel == 'waterfall')
@@ -1198,21 +1201,53 @@ class executionModel extends model
             $module = 'execution';
             $method = 'task';
         }
+        if($module == 'testcase' and ($method == 'view' || $method == 'edit' || $method == 'batchedit'))
+        {
+            $module = 'execution';
+            $method = 'testcase';
+        }
+        if($module == 'testtask' and ($method == 'view' || $method == 'create' || $method == 'edit'))
+        {
+            $module = 'execution';
+            $method = 'testtask';
+        }
         if($module == 'build' and ($method == 'edit' || $method= 'view'))
         {
             $module = 'execution';
             $method = 'build';
         }
+        if($module == 'story')
+        {
+            $module = 'execution';
+            $method = 'story';
+        }
+        if($module == 'product' and $method == 'showerrornone')
+        {
+            $module = 'execution';
+            $method = 'task';
+        }
 
         if($module == 'execution' and $method == 'create') return;
         if($extra != '')
         {
             $link = helper::createLink($module, $method, "executionID=%s&type=$extra");
         }
-        elseif($module == 'execution' && ($method == 'index' or $method == 'all'))
+        elseif($module == 'execution' and ($method == 'index' or $method == 'all'))
         {
             $link = helper::createLink($module, 'task', "executionID=%s");
         }
+        elseif($module == 'bug' and $method == 'create' and $this->app->openApp == 'execution')
+        {
+            $link = helper::createLink($module, $method, "productID=0&branch=0&extra=executionID=%s");
+        }
+        elseif(in_array($module, array('bug', 'case', 'testtask', 'testreport')) and $method == 'view')
+        {
+            $link = helper::createLink('execution', $module, "executionID=%s");
+        }
+        elseif($module == 'repo')
+        {
+            $link = helper::createLink('repo', 'browse', "repoID=0&branchID=&executionID=%s");
+        }
         else
         {
             $link = helper::createLink($module, $method, "executionID=%s");
@@ -1386,8 +1421,6 @@ class executionModel extends model
             if(($this->session->taskBrowseType) and ($this->session->taskBrowseType != 'bysearch')) $browseType = $this->session->taskBrowseType;
         }
 
-        $this->session->set('taskWithChildren', in_array($browseType, array('unclosed', 'byexecution', 'all', 'bysearch')) ? false : true);
-
         /* Get tasks. */
         $tasks = array();
         if($browseType != "bysearch")
@@ -1428,10 +1461,8 @@ class executionModel extends model
             if(strpos($taskQuery, "`execution` =") === false) $taskQuery = $taskQuery . " AND `execution` = $executionID";
             $executionQuery = "`execution` " . helper::dbIN(array_keys($executions));
             $taskQuery    = str_replace("`execution` = 'all'", $executionQuery, $taskQuery); // Search all execution.
-            $this->session->set('taskQueryCondition', $taskQuery);
-            $this->session->set('taskOnlyCondition', true);
-            $this->session->set('taskOrderBy', $sort);
-            $this->session->set('taskBrowseList', array());
+            $this->session->set('taskQueryCondition', $taskQuery, $this->app->openApp);
+            $this->session->set('taskOnlyCondition', true, $this->app->openApp);
 
             $tasks = $this->getSearchTasks($taskQuery, $pager, $sort);
         }
@@ -1525,11 +1556,13 @@ class executionModel extends model
             if(!$withBranch) return $this->loadModel('tutorial')->getProductPairs();
             return $this->loadModel('tutorial')->getExecutionProducts();
         }
+
         $query = $this->dao->select('t2.id, t2.name, t2.type, t1.branch, t1.plan')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')
             ->on('t1.product = t2.id')
             ->where('t1.project')->eq((int)$executionID)
-            ->andWhere('t2.deleted')->eq(0);
+            ->andWhere('t2.deleted')->eq(0)
+            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->products)->fi();
         if(!$withBranch) return $query->fetchPairs('id', 'name');
         return $query->fetchAll('id');
     }
@@ -1726,15 +1759,15 @@ class executionModel extends model
      */
     public function getTasks2Imported($toExecution, $branches)
     {
-        $products   = $this->getProducts($toExecution);
+        $products = $this->getProducts($toExecution);
         if(empty($products)) return array();
 
-        $execution    = $this->getById($toExecution);
+        $execution  = $this->getById($toExecution);
         $executions = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
             ->where('t1.product')->in(array_keys($products))
-            ->andWhere('t2.project')->eq($execution->execution)
-            ->fetchGroup('execution');
+            ->andWhere('t2.project')->eq($execution->project)
+            ->fetchGroup('project');
         $branches = str_replace(',', "','", $branches);
 
         $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')->from(TABLE_TASK)->alias('t1')
@@ -1789,7 +1822,7 @@ class executionModel extends model
         unset($stories[0]);
 
         /* Add members to execution team. */
-        $teamMembers = $this->getTeamMemberPairs($executionID);
+        $teamMembers = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
         foreach($assignedToes as $account => $preExecutionID)
         {
             if(!isset($teamMembers[$account]))
@@ -1879,8 +1912,8 @@ class executionModel extends model
 
             $task = new stdClass();
             $task->bug          = $bug;
-            $task->PRJ          = $this->session->PRJ;
-            $task->execution      = $executionID;
+            $task->project      = $execution->project;
+            $task->execution    = $executionID;
             $task->story        = $bug->story;
             $task->storyVersion = $bug->storyVersion;
             $task->module       = isset($modules[$bug->module]) ? $bug->module : 0;
@@ -2050,7 +2083,7 @@ class executionModel extends model
             $this->story->setStage($storyID);
             $this->linkCases($executionID, (int)$products[$storyID], $storyID);
 
-            $action = $executionID == $this->session->PRJ ? 'linked2project' : 'linked2execution';
+            $action = $executionID == $this->session->project ? 'linked2project' : 'linked2execution';
             $this->action->create('story', $storyID, $action, '', $executionID);
         }
     }
@@ -2083,7 +2116,7 @@ class executionModel extends model
 
             $this->dao->insert(TABLE_PROJECTCASE)->data($object)->exec();
 
-            $action = $executionID == $this->session->PRJ ? 'linked2project' : 'linked2execution';
+            $action = $executionID == $this->session->project ? 'linked2project' : 'linked2execution';
 
             $this->action->create('case', $caseID, $action, '', $executionID);
         }
@@ -2105,12 +2138,13 @@ class executionModel extends model
         $planStories  = array();
         $planProducts = array();
         $count        = 0;
+        $this->loadModel('story');
         if(!empty($plans))
         {
             foreach($plans as $planID => $productID)
             {
                 if(empty($planID)) continue;
-                $planStory = $this->loadModel('story')->getPlanStories($planID);
+                $planStory = $this->story->getPlanStories($planID);
                 if(!empty($planStory))
                 {
                     foreach($planStory as $id => $story)
@@ -2127,9 +2161,11 @@ class executionModel extends model
                 }
             }
         }
+
+        $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
         $this->linkStory($executionID, $planStories, $planProducts);
-        $this->linkStory($this->session->PRJ, $planStories, $planProducts);
-        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate(helper::createLink('execution', 'create', "productID=&executionID=$executionID"));
+        $this->linkStory($projectID, $planStories, $planProducts);
+        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate(helper::createLink('execution', 'create', "projectID=$projectID&executionID=$executionID"));
     }
 
     /**
@@ -2161,7 +2197,7 @@ class executionModel extends model
 
         $this->loadModel('story')->setStage($storyID);
         $this->unlinkCases($executionID, $storyID);
-        $objectType = $executionID == $this->session->PRJ ? unlinkedfromproject : unlinkedfromexecution;
+        $objectType = $executionID == $this->session->project ? 'unlinkedfromproject' : 'unlinkedfromexecution';
         $this->loadModel('action')->create('story', $storyID, $objectType, '', $executionID);
 
         $tasks = $this->dao->select('id')->from(TABLE_TASK)->where('story')->eq($storyID)->andWhere('execution')->eq($executionID)->andWhere('status')->in('wait,doing')->fetchPairs('id');
@@ -2189,7 +2225,7 @@ class executionModel extends model
         foreach($cases as $caseID => $case)
         {
             $this->dao->delete()->from(TABLE_PROJECTCASE)->where('project')->eq($executionID)->andWhere('`case`')->eq($caseID)->limit(1)->exec();
-            $action = $executionID == $this->session->PRJ ? 'unlinkedfromproject' : 'unlinkedfromexecution';
+            $action = $executionID == $this->session->project ? 'unlinkedfromproject' : 'unlinkedfromexecution';
             $this->action->create('case', $caseID, $action, '', $executionID);
         }
 
@@ -2213,58 +2249,14 @@ class executionModel extends model
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembers();
 
-        $execution = $this->getByID($executionID);
-        $type    = $this->config->systemMode == 'new' ? $execution->type : 'execution';
-        if(empty($execution)) return array();
-
         return $this->dao->select("t1.*, t1.hours * t1.days AS totalHours, t2.id as userID, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
             ->where('t1.root')->eq((int)$executionID)
-            ->andWhere('t1.type')->eq($type)
+            ->andWhere('t1.type')->eq('execution')
             ->andWhere('t2.deleted')->eq('0')
             ->fetchAll('account');
     }
 
-    /**
-     * Get team members in pair.
-     *
-     * @param  int    $executionID
-     * @param  string $params
-     * @param  string $usersToAppended
-     * @access public
-     * @return array
-     */
-    public function getTeamMemberPairs($executionID, $params = '', $usersToAppended = '')
-    {
-        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembersPairs();
-        $this->app->loadConfig('user');
-
-        $execution = $this->getByID($executionID);
-        if(empty($execution)) return array();
-
-        $keyField = strpos($params, 'useid') !== false ? 'id' : 'account';
-        $users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
-            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
-            ->where('t1.root')->eq((int)$executionID)
-            ->andWhere('t1.type')->eq($execution->type)
-            ->beginIF($params == 'nodeleted' or empty($this->config->user->showDeleted))
-            ->andWhere('t2.deleted')->eq(0)
-            ->fi()
-            ->fetchAll($keyField);
-
-        if($usersToAppended) $users += $this->dao->select("id, account, realname")->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll($keyField);
-
-        if(!$users) return array('' => '');
-
-        foreach($users as $account => $user)
-        {
-            $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
-            if(!empty($this->config->isINT)) $firstLetter = '';
-            $users[$account] =  $firstLetter . ($user->realname ? $user->realname : $user->account);
-        }
-        return array('' => '') + $users;
-    }
-
     /**
      * Get the skip members of the team.
      *
@@ -2304,7 +2296,8 @@ class executionModel extends model
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.root = t2.id')
             ->where('t1.account')->eq($account)
             ->andWhere('t1.root')->ne($currentExecution)
-            ->andWhere('t1.type')->eq($execution->type)
+            ->andWhere('t1.type')->eq('execution')
+            ->andWhere('t2.project')->eq($execution->project)
             ->andWhere('t2.deleted')->eq('0')
             ->groupBy('t1.root')
             ->orderBy('t1.root DESC')
@@ -2341,14 +2334,15 @@ class executionModel extends model
     public function manageMembers($executionID)
     {
         $execution = $this->getByID($executionID);
-        $data    = (array)fixer::input('post')->get();
+        $data      = (array)fixer::input('post')->get();
 
         extract($data);
-        $executionType = $execution->type;
+        $executionID   = (int)$executionID;
+        $executionType = 'execution';
         $accounts      = array_unique($accounts);
         $limited       = array_values($limited);
-        $oldJoin       = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->fetchPairs();
-        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->exec();
+        $oldJoin       = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq($executionType)->fetchPairs();
+        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq($executionType)->exec();
 
         $executionMember = array();
         foreach($accounts as $key => $account)
@@ -2361,13 +2355,13 @@ class executionModel extends model
             $member->hours   = $hours[$key];
             $member->limited = $limited[$key];
 
-            $member->root    = (int)$executionID;
+            $member->root    = $executionID;
             $member->account = $account;
             $member->join    = isset($oldJoin[$account]) ? $oldJoin[$account] : helper::today();
             $member->type    = $executionType;
 
             $executionMember[$account] = $member;
-            $this->dao->replace(TABLE_TEAM)->data($member)->exec();
+            $this->dao->insert(TABLE_TEAM)->data($member)->exec();
         }
 
         /* Only changed account update userview. */
@@ -2376,36 +2370,23 @@ class executionModel extends model
         $changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
         $changedAccounts = array_unique($changedAccounts);
 
-        if($executionType == 'execution')
-        {
-            $childSprints   = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($execution->id)->andWhere('type')->in('stage,sprint')->andWhere('deleted')->eq('0')->fetchPairs();
-            $linkedProducts = $this->loadModel('product')->getProductPairsByProject($execution->id);
-
-            $this->loadModel('user')->updateUserView(array($executionID), 'execution', $changedAccounts);
-            if(!empty($childSprints))   $this->user->updateUserView($childSprints, 'sprint', $changedAccounts);
-            if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', $changedAccounts);
-        }
-
-        /* Add iteration or phase team members to the execution team. */
-        if($executionType == 'stage' || $executionType == 'sprint')
-        {
-            $this->addExecutionMembers($execution->project, $executionMember);
-            if($execution->acl != 'open') $this->updateUserView($executionID, 'sprint', $changedAccounts);
-        }
+        /* Add the execution team members to the project. */
+        $this->addProjectMembers($execution->project, $executionMember);
+        if($execution->acl != 'open') $this->updateUserView($executionID, 'sprint', $changedAccounts);
     }
 
     /**
-     * Add iteration or phase team members to the execution team.
+     * Add the execution team members to the project.
      *
-     * @param  int    $executionID
+     * @param  int    $projectID
      * @param  array  $members
      * @access public
      * @return void
      */
-    public function addExecutionMembers($executionID = 0, $members = array())
+    public function addProjectMembers($projectID = 0, $members = array())
     {
-        $executionType = 'execution';
-        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq($executionType)->fetchPairs();
+        $projectType = 'project';
+        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs();
 
         $accounts = array();
         foreach($members as $account => $member)
@@ -2413,9 +2394,9 @@ class executionModel extends model
             if(isset($oldJoin[$member->account])) continue;
 
             $accounts[]   = $member->account;
-            $member->root = $executionID;
-            $member->type = $executionType;
-            $this->dao->replace(TABLE_TEAM)->data($member)->exec();
+            $member->root = $projectID;
+            $member->type = $projectType;
+            $this->dao->insert(TABLE_TEAM)->data($member)->exec();
         }
 
         /* Only changed account update userview. */
@@ -2424,8 +2405,8 @@ class executionModel extends model
         $changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
         $changedAccounts = array_unique($changedAccounts);
 
-        $this->loadModel('user')->updateUserView($executionID, $executionType, $changedAccounts);
-        $linkedProducts = $this->loadModel('product')->getProductPairsByProject($executionID);
+        $this->loadModel('user')->updateUserView($projectID, $projectType, $changedAccounts);
+        $linkedProducts = $this->loadModel('product')->getProductPairsByProject($projectID);
         if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', $changedAccounts);
     }
 
@@ -2440,7 +2421,9 @@ class executionModel extends model
     public function unlinkMember($sprintID, $account)
     {
         $sprint = $this->getByID($sprintID);
-        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$sprintID)->andWhere('type')->eq($sprint->type)->andWhere('account')->eq($account)->exec();
+        $type   = ($sprint->type == 'stage' || $sprint->type == 'sprint') ? 'execution' : $sprint->type;
+
+        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$sprintID)->andWhere('type')->eq($type)->andWhere('account')->eq($account)->exec();
         $this->updateUserView($sprintID, 'sprint', array($account));
 
         /* Remove team members from the sprint or stage, and determine whether to remove team members from the execution. */
@@ -2454,9 +2437,9 @@ class executionModel extends model
                 ->fetch();
             if(empty($teamMember))
             {
-                $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($sprint->execution)->andWhere('type')->eq('execution')->andWhere('account')->eq($account)->exec();
-                $this->loadModel('user')->updateUserView($sprint->execution, 'execution', array($account));
-                $linkedProducts = $this->loadModel('product')->getProductPairsByProject($sprint->execution);
+                $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($sprint->project)->andWhere('type')->eq('project')->andWhere('account')->eq($account)->exec();
+                $this->loadModel('user')->updateUserView($sprint->project, 'project', array($account));
+                $linkedProducts = $this->loadModel('product')->getProductPairsByProject($sprint->project);
                 if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', array($account));
             }
         }
@@ -2509,9 +2492,9 @@ class executionModel extends model
             ->where('t1.project')->in(array_keys($executions))
             ->andWhere('t2.deleted')->eq(0)
             ->andWhere('t2.status')->ne('closed')
-            ->andWhere('t2.stage')->in('wait,planned,executioned,developing')
-            ->groupBy('execution')
-            ->fetchAll('execution');
+            ->andWhere('t2.stage')->in('wait,planned,projected,developing')
+            ->groupBy('project')
+            ->fetchAll('project');
 
         foreach($burns as $executionID => $burn)
         {
@@ -2884,7 +2867,7 @@ class executionModel extends model
      * @access public
      * @return void
      */
-    public function buildBugSearchForm($products, $queryID, $actionURL)
+    public function buildBugSearchForm($products, $queryID, $actionURL, $type = 'execution')
     {
         $modules = array();
         $builds  = array('' => '', 'trunk' => $this->lang->trunk);
@@ -2929,7 +2912,7 @@ class executionModel extends model
             }
         }
 
-        $this->config->bug->search['module']    = 'executionBug';
+        $this->config->bug->search['module']    = $type == 'execution' ? 'executionBug' : 'projectBug';
         $this->config->bug->search['actionURL'] = $actionURL;
         $this->config->bug->search['queryID']   = $queryID;
         unset($this->config->bug->search['fields']['execution']);
@@ -3549,58 +3532,6 @@ class executionModel extends model
         if(!empty($products)) $this->user->updateUserView(array_keys($products), 'product', $users);
     }
 
-    /**
-     * Get recent executions.
-     *
-     * @access public
-     * @return object
-     */
-    public function getRecentExecutions()
-    {
-        $isView = (empty($this->app->user->view->sprints) || empty($this->app->user->view->projects)) ? false : true;
-        if(!$this->app->user->admin && $isView === false) return array();
-
-        $executions = $this->dao->select('t1.id,t1.project,t1.code,t1.name,t1.type')->from(TABLE_EXECUTION)->alias('t1')
-            ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
-            ->where('t1.type')->in('stage,sprint')
-            ->andWhere('t2.account')->eq($this->app->user->account)
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi()
-            ->andWhere('t1.status')->ne('closed')
-            ->andWhere('t1.deleted')->eq('0')
-            ->orderBy('project_desc, id_desc')
-            ->fetchAll();
-
-        /* Get the project or product to which the execution belongs. */
-        $projectIdList = array();
-        $stageIdList   = array();
-        foreach($executions as $execution)
-        {
-            if($execution->type == 'stage') $stageIdList[$execution->id] = $execution->id;
-            $projectIdList[$execution->project] = $execution->project;
-        }
-        $projectPairs = $this->loadModel('project')->getPairsByIdList($projectIdList);
-        $productPairs = $this->getStageLinkProductPairs($stageIdList);
-
-        $recentExecutions = isset($this->config->execution->recentExecutions) ? explode(',', $this->config->execution->recentExecutions) : array();
-        $allExecution     = array('recent' => array(), 'mine' => array());
-        foreach($executions as $execution)
-        {
-            if($execution->type == 'stage')  $execution->name = zget($projectPairs, $execution->project) . '/' . zget($productPairs, $execution->id) . '/' . $execution->name;
-            if($execution->type == 'sprint') $execution->name = zget($projectPairs, $execution->project) . '/' . $execution->name;
-            if(in_array($execution->id, $recentExecutions))
-            {
-                $index = array_search($execution->id, $recentExecutions);
-                $allExecution['recent'][$index] = $execution;
-                continue;
-            }
-            $allExecution['mine'][] = $execution;
-        }
-
-        ksort($allExecution['recent']);
-        return $allExecution;
-    }
-
     /**
      * Get the products associated with the stage.
      *
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 2debb51b63..e213e889b8 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -1,4 +1,3 @@
-<?php js::set('executionID', $executionID);?>
 <?php js::set('module', $module);?>
 <?php js::set('method', $method);?>
 <?php js::set('extra', $extra);?>
@@ -12,8 +11,8 @@ $normalProjectsHtml = '';
 $closedProjectsHtml = '';
 foreach($executions as $execution)
 {
-    if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM == $this->app->user->account) $iCharges++;
-    if($execution->status != 'done' and $execution->status != 'closed' and !($execution->PM == $this->app->user->account)) $others++;
+    if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account]))) $iCharges++;
+    if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account])) $others++;
     if($execution->status == 'done' or $execution->status == 'closed') $dones++;
     $executionNames[] = $execution->name;
 }
@@ -21,44 +20,41 @@ $executionsPinYin = common::convert2Pinyin($executionNames);
 
 foreach($executions as $execution)
 {
-    $executionName = zget($projects, $execution->project) . '/' . $execution->name;
-    if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM == $this->app->user->account)
+    $selected      = $execution->id == $executionID ? 'selected' : '';
+    $executionName = $config->systemMode == 'new' ? zget($projects, $execution->project) . '/' . $execution->name : $execution->name;
+    if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account])))
     {
-        $myProjectsHtml .= html::a(sprintf($link, $execution->id), "<i class='icon icon-{$lang->icons[$execution->type]}'></i> " . $executionName, '', "class='text-important' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'");
+        $myProjectsHtml .= html::a(sprintf($link, $execution->id), $executionName, '', "class='text-important $selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
     }
-    else if($execution->status != 'done' and $execution->status != 'closed' and !($execution->PM == $this->app->user->account))
+    else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account]))
     {
-        $normalProjectsHtml .= html::a(sprintf($link, $execution->id), "<i class='icon icon-{$lang->icons[$execution->type]}'></i> " . $executionName, '', "title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'");
+        $normalProjectsHtml .= html::a(sprintf($link, $execution->id), $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
     }
-    else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), "<i class='icon icon-{$lang->icons[$execution->type]}'></i> " . $executionName, '', "title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'");
+    else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
 }
 ?>
 <div class="table-row">
   <div class="table-col col-left">
     <div class='list-group'>
-    <?php
-    if(!empty($myProjectsHtml))
-    {
-        echo "<div class='heading'>{$lang->execution->mine}</div>";
-        echo $myProjectsHtml;
-        if(!empty($myProjectsHtml))
-        {
-            echo "<div class='heading'>{$lang->execution->other}</div>";
-        }
-    }
-    echo $normalProjectsHtml;
-    ?>
+      <?php
+      if(!empty($myProjectsHtml))
+      {
+          echo "<div class='heading'>{$lang->execution->involved}</div>";
+          echo $myProjectsHtml;
+          if(!empty($myProjectsHtml))
+          {
+              echo "<div class='heading'>{$lang->execution->other}</div>";
+          }
+      }
+      echo $normalProjectsHtml;
+      ?>
     </div>
     <div class="col-footer">
-      <?php echo html::a(helper::createLink('execution', 'all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->execution->all, '', 'class="not-list-item"'); ?>
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->execution->doneExecutions;?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>
   <div class="table-col col-right">
-   <div class='list-group'>
-    <?php
-    echo $closedProjectsHtml;
-    ?>
-    </div>
+   <div class='list-group'><?php echo $closedProjectsHtml;?></div>
   </div>
 </div>
+<script>scrollToSelected();</script>
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index fb7bcc5a8e..eab25a40f5 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -21,46 +21,37 @@
 .table td.has-child > .plan-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .plan-toggle > .icon:before {text-align: left;}
 .table td.has-child > .plan-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);}
+.table th.hours {padding-right: 8px !important;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
-.hours {text-align: right;}
+td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
 </style>
 <div id='mainMenu' class='clearfix'>
-  <?php if($from == 'execution'):?>
-  <div id="sidebarHeader">
-    <div class="title">
-      <?php echo empty($projectID) ? $lang->project->common : zget($projects, $projectID);?>
-      <?php if($projectID) echo html::a(inLink('all'), "<i class='icon icon-sm icon-close'></i>", '', 'class="text-muted"');?>
-    </div>
-  </div>
-  <?php endif;?>
   <div class='btn-toolbar pull-left'>
     <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
-    <?php echo html::a(inlink("all", "status=$key&projectID=$projectID&from=$from&orderBy=$orderBy&productID=$productID"), "<span class='text'>{$label}</span>", '', "class='btn btn-link' id='{$key}Tab'");?>
+    <?php echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), "<span class='text'>{$label}</span>", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?>
     <?php endforeach;?>
   </div>
   <div class='btn-toolbar pull-right'>
     <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=$from", "<i class='icon-export muted'> </i>" . $lang->export, '', "class='btn btn-link export'")?>
-    <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . ($from == 'execution' ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary'");?>
+    <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-sm icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary' data-app='$from'");?>
   </div>
 </div>
 <div id='mainContent' class="main-row fade">
-  <?php if($from == 'execution'):?>
-  <div id="sidebar" class="side-col">
-    <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
-    <div class="cell">
-      <?php echo $projectTree;?>
-      <div class="text-center">
-        <?php common::printLink('project', 'projectTitle', '', $lang->project->moduleSetting, '', "class='btn btn-info btn-wide iframe'", true, true);?>
-      </div>
-    </div>
+  <?php if(empty($executionStats)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $from == 'execution' ? $lang->execution->noExecutions : $lang->execution->noExecution;?></span>
+      <?php if(common::hasPriv('execution', 'create')):?>
+      <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='$from'");?>
+      <?php endif;?>
+    </p>
   </div>
-  <?php endif;?>
-  <?php $canOrder = (common::hasPriv('execution', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
+  <?php else:?>
   <?php $canBatchEdit = common::hasPriv('execution', 'batchEdit'); ?>
   <form class='main-table' id='executionsForm' method='post' action='<?php echo inLink('batchEdit');?>' data-ride='table'>
     <table class='table has-sort-head table-fixed' id='executionList'>
-      <?php $vars = "status=$status&projectID=$projectID&from=$from&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+      <?php $vars = "status=$status&projectID=$projectID&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
       <thead>
         <tr>
           <th class='c-id'>
@@ -71,18 +62,15 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th><?php common::printOrderLink('name', $orderBy, $vars, $from == 'execution' ? $lang->execution->execName : $lang->execution->name);?></th>
+          <th><?php common::printOrderLink('name', $orderBy, $vars, (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?></th>
           <th class='thWidth'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->execution->owner);?></th>
-          <th class='w-90px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
-          <th class='w-90px'><?php common::printOrderLink('status', $orderBy, $vars, $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status);?></th>
-          <th class='w-40px'><?php echo $lang->execution->totalEstimate;?></th>
-          <th class='w-40px'><?php echo $lang->execution->totalConsumed;?></th>
-          <th class='w-40px'><?php echo $lang->execution->totalLeft;?></th>
+          <th class='w-80px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
+          <th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status);?></th>
+          <th class='w-70px text-right hours'><?php echo $lang->execution->totalEstimate;?></th>
+          <th class='w-70px text-right hours'><?php echo $lang->execution->totalConsumed;?></th>
+          <th class='w-70px text-right hours'><?php echo $lang->execution->totalLeft;?></th>
           <th class='w-60px'><?php echo $lang->execution->progress;?></th>
           <th class='w-100px'><?php echo $lang->execution->burn;?></th>
-          <?php if($canOrder):?>
-          <th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
-          <?php endif;?>
         </tr>
       </thead>
       <tbody class='sortable' id='executionTableList'>
@@ -91,7 +79,7 @@
           <td class='c-id'>
             <?php if($canBatchEdit):?>
             <div class="checkbox-primary">
-              <input type='checkbox' name='executionIDList[<?php echo $execution->id;?>]' value='<?php echo $execution->id;?>' />
+              <input type='checkbox' name='executionIDList[<?php echo $execution->id;?>]' value='<?php echo $execution->id;?>' autocomplete='off' />
               <label></label>
             </div>
             <?php endif;?>
@@ -100,7 +88,7 @@
           <td class='text-left <?php if(!empty($execution->children)) echo 'has-child';?>' title='<?php echo $execution->name?>'>
             <?php
             if(isset($execution->delay)) echo "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span> ";
-            echo !empty($execution->children) ? $execution->name : html::a($this->createLink('execution', 'view', 'execution=' . $execution->id), $execution->name);
+            echo !empty($execution->children) ? $execution->name : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $execution->name);
             ?>
             <?php if(!empty($execution->children)):?>
               <a class="plan-toggle" data-id="<?php echo $execution->id;?>"><i class="icon icon-angle-double-right"></i></a>
@@ -109,21 +97,18 @@
           <td><?php echo zget($users, $execution->PM);?></td>
           <td><?php echo $execution->end;?></td>
           <?php $executionStatus = $this->processStatus('execution', $execution);?>
-          <td class='c-status' title='<?php echo $executionStatus;?>'>
+          <td class='c-status text-center' title='<?php echo $executionStatus;?>'>
             <span class="status-execution status-<?php echo $execution->status?>"><?php echo $executionStatus;?></span>
           </td>
-          <td class='hours' title='<?php echo $execution->hours->totalEstimate . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalEstimate . ' ' . $this->lang->execution->workHourUnit;?></td>
-          <td class='hours' title='<?php echo $execution->hours->totalConsumed . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalConsumed . ' ' . $this->lang->execution->workHourUnit;?></td>
-          <td class='hours' title='<?php echo $execution->hours->totalLeft     . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalLeft     . ' ' . $this->lang->execution->workHourUnit;?></td>
+          <td class='hours' title='<?php echo $execution->hours->totalEstimate . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalEstimate . $this->lang->execution->workHourUnit;?></td>
+          <td class='hours' title='<?php echo $execution->hours->totalConsumed . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalConsumed . $this->lang->execution->workHourUnit;?></td>
+          <td class='hours' title='<?php echo $execution->hours->totalLeft     . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalLeft     . $this->lang->execution->workHourUnit;?></td>
           <td class="c-progress">
             <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
               <div class='progress-info'><?php echo $execution->hours->progress;?></div>
             </div>
           </td>
           <td id='spark-<?php echo $execution->id?>' class='sparkline text-left no-padding' values='<?php echo join(',', $execution->burns);?>'></td>
-          <?php if($canOrder):?>
-          <td class='sort-handler'><i class="icon icon-move"></i></td>
-          <?php endif;?>
         </tr>
         <?php if(!empty($execution->children)):?>
          <?php $i = 0;?>
@@ -144,7 +129,7 @@
                <?php
                if(isset($child->delay)) echo "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span> ";
                echo "<span class='label label-badge label-light' title='{$lang->programplan->children}'>{$lang->programplan->childrenAB}</span>";
-               echo html::a($this->createLink('execution', 'view', 'execution=' . $child->id), $child->name);
+               echo html::a($this->createLink('execution', 'task', 'execution=' . $child->id), $child->name);
                ?>
              </td>
              <td><?php echo zget($users, $child->PM);?></td>
@@ -162,9 +147,6 @@
                </div>
              </td>
              <td id='spark-<?php echo $child->id?>' class='sparkline text-left no-padding' values='<?php echo join(',', $child->burns);?>'></td>
-             <?php if($canOrder):?>
-             <td class='sort-handler'><i class="icon icon-move"></i></td>
-             <?php endif;?>
            </tr>
            <?php $i ++;?>
            <?php endforeach;?>
@@ -178,11 +160,11 @@
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->execution->batchEdit, '', 'btn');?></div>
       <?php endif;?>
-      <?php if(!$canOrder and common::hasPriv('execution', 'updateOrder')) echo html::a(inlink('all', "status=$status&projectID=$projectID&from=$from&order=order_desc&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $from == 'execution' ? $lang->execution->execUpdateOrder : $lang->execution->updateOrder, '', "class='btn'");?>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
     <?php endif;?>
   </form>
+  <?php endif;?>
 </div>
 <script>
 $("#<?php echo $status;?>Tab").addClass('btn-active-text');
diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php
index 58fbfc3fe9..12aba6da26 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -35,6 +35,14 @@
       }
   }
   $minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
+
+  $name = $from == 'execution' ? 'execName' : 'name';
+  $code = $from == 'execution' ? 'execCode' : 'code';
+  $PM   = $from == 'execution' ? 'execPM'   : 'PM';
+  $type = $from == 'execution' ? 'execType' : 'type';
+  $desc = $from == 'execution' ? 'execDesc' : 'desc';
+  $status = $from == 'execution' ? 'execStatus' : 'status';
+
   ?>
   <form class='main-form' method='post' target='hiddenwin' action='<?php echo inLink('batchEdit');?>'>
     <div class="table-responsive">
@@ -42,20 +50,19 @@
         <thead>
           <tr>
             <th class='w-50px'><?php echo $lang->idAB;?></th>
-            <th class='required <?php echo $minWidth?>'><?php echo $lang->execution->name;?></th>
-            <th class='w-150px required'><?php echo $lang->execution->code;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'PM',     ' hidden') . zget($requiredFields, 'PM',     '', ' required');?>'><?php echo $lang->execution->PM;?></th>
+            <th class='required <?php echo $minWidth?>' style="width:100%"><?php echo $lang->execution->$name;?></th>
+            <th class='w-150px required'><?php echo $lang->execution->$code;?></th>
+            <th class='w-150px<?php echo zget($visibleFields, 'PM',     ' hidden') . zget($requiredFields, 'PM',     '', ' required');?>'><?php echo $lang->execution->$PM;?></th>
             <th class='w-150px<?php echo zget($visibleFields, 'PO',     ' hidden') . zget($requiredFields, 'PO',     '', ' required');?>'><?php echo $lang->execution->PO;?></th>
             <th class='w-150px<?php echo zget($visibleFields, 'QD',     ' hidden') . zget($requiredFields, 'QD',     '', ' required');?>'><?php echo $lang->execution->QD;?></th>
             <th class='w-150px<?php echo zget($visibleFields, 'RD',     ' hidden') . zget($requiredFields, 'RD',     '', ' required');?>'><?php echo $lang->execution->RD;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'type',   ' hidden') . zget($requiredFields, 'type',   '', ' required');?>'><?php echo $lang->execution->type;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->execution->status;?></th>
+            <th class='w-100px<?php echo zget($visibleFields, 'type',   ' hidden') . zget($requiredFields, 'type',   '', ' required');?>'><?php echo $lang->execution->$type;?></th>
+            <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->execution->$status;?></th>
             <th class='w-110px required'><?php echo $lang->execution->begin;?></th>
             <th class='w-110px required'><?php echo $lang->execution->end;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'>    <?php echo $lang->execution->desc;?></th>
+            <th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->execution->$desc;?></th>
             <th class='w-150px<?php echo zget($visibleFields, 'teamname', ' hidden') . zget($requiredFields, 'teamname', '', ' required');?>'><?php echo $lang->execution->teamname;?></th>
             <th class='w-150px<?php echo zget($visibleFields, 'days',     ' hidden') . zget($requiredFields, 'days',     '', ' required');?>'><?php echo $lang->execution->days;?></th>
-            <th class='w-80px'><?php echo $lang->execution->order;?></th>
           </tr>
         </thead>
         <tbody>
@@ -70,13 +77,13 @@
             <td><?php echo sprintf('%03d', $executionID) . html::hidden("executionIDList[$executionID]", $executionID);?></td>
             <td title='<?php echo $executions[$executionID]->name?>'><?php echo html::input("names[$executionID]", $executions[$executionID]->name, "class='form-control'");?></td>
             <td><?php echo html::input("codes[$executionID]",     $executions[$executionID]->code, "class='form-control'");?></td>
-            <td class='text-left<?php echo zget($visibleFields, 'PM', ' hidden')?>' style='overflow:visible'><?php echo html::select("PMs[$executionID]", $pmUsers, $executions[$executionID]->PM, "class='form-control chosen'");?></td>
+            <td class='text-left<?php echo zget($visibleFields, 'PM',  ' hidden')?>' style='overflow:visible'><?php echo html::select("PMs[$executionID]", $pmUsers, $executions[$executionID]->PM, "class='form-control chosen'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'PO', ' hidden')?>' style='overflow:visible'><?php echo html::select("POs[$executionID]", $poUsers, $executions[$executionID]->PO, "class='form-control chosen'");?></td>
             <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 chosen'");?></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 chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'type',   'hidden')?>'>
               <?php
-              if($isStage)
+              if($executions[$executionID]->type == 'stage')
               {
                   echo html::select("attributes[$executionID]",    $lang->stage->typeList,   $executions[$executionID]->attribute,   'class=form-control');
               }
@@ -97,7 +104,6 @@
                 <span class='input-group-addon'><?php echo $lang->execution->day;?></span>
               </div>
             </td>
-            <td><?php echo html::input("orders[$executionID]", $executions[$executionID]->order, "class='form-control'")?></td>
           </tr>
           <?php
           if(isset($this->config->moreLinks["PMs[$executionID]"])) unset($this->config->moreLinks["PMs[$executionID]"]);
diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index 1e579d6dfb..7029cc9ab7 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -11,18 +11,22 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<style>
+#subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;}
+#subHeader #dropMenu .col-left {padding-bottom: 0px;}
+</style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
     $buildName = $build ? " <span class='label label-danger'>Build:{$build->name}</span>" : '';
-    echo html::a($this->inlink('bug', "executionID={$execution->id}&orderBy=status,id_desc&build=$buildID&type=all"), "<span class='text'>{$lang->bug->allBugs}</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', "executionID={$execution->id}&orderBy=status,id_desc&build=$buildID&type=unresolved"), "<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' : '') . "'");
+    echo html::a($this->inlink('bug', "executionID={$execution->id}&productID={$productID}&orderBy=status,id_desc&build=$buildID&type=all"), "<span class='text'>{$lang->bug->allBugs}</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', "executionID={$execution->id}&productID={$productID}&orderBy=status,id_desc&build=$buildID&type=unresolved"), "<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' : '') . "'");
     ?>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->bug->search;?></a>
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=&executionID=$execution->id", "<i class='icon icon-export muted'> </i>" . $lang->bug->export, '', "class='btn btn-link export'");?>
-    <?php if(common::canModify('execution', $execution)) common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extra=executionID=$execution->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
+    <?php if(common::canModify('execution', $execution)) common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extras=executionID=$execution->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent">
@@ -32,7 +36,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->bug->noBug;?></span>
       <?php if(common::canModify('execution', $execution) and common::hasPriv('bug', 'create')):?>
-      <?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branchID&extra=executionID=$execution->id"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?>
+      <?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branchID&extra=executionID=$execution->id"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info' data-app='execution'");?>
       <?php endif;?>
     </p>
   </div>
@@ -40,7 +44,7 @@
   <form class='main-table' method='post' id='executionBugForm' data-ride="table">
     <table class='table has-sort-head' id='bugList'>
       <?php $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');?>
-      <?php $vars = "executionID={$execution->id}&orderBy=%s&build=$buildID&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+      <?php $vars = "executionID={$execution->id}&productID={$productID}&orderBy=%s&build=$buildID&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
       <thead>
         <tr>
           <th class='c-id'>
@@ -77,11 +81,12 @@
       <?php
       $canBeChanged = common::canBeChanged('bug', $bug);
       $arrtibute    = $canBeChanged ? '' : 'disabled';
+      $viewLink     = helper::createLink('bug', 'view', "bugID=$bug->id");
       ?>
       <tr>
         <td class='cell-id'>
           <?php if($canBatchAssignTo):?>
-          <?php echo html::checkbox('bugIDList', array($bug->id => ''), '', $arrtibute) . html::a(helper::createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id));?>
+          <?php echo html::checkbox('bugIDList', array($bug->id => ''), '', $arrtibute) . html::a($viewLink, sprintf('%03d', $bug->id), '', "data-app={$this->app->openApp}");?>
           <?php else:?>
           <?php printf('%03d', $bug->id);?>
           <?php endif;?>
@@ -94,7 +99,7 @@
           <?php endif;?>
         </td>
         <td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
-        <td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
+        <td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($viewLink, $bug->title, null, "style='color: $bug->color' data-app={$this->app->openApp}");?></td>
         <td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
         <td class='c-assignedTo has-btn text-left'><?php $this->bug->printAssignedHtml($bug, $users);?></td>
         <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
@@ -103,7 +108,7 @@
           <?php
           if($canBeChanged)
           {
-              $params = "bugID=$bug->id";
+              $params = "bugID=$bug->id,executionID={$execution->id}";
               common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'ok',      '', 'iframe', true);
               common::printIcon('bug', 'resolve',    $params, $bug, 'list', 'checked', '', 'iframe', true);
               common::printIcon('bug', 'close',      $params, $bug, 'list', '',        '', 'iframe', true);
diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php
index f74fd7f397..c3fd06ebed 100644
--- a/module/execution/view/build.html.php
+++ b/module/execution/view/build.html.php
@@ -80,7 +80,7 @@
             }
             common::printIcon('testtask', 'create', "product=$build->product&execution=$execution->id&build=$build->id", $build, 'list', 'bullhorn');
             $lang->execution->bug = $lang->execution->viewBug;
-            common::printIcon('execution', 'bug',  "execution=$execution->id&orderBy=status&build=$build->id", $build, 'list');
+            common::printIcon('execution', 'bug',  "execution=$execution->id&productID=$productID&orderBy=status&build=$build->id", $build, 'list');
             common::printIcon('build',   'edit', "buildID=$build->id", $build, 'list');
             if(common::hasPriv('build',  'delete', $build))
             {
diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php
index 139885286b..71da19f850 100644
--- a/module/execution/view/burn.html.php
+++ b/module/execution/view/burn.html.php
@@ -28,9 +28,11 @@
     if(common::canModify('execution', $execution)) common::printLink('execution', 'fixFirst', "execution=$execution->id", $lang->execution->fixFirst, '', "class='btn btn-link iframe' data-width='700'");
     echo $lang->execution->howToUpdateBurn;
     ?>
+    <?php if($config->systemMode == 'new'):?>
     <div class='input-control w-150px'>
       <?php echo html::select('burnBy', $lang->execution->burnByList, $burnBy, "class='form-control chosen'");?>
     </div>
+    <?php endif;?>
     <?php if($interval):?>
     <div class='input-control thWidth'>
       <?php echo html::select('interval', $dayList, $interval, "class='form-control chosen'");?>
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 9676214649..ac2d15b0ce 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -10,9 +10,13 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php if($app->openApp == 'execution'): ?>
+<style>#heading {padding: 8px 0;}</style>
+<?php endif;?>
 <?php if(isset($tips)):?>
-<?php $defaultURL = $this-> createLink('execution', 'task', 'executionID=' . $executionID);?>
-<?php include '../../common/view/header.lite.html.php';?>
+<?php $defaultURL = $config->systemMode == 'new' ? $this->createLink('project', 'execution', "status=all&projectID=$projectID") : $this->createLink('execution', 'task', 'executionID=' . $executionID);?>
+<?php include '../../common/view/header.html.php';?>
+<?php js::set('isStage', false);?>
 <body>
   <div class='modal-dialog mw-500px' id='tipsModal'>
     <div class='modal-header'>
@@ -35,29 +39,30 @@
 <?php js::set('holders', $lang->execution->placeholder);?>
 <?php js::set('errorSameProducts', $lang->execution->errorSameProducts);?>
 <?php js::set('productID', empty($productID) ? 0 : $productID);?>
-<?php js::set('isSprint', $isSprint);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
-      <h2><?php echo $lang->execution->create;?></h2>
+      <h2><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create;?></h2>
       <div class="pull-right btn-toolbar">
-        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->execution->copy;?></button>
+        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->copyExec : $lang->execution->copy);?></button>
       </div>
     </div>
     <form class='form-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
+        <?php if($config->systemMode == 'new'):?>
         <tr>
           <th class='w-120px'><?php echo $lang->execution->project;?></th>
-          <td class="col-main"><?php echo html::select("project", $allProjects, '', "class='form-control chosen' required onchange='loadBranches(this)'");?></td>
+          <td class="col-main"><?php echo html::select("project", $allProjects, $projectID, "class='form-control chosen' required onchange='refreshPage(this.value)'");?></td>
           <td></td><td></td>
         </tr>
+        <?php endif;?>
         <tr>
-          <th class='w-120px'><?php echo $lang->execution->name;?></th>
+          <th class='w-120px'><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name;?></th>
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td></td><td></td>
         </tr>
         <tr>
-          <th><?php echo $lang->execution->code;?></th>
+          <th><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execCode : $lang->execution->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td><td></td><td></td>
         </tr>
         <tr>
@@ -85,32 +90,10 @@
           <td><?php echo html::input('team', $team, "class='form-control'");?></td><td></td><td></td>
         </tr>
         <tr>
-          <th><?php echo $lang->execution->type;?></th>
-          <td>
-          <?php
-          if($isSprint)
-          {
-              echo html::select('lifetime', $lang->execution->lifeTimeList, '', "class='form-control' onchange='showLifeTimeTips()'");
-          }
-          else
-          {
-              echo html::select('attribute', $lang->stage->typeList, '', "class='form-control'");
-          }
-          ?>
-          </td>
+          <th><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execType : $lang->execution->type;?></th>
+          <td><?php echo html::select('lifetime', $lang->execution->lifeTimeList, '', "class='form-control' onchange='showLifeTimeTips()'"); ?></td>
           <td class='muted' colspan='2'><div id='lifeTimeTips'><?php echo $lang->execution->typeDesc;?></div></td>
         </tr>
-        <?php if(!$isSprint):?>
-        <tr>
-          <th><?php echo $lang->programplan->percent;?></th>
-          <td>
-            <div class='input-group'>
-              <?php echo html::input('percent', '', "class='form-control'");?>
-              <span class='input-group-addon'>%</span>
-            </div>
-          </td>
-        </tr>
-        <?php endif;?>
         <tr class='hide'>
           <th><?php echo $lang->execution->status;?></th>
           <td><?php echo html::hidden('status', 'wait');?></td>
@@ -165,7 +148,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->execution->desc;?></th>
+          <th><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execDesc : $lang->execution->desc;?></th>
           <td colspan='3'>
             <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=execution&link=desc');?>
             <?php echo html::textarea('desc', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?>
@@ -183,7 +166,6 @@
         </tr>
         <tr>
           <td colspan='4' class='text-center form-actions'>
-            <?php if($isSprint) echo html::hidden('lifetime', 'short');?>
             <?php echo html::submitButton();?>
             <?php echo html::backButton();?>
           </td>
@@ -202,7 +184,7 @@
       <?php if(count($executions) == 1):?>
       <div class='alert with-icon'>
         <i class='icon-exclamation-sign'></i>
-        <div class='content'><?php echo $lang->execution->copyNoProject;?></div>
+        <div class='content'><?php echo $lang->execution->copyNoExecution;?></div>
       </div>
       <?php else:?>
       <div id='copyProjects' class='row'>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 9d6ca9c654..c8a663ca44 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -63,16 +63,7 @@
         <tr>
           <th><?php echo $lang->execution->type;?></th>
           <td>
-          <?php
-          if($isSprint)
-          {
-              echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");
-          }
-          else
-          {
-              echo html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='form-control'");
-          }
-          ?>
+          <?php echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");?>
           </td>
         </tr>
         <tr>
@@ -112,17 +103,6 @@
             </div>
           </td>
         </tr>
-        <?php if(!$isSprint):?>
-        <tr>
-          <th><?php echo $lang->programplan->percent;?></th>
-          <td>
-            <div class='input-group'>
-              <?php echo html::input('percent', $execution->percent, "class='form-control'");?>
-              <span class='input-group-addon'>%</span>
-            </div>
-          </td>
-        </tr>
-        <?php endif;?>
         <tr>
           <th><?php echo $lang->execution->manageProducts;?></th>
           <td class='text-left' id='productsBox' colspan="2">
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 77843350d7..ca422382b0 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -38,9 +38,9 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php
-    if(!isset($browseType)) $browseType = '';
+    if(!isset($browseType)) $browseType = 'all';
     if(!isset($orderBy))    $orderBy = '';
-    common::printIcon('task', 'report', "execution=$executionID&browseType=$browseType", '', 'button', 'bar-chart muted');
+    common::printIcon('task', 'report', "execution=$executionID&browseType=all", '', 'button', 'bar-chart muted');
     ?>
     <div class="btn-group">
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export;?></span> <span class="caret"></span></button>
@@ -74,7 +74,7 @@
     <?php
     $checkObject = new stdclass();
     $checkObject->execution = $executionID;
-    $link = $this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
+    $link = $this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ''));
     if(common::hasPriv('task', 'create', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->create}", '', "class='btn btn-primary'");
     ?>
   </div>
@@ -85,7 +85,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->task->noTask;?></span>
       <?php if(common::hasPriv('task', 'create', $checkObject)):?>
-      <?php echo html::a($this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
+      <?php echo html::a($this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
   </div>
@@ -202,9 +202,9 @@
         <td class="c-status"><span class='status-task status-<?php echo $task->status;?>'> <?php echo $this->processStatus('task', $task);?></span></td>
         <td class="c-assign text-left"><?php echo "<span class='$assignedToClass'>" . $task->assignedToRealName . "</span>";?></td>
         <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
-        <td class="c-hours em" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours em" title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . ' ' . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours em" title="<?php echo $task->left     . ' ' . $lang->execution->workHour;?>"><?php echo $task->left     . ' ' . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours em" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours em" title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours em" title="<?php echo $task->left     . ' ' . $lang->execution->workHour;?>"><?php echo $task->left     . $lang->execution->workHourUnit;?></td>
         <td class="c-num em"><?php echo $task->progress . '%';?></td>
         <td class="c-type"><?php echo zget($lang->task->typeList, $task->type);?></td>
         <td class='c-date <?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php
index 729bd72040..4d9087e11a 100644
--- a/module/execution/view/importtask.html.php
+++ b/module/execution/view/importtask.html.php
@@ -15,9 +15,9 @@
   <div class='pull-left btn-toolbar'>
     <?php echo html::a($this->createLink('execution', 'importTask', "execution=$executionID"), "<span class='text'>{$lang->execution->importTask}</span>", '', "class='btn btn-link btn-active-text'");?>
     <div class='input-control input-group space w-150px'>
-      <?php $executions = array(0 => $lang->execution->allProjects) + $executions;?>
-      <span class='input-group-addon'><?php echo $lang->execution->selectProject;?></span>
-      <?php  echo html::select('fromexecution', $executions, $fromProject, "onchange='reload($executionID, this.value)' class='form-control chosen'");?>
+      <?php $executions = array(0 => $lang->execution->allExecutions) + $executions;?>
+      <span class='input-group-addon'><?php echo $lang->execution->selectExecution;?></span>
+      <?php  echo html::select('fromexecution', $executions, $fromExecution, "onchange='reload($executionID, this.value)' class='form-control chosen'");?>
     </div>
   </div>
 </div>
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index ce4ddb33e2..49307adf4f 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -124,9 +124,9 @@
                   <ul class='dropdown-menu pull-right'>
                     <?php
                     $misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
-                    echo (common::hasPriv('task', 'create'))         ? '<li>' . html::a($this->createLink('task', 'create', "executionID=$story->execution&storyID=$story->id&moduleID=$story->module", '', true), $lang->execution->wbs, '', $misc) : '' . '</li>';
-                    echo (common::hasPriv('task', 'batchCreate'))    ? '<li>' . html::a($this->createLink('task', 'batchCreate', "executionID=$story->execution&storyID=$story->id&moduleID=0&taskID=0&iframe=true", '', true), $lang->execution->batchWBS, '', $misc) : '' . '</li>';
-                    echo (common::hasPriv('execution', 'unlinkStory')) ? '<li>' . html::a($this->createLink('execution', 'unlinkStory', "executionID=$story->execution&storyID=$story->story&confirm=no", '', true), $lang->execution->unlinkStory, 'hiddenwin') : '' . '</li>';
+                    echo (common::hasPriv('task', 'create'))         ? '<li>' . html::a($this->createLink('task', 'create', "executionID=$executionID&storyID=$story->id&moduleID=$story->module", '', true), $lang->execution->wbs, '', $misc) : '' . '</li>';
+                    echo (common::hasPriv('task', 'batchCreate'))    ? '<li>' . html::a($this->createLink('task', 'batchCreate', "executionID=$executionID&storyID=$story->id&moduleID=0&taskID=0&iframe=true", '', true), $lang->execution->batchWBS, '', $misc) : '' . '</li>';
+                    echo (common::hasPriv('execution', 'unlinkStory')) ? '<li>' . html::a($this->createLink('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->story&confirm=no", '', true), $lang->execution->unlinkStory, 'hiddenwin') : '' . '</li>';
                     $misc = "data-toggle='modal' data-type='iframe'";
                     echo (common::hasPriv('story', 'close'))         ? '<li>' . html::a($this->createLink('story', 'close', "storyID=$story->id", '', true), $lang->story->close, '', $misc) : '' . '</li>';
                     ?>
diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index ae3a756b38..9af9d97bd0 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -18,14 +18,12 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->linkStory;?></span></span>
-    <?php if($executionStories and ($this->app->rawModule == 'execution')):?>
-    <span class='btn btn-link'><span class='text'><?php echo $lang->execution->linkPRJStoryTip;?></span></span>
-    <?php elseif($this->app->rawModule == 'execution'):?>
+    <?php if($this->app->rawModule == 'execution' and $config->systemMode == 'new'):?>
     <span class='btn btn-link'><span class='text'><?php echo $lang->execution->linkAllStoryTip;?></span></span>
     <?php endif;?>
   </div>
   <div class='btn-toolbar pull-right'>
-    <?php common::printBack($this->createLink($this->app->rawModule, 'story'), 'btn btn-link');?>
+    <?php common::printBack($this->createLink($this->app->rawModule, 'story', "objectID=$object->id"), 'btn btn-link');?>
   </div>
 </div>
 <div id="mainContent">
@@ -45,9 +43,9 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='w-pri'><?php echo $lang->priAB;?></th>
+          <th><?php echo $lang->story->title;?></th>
           <th class='w-150px'><?php echo $lang->story->product;?></th>
           <th class='w-150px'><?php echo $lang->story->module;?></th>
-          <th><?php echo $lang->story->title;?></th>
           <th class='w-120px'><?php echo $lang->story->plan;?></th>
           <th class='w-80px'><?php echo $lang->story->stage;?></th>
           <?php if($productType != 'normal'):?>
@@ -67,14 +65,14 @@
           <?php echo html::hidden("products[$story->id]", $story->product);?>
         </td>
         <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
-        <td class='text-left' title='<?php echo $products[$story->product]->name?>'><?php echo html::a($this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch"), $products[$story->product]->name, '_blank');?></td>
-        <td class='text-left' title='<?php echo zget($modules, $story->module, '')?>'><?php echo zget($modules, $story->module, '')?></td>
         <td class='text-left nobr' title="<?php echo $story->title?>">
           <?php
           if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
           echo html::a($storyLink, $story->title);
           ?>
         </td>
+        <td class='text-left' title='<?php echo $products[$story->product]->name?>'><?php echo html::a($this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch"), $products[$story->product]->name, '_blank');?></td>
+        <td class='text-left' title='<?php echo zget($modules, $story->module, '')?>'><?php echo zget($modules, $story->module, '')?></td>
         <td class='text-ellipsis' title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
         <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         <?php if($productType != 'normal'):?>
@@ -97,7 +95,7 @@
     </div>
     <?php else:?>
     <div class="table-empty-tip">
-      <p><span class="text-muted"><?php echo $lang->execution->whyNoStories;?></p>
+      <p><span class="text-muted"><?php echo $lang->{$app->rawModule}->whyNoStories;?></p>
     </div>
     <?php endif;?>
   </form>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 5b449f48fb..0f36fa904b 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php $canOrder = common::hasPriv('execution', 'storySort');?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datatable.fix.html.php';?>
 <?php if($canOrder) include '../../common/view/sortable.html.php';?>
 <?php js::set('moduleID', $this->cookie->storyModuleParam);?>
 <?php js::set('productID', $this->cookie->storyProductParam);?>
@@ -20,6 +21,11 @@
 <?php js::set('confirmUnlinkStory', $lang->execution->confirmUnlinkStory)?>
 <?php js::set('typeError', sprintf($this->lang->error->notempty, $this->lang->task->type))?>
 <?php js::set('workingHourError', sprintf($this->lang->error->notempty, $this->lang->workingHour))?>
+<style>
+.btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
+.btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
+.btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
+</style>
 <div id="mainMenu" class="clearfix">
   <?php if(!empty($module->name) or !empty($product->name) or !empty($branch)):?>
   <div id="sidebarHeader">
@@ -47,22 +53,44 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php
-    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export' data-group='execution'");
+    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export iframe' data-app='execution'");
 
     if(common::canModify('execution', $execution))
     {
         $this->lang->story->create = $this->lang->execution->createStory;
+
         if($productID and !$this->loadModel('story')->checkForceReview())
         {
-            echo "<div class='btn-group dropdown-hover'>";
-            echo "<button type='button' class='btn btn-link'>";
-            echo "<i class='icon-plus'></i> {$lang->story->create} <span class='caret'></span>";
-            echo '</button>';
-            echo "<ul class='dropdown-menu pull-right' id='createActionMenu'>";
-            $storyModuleID = (int)$this->cookie->storyModuleParam;
-            if(common::hasPriv('story', 'create')) echo '<li>' . html::a($this->createLink('story', 'create',  "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id"), $lang->story->create, '', "data-group='execution'") . '</li>';
-            if(common::hasPriv('story', 'batchCreate')) echo '<li>' . html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id"), $lang->story->batchCreate, '', "data-group='execution'") . '</li>';
-            echo '</ul>';
+            $storyModuleID   = (int)$this->cookie->storyModuleParam;
+            $createStoryLink = $this->createLink('story', 'create', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id");
+            $batchCreateLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id");
+
+            $buttonLink  = '';
+            $buttonTitle = '';
+            if(common::hasPriv('story', 'batchCreate'))
+            {
+                $buttonLink  = $batchCreateLink;
+                $buttonTitle = $lang->story->batchCreate;
+            }
+            if(common::hasPriv('story', 'create'))
+            {
+                $buttonLink  = $createStoryLink;
+                $buttonTitle = $lang->story->create;
+            }
+
+            $hidden = empty($buttonLink) ? 'hidden' : '';
+            echo "<div class='btn-group dropdown'>";
+            echo html::a($buttonLink, "<i class='icon icon-plus'></i> $buttonTitle", '', "class='btn btn-secondary $hidden' data-app='execution'");
+
+            if($common::hasPriv('story', 'create') and common::hasPriv('story', 'batchCreate'))
+            {
+                echo "<button type='button' class='btn btn-secondary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                echo "<ul class='dropdown-menu pull-right'>";
+                echo '<li>' . html::a($createStoryLink, $lang->story->create, '', "data-app='execution'") . '</li>';
+                echo '<li>' . html::a($batchCreateLink, $lang->story->batchCreate, '', "data-app='execution'") . '</li>';
+                echo '</ul>';
+            }
+
             echo '</div>';
         }
 
@@ -73,14 +101,35 @@
         }
         else
         {
-            echo "<div class='btn-group dropdown-hover'>";
-            echo "<button type='button' class='btn btn-primary' id='linkButton'>";
-            echo "<i class='icon-link'></i> {$lang->execution->linkStory} <span class='caret'></span>";
-            echo '</button>';
-            echo "<ul class='dropdown-menu pull-right' id='linkActionMenu'>";
-            if(common::hasPriv('execution', 'linkStory')) echo '<li>' . html::a(inlink('linkStory', "execution=$execution->id"), $lang->execution->linkStory). "</li>";
-            if(common::hasPriv('execution', 'importPlanStories')) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
-            echo '</ul>';
+            echo "<div class='btn-group dropdown'>";
+
+            $buttonLink  = '';
+            $buttonTitle = '';
+            $dataToggle  = '';
+            if(common::hasPriv('execution', 'importPlanStories'))
+            {
+                $buttonLink  = '#linkStoryByPlan';
+                $buttonTitle = $lang->execution->linkStoryByPlan;
+                $dataToggle  = 'data-toggle="modal"';
+            }
+            if(common::hasPriv('execution', 'linkStory'))
+            {
+                $buttonLink  = inlink('linkStory', "execution=$execution->id");
+                $buttonTitle = $lang->execution->linkStory;
+                $dataToggle  = '';
+            }
+            $hidden = empty($buttonLink) ? 'hidden' : '';
+            echo html::a($buttonLink, "<i class='icon-link'></i> $buttonTitle", '', "class='btn btn-primary $hidden' $dataToggle");
+
+            if(common::hasPriv('execution', 'linkStory') and common::hasPriv('execution', 'importPlanStories'))
+            {
+                echo "<button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                echo "<ul class='dropdown-menu pull-right'>";
+                echo '<li>' . html::a(inlink('linkStory', "execution=$execution->id"), $lang->execution->linkStory). "</li>";
+                echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
+                echo '</ul>';
+            }
+
             echo '</div>';
         }
     }
@@ -93,6 +142,7 @@
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
       <?php echo $moduleTree;?>
+      <div class="text-center"></div>
     </div>
   </div>
   <div class="main-col">
@@ -115,14 +165,13 @@
         <thead>
           <tr>
           <?php
-          $totalEstimate = 0;
-          $canBatchEdit         = common::hasPriv('story', 'batchEdit');
-          $canBatchClose        = common::hasPriv('story', 'batchClose');
-          $canBatchChangeStage  = common::hasPriv('story', 'batchChangeStage');
-          $canBatchUnlink       = common::hasPriv('execution', 'batchUnlinkStory');
-          $canBatchToTask       = common::hasPriv('story', 'batchToTask');
-
-          $canBatchAction       = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+          $totalEstimate       = 0;
+          $canBatchEdit        = common::hasPriv('story', 'batchEdit');
+          $canBatchClose       = common::hasPriv('story', 'batchClose');
+          $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
+          $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
+          $canBatchToTask      = common::hasPriv('story', 'batchToTask');
+          $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
           ?>
           <?php $vars = "executionID={$execution->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
             <th class='c-id {sorter:false}'>
@@ -138,6 +187,7 @@
             <?php endif;?>
             <th class='c-pri {sorter:false}'>  <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
             <th class='c-name {sorter:false}'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->execution->storyTitle);?></th>
+            <th class='w-70px {sorter:false}'><?php common::printOrderLink('category',    $orderBy, $vars, $lang->story->category);?></th>
             <th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
             <th class='c-user {sorter:false}'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
             <th class='c-estimate w-80px {sorter:false} text-right'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
@@ -146,7 +196,7 @@
             <th title='<?php echo $lang->story->taskCount?>' class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
             <th title='<?php echo $lang->story->bugCount?>'  class='w-30px'><?php echo $lang->story->bugCountAB;?></th>
             <th title='<?php echo $lang->story->caseCount?>' class='w-30px'><?php echo $lang->story->caseCountAB;?></th>
-            <th class='c-actions-4 text-center {sorter:false}'><?php echo $lang->actions;?></th>
+            <th class='c-actions-5 text-center {sorter:false}'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody id='storyTableList' class='sortable'>
@@ -158,7 +208,7 @@
           <tr id="story<?php echo $story->id;?>" data-id='<?php echo $story->id;?>' data-order='<?php echo $story->order ?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0)?>'>
             <td class='cell-id'>
               <?php if($canBatchAction):?>
-              <?php echo html::checkbox('storyIdList', array($story->id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$execution->id"), sprintf('%03d', $story->id), null, "data-group='execution'");?>
+              <?php echo html::checkbox('storyIdList', array($story->id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$execution->id"), sprintf('%03d', $story->id), null, "data-app='execution'");?>
               <?php else:?>
               <?php printf('%03d', $story->id);?>
               <?php endif;?>
@@ -169,12 +219,14 @@
             <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
             <td class='c-name' title="<?php echo $story->title?>">
               <?php if(isset($branchGroups[$story->product][$story->branch])) echo "<span class='label label-outline label-badge'>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
+              <?php if(!empty($story->module) and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";?>
               <?php if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";?>
-              <?php echo html::a($storyLink,$story->title, null, "style='color: $story->color' data-group='execution'");?>
+              <?php echo html::a($storyLink,$story->title, null, "style='color: $story->color' data-app='execution'");?>
             </td>
+            <td class='c-name' title='<?php echo zget($lang->story->categoryList, $story->category);?>'><?php echo zget($lang->story->categoryList, $story->category);?></td>
             <td class='c-user' title='<?php echo zget($users, $story->openedBy);?>'><?php echo zget($users, $story->openedBy);?></td>
             <td class='c-user' title='<?php echo zget($users, $story->assignedTo);?>'><?php echo zget($users, $story->assignedTo);?></td>
-            <td class='c-estimate text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+            <td class='c-estimate text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
             <?php $status = $this->processStatus('story', $story);?>
             <td class='c-status' title='<?php echo $status;?>'>
               <span class='status-story status-<?php echo $story->status;?>'><?php echo $status;?></span>
@@ -208,7 +260,7 @@
                   if(commonModel::isTutorialMode())
                   {
                       $wizardParams = helper::safe64Encode($param);
-                      echo html::a($this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-plus'></i>",'', "class='btn btn-task-create' title='{$lang->execution->wbs}'");
+                      echo html::a($this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-plus'></i>",'', "class='btn btn-task-create' title='{$lang->execution->wbs}' data-app='execution'");
                   }
                   else
                   {
@@ -219,7 +271,15 @@
                   if($hasDBPriv) common::printIcon('task', 'batchCreate', "executionID={$execution->id}&story={$story->id}", '', 'list', 'pluses');
 
                   $lang->testcase->batchCreate = $lang->testcase->create;
-                  if($productID && $hasDBPriv) common::printIcon('testcase', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap');
+                  if($productID and $hasDBPriv and common::hasPriv('testcase', 'create'))
+                  {
+                      echo html::a($this->createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&form=&param=0&storyID=$story->id"), '<i class="icon-testcase-create icon-sitemap"></i>', '', "title='{$lang->testcase->create}' data-app='qa'");
+                  }
+
+                  if($canBeChanged and common::hasPriv('execution', 'storyEstimate', $execution))
+                  {
+                      common::printIcon('execution', 'storyEstimate', "executionID=$execution->id&storyID=$story->id", '', 'list', 'estimate', '', 'iframe', true, "data-width='600px'");
+                  }
 
                   if($canBeChanged and common::hasPriv('execution', 'unlinkStory', $execution))
                   {
@@ -267,9 +327,9 @@
             foreach($lang->story->stageList as $key => $stage)
             {
                 if(empty($key)) continue;
-                if(strpos('wait|planned|executioned', $key) !== false) continue;
+                if(strpos('wait|planned|projected', $key) !== false) continue;
                 $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
-                echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "</li>";
+                echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#storyList')\"") . "</li>";
             }
             echo '</ul>';
             ?>
@@ -355,7 +415,10 @@
 <script>
 $(function()
 {
-    // Update table summary text
+    /* Remove datatable setting. */
+    $('#executionStoryForm .table-header .btn-toolbar.pull-right').remove();
+
+    /* Update table summary text. */
     <?php $storyCommon = $lang->SRCommon;?>
     var checkedSummary = '<?php echo str_replace('%storyCommon%', $storyCommon, $lang->product->checkedSummary)?>';
     $('#executionStoryForm').table(
diff --git a/module/execution/view/storyestimate.html.php b/module/execution/view/storyestimate.html.php
new file mode 100644
index 0000000000..6dd16183d4
--- /dev/null
+++ b/module/execution/view/storyestimate.html.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * The create storyestimate view of execution module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Liyuchun  <liyuchun@cnezsoft.com>
+ * @package     execution
+ * @version     $Id
+ * @link        http://www.zentao.net
+ */
+?>
+<style>
+#showAverage {margin: 0;}
+.chosen-container-single .chosen-single div b {top: 8px !important;}
+.chosen-container .chosen-drop {bottom: auto !important;}
+</style>
+<?php include '../../common/view/header.html.php';?>
+<?php js::set('executionID', $executionID);?>
+<?php js::set('storyID', $storyID);?>
+<div id='mainContent' class='main-content'>
+  <div class="main-header">
+    <h2><?php echo $lang->execution->storyEstimate;?></h2>
+  </div>
+  <?php if(empty($team)):?>
+  <div class="table-empty-tip">
+    <p><span class="text-muted"><?php echo $lang->execution->noTeam;?></span></p>
+  </div>
+  <?php else:?>
+  <div class='btn-toolbar pull-left'>
+    <?php if(!empty($rounds)):?>
+    <div class='input-group space w-200px'>
+      <span class='input-group-addon'><?php echo $lang->execution->selectRound?></span>
+      <?php echo html::select('round', $rounds, $round, "class='form-control chosen' onchange='selectRound(this.value)'");?>
+    </div>
+    <div id='reestimate' class='input-group space w-100px'>
+      <?php echo html::a("javascript:showNewEstimate()", $lang->execution->reestimate, '', 'class="btn btn-primary"');?>
+    </div>
+    <?php endif;?>
+  </div>
+  <form class='main-form form-ajax' method='post' target='hiddenwin' id="estimateForm">
+    <table class='table table-form'>
+      <thead>
+        <tr class='text-center'>
+          <th><?php echo $lang->execution->team;?></th>
+          <th> <?php echo $lang->story->estimate;?></th>
+          <th class='th-new-estimate hide'><?php echo $lang->execution->newEstimate;?></th>
+          <th class='empty-th'></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($team as $user):?>
+        <tr class='text-center'>
+          <td><?php echo zget($users, $user->account);?></td>
+          <?php echo html::hidden('account[]', $user->account, "class='form-control'");?>
+          <?php if(!empty($estimateInfo->estimate)):?>
+          <td><?php echo isset($estimateInfo->estimate->{$user->account}) ? $estimateInfo->estimate->{$user->account}->estimate : '';?></td>
+          <td class='new-estimate hide'><?php echo html::input('estimate[]', '', "class='form-control'");?></td>
+          <?php else:?>
+          <td class='new-estimate'><?php echo html::input('estimate[]', '', "class='form-control'");?></td>
+          <?php endif;?>
+        </tr>
+        <?php endforeach;?>
+        <tr class='text-center'>
+          <td><strong><?php echo $lang->execution->average;?></strong></td>
+          <?php if(!empty($estimateInfo->estimate)):?>
+          <td><?php echo $estimateInfo->average;?></td>
+          <td class='new-estimate hide'><p id='showAverage'></p></td>
+          <?php echo html::hidden('average', '', "class='form-control'");?>
+          <?php else:?>
+          <td><p id='showAverage'></p></td>
+          <?php echo html::hidden('average', '', "class='form-control'");?>
+          <?php endif;?>
+        </tr>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td colspan='3' class="text-center form-actions <?php if(!empty($rounds)) echo 'hide';?>">
+            <?php echo html::submitButton(); ?>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
+  <?php endif;?>
+</div>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/execution/view/storykanban.html.php b/module/execution/view/storykanban.html.php
index 2de822b9b5..769fe51f9a 100644
--- a/module/execution/view/storykanban.html.php
+++ b/module/execution/view/storykanban.html.php
@@ -41,7 +41,7 @@
   </div>
 </div>
 <?php
-$cols    = array('executioned', 'developing', 'developed', 'testing', 'tested', 'verified', 'released');
+$cols    = array('projected', 'developing', 'developed', 'testing', 'tested', 'verified', 'released');
 $account = $this->app->user->account;
 ?>
 <div id="kanban" class="main-table" data-ride="table" data-checkable="false" data-group="true">
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 245eeeb560..8443f62667 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -27,6 +27,12 @@ js::set('unfoldTasks', $unfoldTasks);
 js::set('unfoldAll',   $lang->execution->treeLevel['all']);
 js::set('foldAll',     $lang->execution->treeLevel['root']);
 ?>
+<style>
+body {margin-bottom: 25px;}
+.btn-group a i.icon-plus {font-size: 16px;}
+.btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
+.btn-group button.dropdown-toggle.btn-primary {padding:6px;}
+</style>
 <div id="mainMenu" class="clearfix">
   <div id="sidebarHeader">
     <div class="title">
@@ -141,13 +147,19 @@ js::set('foldAll',     $lang->execution->treeLevel['root']);
     $checkObject->execution = $executionID;
     ?>
     <?php if(!common::checkNotCN()):?>
-    <?php
-    $link = $this->createLink('task', 'batchCreate', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
-    if($canBeChanged and common::hasPriv('task', 'batchCreate', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->batchCreate}", '', "class='btn btn btn-secondary'");
-
-    $link = $this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
-    if($canBeChanged and common::hasPriv('task', 'create', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->create}", '', "class='btn btn-primary'");
-    ?>
+    <?php if($canBeChanged and (common::hasPriv('task', 'batchCreate', $checkObject) or common::hasPriv('task', 'create', $checkObject))):?>
+    <div class='btn-group dropdown'>
+      <?php
+      $actionLink = $this->createLink('task', 'create', "executionID=$executionID");
+      echo html::a($actionLink, "<i class='icon icon-plus'></i> {$lang->task->create}", '', "class='btn btn-primary'");
+      ?>
+      <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+      <ul class='dropdown-menu pull-right'>
+        <li><?php echo html::a($actionLink, $lang->task->create);?></li>
+        <li><?php echo html::a($this->createLink('task', 'batchCreate', "executionID=$executionID"), $lang->task->batchCreate);?></li>
+      </ul>
+    </div>
+    <?php endif;?>
     <?php else:?>
     <?php
     echo "<div class='btn-group dropdown-hover'>";
diff --git a/module/execution/view/team.html.php b/module/execution/view/team.html.php
index 64c9f952c0..642471af10 100644
--- a/module/execution/view/team.html.php
+++ b/module/execution/view/team.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmUnlinkMember', $lang->execution->confirmUnlinkMember)?>
+<?php js::set('noAccess', $lang->user->error->noAccess)?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->team;?></span></span>
@@ -66,7 +67,15 @@
         <tr>
           <td>
           <?php
-          if(!common::printLink('user', 'view', "userID={$member->userID}", $member->realname)) print $member->realname;
+          if(common::hasPriv('user', 'view'))
+          {
+              $link = isset($deptUsers[$member->userID]) ? $this->createLink('user', 'view', "userID={$member->userID}") : "javascript:checkUserDept();";
+              echo html::a($link, $member->realname, '', 'data-app="system"');
+          }
+          else
+          {
+              echo $member->realname;
+          }
           $memberHours = $member->days * $member->hours;
           $totalHours  += $memberHours;
           ?>
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index 1b781f5fc5..e7b166fdb9 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -4,7 +4,7 @@
     <?php echo html::a(inlink('testcase', "executionID=$executionID&type=$type&orderBy=$orderBy"), "<span class='text'>{$lang->execution->all}</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&extra=executionID=$execution->id", '', '', '', true), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary'");?>
+    <?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->openApp}'");?>
   </div>
 </div>
 <div id="mainContent">
@@ -13,7 +13,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
       <?php if(common::canModify('execution', $execution) and common::hasPriv('testcase', 'create')):?>
-      <?php echo html::a(helper::createLink('testcase', 'create', "productID=$productID&branch=0&extra=executionID=$execution->id", '', '', '', true), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
+      <?php 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-info' data-app='{$this->app->openApp}'");?>
       <?php endif;?>
     </p>
   </div>
@@ -49,7 +49,7 @@
           <td><span class='label-pri <?php echo 'label-pri-' . $case->pri?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
           <?php $params = "testcaseID=$caseID&version=$case->version";?>
           <?php if($type == 'assigntome') $params .= "&from=testtask&taskID=$case->task";?>
-          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', $params, '', '', $case->project), $case->title, null, "style='color: $case->color' data-group='project'");?></td>
+          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', $params, '', '', $case->project), $case->title, null, "style='color: $case->color' data-app='{$this->app->openApp}'");?></td>
           <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
           <td><?php echo zget($users, $case->openedBy);?></td>
           <td><?php echo zget($users, $case->lastRunner);?></td>
@@ -60,18 +60,19 @@
             <?php
             if($canBeChanged)
             {
-                common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', '', '', $case->project);
+                common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID,executionID=$executionID", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'", '', $case->project);
                 common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project);
                 common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project);
                 common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project);
                 common::printIcon('testcase', 'edit',    "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project);
             }
             ?>
-          </td> 
+          </td>
         </tr>
         <?php endforeach;?>
       </tbody>
     </table>
+    <div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
   </form>
   <?php endif;?>
 </div>
diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php
index 3d0475b5b0..00b651bb89 100644
--- a/module/execution/view/testtask.html.php
+++ b/module/execution/view/testtask.html.php
@@ -29,8 +29,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('execution', $execution)):?>
-    <?php common::printIcon('testreport', 'browse', "objectID=$executionID&objectType=execution", '', 'button','flag muted');?>
-    <?php common::printLink('testtask', 'create', "product=0&execution=$executionID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('testtask', 'create', "product=0&executionID=$executionID&build=0&projectID=$execution->project", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
     <?php endif;?>
   </div>
 </div>
@@ -40,7 +39,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
       <?php if(common::canModify('execution', $execution) and common::hasPriv('testtask', 'create')):?>
-      <?php echo html::a($this->createLink('testtask', 'create', "product=0&execution=$executionID"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?>
+      <?php echo html::a($this->createLink('testtask', 'create', "product=0&executionID=$executionID&build=0&projectID=$execution->project"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info' data-app='execution'");?>
       <?php endif;?>
     </p>
   </div>
@@ -87,7 +86,7 @@
             <?php printf('%03d', $task->id);?>
             <?php endif;?>
           </td>
-          <td class='text-left' title="<?php echo $task->name?>"><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
+          <td class='text-left' title="<?php echo $task->name?>"><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name, '', "data-app='execution'");?></td>
           <td title="<?php echo $task->buildName?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName);?></td>
           <td><?php echo zget($users, $task->owner);?></td>
           <td><?php echo $task->begin?></td>
@@ -100,15 +99,14 @@
             <?php
             if($canBeChanged)
             {
-                common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
-                common::printIcon('testtask',   'linkCase', "taskID=$task->id", $task, 'list', 'link');
-                common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag');
-                common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list');
-                if(common::hasPriv('testtask', 'delete', $task))
+                common::printIcon('testtask', 'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
+                common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link');
+                if(common::hasPriv('execution', 'testreport'))
                 {
-                    $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-                    echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"taskList\", confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->testtask->delete}'");
+                    echo html::a($this->createLink('execution', 'testreport', "executionID=$executionID&objctType=execution&extra=$task->id"), '<i class="icon-testreport-browse icon-flag"></i>', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="execution"');
                 }
+                common::printIcon('testtask', 'edit',   "taskID=$task->id", $task, 'list');
+                common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'list', 'trash', 'hiddenwin');
             }
             ?>
           </td>
@@ -132,7 +130,7 @@
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar">
       <?php
-      $actionLink = $this->createLink('testreport', 'browse', "objectID=$executionID&objctType=execution");
+      $actionLink = $this->createLink('execution', 'testreport', "objectID=$executionID&objctType=execution");
       $misc       = common::hasPriv('testreport', 'browse') ? "onclick=\"setFormAction('$actionLink', '', '#testtaskForm')\"" : "disabled='disabled'";
       echo html::commonButton($lang->testreport->common, $misc);
       ?>
diff --git a/module/execution/view/tips.html.php b/module/execution/view/tips.html.php
index d5698e5efb..e7aa979f44 100644
--- a/module/execution/view/tips.html.php
+++ b/module/execution/view/tips.html.php
@@ -1,9 +1,9 @@
 <div style='margin: 0 auto; max-width: 400px'>
   <p><strong><?php echo $lang->execution->afterInfo;?></strong></p>
   <div>
-    <?php echo html::a($this->createLink('execution', 'team', "executionID=$executionID"), $lang->execution->setTeam, '', "class='btn'");?>
-    <?php if($execution->type != 'ops') echo html::a($this->createLink('execution', 'linkstory', "executionID=$executionID"), $lang->execution->linkStory, '', "class='btn'");?>
-    <?php echo html::a($this->createLink('task', 'create', "execution=$executionID"), $lang->execution->createTask, '', "class='btn'");?>
-    <?php echo html::a($this->createLink('execution', 'task', "executionID=$executionID"), $lang->execution->goback, '', "class='btn'");?>
+    <?php echo html::a($this->createLink('execution', 'team', "executionID=$executionID"), $lang->execution->setTeam, '', "class='btn' data-app='execution'");?>
+    <?php if($execution->lifetime != 'ops') echo html::a($this->createLink('execution', 'linkstory', "executionID=$executionID"), $lang->execution->linkStory, '', "class='btn' data-app='execution'");?>
+    <?php echo html::a($this->createLink('task', 'create', "execution=$executionID"), $lang->execution->createTask, '', "class='btn' data-app='execution'");?>
+    <?php echo html::a($this->createLink('execution', 'task', "executionID=$executionID"), $lang->execution->goback, '', "class='btn' data-app='execution'");?>
   </div>
 </div>
diff --git a/module/execution/view/tree.html.php b/module/execution/view/tree.html.php
index aef3be3ca3..e6a668cab2 100644
--- a/module/execution/view/tree.html.php
+++ b/module/execution/view/tree.html.php
@@ -27,7 +27,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php
-    if(!isset($browseType)) $browseType = '';
+    if(!isset($browseType)) $browseType = 'all';
     if(!isset($orderBy))    $orderBy = '';
     $link = common::hasPriv('task', 'report', $execution) ?  $this->createLink('task', 'report', "execution=$executionID&browseType=$browseType") : '#';
     echo html::a($link, "<i class='icon icon-bar-chart muted'></i> <span class='text'>{$lang->task->reportChart}</span>", '', 'class="btn btn-link"');
diff --git a/module/execution/view/treestory.html.php b/module/execution/view/treestory.html.php
index 145246355a..95f5d7e72e 100644
--- a/module/execution/view/treestory.html.php
+++ b/module/execution/view/treestory.html.php
@@ -41,12 +41,12 @@
       <tbody>
       <tr>
         <th class='w-100px'><?php echo $lang->story->product;?></th>
-        <td><?php echo html::a($this->createLink('product', 'view', "productID=$story->product"), $product->name);?></td>
+        <td><?php echo html::a($this->createLink('product', 'view', "productID=$story->product"), $product->name, '', "data-app='product'");?></td>
       </tr>
       <?php if($product->type != 'normal'):?>
         <tr>
           <th><?php echo sprintf($lang->product->branch, zget($lang->product->branchName, $product->type));?></th>
-          <td><?php common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch", $branches[$story->branch]);?></td>
+          <td><?php common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch", $branches[$story->branch], '', "data-app='product'");?></td>
         </tr>
       <?php endif;?>
       <tr>
diff --git a/module/execution/view/treetask.html.php b/module/execution/view/treetask.html.php
index 91c32e02b8..27e28822f7 100644
--- a/module/execution/view/treetask.html.php
+++ b/module/execution/view/treetask.html.php
@@ -32,7 +32,7 @@
       common::printIcon('task', 'edit',   "taskID=$task->id", $task, 'list', '', '', 'btn btn-info btn-icon');
       if(empty($task->team) or empty($task->children))
       {
-          common::printIcon('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', 'btn btn-info btn-icon', '', '', $lang->task->children);
+          common::printIcon('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', 'btn btn-info btn-icon', '', '', $lang->task->children);
       }
       ?>
     </div>
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index fb16256c3a..d9ff7abf36 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -126,13 +126,13 @@
                   <?php if($libID == 'files'):?>
                   <?php echo html::a($this->createLink('doc', 'showFiles', "type=execution&objectID=$execution->id"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name);?>
                   <?php else:?>
-                  <?php echo html::a($this->createLink('doc', 'browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc&from=execution"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name);?>
+                  <?php echo html::a($this->createLink('doc', 'objectLibs', "type=execution&objectID={$execution->id}&libID=$libID"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name, '', "data-app='execution'");?>
                   <?php endif;?>
                 </div>
                 <?php $i++;?>
                 <?php endforeach;?>
                 <div class="col-xs-6">
-                  <?php if($canBeChanged) common::printLink('doc', 'createLib', "type=execution&objectID=$execution->id", "<i class='icon icon-plus hl-primary text-primary'></i> &nbsp;" . $lang->doc->createlib, '', "class='text-muted iframe' data-width='1000px'");?>
+                  <?php if($canBeChanged) common::printLink('doc', 'createLib', "type=execution&objectID=$execution->id", "<i class='icon icon-plus hl-primary text-primary'></i> &nbsp;" . $lang->doc->createLib, '', "class='text-muted iframe' data-width='1000px'");?>
                 </div>
                 <?php endif;?>
               </div>
@@ -229,7 +229,7 @@
                     <tr>
                       <td colspan="4">
                         <?php $progress = ($execution->totalConsumed + $execution->totalLeft) ? floor($execution->totalConsumed / ($execution->totalConsumed + $execution->totalLeft) * 1000) / 1000 * 100 : 0;?>
-                        <?php echo $lang->execution->progress;?> <em><?php echo $progress . $lang->percent;?></em> &nbsp;
+                        <?php echo $lang->execution->progress;?> <?php echo $progress . $lang->percent;?> &nbsp;
                         <div class="progress inline-block">
                           <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $progress . $lang->percent;?>"></div>
                         </div>
@@ -239,23 +239,23 @@
                       <th><?php echo $lang->execution->begin;?></th>
                       <td><?php echo $execution->begin;?></td>
                       <th><?php echo $lang->execution->totalEstimate;?></th>
-                      <td><em><?php echo (float)$execution->totalEstimate . $lang->execution->workHour;?></em></td>
+                      <td><?php echo (float)$execution->totalEstimate . $lang->execution->workHour;?></td>
                     </tr>
                     <tr>
                       <th><?php echo $lang->execution->end;?></th>
                       <td><?php echo $execution->end;?></td>
                       <th><?php echo $lang->execution->totalConsumed;?></th>
-                      <td><em><?php echo (float)$execution->totalConsumed . $lang->execution->workHour;?></em></td>
+                      <td><?php echo (float)$execution->totalConsumed . $lang->execution->workHour;?></td>
                     </tr>
                     <tr>
                       <th><?php echo $lang->execution->totalDays;?></th>
                       <td><?php echo $execution->days;?></td>
                       <th><?php echo $lang->execution->totalLeft;?></th>
-                      <td><em><?php echo (float)$execution->totalLeft . $lang->execution->workHour;?></em></td>
+                      <td><?php echo (float)$execution->totalLeft . $lang->execution->workHour;?></td>
                     </tr>
                     <tr>
                       <th><?php echo $lang->execution->totalHours;?></th>
-                      <td><em><?php echo (float)$execution->totalHours . $lang->execution->workHour;?></em></td>
+                      <td><?php echo (float)$execution->totalHours . $lang->execution->workHour;?></td>
                     </tr>
                   </tbody>
                 </table>
@@ -268,11 +268,11 @@
                   <tbody>
                     <tr>
                       <th><?php echo $lang->story->common;?></th>
-                      <td><em><?php echo $statData->storyCount;?></em></td>
+                      <td><?php echo $statData->storyCount;?></td>
                       <th><?php echo $lang->task->common;?></th>
-                      <td><em><?php echo $statData->taskCount;?></em></td>
+                      <td><?php echo $statData->taskCount;?></td>
                       <th><?php echo $lang->bug->common;?></th>
-                      <td><em><?php echo $statData->bugCount;?></em></td>
+                      <td><?php echo $statData->bugCount;?></td>
                     </tr>
                   </tbody>
                 </table>
diff --git a/module/extension/control.php b/module/extension/control.php
index 8086d2aad8..f2d0587761 100644
--- a/module/extension/control.php
+++ b/module/extension/control.php
@@ -89,7 +89,7 @@ class extension extends control
     {
         /* Init vars. */
         $type       = strtolower($type);
-        $moduleID   = $type == 'bymodule' ? (int)$param : 0;
+        $moduleID   = $type == 'bymodule' ? (int)base64_decode($param) : 0;
         $extensions = array();
         $pager      = null;
 
@@ -162,7 +162,7 @@ class extension extends control
 
         /* Checking the extension pathes. */
         $return = $this->extension->checkExtensionPathes($extension);
-        if($this->session->dirs2Created == false) $this->session->set('dirs2Created', $return->dirs2Created);    // Save the dirs to be created.
+        if($this->session->dirs2Created == false) $this->session->set('dirs2Created', $return->dirs2Created, 'admin');    // Save the dirs to be created.
         if($return->result != 'ok')
         {
             $this->view->error = $return->errors;
@@ -302,7 +302,7 @@ class extension extends control
         $data->dirs   = $this->session->dirs2Created;
         $data->files  = $this->view->files;
         $data->installedTime = helper::now();
-        $this->session->set('dirs2Created', array());   // clean the session.
+        $this->session->set('dirs2Created', array(), 'admin');   // clean the session.
 
         /* Execute the install.sql. */
         if($upgrade == 'no' and $this->extension->needExecuteDB($extension, 'install'))
@@ -455,6 +455,7 @@ class extension extends control
             $link = $type == 'install' ? inlink('install', "extension=$extension") : inlink('upgrade', "extension=$extension");
             die(js::locate($link, 'parent'));
         }
+
         $this->display();
     }
 
diff --git a/module/extension/css/obtain.css b/module/extension/css/obtain.css
index 43cfa0743a..00a2b3495f 100644
--- a/module/extension/css/obtain.css
+++ b/module/extension/css/obtain.css
@@ -1 +1,3 @@
 .pager {margin-top: 0;}
+.tree li>a:hover {color: #fff; background-color: #0c64eb;}
+.tree li>a.active  {color: #fff; background-color: #0c64eb;}
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index 5b0ca26401..dc72128b44 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -29,6 +29,8 @@ $lang->extension->eraseAction      = 'Erase Extension';
 $lang->extension->upgrade          = 'Upgrade Extension';
 $lang->extension->agreeLicense     = 'I agree to the license.';
 
+$lang->extension->browseAction = 'Extension List';
+
 $lang->extension->structure        = 'Structure';
 $lang->extension->structureAction  = 'Extension Structure';
 $lang->extension->installed        = 'Installed';
diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php
index 6f64bbc913..164c06497d 100644
--- a/module/extension/lang/zh-cn.php
+++ b/module/extension/lang/zh-cn.php
@@ -29,6 +29,8 @@ $lang->extension->eraseAction      = '清除插件';
 $lang->extension->upgrade          = '升级插件';
 $lang->extension->agreeLicense     = '我同意该授权';
 
+$lang->extension->browseAction = '插件列表';
+
 $lang->extension->structure       = '目录结构';
 $lang->extension->structureAction = '目录结构';
 $lang->extension->installed       = '已安装';
@@ -95,7 +97,7 @@ $lang->extension->noticeOkFile             = '<h5>为了安全起见，系统需
     <ol>
     <li>文件内容为空。</li>
     <li>如果之前文件存在，删除之后重新创建。</li>
-    </ol>'; 
+    </ol>';
 
 $lang->extension->upgradeExt     = '升级';
 $lang->extension->installExt     = '安装';
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index 7b3ea70b8f..578f2256b8 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -29,6 +29,8 @@ $lang->extension->eraseAction      = '清除插件';
 $lang->extension->upgrade          = '升級插件';
 $lang->extension->agreeLicense     = '我同意該授權';
 
+$lang->extension->browseAction = '插件列表';
+
 $lang->extension->structure       = '目錄結構';
 $lang->extension->structureAction = '目錄結構';
 $lang->extension->installed       = '已安裝';
@@ -95,7 +97,7 @@ $lang->extension->noticeOkFile             = '<h5>為了安全起見，系統需
     <ol>
     <li>檔案內容為空。</li>
     <li>如果之前檔案存在，刪除之後重新創建。</li>
-    </ol>'; 
+    </ol>';
 
 $lang->extension->upgradeExt     = '升級';
 $lang->extension->installExt     = '安裝';
diff --git a/module/file/model.php b/module/file/model.php
index a3a248d431..1a2252c579 100644
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -356,7 +356,7 @@ class fileModel extends model
 
     /**
      * Get tmp import path.
-     * 
+     *
      * @access public
      * @return string
      */
@@ -470,7 +470,7 @@ class fileModel extends model
             $filePath = $this->dao->select('pathname')->from(TABLE_FILE)->where('id')->eq($fileID)->fetch();
             $pathName = $filePath->pathname;
             $realPathName = $this->savePath . $this->getRealPathName($pathName);
-            if(!is_dir(dirname($realPathName)))mkdir(dirname($realPathName));
+            if(!is_dir(dirname($realPathName))) mkdir(dirname($realPathName));
             move_uploaded_file($file['tmpname'], $realPathName);
 
             $file['pathname'] = $pathName;
@@ -489,7 +489,7 @@ class fileModel extends model
         }
     }
 
-	/** 
+	/**
      * Compress image to config configured size.
      *
      * @param  string  $rawImage
@@ -504,7 +504,7 @@ class fileModel extends model
      * @return void
      */
     public function cropImage($rawImage, $target, $x, $y, $width, $height, $resizeWidth = 0, $resizeHeight = 0)
-    {   
+    {
         $this->app->loadClass('phpthumb', true);
 
         if(!extension_loaded('gd')) return false;
@@ -530,25 +530,32 @@ class fileModel extends model
         $dataLength = strlen($data);
         if(ini_get('pcre.backtrack_limit') < $dataLength) ini_set('pcre.backtrack_limit', $dataLength);
         preg_match_all('/<img src="(data:image\/(\S+);base64,(\S+))".*\/>/U', $data, $out);
-        foreach($out[3] as $key => $base64Image)
+        if($out[3])
         {
-            $extension = strtolower($out[2][$key]);
-            if(!in_array($extension, $this->config->file->imageExtensions)) die();
-            $imageData = base64_decode($base64Image);
+            foreach($out[3] as $key => $base64Image)
+            {
+                $extension = strtolower($out[2][$key]);
+                if(!in_array($extension, $this->config->file->imageExtensions)) die();
+                $imageData = base64_decode($base64Image);
 
-            $file['extension'] = $extension;
-            $file['pathname']  = $this->setPathName($key, $file['extension']);
-            $file['size']      = strlen($imageData);
-            $file['addedBy']   = $this->app->user->account;
-            $file['addedDate'] = helper::today();
-            $file['title']     = str_replace(".$extension", '', basename($file['pathname']));
+                $file['extension'] = $extension;
+                $file['pathname']  = $this->setPathName($key, $file['extension']);
+                $file['size']      = strlen($imageData);
+                $file['addedBy']   = $this->app->user->account;
+                $file['addedDate'] = helper::today();
+                $file['title']     = str_replace(".$extension", '', basename($file['pathname']));
 
-            file_put_contents($this->savePath . $this->getSaveName($file['pathname']), $imageData);
-            $this->dao->insert(TABLE_FILE)->data($file)->exec();
-            $fileID = $this->dao->lastInsertID();
-            if($uid) $_SESSION['album'][$uid][] = $fileID;
+                file_put_contents($this->savePath . $this->getSaveName($file['pathname']), $imageData);
+                $this->dao->insert(TABLE_FILE)->data($file)->exec();
+                $fileID = $this->dao->lastInsertID();
+                if($uid) $_SESSION['album'][$uid][] = $fileID;
 
-            $data = str_replace($out[1][$key], helper::createLink('file', 'read', "fileID=$fileID", $file['extension']), $data);
+                $data = str_replace($out[1][$key], helper::createLink('file', 'read', "fileID=$fileID", $file['extension']), $data);
+            }
+        }
+        else
+        {
+            $data = fixer::stripDataTags(urldecode($data));
         }
 
         return $data;
@@ -759,7 +766,8 @@ class fileModel extends model
      * @access public
      * @return resource
      */
-    public function imagecreatefrombmp($filename) {
+    public function imagecreatefrombmp($filename)
+    {
         $f = fopen($filename, "rb");
 
         //read header
@@ -782,7 +790,8 @@ class fileModel extends model
         $img = imagecreatetruecolor($header['width'], $header['height']);
 
         //read pixels
-        for ($y = $hei - 1; $y >= 0; $y--) {
+        for($y = $hei - 1; $y >= 0; $y--)
+        {
             $row = fread($f, $wid2);
             $pixels = str_split($row, 3);
 
@@ -910,10 +919,10 @@ class fileModel extends model
 
     /**
      * Send the download header to the client.
-     * 
-     * @param  string    $fileName 
-     * @param  string    $fileType 
-     * @param  string    $content 
+     *
+     * @param  string    $fileName
+     * @param  string    $fileType
+     * @param  string    $content
      * @access public
      * @return void
      */
@@ -924,7 +933,7 @@ class fileModel extends model
         for($i = 0; $i < $obLevel; $i++) ob_end_clean();
 
         /* Set the downloading cookie, thus the export form page can use it to judge whether to close the window or not. */
-        setcookie('downloading', 1, 0, $this->config->webRoot, '', false, false);
+        setcookie('downloading', 1, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
 
         /* Only download upload file that is in zentao. */
         if($type == 'file' and stripos($content, $this->savePath) !== 0) die();
@@ -957,4 +966,29 @@ class fileModel extends model
             die();
         }
     }
+
+    /**
+     * Get image size.
+     *
+     * @access public
+     * @param  object $file
+     * @return array
+     */
+    public function getImageSize($file)
+    {
+        if($this->config->file->storageType == 'fs')
+        {
+            return getimagesize($file->realPath);
+        }
+        else if($this->config->file->storageType == 's3')
+        {
+            $this->app->loadClass('ossclient', true);
+
+            $config    = $this->config->file;
+            $ossClient = new ossclient($config->accessKeyId, $config->accessKeySecret, $config->endpoint, $config->bucket);
+            $info      = $ossClient->getImageInfo($file->pathname);
+
+            return array($info->ImageWidth->value, $info->ImageHeight->value, 'img');
+        }
+    }
 }
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index 2f2c18c7a8..e4c7c2a783 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -17,8 +17,9 @@ $sessionString .= session_name() . '=' . session_id();
   function deleteFile(fileID)
   {
       if(!fileID) return;
-      hiddenwin.location.href =createLink('file', 'delete', 'fileID=' + fileID);
+      hiddenwin.location.href = createLink('file', 'delete', 'fileID=' + fileID);
   }
+
   /* Download a file, append the mouse to the link. Thus we call decide to open the file in browser no download it. */
   function downloadFile(fileID, extension, imageWidth, fileTitle)
   {
@@ -52,7 +53,7 @@ $sessionString .= session_name() . '=' . session_id();
               $imageWidth = 0;
               if(stripos('jpg|jpeg|gif|png|bmp', $file->extension) !== false)
               {
-                  $imageSize  = getimagesize($file->realPath);
+                  $imageSize  = $this->file->getImageSize($file);
                   $imageWidth = $imageSize ? $imageSize[0] : 0;
               }
 
diff --git a/module/git/control.php b/module/git/control.php
index 5f9f64b012..e633538088 100644
--- a/module/git/control.php
+++ b/module/git/control.php
@@ -12,8 +12,8 @@
 class git extends control
 {
     /**
-     * Sync git. 
-     * 
+     * Sync git.
+     *
      * @access public
      * @return void
      */
@@ -24,9 +24,9 @@ class git extends control
 
     /**
      * Diff a file.
-     * 
+     *
      * @param  string $path
-     * @param  int    $revision 
+     * @param  int    $revision
      * @access public
      * @return void
      */
@@ -37,14 +37,14 @@ class git extends control
         $path = helper::safe64Decode($path);
         if(common::hasPriv('repo', 'diff'))
         {
-            $repos = $this->loadModel('repo')->getListBySCM('Git', 'haspriv');
+            $repos = $this->loadModel('repo')->getListBySCM('Git,Gitlab', 'haspriv');
             foreach($repos as $repo)
             {
                 if(strpos($path, $repo->path) === 0)
                 {
                     $entry = $this->repo->encodePath(str_replace($repo->path, '', $path));
                     $oldRevision = "$revision^";
-                    $this->locate($this->repo->createLink('diff', "repoID=$repo->id&entry=$entry&oldRevision=$oldRevision&revision=$revision", 'html', 'true'));
+                    $this->locate($this->repo->createLink('diff', "repoID=$repo->id&objectID=0&entry=$entry&oldRevision=$oldRevision&revision=$revision", 'html', 'true'));
                 }
             }
         }
@@ -52,15 +52,15 @@ class git extends control
         $this->view->path     = $path;
         $this->view->revision = $revision;
         $this->view->diff     = $this->git->diff($path, $revision);
-        
+
         $this->display();
     }
 
     /**
      * Cat a file.
-     * 
+     *
      * @param  string $path
-     * @param  int    $revision 
+     * @param  int    $revision
      * @access public
      * @return void
      */
@@ -71,13 +71,13 @@ class git extends control
         $path = helper::safe64Decode($path);
         if(common::hasPriv('repo', 'view'))
         {
-            $repos = $this->loadModel('repo')->getListBySCM('Git', 'haspriv');
+            $repos = $this->loadModel('repo')->getListBySCM('Git,Gitlab', 'haspriv');
             foreach($repos as $repo)
             {
                 if(strpos($path, $repo->path) === 0)
                 {
                     $entry = $this->repo->encodePath(str_replace($repo->path, '', $path));
-                    $this->locate($this->repo->createLink('view', "repoID=$repo->id&entry=$entry&revision=$revision", 'html', true));
+                    $this->locate($this->repo->createLink('view', "repoID=$repo->id&objectID=0&entry=$entry&revision=$revision", 'html', true));
                 }
             }
         }
@@ -85,13 +85,13 @@ class git extends control
         $this->view->path     = $path;
         $this->view->revision = $revision;
         $this->view->code     = $this->git->cat($path, $revision);
-        
-       $this->display(); 
+
+       $this->display();
     }
 
     /**
      * Sync from the syncer by api.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -104,9 +104,9 @@ class git extends control
 
             $logs = array();
             $i    = 0;
-            foreach($list as $line) 
+            foreach($list as $line)
             {
-                if(!$line) 
+                if(!$line)
                 {
                     $i++;
                     continue;
@@ -143,7 +143,7 @@ class git extends control
 
     /**
      * Ajax save log.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -198,7 +198,7 @@ class git extends control
 
     /**
      * Ajax get repos.
-     * 
+     *
      * @access public
      * @return void
      */
diff --git a/module/git/model.php b/module/git/model.php
index f4681d8a76..40b789ef1e 100644
--- a/module/git/model.php
+++ b/module/git/model.php
@@ -15,39 +15,39 @@ class gitModel extends model
 {
     /**
      * The git binary client.
-     * 
-     * @var int   
+     *
+     * @var int
      * @access public
      */
     public $client;
 
     /**
      * Repos.
-     * 
-     * @var array 
+     *
+     * @var array
      * @access public
      */
-    public $repos = array(); 
+    public $repos = array();
 
     /**
      * The root path of a repo
-     * 
+     *
      * @var string
      * @access public
      */
     public $repoRoot = '';
 
     /**
-     * Users 
-     * 
-     * @var array 
+     * Users
+     *
+     * @var array
      * @access public
      */
     public $users = array();
 
     /**
      * Construct function.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -59,8 +59,8 @@ class gitModel extends model
     }
 
     /**
-     * Run. 
-     * 
+     * Run.
+     *
      * @access public
      * @return void
      */
@@ -145,7 +145,7 @@ class gitModel extends model
                 continue;
             }
 
-            $version = $lastInDB->commit;
+            $version = (int)$lastInDB->commit + 1;
             $logs    = $this->repo->getUnsyncCommits($repo);
             $objects = array();
             if(!empty($logs))
@@ -196,13 +196,13 @@ class gitModel extends model
 
     /**
      * Set the repos.
-     * 
+     *
      * @access public
      * @return bool
      */
     public function setRepos()
     {
-        $repos    = $this->loadModel('repo')->getListBySCM('Git');
+        $repos    = $this->loadModel('repo')->getListBySCM('Git,Gitlab');
         $gitRepos = array();
         $paths    = array();
         foreach($repos as $repo)
@@ -224,7 +224,7 @@ class gitModel extends model
 
     /**
      * Get repos.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -239,8 +239,8 @@ class gitModel extends model
 
     /**
      * Set repo.
-     * 
-     * @param  object    $repo 
+     *
+     * @param  object    $repo
      * @access public
      * @return bool
      */
@@ -269,10 +269,10 @@ class gitModel extends model
 
     /**
      * set the root path of a repo.
-     * 
-     * @param  object    $repo 
+     *
+     * @param  object    $repo
      * @access public
-     * @return void 
+     * @return void
      */
     public function setRepoRoot($repo)
     {
@@ -295,9 +295,9 @@ class gitModel extends model
 
     /**
      * Get repo logs.
-     * 
-     * @param  object  $repo 
-     * @param  int     $fromRevision 
+     *
+     * @param  object  $repo
+     * @param  int     $fromRevision
      * @access public
      * @return array
      */
@@ -323,8 +323,8 @@ class gitModel extends model
 
     /**
      * Convert log from xml format to object.
-     * 
-     * @param  object    $log 
+     *
+     * @param  object    $log
      * @access public
      * @return object
      */
@@ -365,9 +365,9 @@ class gitModel extends model
 
     /**
      * Diff a url.
-     * 
+     *
      * @param  string $path
-     * @param  int    $revision 
+     * @param  int    $revision
      * @access public
      * @return string|bool
      */
@@ -407,9 +407,9 @@ class gitModel extends model
 
     /**
      * Cat a url.
-     * 
+     *
      * @param  string $path
-     * @param  int    $revision 
+     * @param  int    $revision
      * @access public
      * @return string|bool
      */
@@ -448,8 +448,8 @@ class gitModel extends model
 
     /**
      * Get repo by url.
-     * 
-     * @param  string    $url 
+     *
+     * @param  string    $url
      * @access public
      * @return object|bool
      */
@@ -465,8 +465,8 @@ class gitModel extends model
 
     /**
      * Pring log.
-     * 
-     * @param  sting    $log 
+     *
+     * @param  sting    $log
      * @access public
      * @return void
      */
diff --git a/module/group/control.php b/module/group/control.php
index 13e1ce479b..afabc0c35e 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -57,8 +57,9 @@ class group extends control
     {
         if(!empty($_POST))
         {
-            $this->group->create();
+            $groupID = $this->group->create();
             if(dao::isError()) die(js::error(dao::getError()));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $groupID));
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
@@ -146,9 +147,13 @@ class group extends control
         $this->view->projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('type')->eq('project')->orderBy('order_desc')->fetchPairs('id', 'name');
         $this->view->products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name');
 
-        $menugroup = array();
-        foreach($this->lang->menugroup as $moduleName => $groupName) $menugroup[$groupName][$moduleName] = $moduleName;
-        $this->view->menugroup = $menugroup;
+        $navGroup = array();
+        foreach($this->lang->navGroup as $moduleName => $groupName)
+        {
+            if($groupName == $moduleName) continue;
+            $navGroup[$groupName][$moduleName] = $moduleName;
+        }
+        $this->view->navGroup = $navGroup;
 
         $this->display();
     }
@@ -201,11 +206,11 @@ class group extends control
             $changelog = array();
             foreach($this->lang->changelog as $currentVersion => $currentChangeLog)
             {
-                if(version_compare($currentVersion, $realVersion, '>=')) $changelog[] = join($currentChangeLog, ',');
+                if(version_compare($currentVersion, $realVersion, '>=')) $changelog[] = join(',', $currentChangeLog);
             }
 
             $this->view->group      = $group;
-            $this->view->changelogs = ',' . join($changelog, ',') . ',';
+            $this->view->changelogs = ',' . join(',', $changelog) . ',';
             $this->view->groupPrivs = $groupPrivs;
             $this->view->groupID    = $groupID;
             $this->view->menu       = $menu;
@@ -248,22 +253,27 @@ class group extends control
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
-        $group      = $this->group->getById($groupID);
-        $groupUsers = $this->group->getUserPairs($groupID);
-        $allUsers   = $this->loadModel('dept')->getDeptUserPairs($deptID);
-        $otherUsers = array_diff_assoc($allUsers, $groupUsers);
+        $group        = $this->group->getById($groupID);
+        $groupUsers   = $this->group->getUserPairs($groupID);
+        $allUsers     = $this->loadModel('dept')->getDeptUserPairs($deptID);
+        $otherUsers   = array_diff_assoc($allUsers, $groupUsers);
+
+        if($this->config->systemMode == 'new')
+        {
+            $outsideUsers = $this->user->getPairs('outside|noclosed|noletter|noempty');
+            $this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers);
+        }
 
         $title      = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember;
         $position[] = $group->name;
         $position[] = $this->lang->group->manageMember;
 
-        $this->view->title      = $title;
-        $this->view->position   = $position;
-        $this->view->group      = $group;
-        $this->view->deptTree   = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createGroupManageMemberLink'), $groupID);
-        $this->view->groupUsers = $groupUsers;
-        $this->view->otherUsers = $otherUsers;
-
+        $this->view->title        = $title;
+        $this->view->position     = $position;
+        $this->view->group        = $group;
+        $this->view->deptTree     = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createGroupManageMemberLink'), $groupID);
+        $this->view->groupUsers   = $groupUsers;
+        $this->view->otherUsers   = $otherUsers;
         $this->display();
     }
 
diff --git a/module/group/css/managepriv.zh-cn.css b/module/group/css/managepriv.zh-cn.css
index 7e102351a5..d7d61bfc9f 100644
--- a/module/group/css/managepriv.zh-cn.css
+++ b/module/group/css/managepriv.zh-cn.css
@@ -1 +1 @@
-.thWidth {width: 150px !important;}
+.thWidth {width: 160px !important;}
diff --git a/module/group/css/managepriv.zh-tw.css b/module/group/css/managepriv.zh-tw.css
index 7e102351a5..d7d61bfc9f 100644
--- a/module/group/css/managepriv.zh-tw.css
+++ b/module/group/css/managepriv.zh-tw.css
@@ -1 +1 @@
-.thWidth {width: 150px !important;}
+.thWidth {width: 160px !important;}
diff --git a/module/group/js/manageprjadmin.js b/module/group/js/manageprojectadmin.js
similarity index 93%
rename from module/group/js/manageprjadmin.js
rename to module/group/js/manageprojectadmin.js
index 69c5236580..29f34ae626 100644
--- a/module/group/js/manageprjadmin.js
+++ b/module/group/js/manageprojectadmin.js
@@ -15,6 +15,8 @@ function addItem(obj)
 
 function deleteItem(obj)
 {
+    if($("table tr").size() < 3) return false;
+
     var $currentLine= $(obj).closest('tr');
     $currentLine.remove();
 }
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index c409ea8634..00c6974c81 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -56,6 +56,7 @@ $lang->group->copyOptions['copyPriv'] = 'Rechte kopieren';
 $lang->group->copyOptions['copyUser'] = 'Benutzer kopieren';
 
 $lang->group->versions['']          = 'Verlauf';
+$lang->group->versions['15_0_rc1']  = 'ZenTao15.0.rc1';
 $lang->group->versions['12_5']      = 'ZenTao12.5';
 $lang->group->versions['12_3']      = 'ZenTao12.3';
 $lang->group->versions['11_6_2']    = 'ZenTao11.6.2';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 59007182f7..11212c03e7 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -56,6 +56,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy Privileges';
 $lang->group->copyOptions['copyUser'] = 'Copy Users';
 
 $lang->group->versions['']          = 'History';
+$lang->group->versions['15_0_rc1']  = 'ZenTao15.0.rc1';
 $lang->group->versions['12_5']      = 'ZenTao12.5';
 $lang->group->versions['12_3']      = 'ZenTao12.3';
 $lang->group->versions['11_6_2']    = 'ZenTao11.6.2';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 778ec86411..edc1f8030a 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -56,6 +56,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copier Privilèges';
 $lang->group->copyOptions['copyUser'] = 'Copier Utilisateurs';
 
 $lang->group->versions['']          = 'History';
+$lang->group->versions['15_0_rc1']  = 'ZenTao15.0.rc1';
 $lang->group->versions['12_5']      = 'ZenTao12.5';
 $lang->group->versions['12_3']      = 'ZenTao12.3';
 $lang->group->versions['11_6_2']    = 'ZenTao11.6.2';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 86e04ef99d..1259b6bf83 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -21,9 +21,9 @@ $lang->moduleOrder[25]  = 'product';
 $lang->moduleOrder[30]  = 'story';
 $lang->moduleOrder[35]  = 'productplan';
 $lang->moduleOrder[40]  = 'release';
-$lang->moduleOrder[45]  = 'projectstory';
 
-$lang->moduleOrder[50]  = 'project';
+$lang->moduleOrder[45]  = 'project';
+$lang->moduleOrder[50]  = 'projectstory';
 $lang->moduleOrder[55]  = 'execution';
 $lang->moduleOrder[60]  = 'task';
 $lang->moduleOrder[65]  = 'build';
@@ -73,26 +73,25 @@ $lang->index->methodOrder[0] = 'index';
 
 /* My module. */
 $lang->resource->my = new stdclass();
-$lang->resource->my->index           = 'index';
+$lang->resource->my->index           = 'indexAction';
 $lang->resource->my->todo            = 'todo';
-$lang->resource->my->calendar        = 'calendar';
-$lang->resource->my->work            = 'work';
-$lang->resource->my->contribute      = 'contribute';
-$lang->resource->my->project         = 'project';
-$lang->resource->my->profile         = 'profile';
+$lang->resource->my->calendar        = 'calendarAction';
+$lang->resource->my->work            = 'workAction';
+$lang->resource->my->contribute      = 'contributeAction';
+$lang->resource->my->profile         = 'profileAction';
 $lang->resource->my->uploadAvatar    = 'uploadAvatar';
 $lang->resource->my->preference      = 'preference';
-$lang->resource->my->dynamic         = 'dynamic';
+$lang->resource->my->dynamic         = 'dynamicAction';
 $lang->resource->my->editProfile     = 'editProfile';
 $lang->resource->my->changePassword  = 'changePassword';
 $lang->resource->my->manageContacts  = 'manageContacts';
 $lang->resource->my->deleteContacts  = 'deleteContacts';
 $lang->resource->my->score           = 'score';
-$lang->resource->my->unbind          = 'unbind';
 $lang->resource->my->team            = 'team';
 $lang->resource->my->story           = 'story';
 $lang->resource->my->task            = 'task';
 $lang->resource->my->bug             = 'bug';
+$lang->resource->my->doc             = 'doc';
 $lang->resource->my->testtask        = 'testtask';
 $lang->resource->my->testcase        = 'testcase';
 $lang->resource->my->execution       = 'execution';
@@ -119,6 +118,7 @@ $lang->my->methodOrder[90]  = 'bug';
 $lang->my->methodOrder[95]  = 'testtask';
 $lang->my->methodOrder[100] = 'testcase';
 $lang->my->methodOrder[105] = 'execution';
+$lang->my->methodOrder[110] = 'doc';
 
 /* Todo. */
 $lang->resource->todo = new stdclass();
@@ -139,31 +139,15 @@ $lang->resource->todo->activate     = 'activate';
 $lang->resource->todo->close        = 'close';
 $lang->resource->todo->batchClose   = 'batchClose';
 
-$lang->todo->methodOrder[5]  = 'create';
-$lang->todo->methodOrder[10] = 'createCycle';
-$lang->todo->methodOrder[15] = 'batchCreate';
-$lang->todo->methodOrder[20] = 'edit';
-$lang->todo->methodOrder[25] = 'batchEdit';
-$lang->todo->methodOrder[30] = 'view';
-$lang->todo->methodOrder[35] = 'delete';
-$lang->todo->methodOrder[40] = 'export';
-$lang->todo->methodOrder[45] = 'start';
-$lang->todo->methodOrder[50] = 'finish';
-$lang->todo->methodOrder[55] = 'batchFinish';
-$lang->todo->methodOrder[60] = 'import2Today';
-$lang->todo->methodOrder[65] = 'assignTo';
-$lang->todo->methodOrder[70] = 'activate';
-$lang->todo->methodOrder[75] = 'close';
-$lang->todo->methodOrder[80] = 'batchClose';
-
 global $config;
 if($config->systemMode == 'new')
 {
+    $lang->resource->my->project = 'project';
+
     /* Program. */
     $lang->resource->program = new stdclass();
-    $lang->resource->program->createGuide             = 'createGuide';
-    //$lang->resource->program->index                 = 'index';
     $lang->resource->program->browse                  = 'browse';
+    $lang->resource->program->view                    = 'view';
     $lang->resource->program->product                 = 'product';
     $lang->resource->program->create                  = 'create';
     $lang->resource->program->edit                    = 'edit';
@@ -177,58 +161,68 @@ if($config->systemMode == 'new')
     $lang->resource->program->createStakeholder       = 'createStakeholder';
     $lang->resource->program->unlinkStakeholder       = 'unlinkStakeholder';
     $lang->resource->program->batchUnlinkStakeholders = 'batchUnlinkStakeholders';
+    $lang->resource->program->unbindWhitelist         = 'unbindWhitelist';
     $lang->resource->program->export                  = 'export';
 
-    $lang->program->methodOrder[0]   = 'createGuide';
-    //$lang->program->methodOrder[5]   = 'index';
-    $lang->program->methodOrder[10]  = 'browse';
-    $lang->program->methodOrder[15]  = 'product';
-    $lang->program->methodOrder[20]  = 'create';
-    $lang->program->methodOrder[25]  = 'edit';
-    $lang->program->methodOrder[30]  = 'start';
-    $lang->program->methodOrder[35]  = 'suspend';
-    $lang->program->methodOrder[40]  = 'close';
-    $lang->program->methodOrder[45]  = 'activate';
-    $lang->program->methodOrder[55]  = 'delete';
-    $lang->program->methodOrder[60]  = 'project';
-    $lang->program->methodOrder[65]  = 'stakeholder';
-    $lang->program->methodOrder[67]  = 'createStakeholder';
-    $lang->program->methodOrder[70]  = 'unlinkStakeholder';
-    $lang->program->methodOrder[75]  = 'batchUnlinkStakeholders';
-    $lang->program->methodOrder[80]  = 'export';
+    $lang->program->methodOrder[5]  = 'browse';
+    $lang->program->methodOrder[10] = 'view';
+    $lang->program->methodOrder[15] = 'product';
+    $lang->program->methodOrder[20] = 'create';
+    $lang->program->methodOrder[25] = 'edit';
+    $lang->program->methodOrder[30] = 'view';
+    $lang->program->methodOrder[35] = 'start';
+    $lang->program->methodOrder[40] = 'suspend';
+    $lang->program->methodOrder[45] = 'activate';
+    $lang->program->methodOrder[50] = 'close';
+    $lang->program->methodOrder[55] = 'delete';
+    $lang->program->methodOrder[60] = 'project';
+    $lang->program->methodOrder[65] = 'stakeholder';
+    $lang->program->methodOrder[70] = 'createStakeholder';
+    $lang->program->methodOrder[75] = 'unlinkStakeholder';
+    $lang->program->methodOrder[80] = 'batchUnlinkStakeholders';
+    $lang->program->methodOrder[85] = 'unbindWhitelist';
+    $lang->program->methodOrder[90] = 'export';
 
     /* Project. */
     $lang->resource->project = new stdclass();
-    $lang->resource->project->index             = 'index';
-    $lang->resource->project->browse            = 'browse';
-    $lang->resource->project->programTitle      = 'moduleOpen';
-    $lang->resource->project->create            = 'create';
-    $lang->resource->project->edit              = 'edit';
-    $lang->resource->project->batchEdit         = 'batchEdit';
-    $lang->resource->project->group             = 'group';
-    $lang->resource->project->createGroup       = 'createGroup';
-    $lang->resource->project->manageView        = 'manageView';
-    $lang->resource->project->managePriv        = 'managePriv';
-    $lang->resource->project->manageMembers     = 'manageMembers';
-    $lang->resource->project->manageGroupMember = 'manageGroupMember';
-    $lang->resource->project->copyGroup         = 'copyGroup';
-    $lang->resource->project->editGroup         = 'editGroup';
-    $lang->resource->project->start             = 'start';
-    $lang->resource->project->suspend           = 'suspend';
-    $lang->resource->project->close             = 'close';
-    $lang->resource->project->activate          = 'activate';
-    $lang->resource->project->delete            = 'delete';
-    $lang->resource->project->view              = 'view';
-    $lang->resource->project->whitelist         = 'whitelist';
-    $lang->resource->project->addWhitelist      = 'addWhitelist';
-    $lang->resource->project->unbindWhitelist    = 'unbindWhitelist';
-    $lang->resource->project->manageProducts    = 'manageProducts';
-    $lang->resource->project->view              = 'view';
-    $lang->resource->project->dynamic           = 'dynamic';
+    $lang->resource->project->index               = 'index';
+    $lang->resource->project->browse              = 'browse';
+    $lang->resource->project->programTitle        = 'moduleOpen';
+    $lang->resource->project->create              = 'create';
+    $lang->resource->project->edit                = 'edit';
+    $lang->resource->project->batchEdit           = 'batchEdit';
+    $lang->resource->project->group               = 'group';
+    $lang->resource->project->createGroup         = 'createGroup';
+    $lang->resource->project->manageView          = 'manageView';
+    $lang->resource->project->managePriv          = 'managePriv';
+    $lang->resource->project->manageMembers       = 'manageMembers';
+    $lang->resource->project->manageGroupMember   = 'manageGroupMember';
+    $lang->resource->project->copyGroup           = 'copyGroup';
+    $lang->resource->project->editGroup           = 'editGroup';
+    $lang->resource->project->start               = 'start';
+    $lang->resource->project->suspend             = 'suspend';
+    $lang->resource->project->close               = 'close';
+    $lang->resource->project->activate            = 'activate';
+    $lang->resource->project->delete              = 'delete';
+    $lang->resource->project->view                = 'view';
+    $lang->resource->project->whitelist           = 'whitelist';
+    $lang->resource->project->addWhitelist        = 'addWhitelist';
+    $lang->resource->project->unbindWhitelist     = 'unbindWhitelist';
+    $lang->resource->project->manageProducts      = 'manageProducts';
+    $lang->resource->project->dynamic             = 'dynamic';
+    $lang->resource->project->build               = 'build';
+    $lang->resource->project->qa                  = 'qa';
+    $lang->resource->project->bug                 = 'bug';
+    $lang->resource->project->testcase            = 'testcase';
+    $lang->resource->project->testtask            = 'testtask';
+    $lang->resource->project->testreport          = 'testreport';
+    $lang->resource->project->execution           = 'execution';
+    $lang->resource->project->export              = 'export';
+    $lang->resource->project->createGuide         = 'createGuide';
 
     $lang->project->methodOrder[0]   = 'index';
     $lang->project->methodOrder[5]   = 'browse';
-    $lang->project->methodOrder[10]  = 'programTitle';
+    $lang->project->methodOrder[10]  = 'projectTitle';
     $lang->project->methodOrder[15]  = 'create';
     $lang->project->methodOrder[20]  = 'edit';
     $lang->project->methodOrder[25]  = 'batchEdit';
@@ -253,6 +247,20 @@ if($config->systemMode == 'new')
     $lang->project->methodOrder[120] = 'manageProducts';
     $lang->project->methodOrder[125] = 'view';
     $lang->project->methodOrder[130] = 'dynamic';
+    $lang->project->methodOrder[135] = 'build';
+    $lang->project->methodOrder[140] = 'qa';
+    $lang->project->methodOrder[145] = 'bug';
+    $lang->project->methodOrder[150] = 'testcase';
+    $lang->project->methodOrder[155] = 'testtask';
+    $lang->project->methodOrder[160] = 'testreport';
+    $lang->project->methodOrder[165] = 'execution';
+    $lang->project->methodOrder[170] = 'export';
+    $lang->project->methodOrder[175] = 'createGuide';
+
+    $lang->resource->projectbuild = new stdclass();
+    $lang->resource->projectbuild->browse = 'browse';
+
+    $lang->projectbuild->methodOrder[5] = 'browse';
 
     /* Personnel . */
     $lang->resource->personnel = new stdclass();
@@ -271,7 +279,7 @@ if($config->systemMode == 'new')
     /* Project Story. */
     $lang->resource->projectstory = new stdclass();
     $lang->resource->projectstory->story             = 'story';
-    $lang->resource->projectstory->track             = 'track';
+    $lang->resource->projectstory->track             = 'trackAction';
     $lang->resource->projectstory->view              = 'view';
     $lang->resource->projectstory->linkStory         = 'linkStory';
     $lang->resource->projectstory->unlinkStory       = 'unlinkStory';
@@ -284,13 +292,9 @@ if($config->systemMode == 'new')
     $lang->projectstory->methodOrder[25] = 'unlinkStory';
     $lang->projectstory->methodOrder[23] = 'importplanstories';
 
-    /* Release. */
-    $lang->resource->projectbuild = new stdclass();
-    $lang->resource->projectbuild->browse = 'browse';
-
     /* Release. */
     $lang->resource->projectrelease = new stdclass();
-    $lang->resource->projectrelease->browse           = 'browse';
+    $lang->resource->projectrelease->browse           = 'browseAction';
     $lang->resource->projectrelease->create           = 'create';
     $lang->resource->projectrelease->edit             = 'edit';
     $lang->resource->projectrelease->delete           = 'delete';
@@ -317,11 +321,47 @@ if($config->systemMode == 'new')
     $lang->projectrelease->methodOrder[60] = 'unlinkBug';
     $lang->projectrelease->methodOrder[65] = 'batchUnlinkBug';
     $lang->projectrelease->methodOrder[70] = 'changeStatus';
+
+    /* Stakeholer. */
+    $lang->resource->stakeholder = new stdclass();
+    $lang->resource->stakeholder->browse       = 'browse';
+    $lang->resource->stakeholder->create       = 'create';
+    $lang->resource->stakeholder->batchCreate  = 'batchCreate';
+    $lang->resource->stakeholder->edit         = 'edit';
+    $lang->resource->stakeholder->delete       = 'delete';
+    $lang->resource->stakeholder->view         = 'viewAction';
+    $lang->resource->stakeholder->issue        = 'issue';
+    $lang->resource->stakeholder->viewIssue    = 'viewIssueAction';
+    $lang->resource->stakeholder->communicate  = 'communicate';
+    $lang->resource->stakeholder->expect       = 'expect';
+    $lang->resource->stakeholder->expectation  = 'expectation';
+    $lang->resource->stakeholder->deleteExpect = 'deleteExpect';
+    $lang->resource->stakeholder->createExpect = 'createExpect';
+    $lang->resource->stakeholder->editExpect   = 'editExpect';
+    $lang->resource->stakeholder->viewExpect   = 'viewExpect';
+    $lang->resource->stakeholder->userIssue    = 'userIssue';
+
+    $lang->stakeholder->methodOrder[5]  = 'browse';
+    $lang->stakeholder->methodOrder[10] = 'create';
+    $lang->stakeholder->methodOrder[13] = 'batchCreate';
+    $lang->stakeholder->methodOrder[15] = 'edit';
+    $lang->stakeholder->methodOrder[25] = 'delete';
+    $lang->stakeholder->methodOrder[30] = 'view';
+    $lang->stakeholder->methodOrder[35] = 'issue';
+    $lang->stakeholder->methodOrder[40] = 'viewIssue';
+    $lang->stakeholder->methodOrder[45] = 'communicate';
+    $lang->stakeholder->methodOrder[50] = 'expect';
+    $lang->stakeholder->methodOrder[55] = 'expectation';
+    $lang->stakeholder->methodOrder[60] = 'deleteExpect';
+    $lang->stakeholder->methodOrder[65] = 'createExpect';
+    $lang->stakeholder->methodOrder[70] = 'editExpect';
+    $lang->stakeholder->methodOrder[75] = 'viewExpect';
+    $lang->stakeholder->methodOrder[80] = 'userIssue';
 }
 
 /* Product. */
 $lang->resource->product = new stdclass();
-$lang->resource->product->index          = 'index';
+$lang->resource->product->index          = 'indexAction';
 $lang->resource->product->browse         = 'browse';
 $lang->resource->product->create         = 'create';
 $lang->resource->product->view           = 'view';
@@ -373,47 +413,11 @@ $lang->branch->methodOrder[0]  = 'manage';
 $lang->branch->methodOrder[5]  = 'sort';
 $lang->branch->methodOrder[10] = 'delete';
 
-/* Stakeholer. */
-$lang->resource->stakeholder = new stdclass();
-$lang->resource->stakeholder->browse       = 'browse';
-$lang->resource->stakeholder->create       = 'create';
-$lang->resource->stakeholder->batchCreate  = 'batchCreate';
-$lang->resource->stakeholder->edit         = 'edit';
-$lang->resource->stakeholder->delete       = 'delete';
-$lang->resource->stakeholder->view         = 'view';
-$lang->resource->stakeholder->issue        = 'issue';
-$lang->resource->stakeholder->viewIssue    = 'viewIssue';
-$lang->resource->stakeholder->communicate  = 'communicate';
-$lang->resource->stakeholder->expect       = 'expect';
-$lang->resource->stakeholder->expectation  = 'expectation';
-$lang->resource->stakeholder->deleteExpect = 'deleteExpect';
-$lang->resource->stakeholder->createExpect = 'createExpect';
-$lang->resource->stakeholder->editExpect   = 'editExpect';
-$lang->resource->stakeholder->viewExpect   = 'viewExpect';
-$lang->resource->stakeholder->userIssue    = 'userIssue';
-
-$lang->stakeholder->methodOrder[5]  = 'browse';
-$lang->stakeholder->methodOrder[10] = 'create';
-$lang->stakeholder->methodOrder[13] = 'batchCreate';
-$lang->stakeholder->methodOrder[15] = 'edit';
-$lang->stakeholder->methodOrder[25] = 'delete';
-$lang->stakeholder->methodOrder[30] = 'view';
-$lang->stakeholder->methodOrder[35] = 'issue';
-$lang->stakeholder->methodOrder[40] = 'viewIssue';
-$lang->stakeholder->methodOrder[45] = 'communicate';
-$lang->stakeholder->methodOrder[50] = 'expect';
-$lang->stakeholder->methodOrder[55] = 'expectation';
-$lang->stakeholder->methodOrder[60] = 'deleteExpect';
-$lang->stakeholder->methodOrder[65] = 'createExpect';
-$lang->stakeholder->methodOrder[70] = 'editExpect';
-$lang->stakeholder->methodOrder[75] = 'viewExpect';
-$lang->stakeholder->methodOrder[80] = 'userIssue';
-
 /* Story. */
 $lang->resource->story = new stdclass();
 $lang->resource->story->create      = 'create';
 $lang->resource->story->batchCreate = 'batchCreate';
-$lang->resource->story->edit        = 'edit';
+$lang->resource->story->edit        = 'editAction';
 $lang->resource->story->linkStory   = 'linkStory';
 $lang->resource->story->batchEdit   = 'batchEdit';
 $lang->resource->story->export      = 'exportAction';
@@ -437,7 +441,7 @@ $lang->resource->story->batchChangeStage   = 'batchChangeStage';
 $lang->resource->story->batchAssignTo      = 'batchAssignTo';
 $lang->resource->story->batchChangeModule  = 'batchChangeModule';
 $lang->resource->story->batchToTask        = 'batchToTask';
-$lang->resource->story->track              = 'track';
+$lang->resource->story->track              = 'trackAB';
 $lang->resource->story->processStoryChange = 'processStoryChange';
 
 $lang->story->methodOrder[5]   = 'create';
@@ -531,15 +535,15 @@ $lang->resource->execution = new stdclass();
 $lang->resource->execution->index             = 'index';
 $lang->resource->execution->view              = 'view';
 $lang->resource->execution->browse            = 'browse';
-$lang->resource->execution->create            = 'create';
-$lang->resource->execution->edit              = 'edit';
-$lang->resource->execution->batchedit         = 'batchEdit';
+$lang->resource->execution->create            = 'createExec';
+$lang->resource->execution->edit              = 'editAction';
+$lang->resource->execution->batchedit         = 'batchEditAction';
 $lang->resource->execution->start             = 'startAction';
 $lang->resource->execution->activate          = 'activateAction';
 $lang->resource->execution->putoff            = 'delayAction';
 $lang->resource->execution->suspend           = 'suspendAction';
 $lang->resource->execution->close             = 'closeAction';
-$lang->resource->execution->delete            = 'delete';
+$lang->resource->execution->delete            = 'deleteAB';
 $lang->resource->execution->task              = 'task';
 $lang->resource->execution->grouptask         = 'groupTask';
 $lang->resource->execution->importtask        = 'importTask';
@@ -547,8 +551,11 @@ $lang->resource->execution->importplanstories = 'importPlanStories';
 $lang->resource->execution->importBug         = 'importBug';
 $lang->resource->execution->story             = 'story';
 $lang->resource->execution->build             = 'build';
-$lang->resource->execution->testtask          = 'testtaskAction';
+//$lang->resource->execution->qa                = 'qa';
+$lang->resource->execution->testtask          = 'testtask';
+$lang->resource->execution->testcase          = 'testcase';
 $lang->resource->execution->bug               = 'bug';
+$lang->resource->execution->testreport        = 'testreport';
 $lang->resource->execution->burn              = 'burn';
 $lang->resource->execution->computeBurn       = 'computeBurnAction';
 $lang->resource->execution->fixFirst          = 'fixFirst';
@@ -563,13 +570,13 @@ $lang->resource->execution->unlinkMember      = 'unlinkMember';
 $lang->resource->execution->linkStory         = 'linkStory';
 $lang->resource->execution->unlinkStory       = 'unlinkStory';
 $lang->resource->execution->batchUnlinkStory  = 'batchUnlinkStory';
-$lang->resource->execution->updateOrder       = 'updateOrder';
+//$lang->resource->execution->updateOrder       = 'updateOrder';
 $lang->resource->execution->kanban            = 'kanbanAction';
 $lang->resource->execution->printKanban       = 'printKanbanAction';
 $lang->resource->execution->tree              = 'treeAction';
 $lang->resource->execution->treeTask          = 'treeOnlyTask';
 $lang->resource->execution->treeStory         = 'treeOnlyStory';
-$lang->resource->execution->all               = 'allExecutions';
+$lang->resource->execution->all               = 'allExecutionAB';
 $lang->resource->execution->kanbanHideCols    = 'kanbanHideCols';
 $lang->resource->execution->kanbanColsColor   = 'kanbanColsColor';
 $lang->resource->execution->export            = 'exportAction';
@@ -577,10 +584,11 @@ $lang->resource->execution->storyKanban       = 'storyKanban';
 $lang->resource->execution->storySort         = 'storySort';
 $lang->resource->execution->whitelist         = 'whitelist';
 $lang->resource->execution->addWhitelist      = 'addWhitelist';
-$lang->resource->execution->unbindWhitelist    = 'unbindWhitelist';
+$lang->resource->execution->unbindWhitelist   = 'unbindWhitelist';
+$lang->resource->execution->storyEstimate     = 'storyEstimate';
 //if($config->systemMode == 'classic') $lang->resource->project->list = 'list';
 
-$lang->execution->methodOrder[0]   = 'index';
+//$lang->execution->methodOrder[0]   = 'index';
 //if($config->systemMode == 'classic') $lang->project->methodOrder[1] = 'list';
 $lang->execution->methodOrder[5]   = 'view';
 $lang->execution->methodOrder[10]  = 'browse';
@@ -600,36 +608,40 @@ $lang->execution->methodOrder[80]  = 'importplanstories';
 $lang->execution->methodOrder[85]  = 'importBug';
 $lang->execution->methodOrder[90]  = 'story';
 $lang->execution->methodOrder[95]  = 'build';
-$lang->execution->methodOrder[100] = 'testtask';
-$lang->execution->methodOrder[105] = 'bug';
-$lang->execution->methodOrder[110] = 'burn';
-$lang->execution->methodOrder[115] = 'computeBurn';
-$lang->execution->methodOrder[120] = 'fixFirst';
-$lang->execution->methodOrder[125] = 'burnData';
-$lang->execution->methodOrder[130] = 'team';
+$lang->execution->methodOrder[100] = 'qa';
+$lang->execution->methodOrder[105] = 'testcase';
+$lang->execution->methodOrder[110] = 'bug';
+$lang->execution->methodOrder[115] = 'testtask';
+$lang->execution->methodOrder[120] = 'testreport';
+$lang->execution->methodOrder[125] = 'burn';
+$lang->execution->methodOrder[130] = 'computeBurn';
+$lang->execution->methodOrder[135] = 'fixFirst';
+$lang->execution->methodOrder[140] = 'burnData';
+$lang->execution->methodOrder[145] = 'team';
 //$lang->execution->methodOrder[130] = 'doc';
-$lang->execution->methodOrder[135] = 'dynamic';
-$lang->execution->methodOrder[140] = 'manageProducts';
-$lang->execution->methodOrder[145] = 'manageMembers';
-$lang->execution->methodOrder[150] = 'unlinkMember';
-$lang->execution->methodOrder[155] = 'linkStory';
-$lang->execution->methodOrder[160] = 'unlinkStory';
-$lang->execution->methodOrder[165] = 'batchUnlinkStory';
-$lang->execution->methodOrder[170] = 'updateOrder';
-$lang->execution->methodOrder[175] = 'kanban';
-$lang->execution->methodOrder[180] = 'printKanban';
-$lang->execution->methodOrder[185] = 'kanbanHideCols';
-$lang->execution->methodOrder[190] = 'kanbanColsColor';
-$lang->execution->methodOrder[195] = 'tree';
-$lang->execution->methodOrder[200] = 'treeTask';
-$lang->execution->methodOrder[205] = 'treeStory';
-$lang->execution->methodOrder[210] = 'all';
-$lang->execution->methodOrder[215] = 'export';
-$lang->execution->methodOrder[220] = 'storyKanban';
-$lang->execution->methodOrder[225] = 'storySort';
-$lang->execution->methodOrder[230] = 'whitelist';
-$lang->execution->methodOrder[235] = 'addWhitelist';
-$lang->execution->methodOrder[240] = 'unbindWhitelist';
+$lang->execution->methodOrder[150] = 'dynamic';
+$lang->execution->methodOrder[155] = 'manageProducts';
+$lang->execution->methodOrder[160] = 'manageMembers';
+$lang->execution->methodOrder[165] = 'unlinkMember';
+$lang->execution->methodOrder[170] = 'linkStory';
+$lang->execution->methodOrder[175] = 'unlinkStory';
+$lang->execution->methodOrder[180] = 'batchUnlinkStory';
+$lang->execution->methodOrder[185] = 'updateOrder';
+$lang->execution->methodOrder[190] = 'kanban';
+$lang->execution->methodOrder[195] = 'printKanban';
+$lang->execution->methodOrder[200] = 'kanbanHideCols';
+$lang->execution->methodOrder[205] = 'kanbanColsColor';
+$lang->execution->methodOrder[210] = 'tree';
+$lang->execution->methodOrder[215] = 'treeTask';
+$lang->execution->methodOrder[220] = 'treeStory';
+$lang->execution->methodOrder[225] = 'all';
+$lang->execution->methodOrder[230] = 'export';
+$lang->execution->methodOrder[235] = 'storyKanban';
+$lang->execution->methodOrder[240] = 'storySort';
+$lang->execution->methodOrder[245] = 'whitelist';
+$lang->execution->methodOrder[250] = 'addWhitelist';
+$lang->execution->methodOrder[255] = 'unbindWhitelist';
+$lang->execution->methodOrder[260] = 'storyEstimate';
 
 /* Task. */
 $lang->resource->task = new stdclass();
@@ -653,7 +665,7 @@ $lang->resource->task->delete             = 'deleteAction';
 $lang->resource->task->view               = 'view';
 $lang->resource->task->export             = 'exportAction';
 $lang->resource->task->confirmStoryChange = 'confirmStoryChange';
-$lang->resource->task->recordEstimate     = 'recordEstimate';
+$lang->resource->task->recordEstimate     = 'recordEstimateAction';
 $lang->resource->task->editEstimate       = 'editEstimate';
 $lang->resource->task->deleteEstimate     = 'deleteEstimate';
 $lang->resource->task->report             = 'reportChart';
@@ -708,13 +720,12 @@ $lang->build->methodOrder[50] = 'batchUnlinkBug';
 
 /* QA. */
 $lang->resource->qa = new stdclass();
-$lang->resource->qa->index = 'index';
+$lang->resource->qa->index = 'indexAction';
 
 $lang->qa->methodOrder[0] = 'index';
 
 /* Bug. */
 $lang->resource->bug = new stdclass();
-$lang->resource->bug->index              = 'index';
 $lang->resource->bug->browse             = 'browse';
 $lang->resource->bug->create             = 'create';
 $lang->resource->bug->batchCreate        = 'batchCreate';
@@ -766,7 +777,6 @@ $lang->bug->methodOrder[110] = 'batchChangeBranch';
 
 /* Test case. */
 $lang->resource->testcase = new stdclass();
-$lang->resource->testcase->index              = 'index';
 $lang->resource->testcase->browse             = 'browse';
 $lang->resource->testcase->groupCase          = 'groupCase';
 $lang->resource->testcase->create             = 'create';
@@ -821,11 +831,10 @@ $lang->testcase->methodOrder[115] = 'batchCaseTypeChange';
 
 /* Test task. */
 $lang->resource->testtask = new stdclass();
-$lang->resource->testtask->index            = 'index';
 $lang->resource->testtask->create           = 'create';
 $lang->resource->testtask->browse           = 'browse';
-$lang->resource->testtask->view             = 'view';
-$lang->resource->testtask->cases            = 'cases';
+$lang->resource->testtask->view             = 'viewAction';
+$lang->resource->testtask->cases            = 'casesAction';
 $lang->resource->testtask->groupCase        = 'groupCase';
 $lang->resource->testtask->edit             = 'edit';
 $lang->resource->testtask->start            = 'startAction';
@@ -904,10 +913,10 @@ $lang->testsuite->methodOrder[40] = 'batchUnlinkCases';
 
 $lang->resource->caselib = new stdclass();
 $lang->resource->caselib->index            = 'index';
-$lang->resource->caselib->browse           = 'browse';
+$lang->resource->caselib->browse           = 'browseAction';
 $lang->resource->caselib->create           = 'create';
 $lang->resource->caselib->edit             = 'edit';
-$lang->resource->caselib->delete           = 'delete';
+$lang->resource->caselib->delete           = 'deleteAction';
 $lang->resource->caselib->view             = 'view';
 $lang->resource->caselib->createCase       = 'createCase';
 $lang->resource->caselib->batchCreateCase  = 'batchCreateCase';
@@ -933,7 +942,7 @@ $lang->resource->automation->browse = 'browse';
 $lang->automation->methodOrder[0] = 'browse';
 
 $lang->resource->repo                 = new stdclass();
-$lang->resource->repo->browse         = 'browse';
+$lang->resource->repo->browse         = 'browseAction';
 $lang->resource->repo->view           = 'view';
 $lang->resource->repo->log            = 'log';
 $lang->resource->repo->revision       = 'revisionAction';
@@ -943,7 +952,7 @@ $lang->resource->repo->edit           = 'editAction';
 $lang->resource->repo->delete         = 'delete';
 $lang->resource->repo->showSyncCommit = 'showSyncCommit';
 $lang->resource->repo->diff           = 'diffAction';
-$lang->resource->repo->download       = 'download';
+$lang->resource->repo->download       = 'downloadAction';
 $lang->resource->repo->maintain       = 'maintain';
 $lang->resource->repo->setRules       = 'setRules';
 
@@ -974,10 +983,10 @@ $lang->compile->methodOrder[5]  = 'browse';
 $lang->compile->methodOrder[10] = 'logs';
 
 $lang->resource->jenkins = new stdclass();
-$lang->resource->jenkins->browse = 'browse';
+$lang->resource->jenkins->browse = 'browseAction';
 $lang->resource->jenkins->create = 'create';
 $lang->resource->jenkins->edit   = 'edit';
-$lang->resource->jenkins->delete = 'delete';
+$lang->resource->jenkins->delete = 'deleteAction';
 
 $lang->jenkins->methodOrder[5]  = 'browse';
 $lang->jenkins->methodOrder[10] = 'create';
@@ -985,7 +994,7 @@ $lang->jenkins->methodOrder[15] = 'edit';
 $lang->jenkins->methodOrder[20] = 'delete';
 
 $lang->resource->job = new stdclass();
-$lang->resource->job->browse = 'browse';
+$lang->resource->job->browse = 'browseAction';
 $lang->resource->job->create = 'create';
 $lang->resource->job->edit   = 'edit';
 $lang->resource->job->delete = 'delete';
@@ -1002,8 +1011,8 @@ $lang->job->methodOrder[25] = 'exec';
 $lang->resource->doc = new stdclass();
 $lang->resource->doc->index      = 'index';
 $lang->resource->doc->browse     = 'browse';
-$lang->resource->doc->createlib  = 'createlib';
-$lang->resource->doc->editlib    = 'editlib';
+$lang->resource->doc->createLib  = 'createLib';
+$lang->resource->doc->editLib    = 'editLib';
 $lang->resource->doc->deleteLib  = 'deleteLib';
 $lang->resource->doc->create     = 'create';
 $lang->resource->doc->view       = 'view';
@@ -1012,27 +1021,21 @@ $lang->resource->doc->delete     = 'delete';
 $lang->resource->doc->deleteFile = 'deleteFile';
 $lang->resource->doc->allLibs    = 'allLibs';
 $lang->resource->doc->objectLibs = 'objectLibs';
-$lang->resource->doc->showFiles  = 'showFiles';
-$lang->resource->doc->sort       = 'sort';
-$lang->resource->doc->collect    = 'collect';
-//$lang->resource->doc->diff       = 'diff';
+$lang->resource->doc->collect    = 'collectAction';
 
 $lang->doc->methodOrder[0]  = 'index';
 $lang->doc->methodOrder[5]  = 'browse';
-$lang->doc->methodOrder[10] = 'createlib';
+$lang->doc->methodOrder[10] = 'createLib';
 $lang->doc->methodOrder[15] = 'editLib';
-$lang->doc->methodOrder[20] = 'deletelib';
+$lang->doc->methodOrder[20] = 'deleteLib';
 $lang->doc->methodOrder[25] = 'create';
 $lang->doc->methodOrder[30] = 'view';
 $lang->doc->methodOrder[35] = 'edit';
 $lang->doc->methodOrder[40] = 'delete';
 $lang->doc->methodOrder[45] = 'deleteFile';
 $lang->doc->methodOrder[50] = 'allLibs';
-$lang->doc->methodOrder[55] = 'showFiles';
-$lang->doc->methodOrder[60] = 'objectLibs';
-$lang->doc->methodOrder[65] = 'sort';
-$lang->doc->methodOrder[70] = 'collect';
-//$lang->doc->methodOrder[55] = 'diff';
+$lang->doc->methodOrder[55] = 'objectLibs';
+$lang->doc->methodOrder[60] = 'collect';
 
 /* Mail. */
 $lang->resource->mail = new stdclass();
@@ -1078,6 +1081,7 @@ $lang->resource->custom->timezone           = 'timezone';
 $lang->resource->custom->setStoryConcept    = 'setStoryConcept';
 $lang->resource->custom->editStoryConcept   = 'editStoryConcept';
 $lang->resource->custom->browseStoryConcept = 'browseStoryConcept';
+$lang->resource->custom->setDefaultConcept  = 'setDefaultConcept';
 $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
 
 $lang->custom->methodOrder[5]  = 'index';
@@ -1089,10 +1093,11 @@ $lang->custom->methodOrder[30] = 'flow';
 $lang->custom->methodOrder[35] = 'working';
 $lang->custom->methodOrder[40] = 'setPublic';
 $lang->custom->methodOrder[45] = 'timezone';
-$lang->custom->methodOrder[50] = 'setStoryContcept';
-$lang->custom->methodOrder[55] = 'editStoryContcept';
-$lang->custom->methodOrder[60] = 'browseStoryContcept';
-$lang->custom->methodOrder[65] = 'deleteStoryContcept';
+$lang->custom->methodOrder[50] = 'setStoryConcept';
+$lang->custom->methodOrder[55] = 'editStoryConcept';
+$lang->custom->methodOrder[60] = 'browseStoryConcept';
+$lang->custom->methodOrder[65] = 'setDefaultConcept';
+$lang->custom->methodOrder[70] = 'deleteStoryConcept';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';
@@ -1199,12 +1204,12 @@ $lang->user->methodOrder[30] = 'todo';
 $lang->user->methodOrder[35] = 'task';
 $lang->user->methodOrder[40] = 'bug';
 $lang->user->methodOrder[45] = 'project';
-$lang->user->methodOrder[50] = 'dynamic';
-$lang->user->methodOrder[55] = 'cropAvatar';
-$lang->user->methodOrder[60] = 'profile';
-$lang->user->methodOrder[65] = 'batchEdit';
-$lang->user->methodOrder[70] = 'unbind';
-$lang->user->methodOrder[75] = 'setPublicTemplate';
+$lang->user->methodOrder[60] = 'dynamic';
+$lang->user->methodOrder[65] = 'cropAvatar';
+$lang->user->methodOrder[70] = 'profile';
+$lang->user->methodOrder[75] = 'batchEdit';
+$lang->user->methodOrder[80] = 'unbind';
+$lang->user->methodOrder[85] = 'setPublicTemplate';
 
 /* Tree. */
 $lang->resource->tree = new stdclass();
@@ -1226,14 +1231,14 @@ $lang->tree->methodOrder[30] = 'delete';
 /* Report. */
 $lang->resource->report = new stdclass();
 $lang->resource->report->index              = 'index';
-$lang->resource->report->executionDeviation = 'executionDeviation';
+$lang->resource->report->projectDeviation   = 'projectDeviation';
 $lang->resource->report->productSummary     = 'productSummary';
 $lang->resource->report->bugCreate          = 'bugCreate';
 $lang->resource->report->bugAssign          = 'bugAssign';
 $lang->resource->report->workload           = 'workload';
 
 $lang->report->methodOrder[0]  = 'index';
-$lang->report->methodOrder[5]  = 'executionDeviation';
+$lang->report->methodOrder[5]  = 'projectDeviation';
 $lang->report->methodOrder[10] = 'productSummary';
 $lang->report->methodOrder[15] = 'bugCreate';
 $lang->report->methodOrder[20] = 'workload';
@@ -1276,7 +1281,7 @@ $lang->admin->methodOrder[30] = 'ztCompany';
 
 /* Extension. */
 $lang->resource->extension = new stdclass();
-$lang->resource->extension->browse     = 'browse';
+$lang->resource->extension->browse     = 'browseAction';
 $lang->resource->extension->obtain     = 'obtain';
 $lang->resource->extension->structure  = 'structureAction';
 $lang->resource->extension->install    = 'install';
@@ -1300,11 +1305,11 @@ $lang->extension->methodOrder[50] = 'upgrade';
 
 /* Webhook. */
 $lang->resource->webhook = new stdclass();
-$lang->resource->webhook->browse     = 'browse';
+$lang->resource->webhook->browse     = 'list';
 $lang->resource->webhook->create     = 'create';
 $lang->resource->webhook->edit       = 'edit';
 $lang->resource->webhook->delete     = 'delete';
-$lang->resource->webhook->log        = 'log';
+$lang->resource->webhook->log        = 'logAction';
 $lang->resource->webhook->bind       = 'bind';
 $lang->resource->webhook->chooseDept = 'chooseDept';
 
@@ -1355,8 +1360,8 @@ $lang->message->methodOrder[15] = 'setting';
 
 $lang->resource->action = new stdclass();
 $lang->resource->action->trash    = 'trash';
-$lang->resource->action->undelete = 'undelete';
-$lang->resource->action->hideOne  = 'hideOne';
+$lang->resource->action->undelete = 'undeleteAction';
+$lang->resource->action->hideOne  = 'hideOneAction';
 $lang->resource->action->hideAll  = 'hideAll';
 $lang->resource->action->comment  = 'comment';
 $lang->resource->action->editComment = 'editComment';
@@ -1374,7 +1379,7 @@ $lang->resource->backup->backup      = 'backup';
 $lang->resource->backup->restore     = 'restore';
 $lang->resource->backup->change      = 'change';
 $lang->resource->backup->delete      = 'delete';
-$lang->resource->backup->setting     = 'setting';
+$lang->resource->backup->setting     = 'settingAction';
 $lang->resource->backup->rmPHPHeader = 'rmPHPHeader';
 
 $lang->backup->methodOrder[5]  = 'index';
@@ -1743,3 +1748,97 @@ $lang->changelog['12.3'][] = 'ci-commitResult';
 $lang->changelog['12.5'][] = 'story-batchToTask';
 $lang->changelog['12.5'][] = 'custom-product';
 $lang->changelog['12.5'][] = 'custom-project';
+
+$lang->changelog['15.0.rc1'][] = 'program-browse';
+$lang->changelog['15.0.rc1'][] = 'program-view';
+$lang->changelog['15.0.rc1'][] = 'program-product';
+$lang->changelog['15.0.rc1'][] = 'program-create';
+$lang->changelog['15.0.rc1'][] = 'program-edit';
+$lang->changelog['15.0.rc1'][] = 'program-start';
+$lang->changelog['15.0.rc1'][] = 'program-suspend';
+$lang->changelog['15.0.rc1'][] = 'program-activate';
+$lang->changelog['15.0.rc1'][] = 'program-close';
+$lang->changelog['15.0.rc1'][] = 'program-delete';
+$lang->changelog['15.0.rc1'][] = 'program-project';
+$lang->changelog['15.0.rc1'][] = 'program-stakeholder';
+$lang->changelog['15.0.rc1'][] = 'program-createStakeholder';
+$lang->changelog['15.0.rc1'][] = 'program-unlinkStakeholder';
+$lang->changelog['15.0.rc1'][] = 'program-batchUnlinkStakeholders';
+$lang->changelog['15.0.rc1'][] = 'program-unbindWhitelist';
+$lang->changelog['15.0.rc1'][] = 'program-export';
+$lang->changelog['15.0.rc1'][] = 'project-execution';
+$lang->changelog['15.0.rc1'][] = 'project-group';
+$lang->changelog['15.0.rc1'][] = 'project-createGroup';
+$lang->changelog['15.0.rc1'][] = 'project-manageView';
+$lang->changelog['15.0.rc1'][] = 'project-managePriv';
+$lang->changelog['15.0.rc1'][] = 'project-manageGroupMember';
+$lang->changelog['15.0.rc1'][] = 'project-copyGroup';
+$lang->changelog['15.0.rc1'][] = 'project-editGroup';
+$lang->changelog['15.0.rc1'][] = 'project-whitelist';
+$lang->changelog['15.0.rc1'][] = 'project-addWhitelist';
+$lang->changelog['15.0.rc1'][] = 'project-unbindWhitelist';
+$lang->changelog['15.0.rc1'][] = 'project-qa';
+$lang->changelog['15.0.rc1'][] = 'project-createGuide';
+$lang->changelog['15.0.rc1'][] = 'project-moduleOpen';
+$lang->changelog['15.0.rc1'][] = 'personnel-accessible';
+$lang->changelog['15.0.rc1'][] = 'personnel-invest';
+$lang->changelog['15.0.rc1'][] = 'personnel-whitelist';
+$lang->changelog['15.0.rc1'][] = 'personnel-addWhitelist';
+$lang->changelog['15.0.rc1'][] = 'personnel-unbindWhitelist';
+$lang->changelog['15.0.rc1'][] = 'my-workAction';
+$lang->changelog['15.0.rc1'][] = 'my-contributeAction';
+$lang->changelog['15.0.rc1'][] = 'my-testtask';
+$lang->changelog['15.0.rc1'][] = 'my-execution';
+$lang->changelog['15.0.rc1'][] = 'my-doc';
+$lang->changelog['15.0.rc1'][] = 'my-calendarAction';
+$lang->changelog['15.0.rc1'][] = 'story-trackAB';
+$lang->changelog['15.0.rc1'][] = 'story-processStoryChange';
+$lang->changelog['15.0.rc1'][] = 'projectstory-story';
+$lang->changelog['15.0.rc1'][] = 'projectstory-trackAction';
+$lang->changelog['15.0.rc1'][] = 'projectstory-view';
+$lang->changelog['15.0.rc1'][] = 'projectstory-linkStory';
+$lang->changelog['15.0.rc1'][] = 'projectstory-unlinkStory';
+$lang->changelog['15.0.rc1'][] = 'projectstory-importplanstories';
+$lang->changelog['15.0.rc1'][] = 'execution-whitelist';
+$lang->changelog['15.0.rc1'][] = 'execution-addWhitelist';
+$lang->changelog['15.0.rc1'][] = 'execution-unbindWhitelist';
+$lang->changelog['15.0.rc1'][] = 'automation-browse';
+$lang->changelog['15.0.rc1'][] = 'group-manageProjectAdmin';
+$lang->changelog['15.0.rc1'][] = 'user-execution';
+$lang->changelog['15.0.rc1'][] = 'custom-setStoryConcept';
+$lang->changelog['15.0.rc1'][] = 'custom-editStoryConcept';
+$lang->changelog['15.0.rc1'][] = 'custom-browseStoryConcept';
+$lang->changelog['15.0.rc1'][] = 'custom-setDefaultConcept';
+$lang->changelog['15.0.rc1'][] = 'custom-deleteStoryConcept';
+$lang->changelog['15.0.rc1'][] = 'search-index';
+$lang->changelog['15.0.rc1'][] = 'search-buildIndex';
+$lang->changelog['15.0.rc1'][] = 'projectbuild-browse';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-browseAction';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-create';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-edit';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-delete';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-view';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-export';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-linkStory';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-unlinkStory';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-batchUnlinkStory';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-linkBug';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-unlinkBug';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-batchUnlinkBug';
+$lang->changelog['15.0.rc1'][] = 'projectrelease-changeStatus';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-browse';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-create';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-batchCreate';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-edit';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-delete';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-viewAction';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-issue';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-viewIssueAction';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-communicate';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-expect';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-expectation';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-deleteExpect';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-createExpect';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-editExpect';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-viewExpect';
+$lang->changelog['15.0.rc1'][] = 'stakeholder-userIssue';
diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php
index f6fb87f221..0f6b989416 100644
--- a/module/group/lang/vi.php
+++ b/module/group/lang/vi.php
@@ -56,6 +56,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy Privileges';
 $lang->group->copyOptions['copyUser'] = 'Copy người dùng';
 
 $lang->group->versions['']           = 'Lịch sử';
+$lang->group->versions['15_0_rc1']  = 'ZenTao15.0.rc1';
 $lang->group->versions['12_5']       = 'ZenTao12.5';
 $lang->group->versions['12_3']       = 'ZenTao12.3';
 $lang->group->versions['11_6_2']     = 'ZenTao11.6.2';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 17c8462223..32bee9be0e 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -32,7 +32,7 @@ $lang->group->productList        = '可访问' . $lang->productCommon;
 $lang->group->projectList        = '可访问项目';
 $lang->group->dynamic            = '可查看动态';
 $lang->group->noticeVisit        = '空代表没有访问限制';
-$lang->group->noneProgram        = "暂时没有项目";
+$lang->group->noneProgram        = "暂时没有项目集";
 $lang->group->noneProduct        = "暂时没有{$lang->productCommon}";
 $lang->group->noneProject        = "暂时没有{$lang->executionCommon}";
 
@@ -56,6 +56,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
 $lang->group->versions['']          = '修改历史';
+$lang->group->versions['15_0_rc1']  = '禅道15.0.rc1';
 $lang->group->versions['12_5']      = '禅道12.5';
 $lang->group->versions['12_3']      = '禅道12.3';
 $lang->group->versions['11_6_2']    = '禅道11.6.2';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index de40fd1752..ced1b02502 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -26,13 +26,13 @@ $lang->group->confirmDelete      = '您確定刪除該用戶分組嗎？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '沒有保存，請確認選擇了權限數據。';
 $lang->group->viewList           = '可訪問視圖';
-$lang->group->manageProject      = '可管理项目';
+$lang->group->manageProject      = '可管理項目';
 $lang->group->programList        = '可訪問項目集';
 $lang->group->productList        = '可訪問' . $lang->productCommon;
 $lang->group->projectList        = '可訪問項目';
 $lang->group->dynamic            = '可查看動態';
 $lang->group->noticeVisit        = '空代表沒有訪問限制';
-$lang->group->noneProgram        = "暫時沒有項目";
+$lang->group->noneProgram        = "暫時沒有項目集";
 $lang->group->noneProduct        = "暫時沒有{$lang->productCommon}";
 $lang->group->noneProject        = "暫時沒有{$lang->executionCommon}";
 
@@ -56,6 +56,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
 $lang->group->versions['']          = '修改歷史';
+$lang->group->versions['15_0_rc1']  = '禪道15.0.rc1';
 $lang->group->versions['12_5']      = '禪道12.5';
 $lang->group->versions['12_3']      = '禪道12.3';
 $lang->group->versions['11_6_2']    = '禪道11.6.2';
diff --git a/module/group/model.php b/module/group/model.php
index 97f3a83336..902e84727a 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -27,7 +27,8 @@ class groupModel extends model
             unset($group->limited);
             $group->role = 'limited';
         }
-        return $this->dao->insert(TABLE_GROUP)->data($group)->batchCheck($this->config->group->create->requiredFields, 'notempty')->exec();
+        $this->dao->insert(TABLE_GROUP)->data($group)->batchCheck($this->config->group->create->requiredFields, 'notempty')->exec();
+        return $this->dao->lastInsertId();
     }
 
     /**
@@ -336,7 +337,7 @@ class groupModel extends model
     }
 
     /**
-     * Update view priv
+     * Update view priv.
      *
      * @param  int    $groupID
      * @access public
@@ -354,15 +355,7 @@ class groupModel extends model
             $dynamic = array();
             foreach($actions['actions'] as $moduleName => $moduleActions)
             {
-                if(isset($this->lang->menugroup->$moduleName))
-                {
-                    $groupModule = $this->lang->menugroup->$moduleName;
-                    if($groupModule != 'my' and !isset($actions['views'][$groupModule])) continue;
-                }
-                else
-                {
-                    if($moduleName != 'my' and !isset($actions['views'][$moduleName])) continue;
-                }
+                if($moduleName != 'todo' and isset($actions['views']) and !in_array($this->lang->navGroup->$moduleName, $actions['views'])) continue;
 
                 $dynamic[$moduleName] = $moduleActions;
             }
@@ -483,6 +476,8 @@ class groupModel extends model
         ksort($this->lang->moduleOrder, SORT_ASC);
         foreach($this->lang->moduleOrder as $moduleName)
         {
+            if(!isset($resources->$moduleName)) continue;
+
             $resource = $resources->$moduleName;
             unset($resources->$moduleName);
             $this->lang->resource->$moduleName = $resource;
diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php
index 99d12c5801..3712eb46e0 100644
--- a/module/group/view/copy.html.php
+++ b/module/group/view/copy.html.php
@@ -19,7 +19,7 @@
     <table align='center' class='table table-form'> 
       <tr>
         <th class='w-100px'><?php echo $lang->group->name;?></th>
-        <td><?php echo html::input('name', $group->name, "class='form-control'");?></td>
+        <td class='required'><?php echo html::input('name', $group->name, "class='form-control'");?></td>
       </tr>
       <tr>
         <th><?php echo $lang->group->desc;?></th>
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index 5c0aefa6db..723cf84131 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -48,8 +48,8 @@
           <tr>
             <th class='w-140px'>
               <div class="checkbox-primary checkbox-inline checkbox-right check-all">
-                <input type='checkbox' id='allOutSideChecker'>
-                <label class='text-right' for='allOutSideChecker'><?php echo $lang->group->outside;?></label>
+                <input type='checkbox' id='allOtherChecker'>
+                <label class='text-right' for='allOtherChecker'><?php echo $lang->group->outside;?></label>
               </div>
             </th>
             <td id='other' class='pv-10px'><?php $i = 1;?>
@@ -58,6 +58,21 @@
               <?php endforeach;?>
             </td>
           </tr>
+          <?php if($config->systemMode == 'new'):?>
+          <tr>
+            <th class='w-140px'>
+              <div class="checkbox-primary checkbox-inline checkbox-right check-all">
+                <input type='checkbox' id='allOutSideChecker'>
+                <label class='text-right' for='allOutSideChecker'><?php echo $lang->user->outside;?></label>
+              </div>
+            </th>
+            <td id='outside' class='pv-10px'><?php $i = 1;?>
+              <?php foreach($outsideUsers as $account => $realname):?>
+              <div class='group-item'><?php echo html::checkbox('members', array($account => $realname), '');?></div>
+              <?php endforeach;?>
+            </td>
+          </tr>
+          <?php endif;?>
           <tr>
             <td class='text-center form-actions' colspan='2'>
               <?php
diff --git a/module/group/view/manageprojectadmin.html.php b/module/group/view/manageprojectadmin.html.php
index aba54965f1..8c60123064 100644
--- a/module/group/view/manageprojectadmin.html.php
+++ b/module/group/view/manageprojectadmin.html.php
@@ -71,8 +71,8 @@
         <tr>
           <td class='text-center form-actions' colspan='5'>
             <?php
-            echo html::submitButton('', '', "btn btn-primary");
-            echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));
+            echo html::submitButton();
+            echo html::linkButton($lang->goback, $this->createLink('group', 'browse'), 'self', '', 'btn btn-wide');
             echo html::hidden('foo'); // Just a var, to make sure $_POST is not empty.
             ?>
           </td>
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index bc5cb699e4..b96c86cb1e 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -92,14 +92,29 @@
           <table class='table table-form'>
             <?php foreach($lang->mainNav as $module => $title):?>
             <?php if(!is_string($title)) continue;?>
-            <?php if($module == 'admin') continue;?>
-            <?php if(!isset($lang->action->dynamicAction->$module) and !isset($menugroup[$module])) continue;?>
+            <?php
+            /* Ignore null actions menus. */
+            $isNullActions = true;
+            if(isset($lang->action->dynamicAction->$module)) $isNullActions = false;
+            if(isset($navGroup[$module]) and $isNullActions)
+            {
+                foreach($navGroup[$module] as $subModule)
+                {
+                    if(isset($lang->action->dynamicAction->$subModule))
+                    {
+                        $isNullActions = false;
+                        break;
+                    }
+                }
+            }
+            if($isNullActions) continue;
+            ?>
             <tr id='<?php echo "{$module}ActionBox";?>'>
               <th class='w-100px text-left text-top'>
                 <div class='action-item'>
                   <div class='checkbox-primary'>
                     <input type="checkbox" id='allchecker' onclick="selectAll(this)"/>
-                    <label class='priv' for='allchecker'><?php echo $module == 'project' ? "<i class='icon icon-menu-doc'></i> " . $lang->executionCommon : substr($title, 0, strpos($title, '|'));?></label>
+                    <label class='priv' for='allchecker'><?php echo substr($title, 0, strpos($title, '|'));?></label>
                   </div>
                 </div>
               </th>
@@ -116,8 +131,8 @@
                   <?php endforeach;?>
                 </div>
                 <?php endif;?>
-                <?php if(isset($menugroup[$module])):?>
-                <?php foreach($menugroup[$module] as $subModule):?>
+                <?php if(isset($navGroup[$module])):?>
+                <?php foreach($navGroup[$module] as $subModule):?>
                 <?php if(isset($lang->action->dynamicAction->$subModule)):?>
                 <div class='clearfix'>
                   <?php foreach($lang->action->dynamicAction->$subModule as $action => $actionTitle):?>
@@ -137,7 +152,7 @@
             <?php endforeach;?>
           </table>
         </td>
-     </tr>
+      </tr>
       <tr>
         <td colspan='2' class='form-actions text-center'>
           <?php echo html::submitButton();?>
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index bcbfc19731..66c6b83b16 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -48,7 +48,7 @@
 <?php else:?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-  <span id='groupName'><i class='icon-lock'></i> <?php echo $group->name;?> <i class="icon icon-chevron-right"></i></span>
+    <span id='groupName'><i class='icon-lock'></i> <?php echo $group->name;?> <i class="icon icon-chevron-right"></i></span>
     <?php $params = "type=byGroup&param=$groupID&menu=%s&version=$version";?>
     <?php $active = empty($menu) ? 'btn-active-text' : '';?>
     <?php echo html::a(inlink('managePriv', sprintf($params, '')), "<span class='text'>{$lang->group->all}</span>", '', "class='btn btn-link $active'")?>
@@ -56,14 +56,14 @@
     <?php foreach($lang->mainNav as $module => $title):?>
     <?php if(!is_string($title)) continue;?>
     <?php $active = $menu == $module ? 'btn-active-text' : '';?>
-    <?php echo html::a(inlink('managePriv', sprintf($params, $module)), "<span class='text'>" . substr($title, 0, strpos($title, '|')) . '</span>', '', "class='btn btn-link $active'")?>
+    <?php echo html::a(inlink('managePriv', sprintf($params, $module)), "<span class='text'>" . strip_tags(substr($title, 0, strpos($title, '|'))) . '</span>', '', "class='btn btn-link $active'")?>
     <?php endforeach;?>
 
     <?php $active = $menu == 'other' ? 'btn-active-text' : '';?>
     <?php echo html::a(inlink('managePriv', sprintf($params, 'other')), "<span class='text'>{$lang->group->other}</span>", '', "class='btn btn-link $active'");?>
 
     <div class='input-control space w-150px'>
-    <?php echo html::select('version', $this->lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control chosen'");?>
+      <?php echo html::select('version', $this->lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control chosen'");?>
     </div>
   </div>
 </div>
@@ -160,7 +160,7 @@ $(document).ready(function()
     })
 
     /**
-     * 勾选浏览列表标签时，自动勾选下面的所有标签。 
+     * 勾选浏览列表标签时，自动勾选下面的所有标签。
      * Check all tabs when the Browse list tab is selected.
      */
     $('.menus input[value=browse]').change(function()
diff --git a/module/index/config.php b/module/index/config.php
new file mode 100644
index 0000000000..6d8d40d7e7
--- /dev/null
+++ b/module/index/config.php
@@ -0,0 +1,23 @@
+<?php
+$config->index->appGroup = array();
+$config->index->appGroup['program']     = 'program';
+$config->index->appGroup['project']     = 'project';
+$config->index->appGroup['risk']        = 'project';
+$config->index->appGroup['issue']       = 'project';
+$config->index->appGroup['task']        = 'execution';
+$config->index->appGroup['build']       = 'execution';
+$config->index->appGroup['execution']   = 'execution';
+$config->index->appGroup['product']     = 'product';
+$config->index->appGroup['release']     = 'product';
+$config->index->appGroup['productplan'] = 'product';
+$config->index->appGroup['story']       = 'product';
+$config->index->appGroup['bug']         = 'qa';
+$config->index->appGroup['testcase']    = 'qa';
+$config->index->appGroup['caselib']     = 'qa';
+$config->index->appGroup['testtask']    = 'qa';
+$config->index->appGroup['testsuite']   = 'qa';
+$config->index->appGroup['testreport']  = 'qa';
+$config->index->appGroup['doc']         = 'doc';
+$config->index->appGroup['todo']        = 'my';
+$config->index->appGroup['effort']      = 'my';
+$config->index->appGroup['user']        = 'admin';
diff --git a/module/index/control.php b/module/index/control.php
index fba20d067b..8d9fbd1d5f 100644
--- a/module/index/control.php
+++ b/module/index/control.php
@@ -69,4 +69,21 @@ class index extends control
     {
         echo $this->fetch('misc', 'getsid');
     }
+
+    /**
+     * ajaxClearObjectSession
+     *
+     * @access public
+     * @return void
+     */
+    public function ajaxClearObjectSession()
+    {
+        $objectType = $this->post->objectType;
+        $appGroup   = zget($this->config->index->appGroup, $objectType, '');
+        if($objectType == 'testcase')    $objectType = 'case';
+        if($objectType == 'testreport')  $objectType = 'report';
+        if($objectType == 'productplan') $objectType = 'productPlan';
+
+        $this->session->set($objectType . 'List', '', $appGroup);
+    }
 }
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 83387211dc..aeaf97d55a 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -2,6 +2,7 @@ body {padding-left: 96px;}
 
 #menu {position: fixed; left: 0; top: 0; bottom: 0; background-color: #3C495C; width: 96px; z-index: 1015;}
 #menuNav {position: absolute; top: 5px; bottom: 80px; width: 100%;}
+.menu-hide #menuNav {bottom: 40px;}
 #menu .nav > li {float: none; padding: 2px 8px;}
 #menu .nav > li > a {color: #fff; line-height: 20px; padding: 8px 6px; border-radius: 2px; white-space: nowrap;}
 #menu .nav > li > a > .icon {display: inline-block; font-size: 16px;}
@@ -17,12 +18,19 @@ body.menu-hide {padding-left: 0;}
 .menu-toggle .is-unfold, .menu-hide .menu-toggle .is-collapse {display: none;}
 .menu-hide .menu-toggle .is-unfold {display: inline;}
 #menuToggleItem,
-.menu-hide #menuToggleMenu {display: none;}
 .menu-hide #menuToggleItem {display: list-item;}
 .menu-hide #menu .nav > li {padding: 4px;}
 .menu-hide #menu .nav > li > a {padding: 6px 4px; text-align: center;}
 .menu-hide #menu .nav > li > a > .text {display: none;}
 .menu-hide #menu .nav > li.has-avatar > a {padding: 2px 0;}
+#menuMoreNav {display: none;}
+.show-more-nav #menuMoreNav {display: block;}
+#menuMoreList {left: 100%; margin-left: -2px; top: 0; background-color: #3c495c;}
+#menuMoreList > li {padding: 2px 6px;}
+#menuMoreList > li > a {color: #fff; padding: 4px 6px 4px 12px; border-radius: 2px; margin: 0;}
+#menuMoreList > li > a > .icon {opacity: 1; font-size: 16px;}
+#menuMoreList > li.divider {opacity: .2; margin: 6px; padding: 0;}
+#menu .dropdown-hover:hover > a, #menu .dropdown.open > a {background-color: rgba(0,0,0,.3);}
 
 #moreExecution {display: none; max-height: 520px; min-height: 520px; max-width: 360px; min-width: 150px; position: fixed; bottom: 40px; z-index: 999; background: white; padding: 20px 10px; border: 1px solid #efefef;}
 .more-execution-show {left: 96px;}
@@ -43,35 +51,33 @@ body.menu-hide {padding-left: 0;}
 #appsBar {position: fixed; left: 96px; bottom: 0; right: 0; height: 40px; z-index: 1012; background: #fff; border-top: 1px solid #eff1f7;}
 .menu-hide #appsBar {left: 40px;}
 #bars {position: absolute; left: 0; top: 0; bottom: 0; padding: 0 5px;}
-#bars > li {padding: 8px 5px;}
-#bars > li > a {height: 24px; color: #fff; background: #3c4353; padding: 2px 8px; line-height: 20px; border-radius: 2px;}
-#bars > li > a:hover, #bars > li > a:active, #bars > li > a:focus {background: #3c495c;}
-#bars > li.active > a, #bars > li.active > a:active, #bars > li.active > a:focus {background: #0c64eb;}
-#bars > li.active:after {content: ' '; display: block; position: absolute; background: #a0cafa; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;}
+#bars > li {padding: 8px 2px;}
+#bars > li > a {height: 24px; color: #000; padding: 2px 8px; line-height: 20px; border-radius: 2px;}
+#bars > li.active > a {background: #fff!important;}
+#bars > li > a:hover, #bars > li > a:active, #bars > li > a:focus {background: #16a8f8!important; color: #fff;}
+#bars > li.active > a > span, #bars > li.active > a:active > span, #bars > li.active > a:focus > span {padding-bottom: 2px; font-weight: 600; border-bottom: 2px solid #16a8f8;}
+#bars > li.active:after {content: ' '; display: block; position: absolute; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;}
+#bars > li.divider{margin-right: 5px; margin-top: 10px; height: 20px; border-right: 1px solid #d9d9d9;}
 
-#userNav {float: none; margin: 0;}
-#userNav>li {text-align: center;}
-#userNav>li>.dropdown-menu {left: 100%; bottom: 0; top: auto; width: 140px; text-align: left; background: #3c495c;}
-#userNav>li>.dropdown-menu a {color: #fff;}
-#userNav>li>.dropdown-menu .dropdown-menu {left: 100%; text-align: left; background: #3c495c;}
-#userNav>li .top .dropdown-menu {top: -60px;}
-#userNav .dropdown-menu>li>a>.icon {position: relative; top: 0; display: inline;}
-#userNav li.open>a {background: #0c64eb;}
-#userNav li.divider {opacity: .24; border-top: 1px solid; height: 2px;}
-#userNav .dropdown-submenu:focus > a, #userNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
+#flodNav {float: none; margin: 0;}
+#flodNav>li {text-align: center;}
+#flodNav>li>.dropdown-menu {left: 100%; bottom: 0; top: auto; width: 140px; text-align: left; background: #3c495c;}
+#flodNav>li>.dropdown-menu a {color: #fff;}
+#flodNav>li>.dropdown-menu .dropdown-menu {left: 100%; text-align: left; background: #3c495c;}
+#flodNav>li .top .dropdown-menu {top: -60px;}
+#flodNav .dropdown-menu>li>a>.icon {position: relative; top: 0; display: inline;}
+#flodNav li.open>a {background: #0c64eb;}
+#flodNav li.divider {opacity: .24; border-top: 1px solid; height: 2px;}
+#flodNav .dropdown-submenu:focus > a, #flodNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
 #poweredBy {width: 40%; position: absolute; top: 4px; right: 0; padding: 0;}
 
 #globalSearchDiv {width: 52%; float: right; margin-right: 4px;}
-@media screen and (max-height: 768px)
-{
-  #globalSearchDiv {width: 62%;}
-}
-#globalSearchDiv .input-group {width: 82%; float: right; margin-top: 2px;}
-@media screen and (max-height: 768px)
-{
-  #globalSearchDiv .input-group {width: 100%;}
-}
-#globalSearchInput {height: 28px; padding-left: 10px;}
+#globalSearchDiv .input-group {width: 194px; float: right; margin-top: 2px;}
+#searchbox .dropdown-menu.show-quick-go.with-active {min-width: 270px;}
+#searchbox .dropdown-menu.show-quick-go > li {padding: 0 5px;}
+#searchbox .dropdown-menu {min-width: 150px;}
+
+#globalSearchInput {width: 150px; height: 28px; padding-left: 10px; border-right: 0px;}
 #globalSearchButton {height: 28px;}
 
 #globalBarLogo {width: 100%; float: right;}
@@ -83,11 +89,11 @@ body.menu-hide {padding-left: 0;}
 #searchbox a:hover {color: white;}
 #searchbox {width: 100%;}
 #searchbox .dropdown-menu {margin-top: 0px; left: 1px; position: absolute; top: -50px;}
-#searchbox .dropdown-menu > li > a {padding: 5px 8px;}
+#searchbox .dropdown-menu > li > a {padding: 5px 0px 5px 2px;}
 #searchbox .dropdown-menu > li {display: none;}
 #searchbox .dropdown-menu > li.search-type-all {width: 100%; display: block;}
 #searchbox .dropdown-menu > li:hover {position: relative;}
-#searchbox .dropdown-menu.show-quick-go.with-active {position: absolute; top: -365px; max-height: 362px; padding-top: 30px;}
+#searchbox .dropdown-menu.show-quick-go.with-active {position: absolute; top: initial; bottom: 4px; min-height: 318px; padding-top: 30px;}
 #searchbox .dropdown-menu.show-quick-go > li {display: block;}
 #searchbox .dropdown-menu.show-quick-go > li.active {width: 100%; position: absolute; top: 0; left: 0; right: 0;}
 #searchbox .dropdown-menu>li.active>a, #searchbox .dropdown-menu>li.selected>a {position: relative; color: #fff; background-color: #16a8f8;}
@@ -106,8 +112,4 @@ body.menu-hide {padding-left: 0;}
 @media screen and (max-height: 768px)
 {
   #upgradeContent{width: 85%;}
-  .version-name {width: 25%; text-overflow: ellipsis; white-space: nowrap;}
-  .version-date {width: 20%; color: #8a8a8a;}
-  .version-explain {width: 25%; color: #8a8a8a; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-  .version-actions {width: 30%;}
 }
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 59dfd11733..f8ebff9f61 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -44,10 +44,24 @@
 
             if(!defaultApp) defaultApp = item.code;
         });
+
+        appsMap['search'] =
+        {
+            active:     false,
+            code:       'search',
+            group:      'search',
+            icon:       'icon-search',
+            methodName: 'index',
+            moduleName: 'search',
+            text:       searchCommon,
+            title:      '<i class="icon icon-search"></i> ' + searchCommon,
+            url:        '/index.php?m=search&f=index',
+            vars:       ''
+        };
     }
 
     /**
-     * Get app app code from url
+     * Get app code from url
      * @param {String} urlOrModuleName Url string
      * @return {String}
      */
@@ -98,10 +112,6 @@
         {
             return (link.params.from || link.params.$3) == 'project' ? 'project' : 'execution';
         }
-        if(['repo', 'jenkins', 'job', 'compile'].includes(moduleName))
-        {
-            return link.prj ? 'project' : 'repo';
-        }
         if(moduleName === 'product')
         {
             if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
@@ -114,15 +124,16 @@
         {
             if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
         }
-        if(moduleName === 'user')    
+        if(moduleName === 'user')
         {
-            if(['todo', 'task', 'story', 'bug', 'testtask', 'testcase', 'execution', 'dynamic', 'profile'].includes(methodLowerCase)) return 'system';
+            if(['todo', 'todocalendar', 'effortcalendar', 'effort', 'task', 'todo', 'story', 'bug', 'testtask', 'testcase', 'execution', 'dynamic', 'profile', 'view', 'issue', 'risk'].includes(methodLowerCase)) return 'system';
         }
-        if(moduleName === 'my')    
+        if(moduleName === 'my')
         {
-            if(['todo', 'team', 'calendar'].includes(methodLowerCase)) return 'system';
+            if(['team'].includes(methodLowerCase)) return 'system';
         }
         if(moduleName === 'company') if(methodLowerCase == 'browse') return 'admin';
+        if(moduleName === 'opportunity' || moduleName === 'risk' || moduleName == 'trainplan') if(methodLowerCase == 'view') return 'project';
         if(moduleName === 'tree')
         {
             if(methodLowerCase === 'browse')
@@ -139,6 +150,7 @@
                 return 'project';
             }
         }
+        if(moduleName === 'search' && methodLowerCase === 'buildindex') return 'admin';
 
         code = window.navGroup[moduleName] || moduleName || urlOrModuleName;
         return appsMap[code] ? code : '';
@@ -158,7 +170,7 @@
             if(appsMap[url])
             {
                 appCode = url;
-                url = '';
+                url     = '';
             }
             else
             {
@@ -167,21 +179,23 @@
             }
         }
 
-        /* Set openApp cookie */
-        $.cookie('openApp', appCode, {expires: config.cookieLife, path: config.webRoot});
-
-        /* Highlight at main menu */
-        var $menuMainNav = $('#menuMainNav');
-        var $lastActiveNav = $menuMainNav.find('li.active');
-        if($lastActiveNav.data('app') !== appCode)
-        {
-            $lastActiveNav.removeClass('active');
-            $menuMainNav.find('li[data-app="' + appCode + '"]').addClass('active');
-        }
-
         /* Create pate app object and store it */
         var app = openedApps[appCode];
-        if(!app)
+        if(app)
+        {
+            if(app.$iframe && app.$iframe.length)
+            {
+                var iframe = app.$iframe[0];
+                if(iframe && iframe.contentDocument && iframe.contentWindow && iframe.contentWindow.$)
+                {
+                    var result = iframe.contentWindow.$(iframe.contentDocument).triggerHandler('openapp.apps', [app, url]);
+                    if (result === false) {
+                        return 'cancel';
+                    }
+                }
+            }
+        }
+        else
         {
             var $iframe = $(
             [
@@ -205,6 +219,18 @@
             if(!url) url = appsMap[appCode].url;
         }
 
+        /* Set openApp cookie */
+        $.cookie('openApp', appCode, {expires: config.cookieLife, path: config.webRoot});
+
+        /* Highlight at main menu */
+        var $menuMainNav   = $('#menuMainNav,#menuMoreNav');
+        var $lastActiveNav = $menuMainNav.find('li.active');
+        if($lastActiveNav.data('app') !== appCode)
+        {
+            $lastActiveNav.removeClass('active');
+            $menuMainNav.find('li[data-app="' + appCode + '"]').addClass('active');
+        }
+
         /* Show page app and update iframe source */
         if(url) reloadApp(appCode, url);
         app.zIndex = openedAppZIndex++;
@@ -212,13 +238,16 @@
 
         /* Update task bar */
         var $bars = $('#bars');
-        var $bar = $('#appBar-' + appCode);
+        var $bar  = $('#appBar-' + appCode);
         if(!$bar.length)
         {
             var $link= $('<a data-pos="bar"></a>')
                 .attr('data-app', appCode)
                 .attr('class', 'show-in-app')
-                .html(app.text);
+                .html('<span>' + app.text + '</span>');
+            var barCount = $('#bars li').length;
+
+            if(barCount) $bar = $('<li class="divider"></li>').appendTo($bars);
             $bar = $('<li></li>').attr('data-app', appCode)
                 .attr('id', 'appBar-' + appCode)
                 .append($link)
@@ -315,11 +344,36 @@
         var app = openedApps[appCode];
         if(!app) return;
 
+        if(app.$iframe && app.$iframe.length)
+        {
+            var iframe = app.$iframe[0];
+            if(iframe && iframe.contentDocument && iframe.contentWindow && iframe.contentWindow.$)
+            {
+                var result = iframe.contentWindow.$(iframe.contentDocument).triggerHandler('closeapp.apps', [app]);
+                if (result === false) {
+                    return 'cancel';
+                }
+            }
+        }
+
+        var appKeys = Object.keys(openedApps)
+        if(appKeys[0] == appCode)
+        {
+            $("#bars li.divider:first").remove();
+        }
+        else
+        {
+            $("#appBar-" + appCode).prev().remove();
+        }
+
         app.closed = true;
         hideApp(appCode);
         app.$app.remove();
         app.$bar.remove();
         delete openedApps[appCode];
+
+        var firstClass = $("#bars li:first").attr('class');
+        if(firstClass == 'divider') $("#bars li.divider:first").remove();
     }
 
     /**
@@ -386,9 +440,86 @@
         getAppCode: getAppCodeFromUrl,
         getLastApp: getLastApp,
         openedApps: openedApps,
-        appsMap:  appsMap
+        appsMap:    appsMap
     };
 
+    /**
+     * Refresh more menu in #menuNav
+     * @return {void}
+     */
+    function refreshMoreMenu()
+    {
+        var $mainNav       = $('#menuMainNav');
+        var $list          = $('#menuMoreList');
+        var $menuNav       = $('#menuNav');
+        var $menuItems     = $mainNav.children('li');
+        var maxHeight      = $menuNav.height();
+        var showMoreMenu   = false;
+        var currentHeight  = 40;
+        var moreMenuHeight = 12;
+
+        $menuItems.each(function()
+        {
+            var $item     = $(this);
+            var isDivider = $item.hasClass('divider');
+            var height    = isDivider ? 17 : 40;
+            currentHeight += height;
+            if(currentHeight > maxHeight)
+            {
+                $item.addClass('hidden');
+                if(!showMoreMenu)
+                {
+                    showMoreMenu = true;
+                    $list.empty();
+
+                    var $prevItem = $item.prev();
+                    if($prevItem.hasClass('divider')) $prevItem.addClass('hidden');
+
+                    if(isDivider) return;
+                }
+                moreMenuHeight += isDivider ? 13 : 30;
+                $list.append($item.clone().removeClass('hidden'));
+            }
+            else
+            {
+                $item.removeClass('hidden');
+            }
+        });
+
+        /* The magic number "111" is the space between dropdown trigger
+           btn and the bottom of screen */
+        var listStyle = {maxHeight: 'initial', top: moreMenuHeight > 111 ? 111 - moreMenuHeight : ''};
+        if($list[0].getBoundingClientRect)
+        {
+            var btnBounding = $list.prev('a')[0].getBoundingClientRect();
+            if(btnBounding.height)
+            {
+                var winHeight = $(window).height();
+                if(winHeight < moreMenuHeight)
+                {
+                    listStyle.maxHeight = winHeight;
+                    listStyle.overflow = 'auto';
+                    listStyle.top = 5 - btnBounding.top;
+                }
+                else if(moreMenuHeight > (winHeight - btnBounding.top))
+                {
+                    listStyle.top = winHeight - btnBounding.top - moreMenuHeight + 5;
+                }
+            }
+        }
+        $list.css(listStyle);
+        $menuNav.toggleClass('show-more-nav', showMoreMenu);
+
+        if(showMoreMenu && !$list.data('listened-click'))
+        {
+            $list.data('listened-click', true).on('click', function()
+            {
+                $list.addClass('hidden');
+                setTimeout(function(){$list.removeClass('hidden')}, 200);
+            });
+        }
+    }
+
     /* Init after current page load */
     $(function()
     {
@@ -441,13 +572,20 @@
                     options.y = bounding.top;
                 }
             }
+            var $dropdown = $btn.closest('.dropdown');
+            if($dropdown.length)
+            {
+                $dropdown.addClass('open');
+                options.onHide = function(){$dropdown.removeClass('open');}
+            }
+
             $.zui.ContextMenu.show(items, options);
             event.preventDefault();
         });
 
         window.addEventListener('popstate', function(event)
         {
-            if(lastOpenedApp !== event.state.app) openApp(event.state.app);
+            if(event.state && lastOpenedApp !== event.state.app) openApp(event.state.app);
         });
 
         /* Redirect or open default app after document load */
@@ -456,8 +594,13 @@
         {
             defaultOpenUrl = decodeURIComponent(location.hash.substr(5));
         }
-        if(defaultOpenUrl) openApp(defaultOpenUrl);
-        else openApp(defaultApp);
+
+        openApp(defaultOpenUrl ? defaultOpenUrl : defaultApp);
+
+        /* Refresh more menu on window resize */
+        $(window).on('resize', refreshMoreMenu);
+        refreshMoreMenu();
+        setTimeout(refreshMoreMenu, 500);
     });
 }());
 
@@ -480,55 +623,9 @@
             var $menu = $('#userNav .dropdown-menu').addClass('hidden');
             setTimeout(function(){$menu.removeClass('hidden')}, 200);
         });
-
-        /* Hide execution list on mouseleave or click */
-        $(document).click(function()
-        {
-            $("#moreExecution").hide();
-        });
-
-        $("#recentMenu").click(function(event)
-        {
-            $('#globalSearchInput').click();
-            event.stopPropagation();
-            getExecutions();
-        });
-
-        $("#moreExecution").click(function(event)
-        {
-            event.stopPropagation();
-        });
     });
 }());
 
-/* Get recent executions. */
-function getExecutions()
-{
-    var $moreExecution = $('#moreExecution').toggle();
-    if(!$moreExecution.is(':hidden'))
-    {
-        if($('body').hasClass('menu-hide'))
-        {
-            $('#moreExecution').addClass('more-execution-hide');
-        }
-        else
-        {
-            $('#moreExecution').removeClass('more-execution-hide');
-        }
-
-        $.ajax(
-        {
-            url: createLink('execution', 'ajaxGetRecentExecutions'),
-            dataType: 'html',
-            type: 'post',
-            success: function(data)
-            {
-                $('#executionList').html(data);
-            }
-        })
-    }
-}
-
 $.extend(
 {
     gotoObject:function()
@@ -541,16 +638,19 @@ $.extend(
             var reg = /[^0-9]/;
             if(reg.test(objectValue) || objectType == 'all')
             {
-                location.href = createLink('search', 'index') + (config.requestType == 'PATH_INFO' ? '?' : '&') + 'words=' + objectValue;
+                var searchLink = createLink('search', 'index') + (config.requestType == 'PATH_INFO' ? '?' : '&') + 'words=' + objectValue;
             }
             else
             {
-                var types = objectType.split('-');
+                var types        = objectType.split('-');
                 var searchModule = types[0];
                 var searchMethod = typeof(types[1]) == 'undefined' ? 'view' : types[1];
-
-                location.href = createLink(searchModule, searchMethod, "id=" + objectValue);
+                var searchLink   = createLink(searchModule, searchMethod, "id=" + objectValue);
             }
+
+            $.post(createLink('index', 'ajaxClearObjectSession'), {objectType: objectType});
+            $.apps.open(searchLink);
+            $('#globalSearchInput').click();
         }
     }
 });
@@ -558,12 +658,11 @@ $.extend(
 /* Initialize global search. */
 $(function()
 {
-    var reg = /[^0-9]/;
+    var reg           = /[^0-9]/;
     var $searchbox    = $('#searchbox');
     var $typeSelector = $searchbox.find('.input-group-btn');
     var $dropmenu     = $typeSelector.children('.dropdown-menu');
     var $searchQuery  = $('#globalSearchInput');
-    var searchType    = $('#searchType').val();
 
     var toggleMenu = function(show)
     {
@@ -688,6 +787,8 @@ function changeSearchObject()
     if(searchType == 'deploystep') var searchType = 'deploy-viewstep';
 
     $("#searchType").val(searchType);
+    $('#searchTypeMenu li:first').attr('class', 'search-type-all');
+
     return searchType;
 }
 
diff --git a/module/index/lang/de.php b/module/index/lang/de.php
index e5e880f07e..4f1d780868 100644
--- a/module/index/lang/de.php
+++ b/module/index/lang/de.php
@@ -1,19 +1,16 @@
 <?php
-$lang->index->common = 'Home';
-$lang->index->index  = 'Home';
-$lang->index->search = 'Please input';
+$lang->index->common      = 'Home';
+$lang->index->index       = 'Home';
+$lang->index->pleaseInput = 'Please input';
+$lang->index->search      = 'Search';
 
 $lang->index->app = new stdClass();
 $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/en.php b/module/index/lang/en.php
index e5e880f07e..4f1d780868 100644
--- a/module/index/lang/en.php
+++ b/module/index/lang/en.php
@@ -1,19 +1,16 @@
 <?php
-$lang->index->common = 'Home';
-$lang->index->index  = 'Home';
-$lang->index->search = 'Please input';
+$lang->index->common      = 'Home';
+$lang->index->index       = 'Home';
+$lang->index->pleaseInput = 'Please input';
+$lang->index->search      = 'Search';
 
 $lang->index->app = new stdClass();
 $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/fr.php b/module/index/lang/fr.php
index 311364b375..4f1d780868 100644
--- a/module/index/lang/fr.php
+++ b/module/index/lang/fr.php
@@ -1,19 +1,16 @@
 <?php
-$lang->index->common = 'Accueil';
-$lang->index->index  = 'Accueil';
-$lang->index->search = 'Please input';
+$lang->index->common      = 'Home';
+$lang->index->index       = 'Home';
+$lang->index->pleaseInput = 'Please input';
+$lang->index->search      = 'Search';
 
 $lang->index->app = new stdClass();
 $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/vi.php b/module/index/lang/vi.php
index 593aab2889..4f1d780868 100644
--- a/module/index/lang/vi.php
+++ b/module/index/lang/vi.php
@@ -1,19 +1,16 @@
 <?php
-$lang->index->common = 'Trang chủ';
-$lang->index->index  = 'Trang chủ';
-$lang->index->search = 'Please input';
+$lang->index->common      = 'Home';
+$lang->index->index       = 'Home';
+$lang->index->pleaseInput = 'Please input';
+$lang->index->search      = 'Search';
 
 $lang->index->app = new stdClass();
 $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/zh-cn.php b/module/index/lang/zh-cn.php
index 3317dc56e9..823c4281b4 100644
--- a/module/index/lang/zh-cn.php
+++ b/module/index/lang/zh-cn.php
@@ -1,7 +1,8 @@
 <?php
-$lang->index->common = '首页';
-$lang->index->index  = '首页';
-$lang->index->search = '请输入';
+$lang->index->common      = '首页';
+$lang->index->index       = '首页';
+$lang->index->pleaseInput = '请输入';
+$lang->index->search      = '搜索';
 
 $lang->index->app = new stdClass();
 $lang->index->app->open   = '打开';
@@ -9,7 +10,8 @@ $lang->index->app->reload = '刷新';
 $lang->index->app->close  = '关闭';
 
 $lang->index->upgradeVersion = '可升级版本';
-$lang->index->upgrade        = '现在升级';
+$lang->index->upgradeNow     = '现在升级';
+$lang->index->upgrade        = '升级';
 $lang->index->log            = '查看版本更新日志 >';
 $lang->index->detailed       = '详情';
 $lang->index->website        = '请访问官网';
diff --git a/module/index/lang/zh-tw.php b/module/index/lang/zh-tw.php
index 3b01643441..d28d0333ca 100644
--- a/module/index/lang/zh-tw.php
+++ b/module/index/lang/zh-tw.php
@@ -1,20 +1,17 @@
 <?php
-$lang->index->common = '首頁';
-$lang->index->index  = '首頁';
-$lang->index->search = '請輸入';
+$lang->index->common      = '首頁';
+$lang->index->index       = '首頁';
+$lang->index->pleaseInput = '請輸入';
+$lang->index->search      = '搜索';
 
 $lang->index->app = new stdClass();
 $lang->index->app->open   = '打開';
 $lang->index->app->reload = '刷新';
 $lang->index->app->close  = '關閉';
 
-$lang->index->upgradeVersion = '禪道新版本';
-$lang->index->currentVersion = '當前版本';
-$lang->index->versionName    = '版本名稱';
-$lang->index->releaseDate    = '發佈日期';
-$lang->index->explain        = '更新說明';
-$lang->index->actions        = '操作';
+$lang->index->upgradeVersion = '可升級版本';
+$lang->index->upgradeNow     = '現在升級';
 $lang->index->upgrade        = '升級';
-$lang->index->log            = '日誌';
+$lang->index->log            = '查看版本更新日誌 >';
 $lang->index->detailed       = '詳情';
 $lang->index->website        = '請訪問官網';
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index 26e66ce1c9..c81c19bb92 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -23,9 +23,6 @@ js::set('defaultOpen', $open);
 #versionTitle {margin: 8px 3px 0px 0px; background-image: url(<?php echo $config->webRoot . 'theme/default/images/main/version-upgrade.svg';?>);}
 .icon-version {width: 20px; height: 24px; margin: -4px 3px 0px 0px; background-image: url(<?php echo $config->webRoot . 'theme/default/images/main/version-new.svg';?>);}
 .version-hr {margin-top: 15px; margin-bottom: 15px;}
-<?php if(isset($this->config->bizVersion)):?>
-#searchbox .dropdown-menu.show-quick-go.with-active {top: -468px; max-height: 465px;}
-<?php endif;?>
 
 <?php if(empty($latestVersionList)):?>
 #upgradeContent {top: -272px; height: 262px;}
@@ -36,8 +33,12 @@ js::set('defaultOpen', $open);
   <nav id='menuNav'>
     <ul class='nav nav-default' id='menuMainNav'>
     </ul>
-    <ul class='nav nav-default'>
-      <?php commonModel::printRecentMenu();?>
+    <ul class='nav nav-default' id='menuMoreNav'>
+      <li class='divider'></li>
+      <li class='dropdown dropdown-hover'>
+        <a title='<?php echo $lang->more; ?>'><i class='icon icon-more-circle'></i><span class='text'><?php echo $lang->more; ?></span></a>
+        <ul id='menuMoreList' class='dropdown-menu fade'></ul>
+      </li>
     </ul>
   </nav>
   <div class="table-col col-right">
@@ -51,9 +52,12 @@ js::set('defaultOpen', $open);
     </div>
   </div>
   <div id='menuFooter'>
-    <ul id="userNav" class="nav">
-      <li id='menuToggleMenu'><a type='button' class='menu-toggle'><i class='icon icon-sm icon-menu-collapse'></i></a></li>
-      <li class='dropdown dropdown-hover has-avatar'><?php common::printUserBar();?></li>
+    <ul id="flodNav" class="nav">
+      <li id='menuToggleMenu'>
+        <a type='button' class='menu-toggle'>
+          <i class='icon icon-sm icon-menu-collapse'></i>
+        </a>
+      </li>
     </ul>
   </div>
 </div>
@@ -72,7 +76,7 @@ js::set('defaultOpen', $open);
             <?php echo common::printSearchBox();?>
           </div>
           <div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example" id="searchboxExample">
-            <input id="globalSearchInput" type="search" onclick="this.value=''" onkeydown="if(event.keyCode==13) $.gotoObject();" class="form-control search-input" placeholder="<?php echo $lang->index->search;?>" autocomplete="off">
+            <input id="globalSearchInput" type="search" onclick="this.value=''" onkeydown="if(event.keyCode==13) $.gotoObject();" class="form-control search-input" placeholder="<?php echo $lang->index->pleaseInput;?>" autocomplete="off">
           </div>
           <span class="input-group-btn" onclick="javascript:$.gotoObject();">
             <button id="globalSearchButton" class="btn btn-secondary" type="button"><i class="icon icon-search"></i></button>
@@ -82,7 +86,7 @@ js::set('defaultOpen', $open);
     </div>
     <div id='upgradeContent' class='main-table'>
       <div class='main-header' style='padding: 5px 20px 5px 15px;'>
-        <i class='version-upgrade' id='versionTitle'></i> 
+        <i class='version-upgrade' id='versionTitle'></i>
         <h2>
           <?php echo $lang->index->upgradeVersion;?>
         </h2>
@@ -96,7 +100,8 @@ js::set('defaultOpen', $open);
         </div>
         <?php else:?>
         <div class='version-content'>
-          <?php foreach($latestVersionList as $version):?>
+          <?php $lastVersion = end($latestVersionList);?>
+          <?php foreach($latestVersionList as $versionNumber => $version):?>
           <div class="version-list">
             <div>
               <i class='version-upgrade icon-version'></i>
@@ -104,11 +109,13 @@ js::set('defaultOpen', $open);
             </div>
             <div class="version-detail"><?php echo $version->explain;?></div>
             <div class="version-footer">
-              <a href="<?php echo inLink('changeLog', 'version=' . $version->name);?>" class="btn btn-link iframe" data-width="800"><?php echo $lang->index->log;?></strong></a>
-              <a href='<?php echo $version->link?>' class='btn btn-primary upgrade-now' style='color: white;' target='_blank'><?php echo $lang->index->upgrade;?></a>
+              <a href="<?php echo inLink('changeLog', 'version=' . $versionNumber);?>" class="btn btn-link iframe" data-width="800"><?php echo $lang->index->log;?></strong></a>
+              <a href='<?php echo $version->link?>' class='btn btn-primary upgrade-now' style='color: white;' target='_blank'><?php echo $lang->index->upgradeNow;?></a>
             </div>
           </div>
+          <?php if($version->name != $lastVersion->name):?>
           <hr class='version-hr'>
+          <?php endif;?>
           <?php endforeach;?>
         </div>
         <?php endif;?>
@@ -118,4 +125,10 @@ js::set('defaultOpen', $open);
 </div>
 <?php js::set('searchAB', $lang->searchAB);?>
 <?php js::set('searchObjectList', ',' . implode(',', array_keys($lang->searchObjects)) . ',');?>
-<?php include '../../common/view/footer.lite.html.php';?>
+<?php js::set('searchCommon', $lang->index->search);?>
+
+<script>
+<?php if(isset($pageJS)) echo $pageJS;?>
+</script>
+</body>
+</html>
diff --git a/module/jenkins/control.php b/module/jenkins/control.php
index ea52501ccb..70c030d2a4 100644
--- a/module/jenkins/control.php
+++ b/module/jenkins/control.php
@@ -61,8 +61,9 @@ class jenkins extends control
     {
         if($_POST)
         {
-            $this->jenkins->create();
+            $jenkinsID = $this->jenkins->create();
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $jenkinsID));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
@@ -116,8 +117,8 @@ class jenkins extends control
 
     /**
      * Ajax get tasks.
-     * 
-     * @param  int    $id 
+     *
+     * @param  int    $id
      * @access public
      * @return void
      */
diff --git a/module/jenkins/lang/en.php b/module/jenkins/lang/en.php
index 1f00f56672..dd8b436308 100644
--- a/module/jenkins/lang/en.php
+++ b/module/jenkins/lang/en.php
@@ -6,6 +6,9 @@ $lang->jenkins->edit          = 'Edit Jenkins';
 $lang->jenkins->delete        = 'Delete';
 $lang->jenkins->confirmDelete = 'Do you want to delete this Jenkins server?';
 
+$lang->jenkins->browseAction = 'Jenkins List';
+$lang->jenkins->deleteAction = 'Delete Jenkins';
+
 $lang->jenkins->id       = 'ID';
 $lang->jenkins->name     = 'Name';
 $lang->jenkins->url      = 'URL';
diff --git a/module/jenkins/lang/zh-cn.php b/module/jenkins/lang/zh-cn.php
index e06aed916e..1c64df3e28 100644
--- a/module/jenkins/lang/zh-cn.php
+++ b/module/jenkins/lang/zh-cn.php
@@ -6,6 +6,9 @@ $lang->jenkins->edit          = '编辑Jenkins';
 $lang->jenkins->delete        = '删除';
 $lang->jenkins->confirmDelete = '确认删除该Jenkins吗？';
 
+$lang->jenkins->browseAction = 'Jenkins列表';
+$lang->jenkins->deleteAction = '删除Jenkins';
+
 $lang->jenkins->id       = 'ID';
 $lang->jenkins->name     = '名称';
 $lang->jenkins->url      = '服务地址';
diff --git a/module/jenkins/lang/zh-tw.php b/module/jenkins/lang/zh-tw.php
index c86afeb8c8..e19ffbbae3 100644
--- a/module/jenkins/lang/zh-tw.php
+++ b/module/jenkins/lang/zh-tw.php
@@ -6,6 +6,9 @@ $lang->jenkins->edit          = '編輯Jenkins';
 $lang->jenkins->delete        = '刪除';
 $lang->jenkins->confirmDelete = '確認刪除該Jenkins嗎？';
 
+$lang->jenkins->browseAction = 'Jenkins列表';
+$lang->jenkins->deleteAction = '刪除Jenkins';
+
 $lang->jenkins->id       = 'ID';
 $lang->jenkins->name     = '名稱';
 $lang->jenkins->url      = '服務地址';
diff --git a/module/jenkins/model.php b/module/jenkins/model.php
index 452a9ce10a..2d12469a3f 100644
--- a/module/jenkins/model.php
+++ b/module/jenkins/model.php
@@ -60,8 +60,8 @@ class jenkinsModel extends model
 
     /**
      * Get jenkins tasks.
-     * 
-     * @param  int    $id 
+     *
+     * @param  int    $id
      * @access public
      * @return array
      */
@@ -107,7 +107,8 @@ class jenkinsModel extends model
             ->batchCheck("url", 'URL')
             ->autoCheck()
             ->exec();
-        return !dao::isError();
+        if(dao::isError()) return false;
+        return $this->dao->lastInsertId();
     }
 
     /**
diff --git a/module/jenkins/view/browse.html.php b/module/jenkins/view/browse.html.php
index 4e3fcf9011..cddf5ca7ab 100644
--- a/module/jenkins/view/browse.html.php
+++ b/module/jenkins/view/browse.html.php
@@ -11,6 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php'; ?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-right">
+    <?php if(common::hasPriv('jenkins', 'create')) common::printLink('jenkins', 'create', "", "<i class='icon icon-plus'></i> " . $lang->jenkins->create, '', "class='btn btn-primary'");?>
+  </div>
+</div>
 <div id='mainContent' class='main-row'>
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='jenkinsList' class='table has-sort-head table-fixed'>
diff --git a/module/jenkins/view/edit.html.php b/module/jenkins/view/edit.html.php
index 947672eba0..04b26aa7f9 100644
--- a/module/jenkins/view/edit.html.php
+++ b/module/jenkins/view/edit.html.php
@@ -19,10 +19,6 @@
       </div>
       <form id='jenkinsForm' method='post' class='form-ajax'>
         <table class='table table-form'>
-          <tr>
-            <th class='thWidth'></th>
-            <td colspan="2"><?php echo $lang->jenkins->tips; ?></td>
-          </tr>
           <tr>
             <th><?php echo $lang->jenkins->name; ?></th>
             <td class='required'><?php echo html::input('name', $jenkins->name, "class='form-control'"); ?></td>
diff --git a/module/job/control.php b/module/job/control.php
index 0413a49e89..cc5ab162b0 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -63,8 +63,9 @@ class job extends control
     {
         if($_POST)
         {
-            $this->job->create();
+            $jobID = $this->job->create();
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $jobID));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
diff --git a/module/job/lang/en.php b/module/job/lang/en.php
index bd40cb24c8..b7d5877f00 100644
--- a/module/job/lang/en.php
+++ b/module/job/lang/en.php
@@ -10,6 +10,8 @@ $lang->job->confirmDelete = 'Do you want to delete this job?';
 $lang->job->dirChange     = 'Directory Changed';
 $lang->job->buildTag      = 'Build Tag';
 
+$lang->job->browseAction = 'Job List';
+
 $lang->job->id          = 'ID';
 $lang->job->name        = 'Name';
 $lang->job->repo        = 'Repo';
diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php
index 680afdba97..366fb3c0de 100644
--- a/module/job/lang/zh-cn.php
+++ b/module/job/lang/zh-cn.php
@@ -10,6 +10,8 @@ $lang->job->confirmDelete = '确认删除该构建任务';
 $lang->job->dirChange     = '目录改动';
 $lang->job->buildTag      = '打标签';
 
+$lang->job->browseAction = '构建任务列表';
+
 $lang->job->id          = 'ID';
 $lang->job->name        = '名称';
 $lang->job->repo        = '代码库';
diff --git a/module/job/lang/zh-tw.php b/module/job/lang/zh-tw.php
index a3655d9512..00f69b430f 100644
--- a/module/job/lang/zh-tw.php
+++ b/module/job/lang/zh-tw.php
@@ -10,6 +10,8 @@ $lang->job->confirmDelete = '確認刪除該構建任務';
 $lang->job->dirChange     = '目錄改動';
 $lang->job->buildTag      = '打標籤';
 
+$lang->job->browseAction = '構建任務列表';
+
 $lang->job->id          = 'ID';
 $lang->job->name        = '名稱';
 $lang->job->repo        = '代碼庫';
diff --git a/module/job/model.php b/module/job/model.php
index 4c7c8f7a63..5d19e6c298 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -12,9 +12,9 @@
 class jobModel extends model
 {
     /**
-     * Get by id. 
-     * 
-     * @param  int    $id 
+     * Get by id.
+     *
+     * @param  int    $id
      * @access public
      * @return object
      */
@@ -25,7 +25,7 @@ class jobModel extends model
 
     /**
      * Get job list.
-     * 
+     *
      * @param  string $orderBy
      * @param  object $pager
      * @access public
@@ -44,7 +44,7 @@ class jobModel extends model
 
     /**
      * Get list by triggerType field.
-     * 
+     *
      * @param  string  $triggerType
      * @param  array   $repoIdList
      * @access public
@@ -107,7 +107,7 @@ class jobModel extends model
 
     /**
      * Create a job.
-     * 
+     *
      * @access public
      * @return bool
      */
@@ -164,13 +164,13 @@ class jobModel extends model
 
         $id = $this->dao->lastInsertId();
         $this->initJob($id, $job, $this->post->repoType);
-        return true;
+        return $id;
     }
 
     /**
      * Update a job.
-     * 
-     * @param  int    $id 
+     *
+     * @param  int    $id
      * @access public
      * @return bool
      */
@@ -236,10 +236,10 @@ class jobModel extends model
 
     /**
      * Init when create or update job.
-     * 
-     * @param  int    $id 
-     * @param  object $job 
-     * @param  string $repoType 
+     *
+     * @param  int    $id
+     * @param  object $job
+     * @param  string $repoType
      * @access public
      * @return bool
      */
@@ -281,8 +281,8 @@ class jobModel extends model
 
     /**
      * Exec job.
-     * 
-     * @param  int    $id 
+     *
+     * @param  int    $id
      * @access public
      * @return bool
      */
diff --git a/module/mail/view/save.html.php b/module/mail/view/save.html.php
index cba2aeab3f..ba9482bfd1 100755
--- a/module/mail/view/save.html.php
+++ b/module/mail/view/save.html.php
@@ -24,7 +24,7 @@
         <?php echo $lang->mail->successSaved;?>
         <?php if($this->post->turnon):?>
         <?php if($mailExist):?>
-        <?php echo html::a(inlink('test'), $lang->mail->test . ' <i class="icon-project"></i>', '', "class='btn btn-primary btn-sm'");?>
+        <?php echo html::a(inlink('test'), $lang->mail->test, '', "class='btn btn-primary btn-sm'");?>
         <?php else:?>
           <span class='content alert-warning'>
             <i class="icon-exclamation-sign"></i><?php echo $lang->mail->setForUser;?>
diff --git a/module/message/config.php b/module/message/config.php
index 2bb98c694b..d39fb726e9 100644
--- a/module/message/config.php
+++ b/module/message/config.php
@@ -1,8 +1,8 @@
 <?php
 $config->message->objectTypes = array();
-$config->message->objectTypes['product']     = array('opened', 'edited', 'closed', 'undeleted'); 
+$config->message->objectTypes['product']     = array('opened', 'edited', 'closed', 'undeleted');
 $config->message->objectTypes['story']       = array('opened', 'edited', 'commented', 'frombug', 'changed', 'reviewed', 'closed', 'activated', 'assigned');
-$config->message->objectTypes['productplan'] = array('opened', 'edited'); 
+$config->message->objectTypes['productplan'] = array('opened', 'edited');
 $config->message->objectTypes['project']     = array('opened', 'edited', 'started', 'delayed', 'suspended', 'closed', 'activated', 'undeleted');
 $config->message->objectTypes['task']        = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'started', 'finished', 'paused', 'canceled', 'restarted', 'closed', 'activated');
 $config->message->objectTypes['bug']         = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'bugconfirmed', 'resolved', 'closed', 'activated');
diff --git a/module/message/model.php b/module/message/model.php
index a5cfdd6c89..ffa3c51b72 100644
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -21,8 +21,8 @@ class messageModel extends model
     }
 
     /**
-     * Get objectTypes 
-     * 
+     * Get objectTypes
+     *
      * @access public
      * @return array
      */
@@ -37,8 +37,8 @@ class messageModel extends model
     }
 
     /**
-     * Get object actions. 
-     * 
+     * Get object actions.
+     *
      * @access public
      * @return array
      */
@@ -57,11 +57,11 @@ class messageModel extends model
 
     /**
      * Check send.
-     * 
-     * @param  string $objectType 
-     * @param  int    $objectID 
-     * @param  string $actionType 
-     * @param  int    $actionID 
+     *
+     * @param  string $objectType
+     * @param  int    $objectID
+     * @param  string $actionType
+     * @param  int    $actionID
      * @access public
      * @return void
      */
@@ -102,11 +102,11 @@ class messageModel extends model
 
     /**
      * Save notice.
-     * 
-     * @param  string $objectType 
-     * @param  int    $objectID 
-     * @param  string $actionType 
-     * @param  int    $actionID 
+     *
+     * @param  string $objectType
+     * @param  int    $objectID
+     * @param  string $actionType
+     * @param  int    $actionID
      * @access public
      * @return void
      */
@@ -127,11 +127,16 @@ class messageModel extends model
         $this->app->loadConfig('mail');
         $sysURL = zget($this->config->mail, 'domain', common::getSysURL());
 
+        $isonlybody = isonlybody();
+        if($isonlybody) unset($_GET['onlybody']);
+
         $moduleName = $objectType == 'case' ? 'testcase' : $objectType;
         $space = common::checkNotCN() ? ' ' : '';
         $data  = $user->realname . $space . $this->lang->action->label->$actionType . $space . $this->lang->action->objectTypes[$objectType];
         $data .= ' ' . html::a($sysURL . helper::createLink($moduleName, 'view', "id=$objectID"), "[#{$objectID}::{$object->$field}]");
 
+        if($isonlybody) $_GET['onlybody'] = 'yes';
+
         $notify = new stdclass();
         $notify->objectType  = 'message';
         $notify->action      = $actionID;
@@ -146,9 +151,9 @@ class messageModel extends model
 
     /**
      * Get toList.
-     * 
-     * @param  object    $object 
-     * @param  string    $objectType 
+     *
+     * @param  object    $object
+     * @param  string    $objectType
      * @access public
      * @return string
      */
@@ -165,7 +170,7 @@ class messageModel extends model
 
     /**
      * Get notice todos.
-     * 
+     *
      * @access public
      * @return array
      */
diff --git a/module/message/view/header.html.php b/module/message/view/header.html.php
index eab41ff405..1c69b5f855 100644
--- a/module/message/view/header.html.php
+++ b/module/message/view/header.html.php
@@ -1,4 +1,4 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('message');?></div>
+  <div class="btn-toolbar pull-left"><?php // common::printAdminSubMenu('message');?></div-->
 </div>
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index 2f4dac3055..470d71b388 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -84,6 +84,9 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Letzte Version';
 $lang->misc->feature->detailed = 'Details';
 
+$lang->misc->releaseDate['15.0.rc3']    = '2021-04-16';
+$lang->misc->releaseDate['15.0.rc2']    = '2021-04-09';
+$lang->misc->releaseDate['15.0.rc1']    = '2021-04-05';
 $lang->misc->releaseDate['12.5.3']      = '2021-01-06';
 $lang->misc->releaseDate['12.5.2']      = '2020-12-18';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
@@ -138,6 +141,9 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust details，Fix bug', 'desc' => '');
+$lang->misc->feature->all['15.0.rc2'][]    = array('title' => 'Fix Bug.', 'desc' => '');
+$lang->misc->feature->all['15.0.rc1'][]    = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => 'Adjust annual data.', 'desc' => '');
 $lang->misc->feature->all['12.5.2'][]      = array('title' => 'Fix Bug', 'desc' => '');
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 8bf4028bbc..bbb343a7b9 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -84,6 +84,9 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
 $lang->misc->feature->detailed = 'Detail';
 
+$lang->misc->releaseDate['15.0.rc3']    = '2021-04-16';
+$lang->misc->releaseDate['15.0.rc2']    = '2021-04-09';
+$lang->misc->releaseDate['15.0.rc1']    = '2021-04-05';
 $lang->misc->releaseDate['12.5.3']      = '2021-01-06';
 $lang->misc->releaseDate['12.5.2']      = '2020-12-18';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
@@ -138,6 +141,9 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust details，Fix bug', 'desc' => '');
+$lang->misc->feature->all['15.0.rc2'][]    = array('title' => 'Fix Bug.', 'desc' => '');
+$lang->misc->feature->all['15.0.rc1'][]    = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => 'Adjust annual data.', 'desc' => '');
 $lang->misc->feature->all['12.5.2'][]      = array('title' => 'Fix Bug', 'desc' => '');
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 9e31fca34d..98688ab3d7 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -84,6 +84,9 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Dernière Version';
 $lang->misc->feature->detailed = 'Détail';
 
+$lang->misc->releaseDate['15.0.rc3']    = '2021-04-16';
+$lang->misc->releaseDate['15.0.rc2']    = '2021-04-09';
+$lang->misc->releaseDate['15.0.rc1']    = '2021-04-05';
 $lang->misc->releaseDate['12.5.3']      = '2021-01-06';
 $lang->misc->releaseDate['12.5.2']      = '2020-12-18';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
@@ -138,6 +141,9 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust details, fix bug.', 'desc' => '');
+$lang->misc->feature->all['15.0.rc2'][]    = array('title' => 'Fix Bug.', 'desc' => '');
+$lang->misc->feature->all['15.0.rc1'][]    = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => 'Adjust annual data.', 'desc' => '');
 $lang->misc->feature->all['12.5.2'][]      = array('title' => 'Fix Bug', 'desc' => '');
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php
index 51de44ed5b..6dc8ed4018 100644
--- a/module/misc/lang/vi.php
+++ b/module/misc/lang/vi.php
@@ -84,6 +84,9 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
 $lang->misc->feature->detailed = 'Chi tiết';
 
+$lang->misc->releaseDate['15.0.rc3']    = '2021-04-16';
+$lang->misc->releaseDate['15.0.rc2']    = '2021-04-09';
+$lang->misc->releaseDate['15.0.rc1']    = '2021-04-05';
 $lang->misc->releaseDate['12.5.3']      = '2021-01-06';
 $lang->misc->releaseDate['12.5.2']      = '2020-12-18';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
@@ -138,6 +141,9 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust detail, fix bug.', 'desc' => '');
+$lang->misc->feature->all['15.0.rc2'][]    = array('title' => 'Fix Bug.', 'desc' => '');
+$lang->misc->feature->all['15.0.rc1'][]    = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => 'Adjust annual data.', 'desc' => '');
 $lang->misc->feature->all['12.5.2'][]      = array('title' => 'Fix Bug', 'desc' => '');
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 78cad4e023..ebad9c5999 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -84,6 +84,9 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
 $lang->misc->feature->detailed = '详情';
 
+$lang->misc->releaseDate['15.0.rc3']    = '2021-04-16';
+$lang->misc->releaseDate['15.0.rc2']    = '2021-04-09';
+$lang->misc->releaseDate['15.0.rc1']    = '2021-04-05';
 $lang->misc->releaseDate['12.5.3']      = '2021-01-06';
 $lang->misc->releaseDate['12.5.2']      = '2020-12-18';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
@@ -138,6 +141,9 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => '完善细节，修复Bug', 'desc' => '');
+$lang->misc->feature->all['15.0.rc2'][]    = array('title' => '修复Bug，优化界面交互', 'desc' => '');
+$lang->misc->feature->all['15.0.rc1'][]    = array('title' => '升级到15版本，重构导航、文档库，增加项目集管理', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => '优化年度总结', 'desc' => '');
 $lang->misc->feature->all['12.5.2'][]      = array('title' => '修复Bug', 'desc' => '');
 $lang->misc->feature->all['12.5.1'][]      = array('title' => '修复漏洞。', 'desc' => '');
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index d65daea3ef..685b569793 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -84,6 +84,9 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
 $lang->misc->feature->detailed = '詳情';
 
+$lang->misc->releaseDate['15.0.rc3']    = '2021-04-16';
+$lang->misc->releaseDate['15.0.rc2']    = '2021-04-09';
+$lang->misc->releaseDate['15.0.rc1']    = '2021-04-05';
 $lang->misc->releaseDate['12.5.3']      = '2021-01-06';
 $lang->misc->releaseDate['12.5.2']      = '2020-12-18';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
@@ -138,6 +141,9 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => '完善細節，修復Bug', 'desc' => '');
+$lang->misc->feature->all['15.0.rc2'][]    = array('title' => '修復Bug，優化界面交互', 'desc' => '');
+$lang->misc->feature->all['15.0.rc1'][]    = array('title' => '升級到15版本，重構導航、文檔庫，增加項目集管理', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => '優化年度總結', 'desc' => '');
 $lang->misc->feature->all['12.5.2'][]      = array('title' => '修復Bug', 'desc' => '');
 $lang->misc->feature->all['12.5.1'][]      = array('title' => '修復漏洞。', 'desc' => '');
diff --git a/module/my/control.php b/module/my/control.php
index 4037593ae0..84eecfc116 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -86,9 +86,6 @@ class my extends control
      */
     public function work($mode = 'task', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $moduleIndex = array_search('my', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
         echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
@@ -106,9 +103,6 @@ class my extends control
      */
     public function contribute($mode = 'task', $type = 'openedBy', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $moduleIndex = array_search('my', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
         if(($mode == 'issue' or $mode == 'risk') and $type == 'openedBy') $type = 'createdBy';
 
         echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
@@ -129,15 +123,13 @@ class my extends control
      */
     public function todo($type = 'before', $userID = '', $status = 'all', $orderBy = "date_desc,status,begin", $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->lang->navGroup->my = 'system';
         /* Save session. */
         $uri = $this->app->getURI(true);
-        if($this->app->viewType != 'json')
-        {
-            $this->session->set('todoList', $uri);
-            $this->session->set('bugList',  $uri);
-            $this->session->set('taskList', $uri);
-        }
+        $this->session->set('todoList',     $uri, 'my');
+        $this->session->set('bugList',      $uri, 'qa');
+        $this->session->set('taskList',     $uri, 'execution');
+        $this->session->set('storyList',    $uri, 'product');
+        $this->session->set('testtaskList', $uri, 'qa');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -189,7 +181,7 @@ class my extends control
     public function story($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
-        if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true));
+        if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true), 'product');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -230,7 +222,7 @@ class my extends control
     public function requirement($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
-        if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true));
+        if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true), 'product');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -271,11 +263,7 @@ class my extends control
     public function task($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
-        if($this->app->viewType != 'json')
-        {
-            $this->session->set('taskList',  $this->app->getURI(true));
-            $this->session->set('storyList', $this->app->getURI(true));
-        }
+        if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -349,7 +337,7 @@ class my extends control
     public function bug($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. load Lang. */
-        if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true));
+        if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
         $this->app->loadLang('bug');
 
         /* Load pager. */
@@ -398,7 +386,7 @@ class my extends control
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Save session. */
-        if($this->app->viewType != 'json') $this->session->set('testtaskList', $this->app->getURI(true));
+        if($this->app->viewType != 'json') $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
 
         $this->app->loadLang('testcase');
 
@@ -423,7 +411,7 @@ class my extends control
     /**
      * My test case.
      *
-     * @param  string $type assigntome|openedbyme
+     * @param  string $type      assigntome|openedbyme
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -433,11 +421,12 @@ class my extends control
      */
     public function testcase($type = 'assigntome', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        /* Save session, load lang. */
-        if($this->app->viewType != 'json') $this->session->set('caseList', $this->app->getURI(true));
         $this->loadModel('testcase');
         $this->loadModel('testtask');
 
+        /* Save session. */
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
+
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
@@ -476,6 +465,37 @@ class my extends control
         $this->display();
     }
 
+    public function doc($type = 'openedbyme', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        /* Save session, load lang. */
+        if($this->app->viewType != 'json') $this->session->set('docList', $this->app->getURI(true), 'doc');
+        $this->loadModel('doc');
+
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = pager::init($recTotal, $recPerPage, $pageID);
+
+        /* Append id for secend sort. */
+        $sort = $this->loadModel('common')->appendOrder($orderBy);
+
+        $docs = $this->doc->getDocsByBrowseType($type, 0, 0, $sort, $pager);
+
+        /* Assign. */
+        $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->doc;
+        $this->view->position[] = $this->lang->my->doc;
+        $this->view->docs       = $docs;
+        $this->view->users      = $this->user->getPairs('noletter');
+        $this->view->type       = $type;
+        $this->view->recTotal   = $recTotal;
+        $this->view->recPerPage = $recPerPage;
+        $this->view->pageID     = $pageID;
+        $this->view->orderBy    = $orderBy;
+        $this->view->pager      = $pager;
+
+        $this->display();
+
+    }
+
     /**
      * My projects.
      *
@@ -491,8 +511,8 @@ class my extends control
         $this->loadModel('program');
         $this->app->loadLang('project');
 
-        $this->app->session->set('programList', $this->app->getURI(true));
-        $this->app->session->set('projectBrowse', $this->app->getURI(true));
+        $this->app->session->set('programList', $this->app->getURI(true), 'program');
+        $this->app->session->set('projectList', $this->app->getURI(true), 'project');
 
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
@@ -565,6 +585,8 @@ class my extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
+        $this->app->session->set('issueList', $this->app->getURI(true), 'project');
+
         $this->view->title      = $this->lang->my->issue;
         $this->view->position[] = $this->lang->my->issue;
         $this->view->mode       = 'issue';
@@ -593,6 +615,8 @@ class my extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
+        $this->app->session->set('riskList', $this->app->getURI(true), 'project');
+
         $this->view->title      = $this->lang->my->risk;
         $this->view->position[] = $this->lang->my->risk;
         $this->view->risks      = $this->loadModel('risk')->getUserRisks($type, $this->app->user->account, $orderBy, $pager);
@@ -604,6 +628,72 @@ class my extends control
         $this->display();
     }
 
+    /**
+     * My audits.
+     *
+     * @param  string $browseType
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function audit($browseType = 'wait', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
+    {
+        $this->loadModel('datatable');
+        $this->session->set('reviewList', $this->app->getURI(true));
+        $this->app->loadLang('review');
+        $this->app->loadClass('pager', true);
+        $pager = pager::init($recTotal, $recPerPage, $pageID);
+
+        $reviewList = $this->loadModel('review')->getUserReviews($browseType, $orderBy, $pager);
+
+        $this->view->title      = $this->lang->my->myReview;
+        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->reviewList = $reviewList;
+        $this->view->products   = $this->my->getProductPairs();
+        $this->view->recTotal   = $recTotal;
+        $this->view->recPerPage = $recPerPage;
+        $this->view->pageID     = $pageID;
+        $this->view->browseType = $browseType;
+        $this->view->orderBy    = $orderBy;
+        $this->view->pager      = $pager;
+        $this->view->mode       = 'audit';
+        $this->display();
+    }
+
+    /**
+     * My ncs.
+     *
+     * @param  string $browseType
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function nc($browseType = 'assignedToMe', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        $this->loadModel('nc');
+        $this->session->set('ncList', $this->app->getURI(true));
+
+        /* Set the pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager($recTotal, $recPerPage = 50, $pageID = 1);
+
+        $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->nc;
+        $this->view->position[] = $this->lang->my->nc;
+        $this->view->browseType = $browseType;
+        $this->view->pager      = $pager;
+        $this->view->ncs        = $this->my->getNcList($browseType, $orderBy, $pager);
+        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->projects   = $this->loadModel('project')->getPairsByProgram(0);
+        $this->view->mode       = 'nc';
+        $this->display();
+    }
+
     /**
      * My team.
      *
@@ -652,6 +742,7 @@ class my extends control
         if(!empty($_POST))
         {
             $_POST['account'] = $this->app->user->account;
+            $_POST['groups']  = $this->dao->select('`group`')->from(TABLE_USERGROUP)->where('account')->eq($this->post->account)->fetchPairs('group', 'group');
             $this->user->update($this->app->user->id);
             if(dao::isError()) die(js::error(dao::getError()));
             die(js::locate($this->createLink('my', 'profile'), 'parent'));
@@ -850,11 +941,11 @@ class my extends control
         $this->view->position[] = $this->lang->my->preference;
 
         $this->view->URSRList         = $this->loadModel('custom')->getURSRPairs();
-        $this->view->URSR             = isset($this->config->URSR) ? $this->config->URSR : $this->setting->getItem('owner=system&module=custom&key=URSR');
+        $this->view->URSR             = $this->setting->getURSR();
         $this->view->programLink      = isset($this->config->programLink) ? $this->config->programLink : 'program-browse';
         $this->view->productLink      = isset($this->config->productLink) ? $this->config->productLink : 'product-all';
         $this->view->projectLink      = isset($this->config->projectLink) ? $this->config->projectLink : 'project-browse';
-        $this->view->executionLink    = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-task';
+        //$this->view->executionLink  = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-task';
         $this->view->preferenceSetted = isset($this->config->preferenceSetted) ? true : false;
 
         $this->display();
@@ -870,20 +961,31 @@ class my extends control
      * @access public
      * @return void
      */
-    public function dynamic($type = 'today', $recTotal = 0, $date = '', $direction = 'next')
+    public function dynamic($type = 'today', $recTotal = 0, $date = '', $direction = 'next', $originTotal = 0)
     {
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('projectList',     $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('designList',      $uri, 'project');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('programList',     $uri, 'program');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('caselibList',     $uri, 'qa');
+        $this->session->set('testsuiteList',   $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('reportList',      $uri, 'qa');
+        $this->session->set('docList',         $uri, 'doc');
+        $this->session->set('todoList',        $uri, 'my');
+        $this->session->set('riskList',        $uri, 'project');
+        $this->session->set('issueList',       $uri, 'project');
+        $this->session->set('stakeholderList', $uri, 'project');
 
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
@@ -898,14 +1000,16 @@ class my extends control
         $this->view->position[] = $this->lang->my->dynamic;
 
         $date    = empty($date) ? '' : date('Y-m-d', $date);
-        $actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $sort, $pager, 'all', 'all', $date, $direction);
+        $actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $sort, $pager, 'all', 'all', 'all', $date, $direction);
+        if(empty($recTotal)) $originTotal = $pager->recTotal;
 
         /* Assign. */
-        $this->view->type       = $type;
-        $this->view->orderBy    = $orderBy;
-        $this->view->pager      = $pager;
-        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
-        $this->view->direction  = $direction;
+        $this->view->type        = $type;
+        $this->view->orderBy     = $orderBy;
+        $this->view->pager       = $pager;
+        $this->view->dateGroups  = $this->action->buildDateGroup($actions, $direction, $type);
+        $this->view->direction   = $direction;
+        $this->view->originTotal = $originTotal;
         $this->display();
     }
 
diff --git a/module/my/css/project.css b/module/my/css/project.css
index 27e3b8117d..16862f86fc 100644
--- a/module/my/css/project.css
+++ b/module/my/css/project.css
@@ -1,3 +1,3 @@
-#programTableList > tr.drop-not-allowed {opacity: 0.1 !important;}
-#programList .c-actions {overflow: visible;}
-#programTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
+#projectTableList > tr.drop-not-allowed {opacity: 0.1 !important;}
+#projectList .c-actions {overflow: visible;}
+#projectTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
diff --git a/module/my/css/requirement.css b/module/my/css/requirement.css
index b1d19f43ad..13919b8117 100644
--- a/module/my/css/requirement.css
+++ b/module/my/css/requirement.css
@@ -7,5 +7,6 @@
 .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .story-toggle > .icon:before {text-align: left;}
 .table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);}
+.table td.c-hours {padding-right: 12px;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}
diff --git a/module/my/css/story.css b/module/my/css/story.css
index b1d19f43ad..13919b8117 100644
--- a/module/my/css/story.css
+++ b/module/my/css/story.css
@@ -7,5 +7,6 @@
 .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .story-toggle > .icon:before {text-align: left;}
 .table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);}
+.table td.c-hours {padding-right: 12px;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}
diff --git a/module/my/css/task.css b/module/my/css/task.css
index 0bc7243a39..36edf036e5 100644
--- a/module/my/css/task.css
+++ b/module/my/css/task.css
@@ -10,5 +10,6 @@ td.delayed {background: #e84e0f !important; color: white;}
 .table td.has-child > .task-toggle > .icon:before {text-align: left;}
 .table td.has-child > .task-toggle.collapsed {top: 2px;}
 .table td.has-child > .task-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);}
+.table td.c-hours {padding-right: 12px;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}
diff --git a/module/my/js/doc.js b/module/my/js/doc.js
new file mode 100644
index 0000000000..ef9e5db6f3
--- /dev/null
+++ b/module/my/js/doc.js
@@ -0,0 +1,19 @@
+$('.ajaxCollect').click(function (event) {
+    var obj = $(this);
+    var url = obj.data('url');
+    $.get(url, function(response)
+    {
+        if(response.status == 'yes')
+        {
+            obj.children('i').removeClass().addClass('icon icon-star text-yellow');
+            obj.parent().prev().children('.file-name').children('i').remove('.icon');
+            obj.parent().prev().children('.file-name').prepend('<i class="icon icon-star text-yellow"></i> ');
+        }
+        else
+        {
+            obj.children('i').removeClass().addClass('icon icon-star-empty');
+            obj.parent().prev().children('.file-name').children('i').remove(".icon");
+        }
+    }, 'json');
+    return false;
+});
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index dda1bbe311..b02897afcd 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -1,8 +1,6 @@
 <?php
 global $config;
 
-$lang->my->common = 'Dashboard';
-
 /* Method List。*/
 $lang->my->index           = 'Home';
 $lang->my->todo            = 'My Todos';
@@ -14,6 +12,7 @@ $lang->my->bug             = 'My Bugs';
 $lang->my->testTask        = 'My Builds';
 $lang->my->testCase        = 'My Cases';
 $lang->my->story           = 'My Stories';
+$lang->my->doc             = "My Docs";
 $lang->my->createProgram   = 'Create Program';
 $lang->my->project         = "My Projects";
 $lang->my->execution       = "My {$lang->executionCommon}s";
@@ -46,7 +45,7 @@ $lang->my->myExecutions = "My Stage/Sprint/Iteration";
 $lang->my->name         = 'Name';
 $lang->my->code         = 'Code';
 $lang->my->projects     = 'Project';
-$lang->my->executions   = $lang->executionCommon;
+$lang->my->executions   = 'Executions';
 
 $lang->my->executionMenu = new stdclass();
 $lang->my->executionMenu->undone = 'Undone';
@@ -61,6 +60,7 @@ $lang->my->taskMenu->canceledByMe = 'CancelledByMe';
 
 $lang->my->storyMenu = new stdclass();
 $lang->my->storyMenu->assignedToMe = 'AssignedToMe';
+$lang->my->storyMenu->reviewByMe   = 'ReviewByMe';
 $lang->my->storyMenu->openedByMe   = 'CreatedByMe';
 $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
 $lang->my->storyMenu->closedByMe   = 'ClosedByMe';
@@ -80,7 +80,8 @@ $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->executionLink = 'Execution Default Page';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . ' Default Page';
+if($config->systemMode == 'new') $lang->my->executionLink = 'Execution Default Page';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'By default, you go to the program list, where you can view all of the programs';
@@ -99,6 +100,10 @@ $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by def
 $lang->my->projectLinkList['project-index']     = 'By default, go to the most recent project dashboard to see the current project overview';
 
 $lang->my->executionLinkList = array();
+if($config->systemMode == 'new')
+{
 $lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
 $lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
 $lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index dda1bbe311..d050c58b80 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -1,8 +1,6 @@
 <?php
 global $config;
 
-$lang->my->common = 'Dashboard';
-
 /* Method List。*/
 $lang->my->index           = 'Home';
 $lang->my->todo            = 'My Todos';
@@ -14,6 +12,7 @@ $lang->my->bug             = 'My Bugs';
 $lang->my->testTask        = 'My Builds';
 $lang->my->testCase        = 'My Cases';
 $lang->my->story           = 'My Stories';
+$lang->my->doc             = "My Docs";
 $lang->my->createProgram   = 'Create Program';
 $lang->my->project         = "My Projects";
 $lang->my->execution       = "My {$lang->executionCommon}s";
@@ -42,11 +41,18 @@ $lang->my->testtask        = 'My Test Task';
 $lang->my->testcase        = 'My Case';
 $lang->my->storyConcept    = 'Story Concept';
 
-$lang->my->myExecutions = "My Stage/Sprint/Iteration";
+$lang->my->indexAction      = 'My Index';
+$lang->my->calendarAction   = 'My Calendar';
+$lang->my->workAction       = 'My Work';
+$lang->my->contributeAction = 'My Contribute';
+$lang->my->profileAction    = 'Profile';
+$lang->my->dynamicAction    = 'Dynamic';
+
+$lang->my->myExecutions = "My Executions";
 $lang->my->name         = 'Name';
 $lang->my->code         = 'Code';
-$lang->my->projects     = 'Project';
-$lang->my->executions   = $lang->executionCommon;
+$lang->my->projects     = 'Projects';
+$lang->my->executions   = 'Executions';
 
 $lang->my->executionMenu = new stdclass();
 $lang->my->executionMenu->undone = 'Undone';
@@ -61,6 +67,7 @@ $lang->my->taskMenu->canceledByMe = 'CancelledByMe';
 
 $lang->my->storyMenu = new stdclass();
 $lang->my->storyMenu->assignedToMe = 'AssignedToMe';
+$lang->my->storyMenu->reviewByMe   = 'ReviewByMe';
 $lang->my->storyMenu->openedByMe   = 'CreatedByMe';
 $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
 $lang->my->storyMenu->closedByMe   = 'ClosedByMe';
@@ -80,7 +87,8 @@ $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->executionLink = 'Execution Default Page';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . ' Default Page';
+if($config->systemMode == 'new') $lang->my->executionLink = 'Execution Default Page';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'By default, you go to the program list, where you can view all of the programs';
@@ -99,6 +107,10 @@ $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by def
 $lang->my->projectLinkList['project-index']     = 'By default, go to the most recent project dashboard to see the current project overview';
 
 $lang->my->executionLinkList = array();
+if($config->systemMode == 'new')
+{
 $lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
 $lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
 $lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index dda1bbe311..b02897afcd 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -1,8 +1,6 @@
 <?php
 global $config;
 
-$lang->my->common = 'Dashboard';
-
 /* Method List。*/
 $lang->my->index           = 'Home';
 $lang->my->todo            = 'My Todos';
@@ -14,6 +12,7 @@ $lang->my->bug             = 'My Bugs';
 $lang->my->testTask        = 'My Builds';
 $lang->my->testCase        = 'My Cases';
 $lang->my->story           = 'My Stories';
+$lang->my->doc             = "My Docs";
 $lang->my->createProgram   = 'Create Program';
 $lang->my->project         = "My Projects";
 $lang->my->execution       = "My {$lang->executionCommon}s";
@@ -46,7 +45,7 @@ $lang->my->myExecutions = "My Stage/Sprint/Iteration";
 $lang->my->name         = 'Name';
 $lang->my->code         = 'Code';
 $lang->my->projects     = 'Project';
-$lang->my->executions   = $lang->executionCommon;
+$lang->my->executions   = 'Executions';
 
 $lang->my->executionMenu = new stdclass();
 $lang->my->executionMenu->undone = 'Undone';
@@ -61,6 +60,7 @@ $lang->my->taskMenu->canceledByMe = 'CancelledByMe';
 
 $lang->my->storyMenu = new stdclass();
 $lang->my->storyMenu->assignedToMe = 'AssignedToMe';
+$lang->my->storyMenu->reviewByMe   = 'ReviewByMe';
 $lang->my->storyMenu->openedByMe   = 'CreatedByMe';
 $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
 $lang->my->storyMenu->closedByMe   = 'ClosedByMe';
@@ -80,7 +80,8 @@ $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->executionLink = 'Execution Default Page';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . ' Default Page';
+if($config->systemMode == 'new') $lang->my->executionLink = 'Execution Default Page';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'By default, you go to the program list, where you can view all of the programs';
@@ -99,6 +100,10 @@ $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by def
 $lang->my->projectLinkList['project-index']     = 'By default, go to the most recent project dashboard to see the current project overview';
 
 $lang->my->executionLinkList = array();
+if($config->systemMode == 'new')
+{
 $lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
 $lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
 $lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index dda1bbe311..b02897afcd 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -1,8 +1,6 @@
 <?php
 global $config;
 
-$lang->my->common = 'Dashboard';
-
 /* Method List。*/
 $lang->my->index           = 'Home';
 $lang->my->todo            = 'My Todos';
@@ -14,6 +12,7 @@ $lang->my->bug             = 'My Bugs';
 $lang->my->testTask        = 'My Builds';
 $lang->my->testCase        = 'My Cases';
 $lang->my->story           = 'My Stories';
+$lang->my->doc             = "My Docs";
 $lang->my->createProgram   = 'Create Program';
 $lang->my->project         = "My Projects";
 $lang->my->execution       = "My {$lang->executionCommon}s";
@@ -46,7 +45,7 @@ $lang->my->myExecutions = "My Stage/Sprint/Iteration";
 $lang->my->name         = 'Name';
 $lang->my->code         = 'Code';
 $lang->my->projects     = 'Project';
-$lang->my->executions   = $lang->executionCommon;
+$lang->my->executions   = 'Executions';
 
 $lang->my->executionMenu = new stdclass();
 $lang->my->executionMenu->undone = 'Undone';
@@ -61,6 +60,7 @@ $lang->my->taskMenu->canceledByMe = 'CancelledByMe';
 
 $lang->my->storyMenu = new stdclass();
 $lang->my->storyMenu->assignedToMe = 'AssignedToMe';
+$lang->my->storyMenu->reviewByMe   = 'ReviewByMe';
 $lang->my->storyMenu->openedByMe   = 'CreatedByMe';
 $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
 $lang->my->storyMenu->closedByMe   = 'ClosedByMe';
@@ -80,7 +80,8 @@ $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->executionLink = 'Execution Default Page';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . ' Default Page';
+if($config->systemMode == 'new') $lang->my->executionLink = 'Execution Default Page';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'By default, you go to the program list, where you can view all of the programs';
@@ -99,6 +100,10 @@ $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by def
 $lang->my->projectLinkList['project-index']     = 'By default, go to the most recent project dashboard to see the current project overview';
 
 $lang->my->executionLinkList = array();
+if($config->systemMode == 'new')
+{
 $lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
 $lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
 $lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 542889bddf..e5697ee35e 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -1,8 +1,6 @@
 <?php
 global $config;
 
-$lang->my->common = '我的地盘';
-
 /* 方法列表。*/
 $lang->my->index           = '首页';
 $lang->my->todo            = '我的待办';
@@ -14,6 +12,7 @@ $lang->my->bug             = '我的Bug';
 $lang->my->testTask        = '我的版本';
 $lang->my->testCase        = '我的用例';
 $lang->my->story           = "我的{$lang->SRCommon}";
+$lang->my->doc             = "我的文档";
 $lang->my->createProgram   = '添加项目';
 $lang->my->project         = "我的项目";
 $lang->my->execution       = "我的{$lang->executionCommon}";
@@ -42,11 +41,18 @@ $lang->my->testtask        = '我的测试单';
 $lang->my->testcase        = '我的用例';
 $lang->my->storyConcept    = $config->URAndSR ? '默认需求概念组合' : '默认需求概念';
 
+$lang->my->indexAction      = '地盘仪表盘';
+$lang->my->calendarAction   = '我的日程';
+$lang->my->workAction       = '我的待处理';
+$lang->my->contributeAction = '我的贡献';
+$lang->my->profileAction    = '个人档案';
+$lang->my->dynamicAction    = '动态';
+
 $lang->my->myExecutions = "我参与的阶段/冲刺/迭代";
 $lang->my->name         = '名称';
 $lang->my->code         = '代号';
 $lang->my->projects     = '所属项目';
-$lang->my->executions   = '所属' . $lang->executionCommon;
+$lang->my->executions   = "所属{$lang->executionCommon}";
 
 $lang->my->executionMenu = new stdclass();
 $lang->my->executionMenu->undone = '未结束';
@@ -61,6 +67,7 @@ $lang->my->taskMenu->canceledByMe = '由我取消';
 
 $lang->my->storyMenu = new stdclass();
 $lang->my->storyMenu->assignedToMe = '指派给我';
+$lang->my->storyMenu->reviewByMe   = '待我评审';
 $lang->my->storyMenu->openedByMe   = '由我创建';
 $lang->my->storyMenu->reviewedByMe = '由我评审';
 $lang->my->storyMenu->closedByMe   = '由我关闭';
@@ -80,7 +87,8 @@ $lang->my->form->lblAccount = '帐号信息';
 $lang->my->programLink   = '项目集默认着陆页';
 $lang->my->productLink   = '产品默认着陆页';
 $lang->my->projectLink   = '项目默认着陆页';
-$lang->my->executionLink = '执行默认着陆页';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . '默认着陆页';
+if($config->systemMode == 'new') $lang->my->executionLink = '执行默认着陆页';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = '默认进入项目集列表，可以查看所有的项目集';
@@ -99,6 +107,10 @@ $lang->my->projectLinkList['project-execution'] = '默认进入项目下所有
 $lang->my->projectLinkList['project-index']     = '默认进入最近一个项目仪表盘，可以查看当前项目概况';
 
 $lang->my->executionLinkList = array();
-$lang->my->executionLinkList['execution-index'] = '默认进入执行仪表盘，可以了解所有执行的统计数据和概况';
-$lang->my->executionLinkList['execution-all']   = '默认进入执行列表，可以查看所有的执行';
-$lang->my->executionLinkList['execution-task']  = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息';
+if($config->systemMode == 'new')
+{
+    $lang->my->executionLinkList['execution-task']  = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息';
+    $lang->my->executionLinkList['execution-index'] = '默认进入执行仪表盘，可以了解所有执行的统计数据和概况';
+    $lang->my->executionLinkList['execution-all']   = '默认进入执行列表，可以查看所有的执行';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "默认进入最近一个{$lang->executionCommon}的任务列表，可以查看当前{$lang->executionCommon}下的任务信息";
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 86b24ac7ac..fd9b1ea349 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -1,8 +1,6 @@
 <?php
 global $config;
 
-$lang->my->common = '我的地盤';
-
 /* 方法列表。*/
 $lang->my->index           = '首頁';
 $lang->my->todo            = '我的待辦';
@@ -14,6 +12,7 @@ $lang->my->bug             = '我的Bug';
 $lang->my->testTask        = '我的版本';
 $lang->my->testCase        = '我的用例';
 $lang->my->story           = "我的{$lang->SRCommon}";
+$lang->my->doc             = "我的文檔";
 $lang->my->createProgram   = '添加項目';
 $lang->my->project         = "我的項目";
 $lang->my->execution       = "我的{$lang->executionCommon}";
@@ -42,11 +41,18 @@ $lang->my->testtask        = '我的測試單';
 $lang->my->testcase        = '我的用例';
 $lang->my->storyConcept    = $config->URAndSR ? '預設需求概念組合' : '預設需求概念';
 
+$lang->my->indexAction      = '地盤儀表盤';
+$lang->my->calendarAction   = '我的日程';
+$lang->my->workAction       = '我的待處理';
+$lang->my->contributeAction = '我的貢獻';
+$lang->my->profileAction    = '個人檔案';
+$lang->my->dynamicAction    = '動態';
+
 $lang->my->myExecutions = "我參與的階段/衝刺/迭代";
 $lang->my->name         = '名稱';
 $lang->my->code         = '代號';
 $lang->my->projects     = '所屬項目';
-$lang->my->executions   = '所屬' . $lang->executionCommon;
+$lang->my->executions   = "所屬{$lang->executionCommon}";
 
 $lang->my->executionMenu = new stdclass();
 $lang->my->executionMenu->undone = '未結束';
@@ -61,6 +67,7 @@ $lang->my->taskMenu->canceledByMe = '由我取消';
 
 $lang->my->storyMenu = new stdclass();
 $lang->my->storyMenu->assignedToMe = '指派給我';
+$lang->my->storyMenu->reviewByMe   = '待我評審';
 $lang->my->storyMenu->openedByMe   = '由我創建';
 $lang->my->storyMenu->reviewedByMe = '由我評審';
 $lang->my->storyMenu->closedByMe   = '由我關閉';
@@ -80,7 +87,8 @@ $lang->my->form->lblAccount = '帳號信息';
 $lang->my->programLink   = '項目集預設着陸頁';
 $lang->my->productLink   = '產品預設着陸頁';
 $lang->my->projectLink   = '項目預設着陸頁';
-$lang->my->executionLink = '執行預設着陸頁';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . '預設着陸頁';
+if($config->systemMode == 'new') $lang->my->executionLink = '執行預設着陸頁';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = '預設進入項目集列表，可以查看所有的項目集';
@@ -94,11 +102,15 @@ $lang->my->productLinkList['product-browse']    = '預設進入最近一個產
 
 global $config;
 $lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse'] = '預設進入項目列表，可以查看所有的項目';
-$lang->my->projectLinkList['project-task']   = '預設進入最近一個項目迭代的任務列表，可以查看當前迭代下的任務信息';
-$lang->my->projectLinkList['project-index']  = '預設進入最近一個項目儀表盤，可以查看當前項目概況';
+$lang->my->projectLinkList['project-browse']    = '預設進入項目列表，可以查看所有的項目';
+$lang->my->projectLinkList['project-execution'] = '預設進入項目下所有執行列表，查看所有執行信息';
+$lang->my->projectLinkList['project-index']     = '預設進入最近一個項目儀表盤，可以查看當前項目概況';
 
 $lang->my->executionLinkList = array();
-$lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤，可以瞭解所有執行的統計數據和概況';
-$lang->my->executionLinkList['execution-all']   = '預設進入執行列表，可以查看所有的執行';
-$lang->my->executionLinkList['execution-task']  = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息';
+if($config->systemMode == 'new')
+{
+    $lang->my->executionLinkList['execution-task']  = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息';
+    $lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤，可以瞭解所有執行的統計數據和概況';
+    $lang->my->executionLinkList['execution-all']   = '預設進入執行列表，可以查看所有的執行';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "預設進入最近一個{$lang->executionCommon}的任務列表，可以查看當前{$lang->executionCommon}下的任務信息";
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 1e0c6c61ec..0a2a9d6fe1 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -35,10 +35,11 @@
   <?php else:?>
   <form id='myBugForm' class="main-table table-bug" data-ride="table" method="post" action='<?php echo $this->createLink('bug', 'batchEdit', "productID=0");?>'>
     <?php
+    $canBatchEdit     = (common::hasPriv('bug', 'batchEdit') and $type == 'assignedTo');
     $canBatchConfirm  = common::hasPriv('bug', 'batchConfirm');
     $canBatchClose    = (common::hasPriv('bug', 'batchClose') and strtolower($type) != 'closedby');
     $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');
-    $canBatchAction   = ($canBatchConfirm or $canBatchClose or $canBatchAssignTo);
+    $canBatchAction   = ($canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchAssignTo);
     ?>
     <table class="table has-sort-head table-fixed" id='bugList'>
       <?php $vars = "mode=$mode&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
@@ -102,8 +103,8 @@
             <?php endif;?>
           </td>
           <td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', '', $bug->project), $bug->title, null, "style='color: $bug->color' title={$bug->title} data-group='project'");?></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('product', 'view', "productID=$bug->product", '', '', $bug->project), $bug->productName, null, "title={$bug->productName} data-group='product'");?></td>
+          <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color' title={$bug->title}");?></td>
+          <td class='text-left nobr'><?php echo html::a($this->createLink('product', explode('-', $config->productLink)[1], "productID=$bug->product"), $bug->productName, null, "title={$bug->productName}");?></td>
           <td title="<?php echo zget($lang->bug->typeList, $bug->type, '');?>"><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
           <?php if($type != 'openedBy'): ?>
           <td><?php echo zget($users, $bug->openedBy);?></td>
@@ -123,8 +124,8 @@
                 common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'ok',      '', 'iframe', true, '', '', $bug->project);
                 common::printIcon('bug', 'resolve',    $params, $bug, 'list', 'checked', '', 'iframe', true, '', '', $bug->project);
                 common::printIcon('bug', 'close',      $params, $bug, 'list', '',        '', 'iframe', true, '', '', $bug->project);
-                common::printIcon('bug', 'edit',       $params, $bug, 'list', '',        '', '',       '',   '', '', $bug->project);
-                common::printIcon('bug', 'create',     "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', '', '', '', '', $bug->project);
+                common::printIcon('bug', 'edit',       $params, $bug, 'list', '',        '', 'iframe', true, "data-width='95%'", '', $bug->project);
+                common::printIcon('bug', 'create',     "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', 'iframe', true, "data-width='95%'", '', $bug->project);
             }
             ?>
           </td>
@@ -138,6 +139,12 @@
       <?php endif;?>
       <div class="table-actions btn-toolbar">
         <?php
+        if($canBatchEdit)
+        {
+            $actionLink = $this->createLink('bug', 'batchEdit');
+            $misc       = "data-form-action='$actionLink'";
+            echo html::commonButton($lang->edit, $misc);
+        }
         if($canBatchConfirm)
         {
           $actionLink = $this->createLink('bug', 'batchConfirm', '', '', '', $bug->project);
diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php
index 62cd33577c..4fce8a8c93 100755
--- a/module/my/view/changepassword.html.php
+++ b/module/my/view/changepassword.html.php
@@ -26,11 +26,11 @@
       <tr>
         <th class='rowhead thWidth'><?php echo $lang->user->account;?></th>
         <td><?php echo $user->account . html::hidden('account',$user->account);?></td>
-      </tr>  
+      </tr>
       <tr>
         <th><?php echo $lang->user->originalPassword;?></th>
         <td><?php echo html::password('originalPassword', '', "class='form-control'");?></td>
-      </tr>  
+      </tr>
       <tr>
         <th><?php echo $lang->user->newPassword;?></th>
         <td>
@@ -39,7 +39,7 @@
             <span class='input-group-addon' id='passwordStrength'></span>
           </span>
         </td>
-      </tr>  
+      </tr>
       <tr>
         <th><?php echo $lang->user->password2;?></th>
         <td><?php echo html::password('password2', '', "class='form-control'");?></td>
diff --git a/module/my/view/doc.html.php b/module/my/view/doc.html.php
new file mode 100644
index 0000000000..596bde78c9
--- /dev/null
+++ b/module/my/view/doc.html.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * The project view file of my 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      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     my
+ * @version     $Id
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<?php js::set('mode', 'doc');?>
+<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=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' : '') . "'");
+    ?>
+  </div>
+</div>
+<div id="mainContent" class='main-table'>
+  <?php if(empty($docs)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $lang->doc->noDoc;?></span>
+    </p>
+  </div>
+  <?php else:?>
+  <form class='main-table' id='projectForm' method='post' data-ride='table' data-nested='true' data-checkable='false'>
+    <table class='table table-fixed' id='docList'>
+      <thead>
+        <tr>
+          <th class="c-name"><?php echo $lang->doc->title;?></th>
+          <th class="c-num"><?php echo $lang->doc->size;?></th>
+          <?php if($type != 'openedbyme'):?>
+          <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
+          <?php endif;?>
+          <th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
+          <th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
+          <th class="w-90px text-center"><?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <tbody id='docTableList'>
+        <?php foreach($docs as $doc):?>
+        <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+        <?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
+        <tr>
+          <td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0&from={$lang->navGroup->doc}", '', true), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title={$doc->title} class='iframe' data-width='90%'");?></td>
+          <td class="c-num"><?php echo $doc->fileSize ? $doc->fileSize : '-';?></td>
+          <?php if($type != 'openedbyme'):?>
+          <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
+          <?php endif;?>
+          <td class="c-datetime"><?php echo formatTime($doc->addedDate, 'y-m-d');?></td>
+          <td class="c-datetime"><?php echo formatTime($doc->editedDate, 'y-m-d');?></td>
+          <td class="c-actions">
+            <?php if(common::canBeChanged('doc', $doc)):?>
+            <?php if(common::hasPriv('doc', 'collect')):?>
+            <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
+            <?php endif;?>
+            <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false&from={$lang->navGroup->doc}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'", true, true)?>
+            <?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no&from={$lang->navGroup->doc}", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
+            <?php endif;?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <div class='table-footer'>
+      <?php $pager->show('right', 'pagerjs');?>
+    </div>
+  </form>
+  <?php endif;?>
+</div>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index 21f4d8eeb5..cc78908d65 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -20,7 +20,7 @@
     if($period == $type)
     {
         $active = 'btn-active-text';
-        $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+        $label .= " <span class='label label-light label-badge'>{$originTotal}</span>";
     }
     echo html::a(inlink('dynamic', "type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
     ?>
@@ -76,8 +76,8 @@ $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
 $lastDate  = substr($action->originalDate, 0, 10);
 $hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
 $hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
-$preLink   = $hasPre ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
-$nextLink  = $hasNext ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+$preLink   = $hasPre ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre&originTotal=' . $originTotal) : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next&originTotal=' . $originTotal) : 'javascript:;';
 ?>
 <?php if($hasPre or $hasNext):?>
 <div id="mainActions" class='main-actions'>
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index c2402101a9..de99c17db4 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -34,7 +34,9 @@
       <tr class='text-left'>
         <th class='w-id'><?php echo $lang->idAB;?></th>
         <th class='c-name text-left'><?php echo $lang->my->name;?></th>
-        <th class='c-name text-left'><?php echo $lang->my->project;?></th>
+        <?php if($config->systemMode == 'new'):?>
+        <th class='c-name text-left'><?php echo $lang->my->projects;?></th>
+        <?php endif;?>
         <th class='c-date'><?php echo $lang->execution->begin;?></th>
         <th class='c-date'><?php echo $lang->execution->end;?></th>
         <th class='c-status'><?php echo $lang->statusAB;?></th>
@@ -51,10 +53,18 @@
       <tr class='text-left'>
         <td><?php echo html::a($link, sprintf('%03d', $execution->id));?></td>
         <td class='c-name text-left'>
-          <span class='project-type-label label label-info label-outline'><?php echo zget($lang->execution->typeList, $execution->type);?></span>
-          <?php echo html::a($link, $execution->name, '', "title='$execution->name'");?>
+          <?php
+          if(isset($this->config->maxVersion))
+          {
+              if($execution->type === 'stage') echo "<span class='project-type-label label label-outline label-warning'>{$lang->project->stage}</span> ";
+              if($execution->type === 'sprint') echo "<span class='project-type-label label label-outline label-info'>{$lang->executionCommon}</span> ";
+          }
+          echo html::a($link, $execution->name, '', "title='$execution->name'");
+          ?>
         </td>
-        <td class='c-name text-left'><?php echo html::a($this->createLink('project', 'browse', "id=$execution->project", '', '', $execution->project), $execution->projectName, '', "title='$execution->projectName'");?></td>
+        <?php if($config->systemMode == 'new'):?>
+        <td class='c-name text-left'><?php echo html::a($this->createLink('project', 'view', "id=$execution->project", '', '', $execution->project), $execution->projectName, '', "title='$execution->projectName'");?></td>
+        <?php endif;?>
         <td><?php echo $execution->begin;?></td>
         <td><?php echo $execution->end;?></td>
         <td class="c-status">
diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php
index 6f6ca08a32..0db51e2353 100755
--- a/module/my/view/preference.html.php
+++ b/module/my/view/preference.html.php
@@ -11,7 +11,10 @@
  */
 ?>
 <?php if($preferenceSetted):?>
-<style> #submit{margin-top: 45px} </style>
+<style>
+#submit{margin-top: 45px}
+.chosen-container-single .chosen-single div b {top: 7px !important;}
+</style>
 <?php include '../../common/view/header.html.php';?>
 <?php else:?>
 <?php include '../../common/view/header.lite.html.php';?>
@@ -54,11 +57,18 @@ html,body {height: 100%;}
         <th><?php echo $lang->my->projectLink;?></th>
         <td><?php echo html::select('projectLink', $lang->my->projectLinkList, $projectLink, "class='form-control chosen'");?></td>
       </tr>
+      <?php else:?>
+      <tr>
+        <th><?php echo $lang->my->executionLink;?></th>
+        <td><?php echo html::select('executionLink', $lang->my->executionLinkList, 'execution-task', "class='form-control chosen'");?></td>
+      </tr>
       <?php endif;?>
+<!--
       <tr>
         <th><?php echo $lang->my->executionLink;?></th>
         <td><?php echo html::select('executionLink', $lang->my->executionLinkList, $executionLink, "class='form-control chosen'");?></td>
       </tr>
+-->
       <tr>
         <td colspan='2' class='text-center form-actions'><?php echo html::submitButton();?></td>
       </tr>
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index f179192800..56eadc4e81 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -26,13 +26,6 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->project->empty;?></span>
-      <?php if(isset($this->config->maxVersion) and common::hasPriv('project', 'createGuide')):?>
-      <?php echo html::a($this->createLink('project', 'createGuide'), "<i class='icon icon-plus'></i> " . $lang->my->createProgram, '', "class='btn btn-info' data-toggle=modal");?>
-      <?php elseif($this->config->systemMode == 'new' and common::hasPriv('project', 'create')):?>
-      <?php echo html::a($this->createLink('project', 'create'), '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
-      <?php elseif($this->config->systemMode == 'classic' and common::hasPriv('execution', 'create')):?>
-      <?php echo html::a($this->createLink('execution', 'create'), '<i class="icon icon-plus"></i>' . $lang->execution->create, '', 'class="btn btn-info"');?>
-      <?php endif;?>
     </p>
   </div>
   <?php else:?>
@@ -57,14 +50,21 @@
         <tr>
           <td class='c-id'><?php printf('%03d', $project->id);?></td>
           <td class='c-name text-left' title='<?php echo $project->name?>'>
-            <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name, '', "data-group='project'");?>
+            <?php
+            if(isset($this->config->maxVersion))
+            {
+                if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$lang->project->waterfall}</span> ";
+                if($project->model === 'scrum')     echo "<span class='project-type-label label label-outline label-info'>{$lang->project->scrum}</span> ";
+            }
+            echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name, '', "data-group='project'");
+            ?>
           </td>
           <?php if($status == 'openedbyme'):?>
           <td class='c-status'><span class="status-project status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span></td>
           <?php endif;?>
           <td class='text-left'><?php echo $project->begin;?></td>
-          <td class='text-left'><?php echo $project->end == '0000-00-00' ? '' : $project->end;?></td>
-          <?php $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->project->tenThousand : number_format((float)$project->budget, 1);?>
+          <td class='text-left'><?php echo $project->end == LONG_TIME ? $this->lang->project->longTime : $project->end;?></td>
+          <?php $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?>
           <td class='text-right'><?php echo $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?></td>
           <td>
             <?php $userID = isset($PMList[$project->PM]) ? $PMList[$project->PM]->id : ''?>
@@ -91,8 +91,8 @@
             <div class='btn-group'>
               <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
               <ul class='dropdown-menu pull-right text-center' role='menu'>
-                <?php common::printIcon('project', 'manageProducts', "projectID=$project->id&projectID=$project->parent", $project, 'list', 'link', '', '', false, "data-group='project'", '', $project->id);?>
-                <?php common::printIcon('project', 'whitelist', "projectID=$project->id&projectID=$project->parent&module=project", $project, 'list', 'shield-check', '', '', false, "data-group='project'", '', $project->id);?>
+                <?php common::printIcon('project', 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', '', false, "data-group='project'", '', $project->id);?>
+                <?php common::printIcon('project', 'whitelist', "projectID=$project->id&module=project", $project, 'list', 'shield-check', '', '', false, "data-group='project'", '', $project->id);?>
                 <?php if(common::hasPriv('project','delete')) echo html::a($this->createLink("project", "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->project->delete}' data-group='my'");?>
               </ul>
             </div>
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index ea933695da..f4031f5183 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -24,6 +24,11 @@
         echo html::a(inlink($app->rawMethod, "mode=requirement&type=reviewedBy&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&&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' : '') . "'");
     }
+    else
+    {
+        echo html::a(inlink($app->rawMethod, "mode=requirement&type=assignedTo&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&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' : '') . "'");
+    }
     ?>
   </div>
 </div>
@@ -86,7 +91,7 @@
           </td>
           <td class='c-product'><?php echo $story->productTitle;?></td>
           <td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
-          <td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
           <td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
           <td class='c-actions'>
@@ -94,11 +99,10 @@
             if($canBeChanged)
             {
                 $vars = "story={$story->id}";
-                common::printIcon('story', 'change',     $vars, $story, 'list', 'fork');
-                common::printIcon('story', 'review',     $vars, $story, 'list', 'glasses');
+                common::printIcon('story', 'change',     $vars, $story, 'list', 'alter', '', 'iframe', true);
+                common::printIcon('story', 'review',     $vars, $story, 'list', 'search', '', 'iframe', true);
                 common::printIcon('story', 'close',      $vars, $story, 'list', '', '', 'iframe', true);
-                common::printIcon('story', 'edit',       $vars, $story, 'list');
-                common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
+                common::printIcon('story', 'edit',       $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'");
             }
             ?>
           </td>
@@ -125,7 +129,7 @@
           </td>
           <td class='c-product'><?php echo $child->productTitle;?></td>
           <td class='c-user'><?php echo zget($users, $child->openedBy);?></td>
-          <td class='c-hours'><?php echo $child->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='c-hours'><?php echo $child->estimate . $config->hourUnit;?></td>
           <td class='c-status'><span class='status-story status-<?php echo $child->status;?>'> <?php echo $this->processStatus('story', $child);?></span></td>
           <td class='c-stage'><?php echo zget($lang->story->stageList, $child->stage);?></td>
           <td class='c-actions'>
@@ -133,8 +137,8 @@
             if($canBeChanged)
             {
                 $vars = "story={$child->id}";
-                common::printIcon('story', 'change',     $vars, $child, 'list', 'fork');
-                common::printIcon('story', 'review',     $vars, $child, 'list', 'glasses');
+                common::printIcon('story', 'change',     $vars, $child, 'list', 'alter');
+                common::printIcon('story', 'review',     $vars, $child, 'list', 'search');
                 common::printIcon('story', 'close',      $vars, $child, 'list', '', '', 'iframe', true);
                 common::printIcon('story', 'edit',       $vars, $child, 'list');
                 common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=&param=0&$vars", $child, 'list', 'sitemap');
@@ -156,7 +160,7 @@
         <?php
         if($canBatchEdit)
         {
-            $actionLink = $this->createLink('story', 'batchEdit');
+            $actionLink = $this->createLink('story', 'batchEdit', "productID=0&executionID=0&branch=0&storyType=requirement&from={$app->rawMethod}");
             $misc       = "data-form-action='$actionLink'";
             echo html::commonButton($lang->edit, $misc);
         }
@@ -233,7 +237,7 @@
         <?php endif;?>
         <?php if($canBatchClose):?>
         <?php
-        $actionLink = $this->createLink('story', 'batchClose');
+        $actionLink = $this->createLink('story', 'batchClose', "productID=0&executionID=0&storyType=requirement&from={$app->rawMethod}");
         $misc = "data-form-action=\"$actionLink\"";
         echo html::commonButton($lang->close, $misc);
         ?>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index d2c4e02b54..e48763c06e 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -24,6 +24,11 @@
         echo html::a(inlink($app->rawMethod, "mode=story&type=reviewedBy&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&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' : '') . "'");
     }
+    else
+    {
+        echo html::a(inlink($app->rawMethod, "mode=story&type=assignedTo&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&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' : '') . "'");
+    }
     ?>
   </div>
 </div>
@@ -88,7 +93,7 @@
           <td class='c-product'><?php echo $story->productTitle;?></td>
           <td class='c-plan'><?php echo $story->planTitle;?></td>
           <td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
-          <td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
           <td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
           <td class='c-actions'>
@@ -96,11 +101,11 @@
             if($canBeChanged)
             {
                 $vars = "story={$story->id}";
-                common::printIcon('story', 'change',     $vars, $story, 'list', 'alter');
-                common::printIcon('story', 'review',     $vars, $story, 'list', 'glasses');
+                common::printIcon('story', 'change',     $vars, $story, 'list', 'alter', '', 'iframe', true);
+                common::printIcon('story', 'review',     $vars, $story, 'list', 'search', '', 'iframe', true);
                 common::printIcon('story', 'close',      $vars, $story, 'list', '', '', 'iframe', true);
-                common::printIcon('story', 'edit',       $vars, $story, 'list');
-                common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
+                common::printIcon('story', 'edit',       $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'");
+                common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', 'iframe', true, "data-width='95%'");
             }
             ?>
           </td>
@@ -128,7 +133,7 @@
           <td class='c-product'><?php echo $child->productTitle;?></td>
           <td class='c-plan'><?php echo $child->planTitle;?></td>
           <td class='c-user'><?php echo zget($users, $child->openedBy);?></td>
-          <td class='c-hours'><?php echo $child->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='c-hours'><?php echo $child->estimate . $config->hourUnit;?></td>
           <td class='c-status'><span class='status-story status-<?php echo $child->status;?>'> <?php echo $this->processStatus('story', $child);?></span></td>
           <td class='c-stage'><?php echo zget($lang->story->stageList, $child->stage);?></td>
           <td class='c-actions'>
@@ -136,8 +141,8 @@
             if($canBeChanged)
             {
                 $vars = "story={$child->id}";
-                common::printIcon('story', 'change',     $vars, $child, 'list', 'fork');
-                common::printIcon('story', 'review',     $vars, $child, 'list', 'glasses');
+                common::printIcon('story', 'change',     $vars, $child, 'list', 'alter');
+                common::printIcon('story', 'review',     $vars, $child, 'list', 'search');
                 common::printIcon('story', 'close',      $vars, $child, 'list', '', '', 'iframe', true);
                 common::printIcon('story', 'edit',       $vars, $child, 'list');
                 common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=&param=0&$vars", $child, 'list', 'sitemap');
@@ -159,7 +164,7 @@
         <?php
         if($canBatchEdit)
         {
-            $actionLink = $this->createLink('story', 'batchEdit');
+            $actionLink = $this->createLink('story', 'batchEdit', "productID=0&executionID=0&branch=0&storyType=story&from={$app->rawMethod}");
             $misc       = "data-form-action='$actionLink'";
             echo html::commonButton($lang->edit, $misc);
         }
@@ -236,7 +241,7 @@
         <?php endif;?>
         <?php if($canBatchClose):?>
         <?php
-        $actionLink = $this->createLink('story', 'batchClose');
+        $actionLink = $this->createLink('story', 'batchClose', "productID=0&executionID=0&storyType=story&from={$app->rawMethod}");
         $misc = "data-form-action=\"$actionLink\"";
         echo html::commonButton($lang->close, $misc);
         ?>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 74fbc708dd..a489aef067 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -34,7 +34,7 @@
   </div>
   <?php else:?>
   <form id='myTaskForm' class="main-table table-task" method="post">
-    <?php $canBatchEdit  = common::hasPriv('task', 'batchEdit');?>
+    <?php $canBatchEdit  = (common::hasPriv('task', 'batchEdit')  and $type == 'assignedTo');?>
     <?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
     <table class="table has-sort-head table-fixed" id='taskTable'>
       <?php $vars = "mode=$mode&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
@@ -50,7 +50,6 @@
           </th>
           <th class='c-pri w-40px'>        <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'>              <?php common::printOrderLink('name',       $orderBy, $vars, $lang->task->name);?></th>
-          <th class='c-project w-120px'>   <?php common::printOrderLink('project',    $orderBy, $vars, $lang->task->project);?></th>
           <th class='c-project w-120px'>   <?php common::printOrderLink('execution',  $orderBy, $vars, $lang->my->executions);?></th>
           <?php if($type != 'openedBy'): ?>
           <th class='c-user w-90px'>       <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
@@ -88,7 +87,6 @@
             <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name, null, "style='color: $task->color' data-group='execution'");?>
             <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
           </td>
-          <td class='c-project' title="<?php echo zget($projects, $task->project, '');?>"><?php echo zget($projects, $task->project, '');?></td>
           <td class='c-project' title="<?php echo $task->executionName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$task->execution", '', '', $task->project), $task->executionName, '', "data-group='execution'");?></td>
           <?php if($type != 'openedBy'): ?>
           <td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
@@ -99,9 +97,9 @@
           <?php if($type != 'finishedBy'): ?>
           <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
           <?php endif;?>
-          <td class='c-hours' title="<?php echo round($task->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->estimate, 1) . ' ' . $lang->execution->workHourUnit;?></td>
-          <td class='c-hours' title="<?php echo round($task->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->consumed, 1) . ' ' . $lang->execution->workHourUnit;?></td>
-          <td class='c-hours' title="<?php echo round($task->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->left,     1) . ' ' . $lang->execution->workHourUnit;?></td>
+          <td class='c-hours' title="<?php echo round($task->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->estimate, 1) . $lang->execution->workHourUnit;?></td>
+          <td class='c-hours' title="<?php echo round($task->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->consumed, 1) . $lang->execution->workHourUnit;?></td>
+          <td class='c-hours' title="<?php echo round($task->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->left,     1) . $lang->execution->workHourUnit;?></td>
           <td class='c-status'>
             <?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
             <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
@@ -123,8 +121,8 @@
                     common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project);
 
                     common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true, '', '', $task->project);
-                    common::printIcon('task', 'edit',   "taskID=$task->id", $task, 'list', '', '', '', '', 'data-group="execution"', '', $task->project);
-                    common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', '', '', 'data-group="project"', $this->lang->task->children, $task->project);
+                    common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='95%'", '', $task->project);
+                    common::printIcon('task', 'batchCreate', "executionID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=true", $task, 'list', 'split', '', 'iframe', true, "data-width='95%'", $this->lang->task->children, $task->project);
                 }
             }
             ?>
@@ -150,7 +148,6 @@
               <?php if($child->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
               <?php echo html::a($this->createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color' data-group='project'");?>
             </td>
-            <td class='c-project'><?php echo zget($projects, $child->project, '');?></td>
             <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$child->project", '', '', $child->project), $child->executionName, '', "data-group='execution'");?></td>
             <?php if($type != 'openedBy'): ?>
             <td class='c-user'><?php echo zget($users, $child->openedBy);?></td>
@@ -186,7 +183,7 @@
 
                       common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true, '', '', $child->project);
                       common::printIcon('task', 'edit',   "taskID=$child->id", $child, 'list', '', '', '', '', 'data-group="execution"', '', $child->project);
-                      common::printIcon('task', 'batchCreate', "project=$child->project&storyID=$child->story&moduleID=$child->module&taskID=$child->id&ifame=0", $child, 'list', 'split', '', '', '', 'data-group="project"', $this->lang->task->children, $child->project);
+                      common::printIcon('task', 'batchCreate', "executionID=$child->execution&storyID=$child->story&moduleID=$child->module&taskID=$child->id&iframe=true", $child, 'list', 'split', '', 'iframe', true, 'data-group="execution"', $this->lang->task->children, $child->project);
                   }
               }
               ?>
@@ -199,11 +196,18 @@
       </tbody>
     </table>
     <div class="table-footer">
-      <?php if($canBatchClose):?>
+      <?php if($canBatchClose or $canBatchEdit):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <?php endif;?>
       <div class="table-actions btn-toolbar">
       <?php
+      if($canBatchEdit)
+      {
+          $actionLink = $this->createLink('task', 'batchEdit');
+          $misc       = "data-form-action='$actionLink'";
+          echo html::commonButton($lang->edit, $misc);
+      }
+
       if($canBatchClose)
       {
           $actionLink = $this->createLink('task', 'batchClose', null, '', '', $task->project);
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index 13cf4aa501..4c854bb812 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -37,17 +37,27 @@
       <?php
       $vars = "mode=$mode&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
       $this->app->loadLang('testtask');
-      $canBatchRun    = common::hasPriv('testtask', 'batchRun');
-      $canBatchEdit   = common::hasPriv('testcase', 'batchEdit');
+      $canBatchRun    = (common::hasPriv('testtask', 'batchRun')  and $type == 'assigntome');
+      $canBatchEdit   = (common::hasPriv('testcase', 'batchEdit') and $type == 'assigntome');
       $canBatchAction = ($canBatchRun or $canBatchEdit);
       ?>
       <thead>
         <tr>
-          <th class='w-50px'>  <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
+        <th class="<?php echo $canBatchAction ? 'w-100px' : 'w-50px';?>">
+            <?php if($canBatchAction):?>
+            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+              <label></label>
+            </div>
+            <?php endif;?>
+            <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+          </th>
           <th class='w-50px'>  <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
           <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
-          <th class='w-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
-          <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+          <?php if($type == 'assigntome'):?>
+          <th class='w-100px'> <?php common::printOrderLink('task',     $orderBy, $vars, $lang->testtask->common);?></th>
+          <?php endif;?>
+          <th class='w-type'>  <?php common::printOrderLink('type',          $orderBy, $vars, $lang->typeAB);?></th>
+          <th class='c-user'>  <?php common::printOrderLink('openedBy',      $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
           <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
@@ -64,12 +74,21 @@
         ?>
         <tr>
           <td class="c-id">
+            <?php if($canBatchAction):?>
+            <div class="checkbox-primary">
+              <input type='checkbox' name='caseIDList[]' value='<?php echo $case->id;?>' <?php if(!$canBeChanged) echo 'disabled';?> />
+              <label></label>
+            </div>
+            <?php endif;?>
             <?php echo sprintf('%03d', $case->id); ?>
           </td>
           <td><span class='label-pri <?php echo 'label-pri-' . $case->pri?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
           <?php $params = "testcaseID=$caseID&version=$case->version";?>
           <?php if($type == 'assigntome') $params .= "&from=testtask&taskID=$case->task";?>
-          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', $params, '', '', $case->project), $case->title, null, "style='color: $case->color' data-group='project'");?></td>
+          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', $params), $case->title, null, "style='color: $case->color'");?></td>
+          <?php if($type == 'assigntome'):?>
+          <td class='c-name' title='<?php echo $case->taskName;?>'><?php echo $case->taskName;?></td>
+          <?php endif;?>
           <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
           <td><?php echo zget($users, $case->openedBy);?></td>
           <td><?php echo zget($users, $case->lastRunner);?></td>
@@ -80,11 +99,11 @@
             <?php
             if($canBeChanged)
             {
-                common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', '', '', $case->project);
-                common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project);
+                common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', 'iframe', 'true', "data-app='qa' data-toggle=''");
+                common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from={$app->rawMethod}&param=$caseID", $case, 'list', 'copy', '', 'iframe', true, "data-width='95%'");
                 common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project);
                 common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project);
-                common::printIcon('testcase', 'edit',    "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project);
+                common::printIcon('testcase', 'edit',    "caseID=$caseID", $case, 'list', 'edit', '', 'iframe', true, "data-width='95%'", '', $case->project);
             }
             ?>
           </td>
@@ -93,6 +112,25 @@
       </tbody>
     </table>
     <div class="table-footer">
+      <?php if($canBatchAction):?>
+      <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <?php endif;?>
+      <div class="table-actions btn-toolbar">
+        <?php
+        if($canBatchEdit)
+        {
+            $actionLink = $this->createLink('testcase', 'batchEdit');
+            $misc       = "data-form-action='$actionLink'";
+            echo html::commonButton($lang->edit, $misc);
+        }
+        if($canBatchRun)
+        {
+            $actionLink = $this->createLink('testtask', 'batchRun', 'productID=0');
+            $misc       = "data-form-action='$actionLink'";
+            echo html::commonButton($lang->testtask->runCase, $misc);
+        }
+        ?>
+      </div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
   </form>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 0c2a4cf2f9..c65c3115e8 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -47,22 +47,22 @@
       <?php foreach($tasks as $task):?>
       <tr>
         <td class="c-id"><?php printf('%03d', $task->id);?></td>
-        <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', '', $task->project), $task->name, '', "data-group='project'");?></td>
+        <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
         <td class='nobr'><?php echo $task->executionName?></td>
-        <td class='nobr' title='<?php echo $task->buildName;?>'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->project), $task->buildName, '', "data-group='project'"));?></td>
+        <td class='nobr' title='<?php echo $task->buildName;?>'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
         <td><?php echo $task->begin?></td>
         <td><?php echo $task->end?></td>
         <td title='<?php echo $task->status?>'><span class="status-task status-<?php echo $task->status?>"><?php echo $this->processStatus('testtask', $task);?></span></td>
         <td class='c-actions'>
           <?php
-          common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap', '', '', '', '', '', $task->project);
-          common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px', '', $task->project);
-          common::printIcon('testtask',   'linkCase', "taskID=$task->id", $task, 'list', 'link', '', '', '', '', '', $task->project);
-          common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag', '', '', '', '', '', $task->project);
-          common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list','','','',true, '', '', $task->project);
+          common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap', '', '', '', "data-app='qa'");
+          common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, "data-width='90%'");
+          common::printIcon('testtask',   'linkCase', "taskID=$task->id", $task, 'list', 'link', '', '', false, "data-app='qa'");
+          common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag', '', '', false, "data-app='qa'");
+          common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='90%'");
           if(common::hasPriv('testtask', 'delete', $task))
           {
-              $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes", '', '', $task->project);
+              $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
               echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"taskList\", confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
           }
           ?>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 1f8898b455..4409ea124d 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -37,7 +37,7 @@
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('todo', 'export')) echo html::a(helper::createLink('todo', 'export', "userID={$user->id}&orderBy=$orderBy", 'html', true), "<i class='icon-export muted'> </i> " . $lang->todo->export, '', "class='btn btn-link export'");?>
     <?php common::printLink('todo', 'batchCreate', '', "<i class='icon icon-plus'></i> " . $lang->todo->batchCreate, '', "id='batchCreate' class='btn btn-secondary iframe' data-width='80%'", '', 'true');?>
-    <?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%'", '', 'true');?>
+    <?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%' data-app='my'", '', 'true');?>
   </div>
 </div>
 <div id="mainContent">
@@ -46,7 +46,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->my->noTodo;?></span>
       <?php if(common::hasPriv('todo', 'create')):?>
-      <?php echo html::a($this->createLink('todo', 'create'), "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "class='btn btn-info'");?>
+      <?php echo html::a($this->createLink('todo', 'create'), "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "class='btn btn-info' data-app='my'");?>
       <?php endif;?>
     </p>
   </div>
@@ -96,9 +96,9 @@
             <?php echo $todo->id?>
           </td>
           <td class="c-date"><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
-          <td class="c-type"><?php echo $lang->todo->typeList[$todo->type];?></td>
+          <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></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-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-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></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><?php echo zget($users, $todo->assignedBy);?></td>
           <td class="c-begin"><?php echo $todo->begin;?></td>
           <td class="c-end"><?php echo $todo->end;?></td>
@@ -173,5 +173,5 @@
   </form>
   <?php endif;?>
 </div>
-<?php js::set('listName', 'todoList')?>
+<?php js::set('listName', 'todoList');?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/personnel/control.php b/module/personnel/control.php
index 6a97c9a925..7bd1032f15 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -26,18 +26,22 @@ class personnel extends control
      */
     public function accessible($programID = 0, $deptID = 0, $browseType='browse', $param = 0, $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
-        $this->setProgramMenu($programID);
+        $this->loadModel('program')->setMenu($programID);
         $this->app->loadLang('user');
 
-        $program = $this->loadModel('program')->getByID($programID);
+        $program = $this->program->getByID($programID);
+
+        /* Build the search form. */
+        $queryID       = $browseType == 'bysearch' ? (int)$param : 0;
+        $actionURL     = $this->createLink('personnel', 'accessible', "pargramID=$programID&deptID=$deptID&browseType=bysearch&quertID=myQueryID");
+        $personnelList = $this->personnel->getAccessiblePersonnel($programID, $deptID, $browseType, $queryID);
 
         /* Set the pager. */
         $this->app->loadClass('pager', true);
-        $pager = pager::init($recTotal, $recPerPage, $pageID);
+        $recTotal      = count($personnelList);
+        $pager         = new pager($recTotal, $recPerPage, $pageID);
+        $personnelList = array_chunk($personnelList, $pager->recPerPage);
 
-        /* Build the search form. */
-        $queryID   = $browseType == 'bysearch' ? (int)$param : 0;
-        $actionURL = $this->createLink('personnel', 'accessible', "pargramID=$programID&deptID=$deptID&browseType=bysearch&quertID=myQueryID");
         $this->config->personnel->accessible->search['params']['role']['values']   = $this->lang->user->roleList;
         $this->config->personnel->accessible->search['params']['gender']['values'] = $this->lang->user->genderList;
         $this->personnel->buildSearchForm($queryID, $actionURL);
@@ -54,7 +58,7 @@ class personnel extends control
         $this->view->pager         = $pager;
         $this->view->param         = $param;
         $this->view->browseType    = $browseType;
-        $this->view->personnelList = $this->personnel->getAccessiblePersonnel($programID, $deptID, $browseType, $queryID, $pager);
+        $this->view->personnelList = empty($personnelList) ? $personnelList : $personnelList[$pageID - 1];
         $this->view->deptList      = $this->loadModel('dept')->getOptionMenu();
         $this->view->dept          = $this->dept->getByID($deptID);
         $this->view->deptTree      = $this->dept->getTreeMenu($deptID = 0, array(new personnelModel, 'createMemberLink'), $programID);
@@ -72,11 +76,11 @@ class personnel extends control
      */
     public function invest($programID = 0)
     {
-        $this->setProgramMenu($programID);
+        $this->loadModel('program')->setMenu($programID);
 
         $this->view->title      = $this->lang->personnel->invest;
         $this->view->position[] = $this->lang->personnel->invest;
-        $this->view->invest     = $this->personnel->getInvest($programID);
+        $this->view->investList = $this->personnel->getInvest($programID);
 
         $this->display();
     }
@@ -98,24 +102,25 @@ class personnel extends control
      */
     public function whitelist($objectID = 0, $module = 'personnel', $objectType = 'program', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $programID = 0, $from = '')
     {
-        if($module == 'personnel') $this->setProgramMenu($objectID);
-
-        if($module == 'product')
+        if($this->app->openApp == 'program')
         {
-            $moduleIndex = array_search('product', $this->lang->noMenuModule);
-            if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
+            $this->loadModel('program')->setMenu($objectID);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($objectID);
         }
 
         /* Load lang and set session. */
         $this->app->loadLang('user');
-        $this->app->session->set('whitelistBrowse', $this->app->getURI(true));
+        $this->app->session->set('whitelistList', $this->app->getURI(true), $this->app->openApp);
 
         /* Load pager. */
         $this->app->loadClass('pager', true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Set back link. */
-        $goback = $this->session->PRJBrowse ? $this->session->PRJBrowse : $this->createLink('program', 'whitelist', "projectID=$objectID");
+        $goback = $this->session->projectList ? $this->session->projectList : $this->createLink('program', 'whitelist', "projectID=$objectID");
         if($from == 'program')  $goback = $this->createLink('program', 'browse');
         if($from == 'programproject') $goback = $this->session->programProject ? $this->session->programProject : $this->createLink('program', 'project', "programID=$programID");
 
@@ -148,7 +153,15 @@ class personnel extends control
      */
     public function addWhitelist($objectID = 0, $deptID = 0, $objectType = 'program', $module = 'personnel', $programID = 0, $from = '')
     {
-        if($module == 'personnel') $this->setProgramMenu($objectID);
+        if($this->app->openApp == 'program')
+        {
+            $this->loadModel('program')->setMenu($objectID);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($objectID);
+        }
+
         $this->app->loadLang('execution');
 
         if($_POST)
@@ -156,7 +169,9 @@ class personnel extends control
             $this->personnel->addWhitelist($objectType, $objectID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->getError()));
 
-            $locateLink = $this->session->whitelistBrowse ? $this->session->whitelistBrowse : $this->createLink($module, 'whitelist', "objectID=$objectID");
+            $this->loadModel('action')->create('whitelist', $objectID, 'managedWhitelist', '', $objectType);
+
+            $locateLink = $this->session->whitelistList ? $this->session->whitelistList : $this->createLink($module, 'whitelist', "objectID=$objectID");
             $openApp = $module == 'program' ? ($from == 'project' || $from == 'my' ? '#open=project' : '#open=program') : '';
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink . $openApp));
         }
@@ -210,23 +225,9 @@ class personnel extends control
             if($acl->objectType == 'product') $this->personnel->deleteProgramWhitelist($acl->objectID, $acl->account);
             if($acl->objectType == 'sprint')  $this->personnel->deleteProjectWhitelist($acl->objectID, $acl->account);
 
+            $this->loadModel('action')->create('whitelist', $acl->objectID, 'managedWhitelist', '', $acl->objectType);
+
             die(js::reload('parent'));
         }
     }
-
-    /*
-     * Setting up the program menu.
-     *
-     * @param  int    $programID
-     * @access public
-     * @return void
-     */
-    public function setProgramMenu($programID = 0)
-    {
-        $this->loadModel('program');
-        $this->lang->navGroup->program       = 'program';
-        $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-        $this->lang->program->mainMenuAction = $this->program->getMainAction();
-        $this->program->setViewMenu($programID);
-    }
 }
diff --git a/module/personnel/lang/zh-tw.php b/module/personnel/lang/zh-tw.php
index 1d602c5a00..7ffd6029e9 100644
--- a/module/personnel/lang/zh-tw.php
+++ b/module/personnel/lang/zh-tw.php
@@ -14,7 +14,7 @@ $lang->personnel->role       = '角色';
 
 $lang->personnel->name          = '人員名稱';
 $lang->personnel->projects      = '項目數';
-$lang->personnel->executions    = '執行';
+$lang->personnel->executions    = '執行數';
 $lang->personnel->workingHours  = '工時';
 $lang->personnel->task          = '任務';
 $lang->personnel->bug           = 'Bug';
diff --git a/module/personnel/model.php b/module/personnel/model.php
index 1a7655f439..df8b2e6463 100644
--- a/module/personnel/model.php
+++ b/module/personnel/model.php
@@ -19,11 +19,10 @@ class personnelModel extends model
      * @param  string    $browseType
      * @param  string    $orderBy
      * @param  int       $queryID
-     * @param  object    $pager
      * @access public
      * @return array
      */
-    public function getAccessiblePersonnel($programID = 0, $deptID = 0, $browseType = 'all', $queryID = 0, $pager)
+    public function getAccessiblePersonnel($programID = 0, $deptID = 0, $browseType = 'all', $queryID = 0)
     {
         $accessibleQuery = '';
         if($browseType == 'bysearch')
@@ -41,20 +40,69 @@ class personnelModel extends model
         /* Determine who can be accessed based on access control. */
         $program = $this->loadModel('program')->getByID($programID);
         $personnelList = array();
-        if($program->acl != 'open')
+        $personnelList = $this->dao->select('t2.id,t2.dept,t2.account,t2.role,t2.realname,t2.gender')->from(TABLE_USERVIEW)->alias('t1')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account')
+            ->where('t2.deleted')->eq(0)
+            ->beginIF($program->acl != 'open')->andWhere("CONCAT(',', t1.programs, ',')")->like("%,$programID,%")
+            ->beginIF($deptID > 0)->andWhere('t2.dept')->eq($deptID)->fi()
+            ->beginIF($browseType == 'bysearch')->andWhere($accessibleQuery)->fi()
+            ->fetchAll('id');
+
+        if($program->acl == 'open')
         {
-            $personnelList = $this->dao->select('t2.id,t2.dept,t2.account,t2.role,t2.realname,t2.gender')->from(TABLE_USERVIEW)->alias('t1')
-                ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account')
-                ->where("CONCAT(',', t1.programs, ',')")->like("%,$programID,%")
-                ->beginIF($deptID > 0)->andWhere('t2.dept')->eq($deptID)->fi()
-                ->beginIF($browseType == 'bysearch')->andWhere($accessibleQuery)->fi()
-                ->page($pager)
-                ->fetchAll();
+            foreach($personnelList as $personnel)
+            {
+                if(!$this->canViewProgram($programID, $personnel->account)) unset($personnelList[$personnel->id]);
+            }
         }
 
         return $personnelList;
     }
 
+    /**
+     * Check if you have permission to view the program.
+     *
+     * @param  int    $programID
+     * @param  string $account
+     * @access public
+     * @return void
+     */
+    public function canViewProgram($programID, $account)
+    {
+        if($this->app->user->admin) return true;
+
+        static $groupAcl  = array();
+        static $groupInfo = array();
+        if(empty($groupAcl))
+        {
+            $groupAcl = $this->dao->select('id,acl')->from(TABLE_GROUP)->fetchPairs();
+            foreach($groupAcl as $groupID => $group) $groupInfo[$groupID] = json_decode($groupAcl[$groupID]);
+        }
+
+        static $userGroups = array();
+        if(empty($userGroups)) $userGroups = $this->dao->select('*')->from(TABLE_USERGROUP)->fetchGroup('account', 'group');
+
+        $programRight = false;
+        if(isset($userGroups[$account]))
+        {
+            foreach($userGroups[$account] as $groupID => $userGroup)
+            {
+                $group = $groupInfo[$groupID];
+                if(!isset($group->programs))
+                {
+                    $programRight = true;
+                    continue;
+                }
+                elseif(in_array($programID, $group->programs))
+                {
+                    $programRight = true;
+                    continue;
+                }
+            }
+        }
+        return $programRight;
+    }
+
     /**
      * Get invest person list.
      *
@@ -74,11 +122,11 @@ class personnelModel extends model
             ->orderBy('id_desc')
             ->fetchAll('id');
         if(empty($projects)) return $personnelList;
-
         $accountPairs = $this->getInvolvedProjects($projects);
+
         if(empty($accountPairs)) return $personnelList;
 
-        $executionPairs   = $this->getInvolvedExecutions($projects);
+        $executionPairs    = $this->getInvolvedExecutions($projects);
         $taskInvest        = $this->getProjectTaskInvest($projects, $accountPairs);
         $bugAndStoryInvest = $this->getBugAndStoryInvest($accountPairs, $programID);
         if(isset($this->config->maxVersion))
@@ -267,7 +315,7 @@ class personnelModel extends model
 
         return $this->dao->select('account, count(root) as executions')->from(TABLE_TEAM)
             ->where('root')->in(array_keys($executions))
-            ->andWhere('type')->in('stage,sprint')
+            ->andWhere('type')->in('execution')
             ->groupBy('account')
             ->fetchPairs('account');
     }
diff --git a/module/personnel/view/accessible.html.php b/module/personnel/view/accessible.html.php
index 538e08c971..745a1c51b5 100644
--- a/module/personnel/view/accessible.html.php
+++ b/module/personnel/view/accessible.html.php
@@ -12,7 +12,6 @@
 <?php include '../../common/view/header.html.php';
 js::set('deptID', $deptID);
 ?>
-<?php if($acl != 'open'): ?>
 <div id="mainMenu" class="clearfix">
   <div id="sidebarHeader">
     <div class="title">
@@ -24,19 +23,15 @@ js::set('deptID', $deptID);
     <a id="bysearchTab" class="btn btn-link querybox-toggle"><i class="icon icon-search muted"></i><?php echo $lang->personnel->search;?></a>
   </div>
 </div>
-<?php endif;?>
 <div id="mainContent" class="main-row fade">
-  <?php if($acl != 'open'): ?>
   <div id="sidebar" class="side-col">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
       <?php echo $deptTree;?>
     </div>
   </div>
-  <?php endif;?>
   <div class="main-col">
-  <?php if(!empty($personnelList)):?>
-    <div id="queryBox" class="cell" data-module="accessible"></div>
+    <div id="queryBox" class="cell <?php if($browseType == 'bysearch') echo ' show';?>" data-module="accessible"></div>
     <form class="main-table table-personnel" action="" data-ride="table">
       <table id="accessibleList" class="table has-sort-head">
         <thead>
@@ -67,12 +62,5 @@ js::set('deptID', $deptID);
       </div>
     </form>
   </div>
-  <?php else:?>
-    <div class="table-empty-tip">
-      <p>
-        <span class="text-muted"><?php echo $acl == 'open' ? $lang->personnel->openedPGMTip : $lang->noData;?></span>
-      </p>
-    </div>
-  <?php endif;?>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/personnel/view/addwhitelist.html.php b/module/personnel/view/addwhitelist.html.php
index d306342ffb..ffc351f2cb 100644
--- a/module/personnel/view/addwhitelist.html.php
+++ b/module/personnel/view/addwhitelist.html.php
@@ -82,7 +82,7 @@
         <tr>
           <td colspan='6' class='text-left form-actions'>
             <?php echo html::submitButton(); ?>
-            <?php $gobackURL = $this->session->whitelistBrowse;?>
+            <?php $gobackURL = $this->session->whitelistList;?>
             <?php $dataGroup = $module == 'program' ? ($from == 'project' || $from == 'my' ? "data-group='project'" : "data-group='program'") : '';?>
             <?php echo empty($gobackURL) ? html::backButton() : html::a($gobackURL, $lang->goback, '', "class='btn btn-back btn-wide' $dataGroup");?>
           </td>
diff --git a/module/personnel/view/invest.html.php b/module/personnel/view/invest.html.php
index 1ec562a3f0..5eb291e263 100644
--- a/module/personnel/view/invest.html.php
+++ b/module/personnel/view/invest.html.php
@@ -15,7 +15,7 @@
 .table.has-sort-head thead>tr>th {padding-right: 8px;}
 </style>
 <div id="mainContent" class="main-row fade">
-  <?php if(!empty($inputPersonnel)):?>
+  <?php if(!empty($investList)):?>
   <div class="main-col">
     <form class="main-table table-product" data-ride="table" method="post" action="">
       <table class="table has-sort-head table-fixed table-bordered text-center">
@@ -56,7 +56,7 @@
           </tr>
         </thead>
         <tbody class="sortable">
-          <?php foreach($invest as $personnel):?>
+          <?php foreach($investList as $personnel):?>
           <tr>
             <td title='<?php echo $personnel['realname'];?>'><?php echo $personnel['realname'];?></td>
             <td title='<?php echo $personnel['role'];?>'><?php echo $personnel['role'];?></td>
diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php
index 36ca0974ee..6291704cda 100644
--- a/module/personnel/view/whitelist.html.php
+++ b/module/personnel/view/whitelist.html.php
@@ -15,11 +15,11 @@
   <?php $openApp = $module == 'program' ? ($from == 'project' || $from == 'my' ? "data-group='project'" : "data-group='program'") : '';?>
   <div class="btn-toolbar pull-left">
     <?php if($module == 'program') echo html::a($goback, $lang->goback, '', 'class="btn btn-secondary"');?>
-    <?php $vars         = $module == 'program' ? "objectID=$objectID&programID=$programID&module=$module&from=$from" : "objectID=$objectID";?>
+    <?php $vars = $module == 'program' ? "objectID=$objectID&programID=$programID&module=$module&from=$from" : "objectID=$objectID";?>
     <?php echo html::a($this->createLink($module, 'whitelist', $vars), '<span class="text">' . $lang->personnel->whitelist . '</span>', '', "class='btn btn-link btn-active-text' $openApp");?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php $vars         = $module == 'program' ? "objectID=$objectID&deptID=0&programID=$programID&from=$from" : "objectID=$objectID";?>
+    <?php $vars = $module == 'program' ? "objectID=$objectID&deptID=0&programID=$programID&from=$from" : "objectID=$objectID";?>
     <?php common::printLink($module, 'addWhitelist', $vars, "<i class='icon icon-plus'></i>" . $lang->personnel->addWhitelist, '', "class='btn btn-primary' $openApp");?>
   </div>
 </div>
diff --git a/module/product/control.php b/module/product/control.php
index c9f293d88f..39d8d7eaab 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -31,7 +31,7 @@ class product extends control
 
         /* Get all products, if no, goto the create page. */
         $this->products = $this->product->getPairs('nocode');
-        if(empty($this->products) and strpos(',create,index,showerrornone,', $this->methodName) === false and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('product', 'create'));
+        if(empty($this->products) and strpos(',create,index,showerrornone,ajaxgetdropmenu,', $this->methodName) === false and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('product', 'create'));
         $this->view->products = $this->products;
     }
 
@@ -49,15 +49,15 @@ class product extends control
      */
     public function index($locate = 'auto', $productID = 0, $status = 'noclosed', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
     {
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher();
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
+        $this->lang->product->switcherMenu = $this->product->getSwitcher();
 
         if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse'));
 
         if($this->app->getViewType() != 'mhtml') unset($this->lang->product->menu->index);
         $productID = $this->product->saveState($productID, $this->products);
         $branch    = (int)$this->cookie->preBranch;
-        //$this->product->setMenu($this->products, $productID, $branch);
+
+        if($this->app->viewType == 'mhtml') $this->product->setMenu($productID, $branch);
 
         if(common::hasPriv('product', 'create')) $this->lang->TRActions = html::a($this->createLink('product', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->product->create, '', "class='btn btn-primary'");
 
@@ -78,17 +78,15 @@ class product extends control
      */
     public function project($status = 'all', $productID = 0, $branch = 0, $involved = 0)
     {
-        $this->product->setMenu($this->products, $productID, $branch);
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
-        $this->app->loadLang('my');
         $this->app->loadLang('execution');
-        $this->app->loadLang('program');
+        $this->app->loadLang('project');
+
+        $this->product->setMenu($productID, $branch);
 
         /* Get PM id list. */
         $accounts     = array();
         $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved);
+
         foreach($projectStats as $project)
         {
             if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM;
@@ -118,12 +116,21 @@ class product extends control
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
-     * @param  string $from product|project
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $from = 'product')
+    public function browse($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
     {
+        $productID = $this->app->openApp != 'project' ? $this->product->saveState($productID, $this->products) : $productID;
+
+        if($this->app->openApp == 'product') $this->product->setMenu($productID, $branch);
+        if($this->app->openApp == 'project')
+        {
+            $this->session->set('storyList', $this->app->getURI(true), 'project');
+            $this->loadModel('project')->setMenu($projectID);
+        }
+
         /* Lower browse type. */
         $browseType = strtolower($browseType);
 
@@ -132,67 +139,60 @@ class product extends control
         $this->loadModel('execution');
 
         /* Set product, module and query. */
-        $productID = $this->app->rawModule != 'projectstory' ? $this->product->saveState($productID, $this->products) : $productID;
-        $branch    = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
-        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        $branch = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
+        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch or $browseType == 'bybranch')
         {
             $_COOKIE['storyModule'] = 0;
-            setcookie('storyModule', 0, 0, $this->config->webRoot, '', false, false);
+            setcookie('storyModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
         }
 
         if($browseType == 'bymodule' or $browseType == '')
         {
-            setcookie('storyModule', (int)$param, 0, $this->config->webRoot, '', false, false);
+            setcookie('storyModule', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            if($this->app->openApp == 'project') setcookie('storyModuleParam', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $_COOKIE['storyBranch'] = 0;
-            setcookie('storyBranch', 0, 0, $this->config->webRoot, '', false, false);
-            if($browseType == '') setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
+            setcookie('storyBranch', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            if($browseType == '') setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
         }
-        if($browseType == 'bybranch') setcookie('storyBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
+        if($browseType == 'bybranch') setcookie('storyBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
 
-        $moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
+        $cookieModule = $this->app->openApp == 'project' ? $this->cookie->storyModuleParam : $this->cookie->storyModule;
+        $moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($cookieModule ? $cookieModule : 0));
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu. The projectstory module does not execute. */
-        if($this->app->rawModule == 'product')
+        if($this->app->openApp == 'product')
         {
             /* Save session. */
-            $this->session->set('storyList',   $this->app->getURI(true));
-            $this->session->set('productList', $this->app->getURI(true));
+            $this->session->set('storyList',   $this->app->getURI(true), 'product');
+            $this->session->set('productList', $this->app->getURI(true), 'product');
 
-            $this->lang->product->menu = $this->lang->product->viewMenu;
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID, "storyType=$storyType", $branch);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->product->setMenu($this->products, $productID, $branch);
+            $this->lang->product->switcherMenu = $this->product->getSwitcher($productID, "storyType=$storyType", $branch);
         }
 
         /* Set moduleTree. */
         $createModuleLink = $storyType == 'story' ? 'createStoryLink' : 'createRequirementLink';
         if($browseType == '')
         {
-            setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
+            setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $browseType = 'unclosed';
-            if($this->app->rawModule == 'projectstory' and empty($productID))
-            {
-                $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
-            }
-            else
-            {
-                $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "&param=$param&storyType=$storyType");
-            }
         }
         else
         {
-            if($this->app->rawModule == 'projectstory' and empty($productID))
-            {
-                $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
-            }
-            else
-            {
-                $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "&param=$param&storyType=$storyType");
-            }
+            $branch = (int)$this->cookie->treeBranch;
+        }
+
+        /* If in project story and not chose product, get project story mdoules. */
+        if($this->app->rawModule == 'projectstory' and empty($productID))
+        {
+            $moduleTree = $this->tree->getProjectStoryTreeMenu($projectID, 0, array('treeModel', $createModuleLink));
+        }
+        else
+        {
+            $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), array('projectID' => $projectID, 'productID' => $productID), $branch, "&param=$param&storyType=$storyType");
         }
 
         if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('storyBrowseType', $browseType);
@@ -200,7 +200,7 @@ class product extends control
 
         /* Process the order by field. */
         if(!$orderBy) $orderBy = $this->cookie->productStoryOrder ? $this->cookie->productStoryOrder : 'id_desc';
-        setcookie('productStoryOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
+        setcookie('productStoryOrder', $orderBy, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
@@ -215,12 +215,12 @@ class product extends control
         if($this->app->rawModule == 'projectstory')
         {
             if(!empty($product)) $this->session->set('currentProductType', $product->type);
-            $this->products  = $this->loadModel('project')->getProducts($this->session->PRJ, false);
-            $projectProducts = $this->product->getProducts($this->session->PRJ);
+            $this->products  = $this->loadModel('project')->getProducts($projectID, false);
+            $projectProducts = $this->product->getProducts($projectID);
             $productPlans    = $this->execution->getPlans($projectProducts);
 
             if($browseType == 'bybranch') $param = $branch;
-            $stories = $this->story->getExecutionStories($this->session->PRJ, $productID, $branch, $sort, $browseType, $param, 'story', '', $pager);
+            $stories = $this->story->getExecutionStories($projectID, $productID, $branch, $sort, $browseType, $param, 'story', '', $pager);
         }
         else
         {
@@ -230,6 +230,8 @@ class product extends control
         /* Process the sql, get the conditon partion, save it to session. */
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', $browseType != 'bysearch' && $this->app->rawModule != 'projectstory');
 
+        if(!empty($stories)) $stories = $this->story->mergeReviewer($stories);
+
         /* Get related tasks, bugs, cases count of each story. */
         $storyIdList = array();
         foreach($stories as $story)
@@ -250,12 +252,17 @@ class product extends control
             $this->lang->story->title  = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title);
             $this->lang->story->create = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->create);
             $this->config->product->search['fields']['title'] = $this->lang->story->title;
+            unset($this->config->product->search['fields']['plan']);
+            unset($this->config->product->search['fields']['stage']);
         }
 
         /* Build search form. */
         $rawModule = $this->app->rawModule;
         $rawMethod = $this->app->rawMethod;
-        $actionURL = $this->createLink($rawModule, $rawMethod, "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID&storyType=$storyType");
+
+        $params    = $rawModule == 'projectstory' ? "projectID=$projectID&" : '';
+        $actionURL = $this->createLink($rawModule, $rawMethod, $params . "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID&storyType=$storyType");
+
         $this->config->product->search['onMenuBar'] = 'yes';
         $this->product->buildSearchForm($productID, $this->products, $queryID, $actionURL);
 
@@ -293,10 +300,11 @@ class product extends control
         $this->view->storyBugs       = $storyBugs;
         $this->view->storyCases      = $storyCases;
         $this->view->param           = $param;
+        $this->view->projectID       = $projectID;
         $this->view->products        = $this->products;
         $this->view->projectProducts = isset($projectProducts) ? $projectProducts : array();
         $this->view->storyType       = $storyType;
-        $this->view->from            = $from;
+        $this->view->from            = $this->app->openApp;
         $this->display();
     }
 
@@ -309,9 +317,6 @@ class product extends control
      */
     public function create($programID = 0)
     {
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher();
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
         if(!empty($_POST))
         {
             $productID = $this->product->create();
@@ -319,23 +324,18 @@ class product extends control
             $this->loadModel('action')->create('product', $productID, 'opened');
 
             $this->executeHooks($productID);
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $productID));
 
-            $moduleName = $programID ? 'program'    : $this->moduleName;
-            $methodName = $programID ? 'product' : 'browse';
-            $param      = $programID ? "programID=$programID" : "productID=$productID";
+            $openApp    = $this->app->openApp;
+            $moduleName = $openApp == 'program'? 'program' : $this->moduleName;
+            $methodName = $openApp == 'program'? 'product' : 'browse';
+            $param      = $openApp == 'program' ? "programID=$programID" : "productID=$productID";
             $locate     = $this->createLink($moduleName, $methodName, $param);
+            if($openApp == 'doc') $locate = $this->createLink('doc', 'objectLibs', 'type=product');
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
-        if($programID)
-        {
-            $this->app->rawModule = 'program';
-            $this->app->rawMethod = 'product';
-            $this->lang->navGroup->program = 'program';
-            $this->loadModel('program')->setViewMenu($programID);
-            $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-            $this->lang->program->mainMenuAction = $this->program->getMainAction();
-        }
+        if($this->app->openApp == 'program') $this->loadModel('program')->setMenu($programID);
 
         $this->loadModel('user');
         $poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed',  '', $this->config->maxCount);
@@ -347,15 +347,20 @@ class product extends control
         $rdUsers = $this->user->getPairs('nodeleted|devfirst|noclosed', '', $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
+        $lines = array();
+        if($programID) $lines = array('') + $this->product->getLinePairs($programID);
+        if($this->config->systemMode == 'classic') $lines = array('') + $this->product->getLinePairs();
+
         $this->view->title      = $this->lang->product->create;
         $this->view->position[] = $this->view->title;
         $this->view->groups     = $this->loadModel('group')->getPairs();
+        $this->view->programID  = $programID;
         $this->view->poUsers    = $poUsers;
         $this->view->qdUsers    = $qdUsers;
         $this->view->rdUsers    = $rdUsers;
         $this->view->users      = $this->user->getPairs('nodeleted|noclosed');
         $this->view->programs   = array('') + $this->loadModel('program')->getTopPairs('', 'noclosed');
-        $this->view->lines      = $this->config->systemMode == 'new' ? array() : array('' => '') + $this->product->getLinePairs();
+        $this->view->lines      = $lines;
         $this->view->URSRPairs  = $this->loadModel('custom')->getURSRPairs();
 
         unset($this->lang->product->typeList['']);
@@ -374,14 +379,12 @@ class product extends control
      */
     public function edit($productID, $action = 'edit', $extra = '', $programID = 0)
     {
-        /* Set menu. */
         $this->app->loadLang('custom');
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
 
         /* Init vars. */
-        $product              = $this->product->getById($productID);
+        $product = $this->product->getById($productID);
+        if($product->bind) $this->config->product->edit->requiredFields = 'name';
+
         $unmodifiableProjects = array();
         $canChangeProgram     = true;
         $singleLinkProjects   = array();
@@ -434,10 +437,13 @@ class product extends control
         {
             $changes = $this->product->update($productID);
 
-            /* Change the projects set of the program. */
-            if(($_POST['program'] != $product->program) and $singleLinkProjects or $multipleLinkProjects)
+            if($this->config->systemMode == 'new')
             {
-                $this->product->updateProjects($productID, $singleLinkProjects, $multipleLinkProjects);
+                /* Change the projects set of the program. */
+                if(($_POST['program'] != $product->program) and $singleLinkProjects or $multipleLinkProjects)
+                {
+                    $this->product->updateProjects($productID, $singleLinkProjects, $multipleLinkProjects);
+                }
             }
 
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -461,35 +467,27 @@ class product extends control
             $param      = $programID ? "programID=$programID" : "product=$productID";
             $locate     = $this->createLink($moduleName, $methodName, $param);
 
-            if(!$programID) $this->session->set('productList', $this->createLink('product', 'browse', $param));
+            if(!$programID) $this->session->set('productList', $this->createLink('product', 'browse', $param), 'product');
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
         $productID = $this->product->saveState($productID, $this->products);
-        $this->product->setMenu($this->products, $productID);
-
-        $moduleIndex = array_search('product', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
+        $this->product->setMenu($productID);
 
         if($programID)
         {
-            $this->app->rawModule = 'program';
-            $this->app->rawMethod = 'product';
-            $this->lang->navGroup->program = 'program';
-            $this->loadModel('program')->setViewMenu($programID);
-            $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-            $this->lang->program->mainMenuAction = $this->program->getMainAction();
+            $this->lang->program->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true);
         }
 
         /* Get the relevant person in charge. */
         $this->loadModel('user');
-        $poUsers = $this->user->getPairs('nodeleted|pofirst',  $product->PO, $this->config->maxCount);
+        $poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed',  $product->PO, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;
 
-        $qdUsers = $this->user->getPairs('nodeleted|qdfirst',  $product->QD, $this->config->maxCount);
+        $qdUsers = $this->user->getPairs('nodeleted|qdfirst|noclosed',  $product->QD, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink;
 
-        $rdUsers = $this->user->getPairs('nodeleted|devfirst', $product->RD, $this->config->maxCount);
+        $rdUsers = $this->user->getPairs('nodeleted|devfirst|noclosed', $product->RD, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
         $lines = array();
@@ -565,12 +563,7 @@ class product extends control
         }
 
         /* Navigation remains under the program. */
-        $this->app->rawModule = 'program';
-        $this->app->rawMethod = 'product';
-        $this->lang->navGroup->program = 'program';
-        $this->loadModel('program')->setViewMenu($programID);
-        $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-        $this->lang->program->mainMenuAction = $this->program->getMainAction();
+        $this->lang->program->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true);
 
         $this->loadModel('user');
         $poUsers = $this->user->getPairs('nodeleted|pofirst', $appendPoUsers);
@@ -623,7 +616,7 @@ class product extends control
             die(js::reload('parent.parent'));
         }
 
-        $this->product->setMenu($this->products, $productID);
+        $this->product->setMenu($productID);
 
         $this->view->product    = $product;
         $this->view->title      = $this->view->product->name . $this->lang->colon .$this->lang->close;
@@ -642,17 +635,12 @@ class product extends control
      */
     public function view($productID)
     {
-        $product = $this->product->getStatByID($productID);
+        $productID = (int)$productID;
+        $product   = $this->product->getStatByID($productID);
         if(!$product) die(js::error($this->lang->notFound) . js::locate('back'));
 
-        $moduleIndex = array_search('product', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
         $product->desc = $this->loadModel('file')->setImgSize($product->desc);
-        $this->product->setMenu($this->products, $productID);
+        $this->product->setMenu($productID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -691,7 +679,7 @@ class product extends control
         {
             $this->product->delete(TABLE_PRODUCT, $productID);
             $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('product')->eq($productID)->exec();
-            $this->session->set('product', '');     // 清除session。
+            $this->session->set('product', '');
             $this->executeHooks($productID);
             die(js::locate($this->createLink('product', 'browse'), 'parent'));
         }
@@ -706,13 +694,11 @@ class product extends control
      */
     public function roadmap($productID, $branch = 0)
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID, '', $branch);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-        $this->product->setMenu($this->products, $productID, $branch);
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
+        $this->product->setMenu($productID, $branch);
 
-        $this->session->set('releaseList',     $this->app->getURI(true));
-        $this->session->set('productPlanList', $this->app->getURI(true));
+        $this->session->set('releaseList',     $this->app->getURI(true), 'product');
+        $this->session->set('productPlanList', $this->app->getURI(true), 'product');
 
         $product = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
         if(empty($product)) $this->locate($this->createLink('product', 'showErrorNone', 'fromModule=product'));
@@ -743,18 +729,19 @@ class product extends control
     {
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('projectList',     $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
 
-        $this->product->setMenu($this->products, $productID);
+        $this->product->setMenu($productID);
 
         /* Append id for secend sort. */
         $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
@@ -773,15 +760,14 @@ class product extends control
         }
         $period  = $type == 'account' ? 'all'  : $type;
         $date    = empty($date) ? '' : date('Y-m-d', $date);
-        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, $productID, 'all', $date, $direction);
+        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, $productID, 'all', 'all', $date, $direction);
 
         /* The header and position. */
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->product->dynamic;
         $this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $this->products[$productID]);
         $this->view->position[] = $this->lang->product->dynamic;
 
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID, $type);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($productID, $type);
 
         $this->view->userIdPairs  = $this->loadModel('user')->getPairs('noletter|nodeleted|noclosed|useid');
         $this->view->accountPairs = $this->user->getPairs('noletter|nodeleted|noclosed');
@@ -812,12 +798,8 @@ class product extends control
         $product   = $this->product->getStatByID($productID);
         if(!$product) die(js::locate('product', 'all'));
 
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
         $product->desc = $this->loadModel('file')->setImgSize($product->desc);
-        $this->product->setMenu($this->products, $productID);
+        $this->product->setMenu($productID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -838,29 +820,69 @@ class product extends control
     }
 
     /**
-     * AJAX: get executions of a product in html select.
+     * Ajax get products.
      *
-     * @param  int    $productID
      * @param  int    $executionID
-     * @param  int    $branch
-     * @param  string $number
      * @access public
      * @return void
      */
-    public function ajaxGetExecutions($productID, $executionID = 0, $branch = 0, $number = '')
+    public function ajaxGetProducts($executionID)
     {
-        $executions = $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : $branch, 'id_desc', $executionID);
+        $this->loadModel('build');
+        $products = $this->product->getProductPairsByProject($executionID);
+        if(empty($products))
+        {
+            die(printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project'));
+        }
+        else
+        {
+            die(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
+        }
+    }
+
+    /**
+     * AJAX: get projects of a product in html select.
+     *
+     * @param  int    $productID
+     * @param  int    $branch
+     * @param  int    $projectID
+     * @access public
+     * @return void
+     */
+    public function ajaxGetProjects($productID, $branch = 0, $projectID = 0)
+    {
+        $projects  = array('' => '');
+        $projects += $this->product->getProjectPairsByProduct($productID, $branch ? "0,$branch" : $branch);
+        if($this->app->getViewType() == 'json') die(json_encode($projects));
+
+        die(html::select('project', $projects, $projectID, "class='form-control' onchange='loadProductExecutions({$productID}, this.value)'"));
+    }
+
+    /**
+     * AJAX: get executions of a product in html select.
+     *
+     * @param  int    $productID
+     * @param  int    $projectID
+     * @param  int    $branch
+     * @param  string $number
+     * @param  int    $executionID
+     * @access public
+     * @return void
+     */
+    public function ajaxGetExecutions($productID, $projectID = 0, $branch = 0, $number = '', $executionID = 0)
+    {
+        $executions = $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : $branch, 'id_desc', $projectID);
         if($this->app->getViewType() == 'json') die(json_encode($executions));
 
         if($number === '')
         {
-            die(html::select('execution', $executions, $executionID, "class='form-control' onchange='loadExecutionRelated(this.value)'"));
+            die(html::select('execution', array('' => '') + $executions, $executionID, "class='form-control' onchange='loadExecutionRelated(this.value)'"));
         }
         else
         {
             $executionsName = "executions[$number]";
             $executions     = empty($executions) ? array('' => '') : $executions;
-            die(html::select($executionsName, $executions, '', "class='form-control' onchange='loadProjectBuilds($productID, this.value, $number)'"));
+            die(html::select($executionsName, $executions, '', "class='form-control' onchange='loadExecutionBuilds($executionID, this.value, $number)'"));
         }
     }
 
@@ -922,9 +944,7 @@ class product extends control
             foreach($this->config->qa->menuList as $menu) $this->lang->navGroup->$menu = 'qa';
         }
 
-        $moduleGroup = zget($this->lang->navGroup, $module);
-        $moduleGroup = in_array($moduleGroup, array('product', 'qa'))? $moduleGroup : 'project';
-        $products    = $moduleGroup == 'project' ? $this->product->getProducts($this->session->PRJ, 'all', 'program desc, line desc, ') : $this->product->getList(0, 'all', 0, 0, 'program desc, line desc, ');
+        $products = $this->app->openApp == 'project' ? $this->product->getProducts($this->session->project) : $this->product->getList();
 
         $this->view->link      = $this->product->getProductLink($module, $method, $extra);
         $this->view->productID = $productID;
@@ -932,10 +952,10 @@ class product extends control
         $this->view->method    = $method;
         $this->view->extra     = $extra;
         $this->view->products  = $products;
-        $this->view->projectID = $moduleGroup == 'project' ? $this->session->PRJ : 0;
+        $this->view->projectID = $this->app->openApp == 'project' ? $this->session->project : 0;
         $this->view->programs  = $this->loadModel('program')->getPairs(true);
         $this->view->lines     = $this->product->getLinePairs();
-        $this->view->openApp   = $moduleGroup;
+        $this->view->openApp   = $this->app->openApp;
         $this->display();
     }
 
@@ -971,53 +991,50 @@ class product extends control
     /**
      * Show error no product when visit qa.
      *
-     * @param  string $fromModule
+     * @param  string $moduleName
+     * @param  string $activeMenu
+     * @param  int    $objectID
      * @access public
      * @return void
      */
-    public function showErrorNone($fromModule = 'bug', $moduleGroup = 'product', $activeMenu = '')
+    public function showErrorNone($moduleName = 'qa', $activeMenu = 'index', $objectID = 0)
     {
-        /* The module in the test menu shows the created product. */
-        if($moduleGroup == 'qa')
+        if($moduleName == 'project')
+        {
+            $this->loadModel('project')->setMenu($objectID);
+            $project = $this->project->getByID($objectID);
+            $this->lang->project->menu      = $this->lang->{$project->model}->menu;
+            $this->lang->project->menuOrder = $this->lang->{$project->model}->menuOrder;
+            $this->app->rawModule = $activeMenu;
+
+            if($activeMenu == 'bug')            $this->lang->{$project->model}->menu->qa['subMenu']->bug['subModule']        = 'product';
+            if($activeMenu == 'testcase')       $this->lang->{$project->model}->menu->qa['subMenu']->testcase['subModule']   = 'product';
+            if($activeMenu == 'testtask')       $this->lang->{$project->model}->menu->qa['subMenu']->testtask['subModule']   = 'product';
+            if($activeMenu == 'testreport')     $this->lang->{$project->model}->menu->qa['subMenu']->testreport['subModule'] = 'product';
+            if($activeMenu == 'projectrelease') $this->lang->{$project->model}->menu->release['subModule']                   = 'projectrelease';
+        }
+        elseif($moduleName == 'qa')
         {
             $this->loadModel('qa')->setMenu(array(), 0);
+            $this->app->rawModule = $activeMenu;
 
-            $this->app->loadLang($fromModule);
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-
-            $this->lang->set('menugroup.product', $activeMenu);
-            $this->lang->product->menu      = $this->lang->qa->menu;
-            $this->lang->product->menuOrder = $this->lang->qa->menuOrder;
+            if($activeMenu == 'testcase')   $this->lang->qa->menu->testcase['subMenu']->case['subModule']      = 'product';
+            if($activeMenu == 'testsuite')  $this->lang->qa->menu->testcase['subMenu']->testsuite['subModule'] = 'product';
+            if($activeMenu == 'testtask')   $this->lang->qa->menu->testtask['subMenu']->testtask['subModule']  = 'product';
+            if($activeMenu == 'testreport') $this->lang->qa->menu->testtask['subMenu']->report['subModule']    = 'product';
         }
-
-        /* The module in the project menu displays related products. */
-        if($moduleGroup == 'project')
+        elseif($moduleName == 'execution')
         {
-            $this->app->loadLang($fromModule);
-
-            $this->lang->set('menugroup.product', $activeMenu);
-            $projectModel = $this->loadModel('project')->getByID($this->session->PRJ);
-            $this->lang->product->menu      = $this->lang->menu->{$projectModel->model};
-            $this->lang->product->menuOrder = $this->lang->{$projectModel->model}->menuOrder;
-
-            /* The secondary test menu processing in the project. */
-            if(in_array($fromModule, array('qa', 'bug', 'testtask', 'testreport')))
-            {
-                $this->lang->set('menugroup.product', 'qa');
-                $moduleIndex = array_search('product', $this->lang->noMenuModule);
-                if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
-                $menu = $this->lang->qa->menu->$activeMenu;
-                $menu['subModule'] = 'product';
-                $this->lang->qa->menu->$activeMenu = $menu;
-                $this->app->rawModule = 'qa';
-                $this->loadModel('qa')->setMenu(array(), 0);
-            }
+            $this->loadModel('execution')->setMenu($objectID);
+            $this->app->rawModule = $activeMenu;
+            if($activeMenu == 'bug')        $this->lang->execution->menu->qa['subMenu']->bug['subModule']        = 'product';
+            if($activeMenu == 'testcase')   $this->lang->execution->menu->qa['subMenu']->testcase['subModule']   = 'product';
+            if($activeMenu == 'testtask')   $this->lang->execution->menu->qa['subMenu']->testtask['subModule']   = 'product';
+            if($activeMenu == 'testreport') $this->lang->execution->menu->qa['subMenu']->testreport['subModule'] = 'product';
         }
 
-        $this->view->title       = $this->lang->$fromModule->common;
-        $this->view->fromModule  = $fromModule;
-        $this->view->moduleGroup = $moduleGroup;
+        $this->view->title    = $this->lang->$moduleName->common;
+        $this->view->objectID = $objectID;
         $this->display();
     }
 
@@ -1029,13 +1046,17 @@ class product extends control
      * @access public
      * @return void
      */
-    public function all($browseType = 'noclosed', $orderBy = 'order_asc')
+    public function all($browseType = 'noclosed', $orderBy = 'program_asc')
     {
-        if($this->session->moreProductLink) $this->lang->product->mainMenuAction = html::a($this->session->moreProductLink, '<i class="icon icon-back"></i> ' . $this->lang->goback, '', "class='btn btn-link'");
-
         /* Load module and set session. */
         $this->loadModel('program');
-        $this->session->set('productList', $this->app->getURI(true));
+        $this->session->set('productList', $this->app->getURI(true), 'product');
+
+        if($this->app->viewType == 'mhtml')
+        {
+            $productID = $this->product->saveState(0, $this->products);
+            $this->product->setMenu($productID);
+        }
 
         /* Process product structure. */
         $productStructure = array();
@@ -1098,10 +1119,8 @@ class product extends control
      */
     public function whitelist($productID = 0, $module = 'product', $objectType = 'product', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID, '', 0);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-        $this->product->setMenu($this->products, $productID, 0);
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', 0);
+        $this->product->setMenu($productID, 0);
         $this->lang->modulePageNav = '';
 
         echo $this->fetch('personnel', 'whitelist', "objectID=$productID&module=product&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
@@ -1118,12 +1137,7 @@ class product extends control
      */
     public function addWhitelist($productID = 0, $deptID = 0, $branch = '')
     {
-        $this->lang->product->menu           = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID, '', $branch);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-        $this->product->setMenu($this->products, $productID, $branch);
-        $moduleIndex = array_search('product', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
+        $this->product->setMenu($productID, $branch);
         $this->lang->modulePageNav = '';
 
         echo $this->fetch('personnel', 'addWhitelist', "objectID=$productID&dept=$deptID&objectType=product&module=product");
@@ -1194,18 +1208,6 @@ class product extends control
         $this->display();
     }
 
-    /**
-     * Doc for compatible.
-     *
-     * @param  int    $productID
-     * @access public
-     * @return void
-     */
-    public function doc($productID)
-    {
-        $this->locate($this->createLink('doc', 'objectLibs', "type=product&objectID=$productID&from=product"));
-    }
-
     /**
      * Build of product.
      *
@@ -1216,19 +1218,19 @@ class product extends control
     public function build($productID = 0, $branch = 0)
     {
         $this->app->loadLang('build');
-        $this->session->set('productList', $this->app->getURI(true));
+        $this->session->set('productList', $this->app->getURI(true), 'product');
 
         /* Get all product list. Locate to the create product page if there is no product. */
-        $this->products = $this->product->getPairs('', $this->session->PRJ);
+        $this->products = $this->product->getPairs('', $this->session->project);
         if(empty($this->products) and strpos('create|view', $this->methodName) === false) $this->locate($this->createLink('product', 'create'));
 
         /* Get current product. */
         $productID = $this->product->saveState($productID, $this->products);
         $product   = $this->product->getById($productID);
-        $this->product->setMenu($this->products, $productID, $branch);
+        $this->product->setMenu($productID, $branch);
 
         /* Set menu.*/
-        $this->session->set('buildList', $this->app->getURI(true));
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
 
         $this->view->title      = $product->name . $this->lang->colon . $this->lang->product->build;
         $this->view->position[] = $this->lang->product->build;
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index e947e7d442..76e4e5f962 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -25,5 +25,6 @@ a.removeModule:hover {color: red;}
 .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .story-toggle > .icon:before {text-align: left;}
 .table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);}
+.table td.c-estimate {padding-right: 12px;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}
diff --git a/module/product/css/project.css b/module/product/css/project.css
index 8aba86141d..7ca7322acc 100644
--- a/module/product/css/project.css
+++ b/module/product/css/project.css
@@ -1,3 +1,4 @@
 .checkbox-primary {margin-top: 6px;}
 .tip {display: inline-block; vertical-align: middle; margin-top: 6px;}
 #mainMenu .icon.icon-help {margin-left: 5px;}
+td.padding-right {padding-right: 20px !important}
diff --git a/module/product/css/view.css b/module/product/css/view.css
index 0ff2225fa2..537f2b58fa 100644
--- a/module/product/css/view.css
+++ b/module/product/css/view.css
@@ -2,4 +2,6 @@
 .branch-list > li {float: left; list-style: none; width: 50%; margin: 5px 0;}
 .data-basic.table-data tbody > tr > th {width: 100px;}
 .col-12 .cell table td {word-wrap: break-word; word-break: normal;}
+td.normal {color: #00da88;}
+td.acl {white-space: nowrap;}
 .row > .col-sm-12:first-child {padding-bottom: 20px;}
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index 00b3361e61..fe86a31b9a 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -27,7 +27,7 @@ $(function()
         var planID = $('#plan').val();
         if(planID)
         {
-            parent.location.href = createLink('execution', 'importPlanStories', 'projectID=' + projectID + '&planID=' + planID + '&productID=' + productID);
+            parent.location.href = createLink('projectstory', 'importPlanStories', 'projectID=' + projectID + '&planID=' + planID + '&productID=' + productID);
         }
     })
 
@@ -62,4 +62,24 @@ $(function()
     });
 
     toggleFold('#productStoryForm', unfoldStories, productID, 'product');
+
+    adjustTableFooter();
+    $('body').on('click', '#toggleFold', adjustTableFooter);
+    $('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter);
 });
+
+/**
+ * Adjust the table footer style.
+ *
+ * @access public
+ * @return void
+ */
+function adjustTableFooter()
+{
+    if($('.main-col').height() < $(window).height())
+    {
+        $('.table.with-footer-fixed').css('margin-bottom', '0');
+        $('.table-footer').removeClass('fixed-footer');
+        $('.table-footer').css({"left":"0", "bottom":"0", "width":"unset"});
+    }
+}
diff --git a/module/product/js/create.js b/module/product/js/create.js
index 32f955c4c7..452aa8d760 100644
--- a/module/product/js/create.js
+++ b/module/product/js/create.js
@@ -1,5 +1,5 @@
 /**
-  * Load product Lines. 
+  * Load product Lines.
   *
   * @param  $rootID
   * @access public
@@ -14,6 +14,18 @@ function loadProductLines(rootID)
     });
 }
 
+/**
+ * Set parent program.
+ *
+ * @param  $parentProgram
+ * @access public
+ * @return void
+ */
+function setParentProgram(parentProgram)
+{
+    location.href = createLink('product', 'create', 'programID=' + parentProgram);
+}
+
 $('#program').change(function()
 {
     var programID = $(this).val();
@@ -25,3 +37,31 @@ $('#program').change(function()
         $('#line').chosen();
     })
 })
+
+/**
+ * Toggle line.
+ *
+ * @param  object $obj
+ * @access public
+ * @return void
+ */
+function toggleLine(obj)
+{
+    var $obj = $(obj);
+    if($obj.length == 0) return false;
+
+    var $line = $obj.closest('table').find('#line');
+
+    if($obj.prop('checked'))
+    {
+        $('form .line-no-exist').removeClass('hidden');
+        $('form .line-exist').addClass('hidden');
+        $line.attr('disabled', 'disabled');
+    }
+    else
+    {
+        $('form .line-exist').removeClass('hidden');
+        $('form .line-no-exist').addClass('hidden');
+        $line.removeAttr('disabled');
+    }
+}
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index e70e880ae3..ffc61b5716 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -9,7 +9,6 @@
  * @version     $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common        = $lang->productCommon;
 $lang->product->index         = $lang->productCommon . 'Home';
 $lang->product->browse        = 'Story Liste';
 $lang->product->dynamic       = 'Verlauf';
@@ -29,6 +28,7 @@ $lang->product->updateOrder   = 'Ranking';
 $lang->product->orderAction   = "Rank {$lang->productCommon}";
 $lang->product->all           = "Alle {$lang->productCommon}";
 $lang->product->manageLine    = "Manage {$lang->productCommon} Line";
+$lang->product->newLine       = "Create {$lang->productCommon} Line";
 $lang->product->export        = 'Exportiere Daten';
 $lang->product->exportAction  = "Export {$lang->productCommon}";
 $lang->product->dashboard     = 'Dashboard';
@@ -41,7 +41,8 @@ $lang->product->plans       = 'Plan';
 $lang->product->releases    = 'Release';
 $lang->product->docs        = 'Dok';
 $lang->product->bugs        = 'Verknüpfte Bugs';
-$lang->product->projects    = "Verknüpfte {$lang->executionCommon}";
+$lang->product->projects    = "Linked Project";
+$lang->product->executions  = "Verknüpfte {$lang->execution->common}";
 $lang->product->cases       = 'Fälle';
 $lang->product->builds      = 'Builds';
 $lang->product->roadmap     = 'Roadmap';
@@ -51,7 +52,7 @@ $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->currentExecution      = "Aktuelle {$lang->sprintCommon}";
+$lang->product->currentExecution      = "Aktuelle Execution";
 $lang->product->activeStories         = 'Aktivierte [S]';
 $lang->product->activeStoriesTitle    = 'Active Stories';
 $lang->product->changedStories        = 'Geänderte [S]';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 71f0c7f36b..f4664fd07d 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -9,30 +9,34 @@
  * @version     $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common        = $lang->productCommon;
-$lang->product->index         = $lang->productCommon . ' Home';
-$lang->product->browse        = 'Story List';
-$lang->product->dynamic       = 'Dynamics';
-$lang->product->view          = "{$lang->productCommon} Detail";
-$lang->product->edit          = "Edit {$lang->productCommon}";
-$lang->product->batchEdit     = 'Batch Edit';
-$lang->product->create        = "Create {$lang->productCommon}";
-$lang->product->delete        = "Delete {$lang->productCommon}";
-$lang->product->deleted       = 'Deleted';
-$lang->product->close         = "Close";
+$lang->product->index           = $lang->productCommon . ' Home';
+$lang->product->browse          = 'Story List';
+$lang->product->dynamic         = 'Dynamics';
+$lang->product->view            = "{$lang->productCommon} Detail";
+$lang->product->edit            = "Edit {$lang->productCommon}";
+$lang->product->batchEdit       = 'Batch Edit';
+$lang->product->create          = "Create {$lang->productCommon}";
+$lang->product->delete          = "Delete {$lang->productCommon}";
+$lang->product->deleted         = 'Deleted';
+$lang->product->close           = "Close";
+$lang->product->select          = "Select {$lang->productCommon}";
+$lang->product->mine            = 'Mine:';
+$lang->product->other           = 'Others:';
+$lang->product->closed          = 'Closed';
+$lang->product->updateOrder     = 'Order';
+$lang->product->all             = "All {$lang->productCommon}s";
+$lang->product->manageLine      = "Manage {$lang->productCommon} Line";
+$lang->product->newLine         = "Create {$lang->productCommon} Line";
+$lang->product->export          = 'Export';
+$lang->product->dashboard       = "Dashboard";
+$lang->product->changeProgram   = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
+$lang->product->addWhitelist    = 'Add Whitelist';
+$lang->product->unbindWhitelist = 'Unbind Whitelist';
+
+$lang->product->indexAction   = "All {$lang->productCommon}";
 $lang->product->closeAction   = "Close {$lang->productCommon}";
-$lang->product->select        = "Select {$lang->productCommon}";
-$lang->product->mine          = 'Mine:';
-$lang->product->other         = 'Others:';
-$lang->product->closed        = 'Closed';
-$lang->product->updateOrder   = 'Order';
-$lang->product->orderAction   = "Rank {$lang->productCommon}";
-$lang->product->all           = "All {$lang->productCommon}s";
-$lang->product->manageLine    = "Manage {$lang->productCommon} Line";
-$lang->product->export        = 'Export';
+$lang->product->orderAction   = "Sort {$lang->productCommon}";
 $lang->product->exportAction  = "Export {$lang->productCommon}";
-$lang->product->dashboard     = "Dashboard";
-$lang->product->changeProgram = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
 
 $lang->product->basicInfo = 'Basic Info';
 $lang->product->otherInfo = 'Other Info';
@@ -41,7 +45,8 @@ $lang->product->plans       = 'Plans';
 $lang->product->releases    = 'Releases';
 $lang->product->docs        = 'Doc';
 $lang->product->bugs        = 'Linked Bug';
-$lang->product->projects    = "Linked {$lang->executionCommon}";
+$lang->product->projects    = "Linked Project";
+$lang->product->executions  = "Linked {$lang->execution->common}";
 $lang->product->cases       = 'Case';
 $lang->product->builds      = 'Build';
 $lang->product->roadmap     = "{$lang->productCommon} Roadmap";
@@ -51,7 +56,7 @@ $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->currentExecution      = "Current {$lang->sprintCommon}";
+$lang->product->currentExecution      = "Current Execution";
 $lang->product->activeStories         = 'Active [S]';
 $lang->product->activeStoriesTitle    = 'Active Stories';
 $lang->product->changedStories        = 'Changed [S]';
@@ -91,8 +96,6 @@ $lang->product->QD             = 'QA Manager';
 $lang->product->RD             = 'Release Manager';
 $lang->product->acl            = 'Access Control';
 $lang->product->whitelist      = 'Whitelist';
-$lang->product->addWhitelist   = 'Add Whitelist';
-$lang->product->unbindWhitelist = 'Remove Whitelist';
 $lang->product->branch         = '%s';
 $lang->product->qa             = 'Test';
 $lang->product->release        = 'Release';
@@ -141,7 +144,15 @@ $lang->product->statusList['']       = '';
 $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Closed';
 
-$lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->executionCommon} team members only)";
+global $config;
+if($config->systemMode == 'new')
+{
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Stakeholders of the respective program, team members and stakeholders of the associated project can access)";
+}
+else
+{
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->executionCommon} team members only)";
+}
 $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 ca43561fdc..ce23958b37 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -9,7 +9,6 @@
  * @version     $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        https://www.zentao.pm
  */
-$lang->product->common        = $lang->productCommon;
 $lang->product->index         = 'Accueil ' . $lang->productCommon;
 $lang->product->browse        = 'Liste Stories';
 $lang->product->dynamic       = 'Historique';
@@ -29,6 +28,7 @@ $lang->product->updateOrder   = 'Ordre';
 $lang->product->orderAction   = "Rang {$lang->productCommon}";
 $lang->product->all           = "Tous les {$lang->productCommon}s";
 $lang->product->manageLine    = "Manage {$lang->productCommon} Line";
+$lang->product->newLine       = "Create {$lang->productCommon} Line";
 $lang->product->export        = 'Export';
 $lang->product->exportAction  = "Export {$lang->productCommon}";
 $lang->product->dashboard     = "Dashboard";
@@ -41,7 +41,8 @@ $lang->product->plans       = 'Plans';
 $lang->product->releases    = 'Releases';
 $lang->product->docs        = 'Doc';
 $lang->product->bugs        = 'Bug Liés';
-$lang->product->projects    = "{$lang->executionCommon}s Liés";
+$lang->product->projects    = "Linked Project";
+$lang->product->executions  = "{$lang->execution->common}s Liés";
 $lang->product->cases       = 'CasTests';
 $lang->product->builds      = 'Build';
 $lang->product->roadmap     = "Roadmap {$lang->productCommon}";
@@ -51,7 +52,7 @@ $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->currentExecution      = "Current {$lang->sprintCommon}";
+$lang->product->currentExecution      = "Current Execution";
 $lang->product->activeStories         = 'Actives [S]';
 $lang->product->activeStoriesTitle    = 'Stories Actives';
 $lang->product->changedStories        = 'Changées [S]';
diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php
index 610d5de2c2..a68b607a11 100644
--- a/module/product/lang/vi.php
+++ b/module/product/lang/vi.php
@@ -9,7 +9,6 @@
  * @version  $Id: vi.php 5091 2013-07-10 06:06:46Z quocnho@gmail.com $
  * @link  http://www.zentao.net
  */
-$lang->product->common        = $lang->productCommon;
 $lang->product->index         = 'Trang '.$lang->productCommon;
 $lang->product->browse        = 'Danh sách câu chuyện';
 $lang->product->dynamic       = 'Lịch sử';
@@ -29,6 +28,7 @@ $lang->product->updateOrder   = 'Sắp xếp';
 $lang->product->orderAction   = "Đánh giá {$lang->productCommon}";
 $lang->product->all           = "Tất cả {$lang->productCommon}";
 $lang->product->manageLine    = "Manage {$lang->productCommon} Line";
+$lang->product->newLine       = "Create {$lang->productCommon} Line";
 $lang->product->export        = 'Xuất';
 $lang->product->exportAction  = "Xuất {$lang->productCommon}";
 $lang->product->dashboard     = "Dashboard";
@@ -41,7 +41,8 @@ $lang->product->plans       = 'Kế hoạch';
 $lang->product->releases    = 'Phát hành';
 $lang->product->docs        = 'Tài liệu';
 $lang->product->bugs        = 'Bug liên kết';
-$lang->product->projects    = "{$lang->executionCommon} liên kết";
+$lang->product->projects    = "Linked Project";
+$lang->product->executions  = "{$lang->execution->common} liên kết";
 $lang->product->cases       = 'Tình huống';
 $lang->product->builds      = 'Bản dựng';
 $lang->product->roadmap     = "Lộ trình {$lang->productCommon}";
@@ -51,7 +52,7 @@ $lang->product->build       = 'Danh sách bản dựng';
 $lang->product->moreProduct = "More Product";
 $lang->product->projectInfo = "Projects đã liên kết tới {$lang->productCommon} này được liệt kê bên dưới.";
 
-$lang->product->currentExecution      = "Hiện {$lang->sprintCommon}";
+$lang->product->currentExecution      = "Hiện Execution";
 $lang->product->activeStories         = 'Kích hoạt [S]';
 $lang->product->activeStoriesTitle    = 'Kích hoạt câu chuyện';
 $lang->product->changedStories        = 'Đã thay đổi [S]';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 1fa12f928c..2e8d3c00ff 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -9,30 +9,34 @@
  * @version     $Id: zh-cn.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common        = $lang->productCommon . '视图';
-$lang->product->index         = $lang->productCommon . '主页';
-$lang->product->browse        = "{$lang->SRCommon}列表";
-$lang->product->dynamic       = $lang->productCommon . '动态';
-$lang->product->view          = "{$lang->productCommon}概况";
-$lang->product->edit          = "编辑{$lang->productCommon}";
-$lang->product->batchEdit     = '批量编辑';
-$lang->product->create        = "添加{$lang->productCommon}";
-$lang->product->delete        = "删除{$lang->productCommon}";
-$lang->product->deleted       = '已删除';
-$lang->product->close         = '关闭';
+$lang->product->index           = $lang->productCommon . '主页';
+$lang->product->browse          = "{$lang->SRCommon}列表";
+$lang->product->dynamic         = $lang->productCommon . '动态';
+$lang->product->view            = "{$lang->productCommon}概况";
+$lang->product->edit            = "编辑{$lang->productCommon}";
+$lang->product->batchEdit       = '批量编辑';
+$lang->product->create          = "添加{$lang->productCommon}";
+$lang->product->delete          = "删除{$lang->productCommon}";
+$lang->product->deleted         = '已删除';
+$lang->product->close           = '关闭';
+$lang->product->select          = "请选择{$lang->productCommon}";
+$lang->product->mine            = '我负责：';
+$lang->product->other           = '其他：';
+$lang->product->closed          = '已关闭';
+$lang->product->updateOrder     = '排序';
+$lang->product->all             = "所有{$lang->productCommon}";
+$lang->product->manageLine      = "维护{$lang->productCommon}线";
+$lang->product->newLine         = "新建{$lang->productCommon}线";
+$lang->product->export          = '导出数据';
+$lang->product->dashboard       = "{$lang->productCommon}仪表盘";
+$lang->product->changeProgram   = "{$lang->productCommon}调整所属项目集影响范围确认";
+$lang->product->addWhitelist    = '添加白名单';
+$lang->product->unbindWhitelist = '移除白名单';
+
+$lang->product->indexAction   = "所有{$lang->productCommon}仪表盘";
 $lang->product->closeAction   = "关闭{$lang->productCommon}";
-$lang->product->select        = "请选择{$lang->productCommon}";
-$lang->product->mine          = '我负责：';
-$lang->product->other         = '其他：';
-$lang->product->closed        = '已关闭';
-$lang->product->updateOrder   = '排序';
 $lang->product->orderAction   = "{$lang->productCommon}排序";
-$lang->product->all           = "所有{$lang->productCommon}";
-$lang->product->manageLine    = "维护{$lang->productCommon}线";
-$lang->product->export        = '导出数据';
 $lang->product->exportAction  = "导出{$lang->productCommon}";
-$lang->product->dashboard     = "{$lang->productCommon}仪表盘";
-$lang->product->changeProgram = "{$lang->productCommon}调整所属项目集影响范围确认";
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
@@ -41,7 +45,8 @@ $lang->product->plans       = "计划数";
 $lang->product->releases    = '发布数';
 $lang->product->docs        = '文档数';
 $lang->product->bugs        = '相关Bug';
-$lang->product->projects    = "关联{$lang->executionCommon}数";
+$lang->product->projects    = "关联项目数";
+$lang->product->executions  = "关联{$lang->execution->common}数";
 $lang->product->cases       = '用例数';
 $lang->product->builds      = '版本数';
 $lang->product->roadmap     = "{$lang->productCommon}路线图";
@@ -51,7 +56,7 @@ $lang->product->build       = '版本列表';
 $lang->product->moreProduct = "更多产品";
 $lang->product->projectInfo = "所有与此产品关联的项目";
 
-$lang->product->currentExecution      = "当前{$lang->sprintCommon}";
+$lang->product->currentExecution      = "当前执行";
 $lang->product->activeStories         = "激活{$lang->SRCommon}";
 $lang->product->activeStoriesTitle    = "激活{$lang->SRCommon}";
 $lang->product->changedStories        = "已变更{$lang->SRCommon}";
@@ -91,8 +96,6 @@ $lang->product->QD             = '测试负责人';
 $lang->product->RD             = '发布负责人';
 $lang->product->acl            = '访问控制';
 $lang->product->whitelist      = '白名单';
-$lang->product->addWhitelist   = '添加白名单';
-$lang->product->unbindWhitelist = '删除白名单';
 $lang->product->branch         = '所属%s';
 $lang->product->qa             = '测试';
 $lang->product->release        = '发布';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 883b58cbae..3f7661fb1f 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -9,29 +9,33 @@
  * @version     $Id: zh-tw.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common        = $lang->productCommon . '視圖';
-$lang->product->index         = $lang->productCommon . '主頁';
-$lang->product->browse        = "{$lang->SRCommon}列表";
-$lang->product->dynamic       = $lang->productCommon . '動態';
-$lang->product->view          = "{$lang->productCommon}概況";
-$lang->product->edit          = "編輯{$lang->productCommon}";
-$lang->product->batchEdit     = '批量編輯';
-$lang->product->create        = "添加{$lang->productCommon}";
-$lang->product->delete        = "刪除{$lang->productCommon}";
-$lang->product->deleted       = '已刪除';
-$lang->product->close         = '關閉';
+$lang->product->index           = $lang->productCommon . '主頁';
+$lang->product->browse          = "{$lang->SRCommon}列表";
+$lang->product->dynamic         = $lang->productCommon . '動態';
+$lang->product->view            = "{$lang->productCommon}概況";
+$lang->product->edit            = "編輯{$lang->productCommon}";
+$lang->product->batchEdit       = '批量編輯';
+$lang->product->create          = "添加{$lang->productCommon}";
+$lang->product->delete          = "刪除{$lang->productCommon}";
+$lang->product->deleted         = '已刪除';
+$lang->product->close           = '關閉';
+$lang->product->select          = "請選擇{$lang->productCommon}";
+$lang->product->mine            = '我負責：';
+$lang->product->other           = '其他：';
+$lang->product->closed          = '已關閉';
+$lang->product->updateOrder     = '排序';
+$lang->product->all             = "所有{$lang->productCommon}";
+$lang->product->manageLine      = "維護{$lang->productCommon}綫";
+$lang->product->export          = '導出數據';
+$lang->product->dashboard       = "{$lang->productCommon}儀表盤";
+$lang->product->changeProgram   = "{$lang->productCommon}調整所屬項目集影響範圍確認";
+$lang->product->addWhitelist    = '添加白名單';
+$lang->product->unbindWhitelist = '移除白名單';
+
+$lang->product->indexAction   = "所有{$lang->productCommon}儀表盤";
 $lang->product->closeAction   = "關閉{$lang->productCommon}";
-$lang->product->select        = "請選擇{$lang->productCommon}";
-$lang->product->mine          = '我負責：';
-$lang->product->other         = '其他：';
-$lang->product->closed        = '已關閉';
-$lang->product->updateOrder   = '排序';
 $lang->product->orderAction   = "{$lang->productCommon}排序";
-$lang->product->all           = "所有{$lang->productCommon}";
-$lang->product->export        = '導出數據';
 $lang->product->exportAction  = "導出{$lang->productCommon}";
-$lang->product->dashboard     = "{$lang->productCommon}儀表盤";
-$lang->product->changeProgram = "{$lang->productCommon}調整所屬項目集影響範圍確認";
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
@@ -40,9 +44,10 @@ $lang->product->plans       = "計劃數";
 $lang->product->releases    = '發佈數';
 $lang->product->docs        = '文檔數';
 $lang->product->bugs        = '相關Bug';
-$lang->product->projects    = "關聯{$lang->executionCommon}數";
+$lang->product->projects    = "關聯項目數";
+$lang->product->executions  = "關聯{$lang->execution->common}數";
 $lang->product->cases       = '用例數';
-$lang->product->builds      = 'BUILD數';
+$lang->product->builds      = '版本數';
 $lang->product->roadmap     = "{$lang->productCommon}路線圖";
 $lang->product->doc         = '文檔列表';
 $lang->product->project     = $lang->executionCommon . '列表';
@@ -50,7 +55,7 @@ $lang->product->build       = '版本列表';
 $lang->product->moreProduct = "更多產品";
 $lang->product->projectInfo = "所有與此產品關聯的項目";
 
-$lang->product->currentExecution      = "當前{$lang->sprintCommon}";
+$lang->product->currentExecution      = "當前執行";
 $lang->product->activeStories         = "激活{$lang->SRCommon}";
 $lang->product->activeStoriesTitle    = "激活{$lang->SRCommon}";
 $lang->product->changedStories        = "已變更{$lang->SRCommon}";
@@ -64,17 +69,20 @@ $lang->product->unResolvedBugsTitle   = '未解決Bug';
 $lang->product->assignToNullBugs      = '未指派Bug';
 $lang->product->assignToNullBugsTitle = '未指派Bug';
 
-$lang->product->confirmDelete    = " 您確定刪除該{$lang->productCommon}嗎？";
-$lang->product->errorNoProduct   = "還沒有創建{$lang->productCommon}！";
-$lang->product->accessDenied     = "您無權訪問該{$lang->productCommon}";
-$lang->product->PGMChangeTip     = "如下項目只關聯了該{$lang->productCommon}， 將直接轉移至新項目集下。";
-$lang->product->notChangePGMTip  = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到如下項目，請取消關聯後再操作";
-$lang->product->confirmChangePGM = "如下項目既關聯了該{$lang->productCommon}又關聯了其他{$lang->productCommon}，請確認是否繼續關聯該{$lang->productCommon}，勾選後將取消與其他{$lang->productCommon}的關聯關係，同時轉移至新項目集下。";
+$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->product->confirmChangeProgram = "如下項目既關聯了該{$lang->productCommon}又關聯了其他{$lang->productCommon}，請確認是否繼續關聯該{$lang->productCommon}，勾選後將取消與其他{$lang->productCommon}的關聯關係，同時轉移至新項目集下。";
+$lang->product->changeProgramError   = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到項目，請取消關聯後再操作";
 
 $lang->product->id             = '編號';
 $lang->product->program        = "所屬項目集";
 $lang->product->name           = "{$lang->productCommon}名稱";
 $lang->product->code           = "{$lang->productCommon}代號";
+$lang->product->line           = "{$lang->productCommon}綫";
+$lang->product->lineName       = "{$lang->productCommon}綫名稱";
 $lang->product->order          = '排序';
 $lang->product->type           = "{$lang->productCommon}類型";
 $lang->product->typeAB         = "類型";
@@ -87,8 +95,6 @@ $lang->product->QD             = '測試負責人';
 $lang->product->RD             = '發佈負責人';
 $lang->product->acl            = '訪問控制';
 $lang->product->whitelist      = '白名單';
-$lang->product->addWhitelist   = '添加白名單';
-$lang->product->unbindWhitelist = '刪除白名單';
 $lang->product->branch         = '所屬%s';
 $lang->product->qa             = '測試';
 $lang->product->release        = '發佈';
@@ -137,7 +143,15 @@ $lang->product->statusList['']       = '';
 $lang->product->statusList['normal'] = '正常';
 $lang->product->statusList['closed'] = '結束';
 
-$lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、所屬項目集的干係人、相關聯項目的團隊成員和干係人可訪問)";
+global $config;
+if($config->systemMode == 'new')
+{
+    $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、所屬項目集的干係人、相關聯項目的團隊成員和干係人可訪問)";
+}
+else
+{
+    $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、相關聯{$lang->executionCommon}的團隊成員可訪問)";
+}
 $lang->product->aclList['open']    = "公開(有{$lang->productCommon}視圖權限，即可訪問)";
 //$lang->product->aclList['custom']  = '自定義白名單(團隊成員和白名單的成員可以訪問)';
 
diff --git a/module/product/model.php b/module/product/model.php
index 9274c2bb98..97d3534ca5 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -13,51 +13,20 @@
 <?php
 class productModel extends model
 {
-    /**
-     *
-     * Set menu.
-     *
-     * @param array  $products
-     * @param int    $productID
-     * @param int    $branch
-     * @param int    $module
-     * @param string $moduleType
-     * @param string $extra
-     *
-     * @access public
-     * @return void
-     */
-    public function setMenu($products, $productID, $branch = 0, $module = 0, $moduleType = '', $extra = '')
-    {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $product = $this->getByID($productID);
-        if($product)
-        {
-            $this->lang->modulePageNav = $this->getModuleNav($products, '', $product, $extra, $branch, $module, $moduleType);
-        }
-
-        foreach($this->lang->product->menu as $key => $menu)
-        {
-            $replace = array();
-            $replace['productID'] = $productID;
-            $replace['branch']    = $branch;
-            common::setMenuVars($this->lang->product->menu, $key, $replace);
-        }
-    }
-
     /**
      * Get product module menu.
      *
      * @param  array  $products
      * @param  int    $productID
-     * @param  string $currentModule
-     * @param  string $currentMethod
      * @param  string $extra
+     * @param  string $branch
+     * @param  string $module
+     * @param  string $moduleType
      *
      * @access public
      * @return string
      */
-    public function getModuleNav($products, $project, $product, $extra, $branch, $module, $moduleType)
+    public function getModuleNav($products, $productID, $extra, $branch, $module = 0, $moduleType = '')
     {
         $currentModule = $this->app->getModuleName();
         $currentMethod = $this->app->getMethodName();
@@ -71,7 +40,7 @@ class productModel extends model
         }
         if($currentMethod == 'report') $currentMethod = 'browse';
 
-        $selectHtml = $this->select($products, $product->id, $currentModule, $currentMethod, $extra, $branch, $module, $moduleType);
+        $selectHtml = $this->select($products, $productID, $currentModule, $currentMethod, $extra, $branch, $module, $moduleType);
 
         $pageNav  = '';
         $isMobile = $this->app->viewType == 'mhtml';
@@ -96,25 +65,33 @@ class productModel extends model
      * @param  string $currentModule
      * @param  string $currentMethod
      * @param  string $extra
+     * @param  int    $branch
+     * @param  int    $module
+     * @param  string $moduleType
+     * @param  bool   $withBranch      true|false
      *
      * @access public
      * @return string
      */
-    public function select($products, $productID, $currentModule, $currentMethod, $extra = '', $branch = 0, $module = 0, $moduleType = '')
+    public function select($products, $productID, $currentModule, $currentMethod, $extra = '', $branch = 0, $module = 0, $moduleType = '', $withBranch = true)
     {
-        $isProjectBug = isset($products[0]) ? true : false;
+        $isBrowseBug = (strpos(',project,execution,', ",{$this->app->openApp},") !== false and strpos(',bug,testcase,testtask,ajaxselectstory,', ",{$this->app->rawMethod},") !== false and isset($products[0])) ? true : false;
 
         $this->app->loadLang('product');
-        if(!$isProjectBug and !$productID)
+        if(!$isBrowseBug and !$productID)
         {
-            unset($this->lang->product->setMenu->branch);
+            unset($this->lang->product->menu->settings['subMenu']->branch);
             return;
         }
         $isMobile = $this->app->viewType == 'mhtml';
 
-        setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
         if($productID) $currentProduct = $this->getById($productID);
-        if($isProjectBug and !$productID)
+
+        if($isBrowseBug and $this->app->openApp == 'project')   $extra = $this->session->project;
+        if($isBrowseBug and $this->app->openApp == 'execution') $extra = $this->session->execution;
+
+        if($isBrowseBug and !$productID)
         {
             $currentProduct = new stdclass();
             $currentProduct->name = $products[$productID];
@@ -125,23 +102,23 @@ class productModel extends model
         $output = '';
         if(!empty($products))
         {
-            $dropMenuLink = helper::createLink($isProjectBug ? 'bug' : 'product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
+            $dropMenuLink = helper::createLink($isBrowseBug ? 'bug' : 'product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
             $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProduct->name}'><span class='text'>{$currentProduct->name}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
             $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
             $output .= "</div></div>";
             if($isMobile) $output = "<a id='currentItem' href=\"javascript:showSearchMenu('product', '$productID', '$currentModule', '$currentMethod', '$extra')\"><span class='text'>{$currentProduct->name}</span> <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
 
-            if($currentProduct->type == 'normal') unset($this->lang->product->setMenu->branch);
-            if($currentProduct->type != 'normal' && $currentModule != 'programplan')
+            if($currentProduct->type == 'normal' || !$withBranch) unset($this->lang->product->menu->settings['subMenu']->branch);
+            if($currentProduct->type != 'normal' && $currentModule != 'programplan' && $withBranch)
             {
-                $this->lang->product->branch = $this->lang->product->branchName[$currentProduct->type];
-                $this->lang->product->setMenu->branch = str_replace('@branch@', $this->lang->product->branch, $this->lang->product->setMenu->branch);
+                $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$currentProduct->type]);
+                $this->lang->product->menu->settings['subMenu']->branch = str_replace('@branch@', $this->lang->product->branch, $this->lang->product->menu->settings['subMenu']->branch);
 
                 $branches   = $this->loadModel('branch')->getPairs($productID);
                 $branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
                 if(!$isMobile)
                 {
-                    $dropMenuLink = helper::createLink('branch', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
+                    $dropMenuLink = helper::createLink('branch', 'ajaxGetDropMenu', "objectID=$productID&branch=$branch&module=$currentModule&method=$currentMethod&extra=$extra");
                     $output .= "<div class='btn-group'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit'>{$branchName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
                     $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
                     $output .= "</div></div>";
@@ -179,7 +156,7 @@ class productModel extends model
         if($this->cookie->preProductID != $productID)
         {
             $this->cookie->set('preBranch', 0);
-            setcookie('preBranch', 0, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+            setcookie('preBranch', 0, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
         }
 
         return $this->session->product;
@@ -258,23 +235,24 @@ class productModel extends model
      * @access public
      * @return array
      */
-    public function getList($programID = 0, $status = 'all', $limit = 0, $line = 0, $orderBy = '')
+    public function getList($programID = 0, $status = 'all', $limit = 0, $line = 0)
     {
-        return $this->dao->select('*')->from(TABLE_PRODUCT)
-            ->where('deleted')->eq(0)
-            ->beginIF($programID)->andWhere('program')->eq($programID)->fi()
-            ->beginIF($line > 0)->andWhere('line')->eq($line)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
-            ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
-            ->beginIF($status != 'all' and $status != 'noclosed' and $status != 'involved')->andWhere('status')->in($status)->fi()
+        return $this->dao->select('t1.id as id,t1.*')->from(TABLE_PRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
+            ->where('t1.deleted')->eq(0)
+            ->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi()
+            ->beginIF($line > 0)->andWhere('t1.line')->eq($line)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi()
+            ->beginIF($status == 'noclosed')->andWhere('t1.status')->ne('closed')->fi()
+            ->beginIF($status != 'all' and $status != 'noclosed' and $status != 'involved')->andWhere('t1.status')->in($status)->fi()
             ->beginIF($status == 'involved')
-            ->andWhere('PO', true)->eq($this->app->user->account)
-            ->orWhere('QD')->eq($this->app->user->account)
-            ->orWhere('RD')->eq($this->app->user->account)
-            ->orWhere('createdBy')->eq($this->app->user->account)
+            ->andWhere('t1.PO', true)->eq($this->app->user->account)
+            ->orWhere('t1.QD')->eq($this->app->user->account)
+            ->orWhere('t1.RD')->eq($this->app->user->account)
+            ->orWhere('t1.createdBy')->eq($this->app->user->account)
             ->markRight(1)
             ->fi()
-            ->orderBy($orderBy . '`order` desc')
+            ->orderBy('t2.order_asc, t1.line_desc, t1.order_asc')
             ->beginIF($limit > 0)->limit($limit)->fi()
             ->fetchAll('id');
     }
@@ -284,21 +262,36 @@ class productModel extends model
      *
      * @param  string $mode
      * @param  string $programID
+     * @param  string $orderBy   program_asc
      * @return array
      */
-    public function getPairs($mode = '', $programID = 0)
+    public function getPairs($mode = '', $programID = 0, $orderBy = '')
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs();
 
-        $orderBy  = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
-        $products = $this->dao->select('*,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
-            ->from(TABLE_PRODUCT)
-            ->where('deleted')->eq(0)
-            ->beginIF($programID)->andWhere('program')->eq($programID)->fi()
-            ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
-            ->orderBy($orderBy)
-            ->fetchPairs('id', 'name');
+        if($orderBy == 'program_asc')
+        {
+            $products = $this->dao->select('t1.id as id, t1.name as name, t1.*, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed')->from(TABLE_PRODUCT)->alias('t1')
+                ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
+                ->where('t1.deleted')->eq(0)
+                ->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi()
+                ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi()
+                ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi()
+                ->orderBy('t2.order_asc, t1.line_desc, t1.order_desc')
+                ->fetchPairs('id', 'name');
+        }
+        else
+        {
+            $orderBy  = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
+            $products = $this->dao->select('*,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
+                ->from(TABLE_PRODUCT)
+                ->where('deleted')->eq(0)
+                ->beginIF($programID)->andWhere('program')->eq($programID)->fi()
+                ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
+                ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
+                ->orderBy($orderBy)
+                ->fetchPairs('id', 'name');
+        }
         return $products;
     }
 
@@ -310,7 +303,7 @@ class productModel extends model
      * @access public
      * @return array
      */
-    public function getProductPairsByProject($projectID, $status = 'all')
+    public function getProductPairsByProject($projectID = 0, $status = 'all')
     {
         $products = empty($projectID) ? $this->getList() : $this->getProducts($projectID, $status);
         $pairs    = array();
@@ -322,6 +315,24 @@ class productModel extends model
         return $pairs;
     }
 
+    /**
+     * Get product pairs by project model.
+     *
+     * @param  string $model all|scrum|waterfall
+     * @access public
+     * @return array
+     */
+    public function getPairsByProjectModel($model)
+    {
+        return $this->dao->select('t3.id as id, t3.name as name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+            ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
+            ->where('t3.deleted')->eq(0)
+            ->beginIF(!$this->app->user->admin)->andWhere('t3.id')->in($this->app->user->view->products)->fi()
+            ->beginIF($model != 'all')->andWhere('t2.model')->eq($model)
+            ->fetchPairs('id', 'name');
+    }
+
     /**
      * Get products by project.
      *
@@ -331,7 +342,7 @@ class productModel extends model
      * @access public
      * @return array
      */
-    public function getProducts($projectID, $status = 'all', $orderBy = '')
+    public function getProducts($projectID = 0, $status = 'all', $orderBy = '')
     {
         return $this->dao->select('t1.branch, t1.plan, t2.*')
             ->from(TABLE_PROJECTPRODUCT)->alias('t1')
@@ -341,7 +352,7 @@ class productModel extends model
             ->beginIF(!empty($projectID))->andWhere('t1.project')->eq($projectID)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->products)->fi()
             ->beginIF(strpos($status, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
-            ->orderBy($orderBy . 't2.order desc')
+            ->orderBy($orderBy . 't2.order asc')
             ->fetchAll('id');
     }
 
@@ -388,7 +399,7 @@ class productModel extends model
         $products = array();
         if($projectID)
         {
-            $pairs    = $this->getProducts($projectID);
+            $pairs    = $this->getProducts($projectID, $status == 'normal' ? 'noclosed' : '');
             $products = $this->getByIdList(array_keys($pairs));
         }
         else
@@ -450,40 +461,44 @@ class productModel extends model
     {
         $currentModule = $this->app->moduleName;
         $currentMethod = $this->app->methodName;
-        $this->session->set('moreProductLink', $this->app->getURI(true));
 
-        /* init currentModule and currentMethod for report and story. */
+        /* Init currentModule and currentMethod for report and story. */
         if($currentModule == 'story')
         {
-            $storyMethods = ",track,create,batchcreate,batchclose,";
+            $storyMethods = ",track,create,batchcreate,batchclose,zerocase,";
             if(strpos($storyMethods, "," . $currentMethod . ",") === false) $currentModule = 'product';
-            if($currentMethod == 'view' || $currentMethod == 'change' || $currentMethod == 'review') $currentMethod = 'browse';
+            if($currentMethod == 'view' or $currentMethod == 'change' or $currentMethod == 'review') $currentMethod = 'browse';
         }
+        if($currentModule == 'testcase' and $currentMethod == 'view') $currentMethod = 'browse';
         if($currentMethod == 'report') $currentMethod = 'browse';
 
-        $this->app->loadLang('project');
         $currentProductName = $this->lang->product->common;
         if($productID)
         {
             $currentProduct     = $this->getById($productID);
             $currentProductName = $currentProduct->name;
+            $this->session->set('currentProductType', $currentProduct->type);
         }
 
         $fromModule   = $this->lang->navGroup->qa == 'qa' ? 'qa' : '';
-        $dropMenuLink = helper::createLink('product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra&from=$fromModule");
+        $dropMenuLink = helper::createLink($this->app->openApp == 'qa' ? 'product' : $this->app->openApp, 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra&from=$fromModule");
 
-        $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProductName}'><span class='text'><i class='icon icon-product'></i> {$currentProductName}</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+        if($this->app->viewType == 'mhtml' and $productID) return $this->getModuleNav(array($productID => $currentProductName), $productID, $extra, $branch);
+
+
+        $output  = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProductName}'><span class='text'>{$currentProductName}</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
         $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
         $output .= "</div></div>";
 
-        if(isset($currentProduct->type) && $currentProduct->type != 'normal')
+        if(isset($currentProduct->type) and $currentProduct->type != 'normal' and $currentModule != 'testsuite')
         {
+            $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$currentProduct->type]);
             $branches     = $this->loadModel('branch')->getPairs($productID);
-            $branch       = empty($branch) ? (int)$this->cookie->preBranch : $branch;
+            $branch       = (int)$branch;
             $branchName   = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
-            $dropMenuLink = helper::createLink('branch', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
+            $dropMenuLink = helper::createLink('branch', 'ajaxGetDropMenu', "objectID=$productID&branch=$branch&module=$currentModule&method=$currentMethod&extra=$extra");
 
-            $output .= "<div class='btn-group header-angle-btn'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn'><span class='text'>{$branchName}</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+            $output .= "<div class='btn-group header-btn'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn'><span class='text'>{$branchName}</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
             $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
             $output .= "</div></div>";
         }
@@ -491,19 +506,6 @@ class productModel extends model
         return $output;
     }
 
-    /**
-     * Get product main action.
-     *
-     * @access public
-     * @return string
-     */
-    public function getProductMainAction()
-    {
-        $link = html::a(helper::createLink('product', 'all'), "<i class='icon icon-list'></i>", '', "style='border: none;'");
-        $html = "<p style='padding-top:5px;'>" . $link . "</p>";
-        return common::hasPriv('product', 'all') ? $html : '';
-    }
-
     /**
      * Create a product.
      *
@@ -521,9 +523,32 @@ class productModel extends model
             ->setIF($this->post->acl == 'open', 'whitelist', '')
             ->stripTags($this->config->product->editor->create['id'], $this->config->allowedTags)
             ->join('whitelist', ',')
-            ->remove('uid')
+            ->remove('uid,newLine,lineName')
             ->get();
 
+        if(!empty($_POST['lineName']))
+        {
+            /* Insert product line. */
+            $maxOrder = $this->dao->select("max(`order`) as maxOrder")->from(TABLE_MODULE)->where('type')->eq('line')->fetch('maxOrder');
+            $maxOrder = $maxOrder ? $maxOrder + 10 : 0;
+
+            $line = new stdClass();
+            $line->type   = 'line';
+            $line->parent = 0;
+            $line->grade  = 1;
+            $line->name   = $this->post->lineName;
+            $line->root   = $product->program;
+            $line->order  = $maxOrder;
+            $this->dao->insert(TABLE_MODULE)->data($line)->exec();
+
+            $lineID = $this->dao->lastInsertID();
+            $path   = ",$lineID,";
+            $this->dao->update(TABLE_MODULE)->set('path')->eq($path)->where('id')->eq($lineID)->exec();
+
+            if(dao::isError()) return false;
+            $product->line = $lineID;
+        }
+
         $product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_PRODUCT)->data($product)->autoCheck()
             ->batchCheck($this->config->product->create->requiredFields, 'notempty')
@@ -566,6 +591,7 @@ class productModel extends model
     {
         $productID  = (int)$productID;
         $oldProduct = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
+        if($oldProduct->bind) $this->config->product->edit->requiredFields = 'name';
 
         $product = fixer::input('post')
             ->setIF($this->post->acl == 'open', 'whitelist', '')
@@ -575,19 +601,22 @@ class productModel extends model
             ->remove('uid,changeProjects')
             ->get();
 
-        if($product->program != $oldProduct->program)
+        if($this->config->systemMode == 'new')
         {
-            /* Link the projects stories under this product. */
-            $unmodifiableProjects = $this->dao->select('t1.*')->from(TABLE_PROJECTSTORY)->alias('t1')
-                ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
-                ->where('t1.product')->eq($productID)
-                ->andWhere('t2.type')->eq('project')
-                ->andWhere('t2.deleted')->eq('0')
-                ->fetchPairs('project', 'product');
-            if(!empty($unmodifiableProjects))
+            if($product->program != $oldProduct->program)
             {
-                dao::$errors[] = $this->lang->product->changeProgramError;
-                return false;
+                /* Link the projects stories under this product. */
+                $unmodifiableProjects = $this->dao->select('t1.*')->from(TABLE_PROJECTSTORY)->alias('t1')
+                    ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+                    ->where('t1.product')->eq($productID)
+                    ->andWhere('t2.type')->eq('project')
+                    ->andWhere('t2.deleted')->eq('0')
+                    ->fetchPairs('project', 'product');
+                if(!empty($unmodifiableProjects))
+                {
+                    dao::$errors[] = $this->lang->product->changeProgramError;
+                    return false;
+                }
             }
         }
 
@@ -776,31 +805,10 @@ class productModel extends model
         if($browseType == 'changedstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'changed', $type, $sort, $pager);
         if($browseType == 'willclose')    $stories = $this->story->get2BeClosed($productID, $branch, $modules, $type, $sort, $pager);
         if($browseType == 'closedstory')  $stories = $this->story->getByStatus($productID, $branch, $modules, 'closed', $type, $sort, $pager);
-        if($browseType == 'emptysr')      $stories = $this->story->getEmptySR($productID, $branch, $modules, '', $type, $sort, $pager);
 
         return $stories;
     }
 
-    /**
-     * Get the total number of requirements associated with the product.
-     *
-     * @param  array   $productIdList
-     * @param  string  $type
-     * @param  string  $status  closed|active|draft
-     * @access public
-     * @return int
-     */
-    public function getTotalStoriesByProduct($productIdList, $type, $status = '')
-    {
-        return $this->dao->select("count(*) as stories")->from(TABLE_STORY)
-            ->where('type')->eq($type)
-            ->andWhere('product')->in($productIdList)
-            ->beginIF($status != '')->andWhere('status')->eq($status)
-            ->beginIF($status == 'closed')->andWhere('closedReason')->eq('done')->fi()
-            ->andWhere('deleted')->eq(0)
-            ->fetch('stories');
-    }
-
     /**
      * Batch get story stage.
      *
@@ -833,7 +841,7 @@ class productModel extends model
         $this->config->product->search['queryID']   = $queryID;
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
 
-        $product = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $products : array($productID => $products[$productID]);
+        $product = ($this->app->openApp == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]);
         $this->config->product->search['params']['product']['values'] = $product + array('all' => $this->lang->product->allProduct);
 
         /* Get module of all products.*/
@@ -873,8 +881,8 @@ class productModel extends model
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t1.product')->eq($productID)
             ->andWhere('t2.type')->eq('project')
-            ->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
+            ->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi()
             ->andWhere('t2.deleted')->eq('0')
             ->fetchPairs();
     }
@@ -894,22 +902,26 @@ class productModel extends model
         $projectList = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t1.product')->eq($productID)
-            ->andWhere('t2.type')->eq('project')
+            ->beginIF($this->config->systemMode == 'new')->andWhere('t2.type')->eq('project')->fi()
             ->beginIF($browseType != 'all')->andWhere('t2.status')->eq($browseType)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin and $this->config->systemMode != 'new')->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
             ->beginIF($this->cookie->involved or $involved)
             ->andWhere('t2.openedBy', true)->eq($this->app->user->account)
             ->orWhere('t2.PM')->eq($this->app->user->account)
             ->markRight(1)
             ->fi()
             ->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
             ->andWhere('t2.deleted')->eq('0')
             ->fetchAll('id');
 
         /* Determine how to display the name of the program. */
         $programList = $this->loadModel('program')->getParentPairs('', 'noclosed');
-        foreach($projectList as $id => $project) $projectList[$id]->programName = $programList[$project->parent];
+        foreach($projectList as $id => $project)
+        {
+            $projectList[$id]->programName = $project->parent ? zget($programList, $project->parent, '') : '';
+            $projectList[$id]->programName = preg_replace('/\//', '', $projectList[$id]->programName, 1);
+        }
 
         return $projectList;
     }
@@ -1009,7 +1021,7 @@ class productModel extends model
     public function getExecutionPairsByProduct($productID, $branch = 0, $orderBy = 'id_asc', $projectID = 0)
     {
         if(empty($productID)) return array();
-        if(empty($projectID)) return $this->getAllExecutionPairsByProduct($productID, $branch);
+        if(empty($projectID) or $this->config->systemMode == 'classic') return $this->getAllExecutionPairsByProduct($productID, $branch);
 
         $project = $this->loadModel('project')->getByID($projectID);
         $orderBy = $project->model == 'waterfall' ? 'begin_asc,id_asc' : 'begin_desc,id_desc';
@@ -1079,7 +1091,7 @@ class productModel extends model
         $projectIdList = array();
         foreach($executions as $id => $execution) $projectIdList[$execution->project] = $execution->project;
 
-        $executionPairs = array();
+        $executionPairs = array(0 => '');
         $projectPairs   = $this->loadModel('project')->getPairsByIdList($projectIdList);
         foreach($executions as $id => $execution)
         {
@@ -1098,7 +1110,8 @@ class productModel extends model
                 $executionPairs = $executionPairs + $execution->children;
                 continue;
             }
-            $executionPairs[$execution->id] = $projectPairs[$execution->project] . '/' . $execution->name;
+           if($this->config->systemMode == 'new') $executionPairs[$execution->id] = $projectPairs[$execution->project] . '/' . $execution->name;
+           if($this->config->systemMode == 'classic') $executionPairs[$execution->id] = $execution->name;
         }
 
         return $executionPairs;
@@ -1304,16 +1317,25 @@ class productModel extends model
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t2.deleted')->eq(0)
             ->andWhere('t1.product')->eq($productID)
+            ->andWhere('t2.type')->eq('project')
             ->fetch();
 
-        $product->stories  = $stories;
-        $product->plans    = $plans    ? $plans->count : 0;
-        $product->releases = $releases ? $releases->count : 0;
-        $product->builds   = $builds   ? $builds->count : 0;
-        $product->cases    = $cases    ? $cases->count : 0;
-        $product->projects = $projects ? $projects->count : 0;
-        $product->bugs     = $bugs     ? $bugs->count : 0;
-        $product->docs     = $docs     ? $docs->count : 0;
+        $executions = $this->dao->select('count("t1.*") AS count')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+            ->where('t2.deleted')->eq(0)
+            ->andWhere('t1.product')->eq($productID)
+            ->andWhere('t2.type')->in('sprint,stage')
+            ->fetch();
+
+        $product->stories    = $stories;
+        $product->plans      = $plans      ? $plans->count : 0;
+        $product->releases   = $releases   ? $releases->count : 0;
+        $product->builds     = $builds     ? $builds->count : 0;
+        $product->cases      = $cases      ? $cases->count : 0;
+        $product->projects   = $projects   ? $projects->count : 0;
+        $product->executions = $executions ? $executions->count : 0;
+        $product->bugs       = $bugs       ? $bugs->count : 0;
+        $product->docs       = $docs       ? $docs->count : 0;
 
         return $product;
     }
@@ -1340,11 +1362,23 @@ class productModel extends model
         if(empty($products)) return array();
 
         $productKeys = array_keys($products);
-        $products = $this->dao->select('*')->from(TABLE_PRODUCT)
-            ->where('id')->in($productKeys)
-            ->orderBy($orderBy)
-            ->page($pager)
-            ->fetchAll('id');
+        if($orderBy == 'program_asc')
+        {
+            $products = $this->dao->select('t1.id as id, t1.*')->from(TABLE_PRODUCT)->alias('t1')
+                ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
+                ->where('t1.id')->in($productKeys)
+                ->orderBy('t2.order_asc, t1.line_desc, t1.order_desc')
+                ->page($pager)
+                ->fetchAll('id');
+        }
+        else
+        {
+            $products = $this->dao->select('*')->from(TABLE_PRODUCT)
+                ->where('id')->in($productKeys)
+                ->orderBy($orderBy)
+                ->page($pager)
+                ->fetchAll('id');
+        }
 
         $linePairs = $this->getLinePairs();
         foreach($products as $product) $product->lineName = zget($linePairs, $product->line, '');
@@ -1575,7 +1609,7 @@ class productModel extends model
     public function getProductLink($module, $method, $extra, $branch = false)
     {
         $link = '';
-        if(strpos('programplan,product,roadmap,bug,testcase,testtask,story,qa,testsuite,testreport,build,projectrelease,projectstory', $module) !== false)
+        if(strpos(',programplan,product,roadmap,bug,testcase,testtask,story,qa,testsuite,testreport,build,projectrelease,projectstory,', ',' . $module . ',') !== false)
         {
             if($module == 'product' && $method == 'project')
             {
@@ -1589,6 +1623,10 @@ class productModel extends model
             {
                 $link = helper::createLink($module, $method, "productID=%s&type=$extra");
             }
+            elseif($module == 'product' && $method == 'create')
+            {
+                $link = helper::createLink($module, 'browse', "productID=%s&type=$extra");
+            }
             elseif($module == 'qa' && $method == 'index')
             {
                 $link = helper::createLink('bug', 'browse', "productID=%s" . ($branch ? "&branch=%s" : ''));
@@ -1600,12 +1638,25 @@ class productModel extends model
             elseif($module == 'programplan')
             {
                 $extra = $extra ? $extra : 'gantt';
-                $link  = helper::createLink($module, 'browse', "projectID=%s&productID=%s&type=$extra" . ($branch ? "&branch=%s" : ''));
+                $link  = helper::createLink($module, 'browse', "projectID=%s&productID=%s&type=$extra");
             }
             elseif($module == 'story' && $method == 'report')
             {
                 $link = helper::createLink($module, 'report', "productID=%s" . ($branch ? "&branch=%s" : '&branch=0') . "&extra=$extra");
             }
+            elseif($module == 'testtask')
+            {
+                $extra = $method != 'browse' ? '' : "&extra=$extra";
+                $link  = helper::createLink($module, 'browse', "productID=%s" . ($branch ? "&branch=%s" : '&branch=0') . $extra);
+            }
+            elseif($module == 'bug' && $method == 'view')
+            {
+                $link = helper::createLink('bug', 'browse', "productID=%s" . ($branch ? "&branch=%s" : '&branch=0') . "&extra=$extra");
+            }
+            elseif($module == 'testsuite' && !in_array($method, array('browse', 'create')))
+            {
+                $link = helper::createLink('testsuite', 'browse', "productID=%s");
+            }
             else
             {
                 $link = helper::createLink($module, $method, "productID=%s" . ($branch ? "&branch=%s" : ''));
@@ -1632,6 +1683,11 @@ class productModel extends model
         {
             return helper::createLink('design', 'browse', "productID=%s");
         }
+        elseif($module == 'project' or $module == 'execution')
+        {
+            $objectID = $module == 'project' ? 'projectID' : 'executionID';
+            return helper::createLink($module, $method, "$objectID=$extra&productID=%s");
+        }
 
         return $link;
     }
@@ -1724,4 +1780,37 @@ class productModel extends model
             }
         }
     }
+
+    /**
+     *
+     * Set menu.
+     *
+     * @param int    $productID
+     * @param int    $branch
+     * @param int    $module
+     * @param string $moduleType
+     * @param string $extra
+     *
+     * @access public
+     * @return void
+     */
+    public function setMenu($productID, $branch = 0, $module = 0, $moduleType = '', $extra = '')
+    {
+        $product = $this->getByID($productID);
+        if(!$product) return;
+
+        $this->lang->switcherMenu = $this->getSwitcher($productID, $extra, $branch);
+        $params = array('branch' => $branch);
+        common::setMenuVars('product', $productID, $params);
+
+        if($product->type == 'normal')
+        {
+            unset($this->lang->product->menu->settings['subMenu']->branch);
+        }
+        else
+        {
+            $branchLink = $this->lang->product->menu->settings['subMenu']->branch['link'];
+            $this->lang->product->menu->settings['subMenu']->branch['link'] = str_replace('@branch@', $this->lang->product->branchName[$product->type], $branchLink);
+        }
+    }
 }
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 4d5391c44d..6a5d10b94b 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -22,53 +22,53 @@ $closedProductsHtml = '';
 
 foreach($products as $product)
 {
+    $selected     = $product->id == $productID ? 'selected' : '';
     $productName  = $product->program ? zget($programs, $product->program, '') . '/' : '';
     $productName .= $product->line ? zget($lines, $product->line, '') . '/' . $product->name : $product->name;
     if($product->status == 'normal' and $product->PO == $this->app->user->account)
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
-        $myProductsHtml .= html::a($linkHtml, $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'");
+        $myProductsHtml .= html::a($linkHtml, $productName, '', "class='text-important $selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
     }
     else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
-        $normalProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'");
+        $normalProductsHtml .= html::a($linkHtml, $productName, '', "class='$selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
     }
     else if($product->status == 'closed')
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $objectID);
-        $closedProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'");
+        $closedProductsHtml .= html::a($linkHtml, $productName, '', "class='$selected' title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
     }
 }
 ?>
 <div class="table-row">
   <div class="table-col col-left">
     <div class='list-group'>
-    <?php
-    if(!empty($myProductsHtml))
-    {
-        echo "<div class='heading'>{$lang->product->mine}</div>";
-        echo $myProductsHtml;
-        if(!empty($myProductsHtml))
-        {
-            echo "<div class='heading'>{$lang->product->other}</div>";
-        }
-    }
-    echo $normalProductsHtml;
-    ?>
+      <?php
+      if(!empty($myProductsHtml))
+      {
+          echo "<div class='heading'>{$lang->product->mine}</div>";
+          echo $myProductsHtml;
+          if(!empty($myProductsHtml))
+          {
+              echo "<div class='heading'>{$lang->product->other}</div>";
+          }
+      }
+      echo $normalProductsHtml;
+      ?>
     </div>
     <div class="col-footer">
       <?php //echo html::a(helper::createLink('product', 'all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->product->all, '', 'class="not-list-item"'); ?>
-      <?php echo html::a(helper::createLink('product', 'create'), '<i class="icon icon-plus"></i> ' . $lang->product->create, '', 'class="not-list-item"'); ?>
+      <?php //echo html::a(helper::createLink('project', 'browse', 'programID=0&browseType=all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->product->closed?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>
   <div class="table-col col-right">
-   <div class='list-group'>
-    <?php echo $closedProductsHtml;?>
-    </div>
+   <div class='list-group'><?php echo $closedProductsHtml;?></div>
   </div>
 </div>
+<script>scrollToSelected();</script>
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 0806072497..82868a70a3 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -80,7 +80,7 @@
           <?php foreach($program as $lineID => $line):?>
           <?php if(isset($line['lineName'])):?>
           <?php
-          if($this->config->systemMode == 'new')
+          if($this->config->systemMode == 'new' and $programID)
           {
               $trAttrs  = "data-id='line.$lineID' data-parent='program.$programID'";
               $trClass .= ' is-nest-child  table-nest';
@@ -110,9 +110,11 @@
           $trClass = '';
           if($product->line)
           {
+              $path = "$product->line,$product->id";
+              if($this->config->systemMode == 'new' and $product->program) $path = "$product->program,$path";
               $trAttrs  = "data-id='$product->id' data-parent='line.$product->line'";
               $trClass .= ' is-nest-child  table-nest';
-              $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.$product->program,$product->line,$product->id'";
+              $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.{$path}'";
           }
           elseif($product->program)
           {
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index d2192a27d7..891e914a25 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -12,9 +12,15 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datatable.fix.html.php';?>
+<style>
+body {margin-bottom: 25px;}
+#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text {color: #fff;}
+#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text:after {border-bottom: unset;}
+.body-modal #mainMenu>.btn-toolbar {width: auto;}
+</style>
 <?php js::set('browseType', $browseType);?>
 <?php js::set('productID', $productID);?>
-<?php js::set('projectID', $this->session->PRJ);?>
+<?php js::set('projectID', $projectID);?>
 <?php js::set('branch', $branch);?>
 <?php js::set('rawModule', $this->app->rawModule);?>
 <?php
@@ -26,9 +32,13 @@ js::set('foldAll',       $lang->execution->treeLevel['root']);
 js::set('storyType',     $storyType);
 $lang->story->createCommon = $storyType == 'story' ? $lang->story->createStory : $lang->story->createRequirement;
 $isProjectStory = $this->app->rawModule == 'projectstory';
+$projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
 ?>
 <style>
 .btn-group .icon-close:before {font-size: 5px; vertical-align: 25%;}
+.btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
+.btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
+.btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if(!$isProjectStory):?>
@@ -38,7 +48,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       echo $moduleName;
       if($moduleID)
       {
-          $removeLink = $browseType == 'bymodule' ? $this->createLink($this->app->rawModule, $this->app->rawMethod, "productID=$productID&branch=$branch&browseType=$browseType&param=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModule")';
+          $removeLink = $browseType == 'bymodule' ? $this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$browseType&param=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModule")';
           echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
       }
       ?>
@@ -51,10 +61,10 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><span class='text' title='<?php echo $productName;?>'><?php echo $productName;?></span> <span class='caret'></span></a>
       <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
         <?php
-        echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=0"), $lang->product->all)  . "</li>";
+        echo "<li>" . html::a($this->createLink('projectstory', 'story', "projectID=$projectID"), $lang->product->all)  . "</li>";
         foreach($projectProducts as $product)
         {
-            echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=$product->id&branch=0"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
+            echo "<li>" . html::a($this->createLink('projectstory', 'story', "projectID=$projectID&productID=$product->id&branch=0"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
         }
         ?>
       </ul>
@@ -64,14 +74,14 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       <?php
       if($moduleID)
       {
-          $removeLink = $browseType == 'bymodule' ? $this->createLink($this->app->rawModule, $this->app->rawMethod, "productID=$productID&branch=$branch&browseType=$browseType&param=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModule")';
+          $removeLink = $browseType == 'bymodule' ? $this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$browseType&param=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModuleParam")';
           echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted btn btn-link' style='padding-left: 0;'");
       }
       ?>
     </div>
     <?php endif;?>
     <?php
-    foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem)
+    foreach(customModel::getFeatureMenu($this->app->rawModule, $this->app->rawMethod) as $menuItem)
     {
         if(isset($menuItem->hidden)) continue;
         if($menuItem->name == 'emptysr' && $storyType == 'story') continue;
@@ -94,25 +104,26 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
                 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, "productID=$productID&branch=$branch&browseType=$key&param=0&storyType=$storyType"), "<span class='text'>{$value}</span>", '', "class='btn btn-link $active'") . '</li>';
+                    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')
         {
-            $searchBrowseLink = $this->createLink($this->app->rawModule, $this->app->rawMethod, "productID=$productID&branch=$branch&browseType=$menuBrowseType&param=%s&storyType=$storyType");
+            $searchBrowseLink = $this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$menuBrowseType&param=%s&storyType=$storyType");
             $isBySearch       = $this->session->storyBrowseType == 'bysearch';
             include '../../common/view/querymenu.html.php';
         }
         else
         {
-            echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, "productID=$productID&branch=$branch&browseType=$menuBrowseType&param=0&storyType=$storyType"), "<span class='text'>$menuItem->text</span>" . ($menuItem->name == $this->session->storyBrowseType ? ' <span class="label label-light label-badge">' . $pager->recTotal . '</span>' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItem->name ? ' btn-active-text' : '') . "'");
+            echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$menuBrowseType&param=0&storyType=$storyType"), "<span class='text'>$menuItem->text</span>" . ($menuItem->name == $this->session->storyBrowseType ? ' <span class="label label-light label-badge">' . $pager->recTotal . '</span>' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItem->name ? ' btn-active-text' : '') . "'");
         }
     }
     ?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
   </div>
+  <?php if(!isonlybody()):?>
   <div class="btn-toolbar pull-right">
     <?php if($this->app->rawModule != 'projectstory') common::printIcon('story', 'report', "productID=$productID&branchID=$branch&storyType=$storyType&browseType=$browseType&moduleID=$moduleID&chartType=pie", '', 'button', 'bar-chart muted'); ?>
     <div class="btn-group">
@@ -121,54 +132,59 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
         <?php
         $openApp = $isProjectStory ? 'project' : 'product';
         $class = common::hasPriv('story', 'export') ? '' : "class=disabled";
-        $misc  = common::hasPriv('story', 'export') ? "class='export' data-group='$openApp'" : "class=disabled";
+        $misc  = common::hasPriv('story', 'export') ? "data-toggle='modal' data-type='iframe' class='export' data-app='$openApp'" : "class=disabled";
         $link  = common::hasPriv('story', 'export') ?  $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&browseType=$browseType&type=$storyType") : '#';
         echo "<li $class>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
     <?php if(common::canModify('product', $product)):?>
-    <div class='btn-group dropdown-hover'>
-      <?php echo html::a('javascript:;', "<i class='icon icon-plus'></i> {$lang->story->create} </span><span class='caret'>", '', "class='btn btn-secondary'");?>
-      <ul class='dropdown-menu'>
+    <div class='btn-group dropdown'>
+      <?php
+      $createStoryLink = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType");
+      $batchCreateLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project=$projectID&plan=0&type=$storyType");
+
+      $buttonLink  = '';
+      $buttonTitle = '';
+      $buttonType  = $from == 'project' ? 'btn-secondary' : 'btn-primary';
+      if(common::hasPriv('story', 'batchCreate'))
+      {
+          $buttonLink  = empty($productID) ? '' : $batchCreateLink;
+          $buttonTitle = $lang->story->batchCreate;
+      }
+      if(common::hasPriv('story', 'create'))
+      {
+          $buttonLink  = $createStoryLink;
+          $buttonTitle = $lang->story->create;
+      }
+
+      $hidden = empty($buttonLink) ? 'hidden' : '';
+      echo html::a($buttonLink, "<i class='icon icon-plus'></i> $buttonTitle", '', "class='btn $buttonType $hidden' data-app='$openApp'");
+      ?>
+      <?php if(!empty($productID) and common::hasPriv('story', 'batchCreate') and common::hasPriv('story', 'create')): ?>
+      <button type='button' class="btn <?php echo $buttonType?> dropdown-toggle" data-toggle='dropdown'><span class='caret'></span></button>
+      <ul class='dropdown-menu pull-right'>
         <li>
         <?php
-        $openApp = $isProjectStory ? 'project' : 'product';
         if(commonModel::isTutorialMode())
         {
             $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
-            if($isProjectStory) $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=&projectID={$this->session->PRJ}");
+            if($isProjectStory) $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=&projectID=$projectID");
             $link = $this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams");
-            echo html::a($link, $lang->story->createCommon, '', "data-group='$openApp'");
+            echo html::a($link, $lang->story->createCommon, '', "data-app='$openApp'");
         }
         else
         {
-            $link     = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=0&bugID=0&planID=0&todoID=0&extra=&type=$storyType");
-            if($isProjectStory) $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID={$this->session->PRJ}");
-            $disabled = '';
-            if(!common::hasPriv('story', 'create'))
-            {
-                $link     = '###';
-                $disabled = 'disabled';
-            }
-            echo html::a($link, $lang->story->createCommon, '', "class='$disabled' data-group='$openApp'");
+            echo html::a($createStoryLink, $lang->story->create, '', "data-group='$openApp'");
         }
         ?>
         </li>
-        <?php if(!empty($productID)): ?>
-        <?php $batchDisabled = common::hasPriv('story', 'batchCreate') ? '' : "class='disabled'";?>
-        <li <?php echo $batchDisabled;?>>
-        <?php
-          $batchLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project=0&plan=0&type=$storyType");
-          if($isProjectStory) $batchLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project={$this->session->PRJ}");
-          echo html::a($batchLink, $lang->story->batchCreate, '', "data-group='$openApp'");
-        ?>
-        </li>
-        <?php endif;?>
+        <li><?php echo html::a($batchCreateLink, $lang->story->batchCreate, '', "data-group='$openApp'");?></li>
       </ul>
+      <?php endif;?>
     </div>
     <?php $isShow = $isProjectStory ? '' : "style='display: none;'";?>
-    <div class='btn-group dropdown-hover' <?php echo $isShow;?>>
+    <div class='btn-group dropdown' <?php echo $isShow;?>>
     <?php
     if(commonModel::isTutorialMode())
     {
@@ -177,18 +193,39 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
     }
     else
     {
-        echo "<button type='button' class='btn btn-primary' id='linkButton'>";
-        echo "<i class='icon-link'></i> {$lang->execution->linkStory} <span class='caret'></span>";
-        echo '</button>';
-        echo "<ul class='dropdown-menu pull-right' id='linkActionMenu'>";
-        if(common::hasPriv('projectstory', 'linkStory')) echo '<li>' . html::a($this->createLink('projectstory', 'linkStory', "project={$this->session->PRJ}"), $lang->execution->linkStory). "</li>";
-        if(common::hasPriv('projectstory', 'importPlanStories') and !empty($productID)) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
-        echo '</ul>';
+        $buttonLink  = '';
+        $buttonTitle = '';
+        $dataToggle  = '';
+        if(common::hasPriv('projectstory', 'importPlanStories'))
+        {
+            $buttonLink  = empty($productID) ? '' : '#linkStoryByPlan';
+            $buttonTitle = $lang->execution->linkStoryByPlan;
+            $dataToggle  = 'data-toggle="modal"';
+        }
+        if(common::hasPriv('projectstory', 'linkStory'))
+        {
+            $buttonLink  = $this->createLink('projectstory', 'linkStory', "project=$projectID");
+            $buttonTitle = $lang->execution->linkStory;
+            $dataToggle  = '';
+        }
+
+        $hidden = empty($buttonLink) ? 'hidden' : '';
+        echo html::a($buttonLink, "<i class='icon-link'></i> $buttonTitle", '', "class='btn btn-primary $hidden' $dataToggle");
+
+        if(!empty($productID) and common::hasPriv('projectstory', 'linkStory') and common::hasPriv('projectstory', 'importPlanStories'))
+        {
+            echo "<button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+            echo "<ul class='dropdown-menu pull-right'>";
+            echo '<li>' . html::a($this->createLink('projectstory', 'linkStory', "project=$projectID"), $lang->execution->linkStory). "</li>";
+            echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
+            echo '</ul>';
+        }
     }
     ?>
-    </div>
     <?php endif;?>
+    </div>
   </div>
+  <?php endif;?>
 </div>
 <div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
@@ -215,9 +252,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       <p>
         <span class="text-muted"><?php echo $storyType == 'story' ? $lang->story->noStory : $lang->story->noRequirement;?></span>
         <?php if(common::canModify('product', $product) and common::hasPriv('story', 'create')):?>
-        <?php $projectID  = $isProjectStory ? $this->session->PRJ : 0;?>
-        <?php $openApp  = $isProjectStory ? 'project' : 'product';?>
-        <?php echo html::a($this->createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType"), "<i class='icon icon-plus'></i> " . $lang->story->createCommon, '', "class='btn btn-info' data-group='$openApp'");?>
+        <?php echo html::a($this->createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType"), "<i class='icon icon-plus'></i> " . $lang->story->createCommon, '', "class='btn btn-info' data-app='$from'");?>
         <?php endif;?>
       </p>
     </div>
@@ -229,7 +264,8 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       <?php
       $datatableId  = $this->moduleName . ucfirst($this->methodName);
       $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
-      $vars         = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+      $vars = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+      if($from == 'project') $vars = "projectID=$projectID&productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
 
       if($useDatatable) include '../../common/view/datatable.html.php';
       $setting = $this->datatable->getSetting('product');
@@ -255,7 +291,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
           <?php
           foreach($setting as $key => $value)
           {
-              if($storyType == 'requirement' and $value->id == 'plan') $value->show = false;
+              if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false;
 
               if($value->show)
               {
@@ -296,14 +332,15 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
           <div class='btn-group dropup'>
             <?php
             $disabled   = $canBatchEdit ? '' : "disabled='disabled'";
-            $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=0&branch=$branch&storyType=$storyType");
+            $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=$projectID&branch=$branch&storyType=$storyType");
             ?>
             <?php echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");?>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
             <ul class='dropdown-menu'>
               <?php
               $class      = $canBatchClose ? '' : "class='disabled'";
-              $actionLink = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0");
+              $productID  = $this->app->openApp == 'project' ? 0 : $productID;
+              $actionLink = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0&storyType=$storyType");
               $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink')\"" : '';
               echo "<li $class>" . html::a('#', $lang->close, '', $misc) . "</li>";
 
@@ -365,24 +402,27 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
                   echo '</div></li>';
               }
 
-              if($canBatchChangeStage)
+              if($storyType == 'story')
               {
-                  echo "<li class='dropdown-submenu'>";
-                  echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'");
-                  echo "<ul class='dropdown-menu'>";
-                  foreach($lang->story->stageList as $key => $stage)
+                  if($canBatchChangeStage)
                   {
-                      if(empty($key)) continue;
-                      if(strpos('tested|verified|released|closed', $key) === false) continue;
-                      $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
-                      echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "</li>";
+                      echo "<li class='dropdown-submenu'>";
+                      echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'");
+                      echo "<ul class='dropdown-menu'>";
+                      foreach($lang->story->stageList as $key => $stage)
+                      {
+                          if(empty($key)) continue;
+                          if(strpos('tested|verified|released|closed', $key) === false) continue;
+                          $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
+                          echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "</li>";
+                      }
+                      echo '</ul></li>';
+                  }
+                  else
+                  {
+                      $class= "class='disabled'";
+                      echo "<li $class>" . html::a('javascript:;', $lang->story->stageAB, '', $class) . '</li>';
                   }
-                  echo '</ul></li>';
-              }
-              else
-              {
-                  $class= "class='disabled'";
-                  echo "<li $class>" . html::a('javascript:;', $lang->story->stageAB, '', $class) . '</li>';
               }
               ?>
             </ul>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 4c3980a0cc..4ccd01da23 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -24,12 +24,29 @@
           <?php if($this->config->systemMode == 'new'):?>
           <tr>
             <th class='w-140px'><?php echo $lang->program->common;?></th>
-            <td><?php echo html::select('program', $programs, '', "class='form-control chosen' required");?></td><td></td>
+            <td><?php echo html::select('program', $programs, $programID, "class='form-control chosen' required  onchange='setParentProgram(this.value)'");?></td><td></td>
           </tr>
           <?php endif;?>
           <tr>
             <th class='w-140px'><?php echo $lang->product->line;?></th>
+            <?php if($programID):?>
+            <td>
+              <div class='input-group'>
+                <?php echo html::select("line", $lines, '', "class='form-control hidden line-exist'");?>
+                <?php echo html::input("lineName", '', "class='form-control line-no-exist'");?>
+                <?php if(count($lines)):?>
+                <span class='input-group-addon'>
+                  <div class="checkbox-primary">
+                    <input type="checkbox" name="newLine" value="0" checked onchange="toggleLine(this)" id="newLine0" />
+                    <label for="newLine0"><?php echo $lang->product->newLine;?></label>
+                  </div>
+                </span>
+                <?php endif;?>
+              </div>
+            </td>
+            <?php else:?>
             <td><?php echo html::select('line', $lines, '', "class='form-control chosen'");?></td><td></td>
+            <?php endif;?>
           </tr>
           <tr>
             <th><?php echo $lang->product->name;?></th>
@@ -75,7 +92,7 @@
             <th><?php echo $lang->product->acl;?></th>
             <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->product->aclList, 'private', "onclick='setWhite(this.value);'", 'block'));?></td>
           </tr>
-          <tr class="hidden" id="whitelistBox">
+          <tr id="whitelistBox">
             <th><?php echo $lang->whitelist;?></th>
             <td><?php echo html::select('whitelist[]', $users, '', 'class="form-control chosen" multiple');?></td>
             <td></td>
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index dc7964c846..5f23536dab 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -33,15 +33,17 @@
         <tr>
           <th class='c-id w-50px'><?php echo $lang->idAB;?></th>
           <th><?php echo $lang->project->name;?></th>
-          <th class='w-150px'><?php echo $lang->project->common;?></th>
-          <th class='w-80px'><?php echo $lang->project->PM;?></th>
-          <th class='w-100px'><?php echo $lang->project->begin;?></th>
-          <th class='w-100px'><?php echo $lang->project->end;?></th>
-          <th class='w-100px'><?php echo $lang->project->status;?></th>
-          <th class='w-100px'><?php echo $lang->project->budget;?></th>
-          <th class='w-80px text-right'><?php echo $lang->project->estimate;?></th>
-          <th class='w-80px text-right'><?php echo $lang->project->consume;?></th>
-          <th class='w-60px'><?php echo $lang->project->progress;?></th>
+          <?php if($config->systemMode == 'new'):?>
+          <th class='w-150px'><?php echo $lang->program->common;?></th>
+          <?php endif;?>
+          <th class='w-80px text-left'><?php echo $lang->project->PM;?></th>
+          <th class='w-80px'><?php echo $lang->project->begin;?></th>
+          <th class='w-80px'><?php echo $lang->project->end;?></th>
+          <th class='w-70px'><?php echo $lang->project->status;?></th>
+          <th class="w-80px text-center"><?php echo $lang->project->budget;?></th>
+          <th class="w-60px text-center"><?php echo $lang->project->estimate;?></th>
+          <th class="w-60px text-center"><?php echo $lang->project->consume;?></th>
+          <th class='w-50px'><?php echo $lang->project->progress;?></th>
         </tr>
       </thead>
       <tbody>
@@ -49,22 +51,38 @@
         <?php foreach($projectStats as $project):?>
         <tr>
           <td><?php printf('%03d', $project->id);?></td>
-          <td class='text-left'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id, '', false, $project->id), $project->name, '_parent');?></td>
-          <td><?php echo isset($project->programName) ? $project->programName : '';?></td>
-          <td>
+          <td class='text-left'>
+            <?php
+            if($config->systemMode == 'new')
+            {
+                echo html::a($this->createLink('project', 'index', 'project=' . $project->id, '', false, $project->id), $project->name, '_parent');
+            }
+            else
+            {
+                echo html::a($this->createLink('execution', 'task', 'project=' . $project->id, '', false, $project->id), $project->name, '_parent');
+            }
+            ?>
+          </td>
+          <?php if($config->systemMode == 'new'):?>
+          <td title='<?php echo $project->programName;?>' class='text-ellipsis'><?php echo $project->programName;?></td>
+          <?php endif;?>
+          <td class='padding-right'>
             <?php $userID = isset($PMList[$project->PM]) ? $PMList[$project->PM]->id : ''?>
             <?php if(!empty($project->PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='800'");?>
           </td>
-          <td><?php echo $project->begin;?></td>
-          <td><?php echo $project->end;?></td>
+          <td class='padding-right text-left'><?php echo $project->begin;?></td>
+          <td class='padding-right text-left'><?php echo $project->end;?></td>
           <?php $status = $this->processStatus('project', $project);?>
           <td class='c-status' title='<?php echo $status;?>'>
             <span class="status-project status-<?php echo $project->status?>"><?php echo $status;?></span>
           </td>
-          <td><?php echo $project->budget != 0 ? zget($lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->project->future;?></td>
-          <td class="text-right" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?></td>
-          <td class="text-right" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?></td>
-          <td>
+          <?php $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?>
+          <?php $budgetTitle   = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;?>
+          <?php $textStyle = $project->budget != 0 ? 'text-right' : 'text-center';?>
+          <td title='<?php echo $budgetTitle;?>' class="text-ellipsis <?php echo $textStyle;?>"><?php echo $budgetTitle;?></td>
+          <td class="text-right padding-right" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $project->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
+          <td class="text-right padding-right" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $project->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
+          <td class='padding-right text-center'>
             <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
               <div class='progress-info'><?php echo $project->hours->progress;?></div>
             </div>
diff --git a/module/product/view/showerrornone.html.php b/module/product/view/showerrornone.html.php
index 4af80ddd74..d304963287 100644
--- a/module/product/view/showerrornone.html.php
+++ b/module/product/view/showerrornone.html.php
@@ -11,14 +11,17 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php if($moduleGroup == 'project'):?>
+<?php if($this->app->openApp == 'project'):?>
 <div class="table-empty-tip">
-  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('project', 'manageProducts', "projectID={$this->session->PRJ}", "<i class='icon icon-plus'></i> " . $lang->project->manageProducts, '', "class='btn btn-info'");?></p>
+  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('project', 'manageProducts', "projectID=$objectID", "<i class='icon icon-plus'></i> " . $lang->project->manageProducts, '', "class='btn btn-info'  data-app='project'");?></p>
+</div>
+<?php elseif($this->app->openApp == 'execution'):?>
+<div class="table-empty-tip">
+  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('execution', 'manageProducts', "executionID=$objectID", "<i class='icon icon-plus'></i> " . $lang->execution->manageProducts, '', "class='btn btn-info'  data-app='execution'");?></p>
 </div>
-<script>$("#menuNav .nav li a[href*='product']").closest('li').removeClass('active');</script>
 <?php else:?>
 <div class="table-empty-tip">
-  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'></i> " . $lang->product->create, '', "class='btn btn-info'");?></p>
+  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'></i> " . $lang->product->create, '', "class='btn btn-info' data-app='product'");?></p>
 </div>
 <?php endif;?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 673280e033..b5b6bb9692 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -21,19 +21,12 @@
           <div class="detail">
             <h2 class="detail-title"><span class="label-id"><?php echo $product->id;?></span> <span class="label label-light label-outline"><?php echo $product->code;?></span> <?php echo $product->name;?></h2>
             <div class="detail-content article-content">
-              <p><span class="text-limit" data-limit-size="40"><?php echo $product->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></p>
-              <p>
-                <span class="label label-primary label-outline"><?php echo $lang->product->typeAB . ':' . zget($lang->product->typeList, $product->type);?></span>
-                <span class="label label-success label-outline"><?php echo $lang->product->status . ':' . $this->processStatus('product', $product);?></span>
-                <?php if($product->deleted):?>
-                <span class='label label-danger label-outline'><?php echo $lang->product->deleted;?></span>
-                <?php endif; ?>
-              </p>
+              <p><?php echo $product->desc;?></p>
             </div>
           </div>
           <?php if($product->type == 'platform'):?>
           <div class="detail">
-          <div class="detail-title"><strong><?php echo $lang->product->branchName['platform'];?></strong><a class="btn btn-link pull-right muted"><i class="icon icon-more icon-sm"></i></a></div>
+          <div class="detail-title"><strong><?php echo $lang->product->branchName['platform'];?></strong><a class="btn btn-link pull-right muted" href="<?php echo $this->createLink('branch', 'manage', "productID={$product->id}")?>"><i class="icon icon-more icon-sm"></i></a></div>
             <div class="detail-content">
               <ul class="clearfix branch-list">
                 <?php foreach($branches as $branchName):?>
@@ -51,15 +44,14 @@
                 <tbody>
                   <tr>
                     <th class='w-65px'><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
-                    <td><em><?php echo zget($users, $product->PO);?></em></td>
+                    <td><strong><?php echo zget($users, $product->PO);?></strong></td>
+                    <th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
+                    <td><strong><?php echo zget($users, $product->RD);?></strong></td>
+                    <td></td>
                   </tr>
                   <tr>
                     <th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->qa;?></th>
-                    <td><em><?php echo zget($users, $product->QD);?></em></td>
-                  </tr>
-                  <tr>
-                    <th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
-                    <td><em><?php echo zget($users, $product->RD);?></em></td>
+                    <td><strong><?php echo zget($users, $product->QD);?></strong></td>
                   </tr>
                 </tbody>
               </table>
@@ -71,27 +63,45 @@
               <table class="table table-data data-basic">
                 <tbody>
                   <tr>
+                    <?php if(!empty($product->code)):?>
+                    <th class="w-80px"><?php echo $lang->product->code;?></th>
+                    <td><strong><?php echo $product->code;?></strong></td>
+                    <?php else:?>
+                    <th class="w-80px"><?php echo $lang->product->type;?></th>
+                    <td><strong><?php echo zget($lang->product->typeList, $product->type);?></strong></td>
+                    <?php endif;?>
                     <th class="w-80px"><?php echo $lang->story->openedBy?></th>
-                    <td><em><?php echo zget($users, $product->createdBy);?></em></td>
+                    <td colspan="2"><strong><?php echo zget($users, $product->createdBy);?></strong></td>
                   </tr>
                   <tr>
+                    <?php if(!empty($product->code)):?>
+                    <th class="w-80px"><?php echo $lang->product->type;?></th>
+                    <td><strong><?php echo zget($lang->product->typeList, $product->type);?></strong></td>
+                    <?php else:?>
+                    <th class="w-80px"><?php echo $lang->productCommon . $lang->product->status;?></th>
+                    <td class="<?php echo $product->status;?>"><strong><?php echo zget($lang->product->statusList, $product->status);?></strong></td>
+                    <?php endif;?>
                     <th><?php echo $lang->story->openedDate?></th>
-                    <td><em><?php echo formatTime($product->createdDate, DT_DATE1);?></em></td>
+                    <td colspan="2"><strong><?php echo formatTime($product->createdDate, DT_DATE1);?></strong></td>
                   </tr>
                   <tr>
+                    <?php if(!empty($product->code)):?>
+                    <th class="w-80px"><?php echo $lang->productCommon . $lang->product->status;?></th>
+                    <td class="<?php echo $product->status;?>"><strong><?php echo zget($lang->product->statusList, $product->status);?></strong></td>
+                    <?php endif;?>
                     <th><?php echo $lang->product->acl;?></th>
-                    <td><em><?php echo $lang->product->aclList[$product->acl];?></em></td>
+                    <td <?php echo empty($product->code) ? "colspan='4'" : "colspan='2'";?>><strong><?php echo $lang->product->aclList[$product->acl];?></strong></td>
                   </tr>
                   <?php if($product->acl == 'custom'):?>
                   <tr>
                     <th><?php echo $lang->product->whitelist;?></th>
                     <td>
-                      <em>
+                      <strong>
                         <?php
                         $whitelist = explode(',', $product->whitelist);
                         foreach($whitelist as $groupID) if(isset($groups[$groupID])) echo $groups[$groupID] . '&nbsp;';
                         ?>
-                      </em>
+                      </strong>
                     </td>
                   </tr>
                   <?php endif;?>
@@ -107,33 +117,37 @@
                   <?php $space = common::checkNotCN() ? ' ' : '';?>
                   <tr>
                     <th><?php echo $lang->story->statusList['active']  . $space . $lang->story->common;?></th>
-                    <td><em><?php echo $product->stories['active']?></em></td>
+                    <td><strong><?php echo $product->stories['active']?></strong></td>
                     <th><?php echo $lang->product->plans?></th>
-                    <td><em><?php echo $product->plans?></em></td>
+                    <td><strong><?php echo $product->plans?></strong></td>
                     <th class='w-80px'><?php echo $lang->product->bugs?></th>
-                    <td><em><?php echo $product->bugs?></em></td>
+                    <td><strong><?php echo $product->bugs?></strong></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->story->statusList['changed']  . $space . $lang->story->common;?></th>
-                    <td><em><?php echo $product->stories['changed']?></em></td>
-                    <th><?php echo $lang->product->projects?></th>
-                    <td><em><?php echo $product->projects?></em></td>
+                    <td><strong><?php echo $product->stories['changed']?></strong></td>
+                    <th><?php echo $lang->product->releases?></th>
+                    <td><strong><?php echo $product->releases?></strong></td>
                     <th><?php echo $lang->product->cases?></th>
-                    <td><em><?php echo $product->cases?></em></td>
+                    <td><strong><?php echo $product->cases?></strong></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->story->statusList['draft']  . $space . $lang->story->common;?></th>
-                    <td><em><?php echo $product->stories['draft']?></em></td>
+                    <td><strong><?php echo $product->stories['draft']?></strong></td>
                     <th><?php echo $lang->product->builds?></th>
-                    <td><em><?php echo $product->builds?></em></td>
+                    <td><strong><?php echo $product->builds?></strong></td>
                     <th><?php echo $lang->product->docs?></th>
-                    <td><em><?php echo $product->docs?></em></td>
+                    <td><strong><?php echo $product->docs?></strong></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->story->statusList['closed']  . $space . $lang->story->common;?></th>
-                    <td><em><?php echo $product->stories['closed']?></em></td>
-                    <th><?php echo $lang->product->releases?></th>
-                    <td><em><?php echo $product->releases?></em></td>
+                    <td><strong><?php echo $product->stories['closed']?></strong></td>
+                    <?php if($config->systemMode == 'new'):?>
+                    <th><?php echo $lang->product->projects?></th>
+                    <td><strong><?php echo $product->projects?></strong></td>
+                    <?php endif;?>
+                    <th><?php echo $lang->product->executions?></th>
+                    <td><strong><?php echo $product->executions?></strong></td>
                   </tr>
                 </tbody>
               </table>
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 86b3479d85..3a54d382f2 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -22,31 +22,29 @@ class productplan extends control
      */
     public function commonAction($productID, $branch = 0)
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->loadModel('product')->getSwitcher($productID, '', $branch);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
-        $this->loadModel('product');
-        $this->app->loadConfig('execution');
-        $product = $this->product->getById($productID);
+        $product = $this->loadModel('product')->getById($productID);
         if(empty($product)) $this->locate($this->createLink('product', 'create'));
+
+        $this->app->loadConfig('execution');
+        $this->product->setMenu($productID, $branch);
+        $this->session->set('currentProductType', $product->type);
+
         $this->view->product  = $product;
         $this->view->branch   = $branch;
         $this->view->branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID);
         $this->view->position[] = html::a($this->createLink('product', 'browse', "productID={$productID}&branch=$branch"), $product->name);
-        $this->product->setMenu($this->product->getPairs(), $productID, $branch);
     }
 
     /**
      * Create a plan.
      *
-     * @param string $product
-     * @param int    $branch
+     * @param string $productID
+     * @param int    $branchID
      *
      * @access public
      * @return void
      */
-    public function create($product = '', $branch = 0, $parent = 0)
+    public function create($productID = '', $branchID = 0, $parent = 0)
     {
         if(!empty($_POST))
         {
@@ -56,12 +54,14 @@ class productplan extends control
 
             $this->executeHooks($planID);
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $planID));
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'parent.refreshPlan()'));
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('productplan', 'browse', "productID=$product&branch=$branch")));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('productplan', 'browse', "productID=$productID&branch=$branchID")));
         }
 
-        $this->commonAction($product, $branch);
-        $lastPlan = $this->productplan->getLast($product, $branch, $parent);
+        $this->commonAction($productID, $branchID);
+        $lastPlan = $this->productplan->getLast($productID, $branchID, $parent);
+
         if($lastPlan)
         {
             $timestamp = strtotime($lastPlan->end);
@@ -79,7 +79,7 @@ class productplan extends control
         $this->view->position[] = $this->lang->productplan->create;
 
         $this->view->lastPlan = $lastPlan;
-        $this->view->branch   = $branch;
+        $this->view->branch   = $branchID;
         $this->view->parent   = $parent;
         $this->display();
     }
@@ -208,16 +208,14 @@ class productplan extends control
      */
     public function browse($productID = 0, $branch = 0, $browseType = 'all', $orderBy = 'begin_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1 )
     {
-        $this->app->loadLang('project');
-
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
+        $this->session->set('productPlanList', $this->app->getURI(true), 'product');
 
-        $this->session->set('productPlanList', $this->app->getURI(true));
         $this->commonAction($productID, $branch);
         $products               = $this->product->getPairs();
         $this->view->title      = $products[$productID] . $this->lang->colon . $this->lang->productplan->browse;
@@ -249,11 +247,12 @@ class productplan extends control
      */
     public function view($planID = 0, $type = 'story', $orderBy = 'id_desc', $link = 'false', $param = '', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $plan = $this->productplan->getByID($planID, true);
+        $planID = (int)$planID;
+        $plan   = $this->productplan->getByID($planID, true);
         if(!$plan) die(js::error($this->lang->notFound) . js::locate('back'));
 
-        $this->session->set('storyList', $this->app->getURI(true) . '&type=' . 'story');
-        $this->session->set('bugList', $this->app->getURI(true) . '&type=' . 'bug');
+        $this->session->set('storyList', $this->app->getURI(true) . '&type=' . 'story', 'product');
+        $this->session->set('bugList', $this->app->getURI(true) . '&type=' . 'bug', 'qa');
 
         /* Determines whether an object is editable. */
         $canBeChanged = common::canBeChanged('plan', $plan);
@@ -266,7 +265,7 @@ class productplan extends control
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         $this->commonAction($plan->product, $plan->branch);
-        $products = $this->product->getProductPairsByProject($this->session->PRJ);
+        $products = $this->product->getProductPairsByProject($this->session->project);
 
         $bugPager   = new pager(0, $recPerPage, $type == 'bug' ? $pageID : 1);
         $storyPager = new pager(0, $recPerPage, $type == 'story' ? $pageID : 1);
@@ -362,13 +361,13 @@ class productplan extends control
             die(js::locate(inlink('view', "planID=$planID&type=story&orderBy=$orderBy"), 'parent'));
         }
 
-        $this->session->set('storyList', inlink('view', "planID=$planID&type=story&orderBy=$orderBy&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('storyList', inlink('view', "planID=$planID&type=story&orderBy=$orderBy&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'product');
 
         $this->loadModel('story');
         $this->loadModel('tree');
         $plan = $this->productplan->getByID($planID);
         $this->commonAction($plan->product, $plan->branch);
-        $products = $this->product->getProductPairsByProject($this->session->PRJ);
+        $products = $this->product->getProductPairsByProject($this->session->project);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -501,13 +500,13 @@ class productplan extends control
 
         /* Load module and set session. */
         $this->loadModel('bug');
-        $this->session->set('bugList', inlink('view', "planID=$planID&type=bug&orderBy=$orderBy&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('bugList', inlink('view', "planID=$planID&type=bug&orderBy=$orderBy&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa');
 
         /* Init vars. */
-        $projects  = $this->app->user->view->projects . ',0';
-        $plan      = $this->productplan->getByID($planID);
-        $productID = $plan->product;
-        $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
+        $executions = $this->app->user->view->sprints . ',0';
+        $plan       = $this->productplan->getByID($planID);
+        $productID  = $plan->product;
+        $queryID    = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set drop menu. */
         $this->commonAction($productID, $plan->branch);
@@ -549,7 +548,7 @@ class productplan extends control
         }
         else
         {
-            $allBugs = $this->bug->getActiveBugs($this->view->product->id, $plan->branch, $projects, array_keys($planBugs), $pager);
+            $allBugs = $this->bug->getActiveBugs($this->view->product->id, $plan->branch, $executions, array_keys($planBugs), $pager);
         }
 
         $this->view->allBugs    = $allBugs;
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index f52f31a236..d8851258c0 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -1,5 +1,5 @@
 $(document).on('click', '.task-toggle', function(e)
-{   
+{
     var $toggle = $(this);
     var id = $(this).data('id');
     var isCollapsed = $toggle.toggleClass('collapsed').hasClass('collapsed');
@@ -22,9 +22,9 @@ $(function()
 
     $('#createExecutionButton').on('click', function()
     {
-        var PRJID  = $('#project').val();
-        var planID = $('#planID').val();
-        parent.location.href = createLink('project', 'create', 'productID=' + productID + '&projectID=&copyProjectID=&planID=' + planID, '', '', PRJID);
+        var projectID = $('#project').val();
+        var planID    = $('#planID').val();
+        $.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project')
     });
 });
 $(document).on('click', 'td.content .more', function(e)
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index e707980968..6f0c41c414 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -30,7 +30,7 @@ $lang->productplan->linkedStories    = $lang->SRCommon;
 $lang->productplan->unlinkedStories  = "未關聯{$lang->SRCommon}";
 $lang->productplan->updateOrder      = '排序';
 $lang->productplan->createChildren   = "創建子計劃";
-$lang->productplan->createExecution  = "創建{$lang->sprintCommon}";
+$lang->productplan->createExecution  = "創建{$lang->executionCommon}";
 
 $lang->productplan->linkBug          = "關聯Bug";
 $lang->productplan->unlinkBug        = "移除Bug";
@@ -60,7 +60,7 @@ $lang->productplan->future     = '待定';
 $lang->productplan->stories    = "{$lang->SRCommon}數";
 $lang->productplan->bugs       = 'Bug數';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->execution  = $lang->sprintCommon;
+$lang->productplan->execution  = $lang->executionCommon;
 $lang->productplan->parent     = "父計劃";
 $lang->productplan->parentAB   = "父";
 $lang->productplan->children   = "子計劃";
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 7b15c399e4..3d78e0598a 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -96,6 +96,7 @@ class productplanModel extends model
             $plans      = $this->reorder4Children($plans);
             $planIdList = array_keys($plans);
 
+            $storyCountInTable = $this->dao->select('plan,count(story) as count')->from(TABLE_PLANSTORY)->where('plan')->in($planIdList)->groupBy('plan')->fetchPairs('plan', 'count');
             $product = $this->loadModel('product')->getById($product);
             if($product->type == 'normal')
             {
@@ -127,6 +128,22 @@ class productplanModel extends model
                 $plan->hour      = array_sum($storyPairs);
                 $plan->projectID = $plan->project;
 
+                /* Sync linked stories. */
+                if(!isset($storyCountInTable[$plan->id]) or $storyCountInTable[$plan->id] != $plan->stories)
+                {
+                    $this->dao->delete()->from(TABLE_PLANSTORY)->where('plan')->eq($plan->id)->exec();
+
+                    $order = 1;
+                    foreach($storyPairs as $storyID => $estimate)
+                    {
+                        $planStory = new stdclass();
+                        $planStory->plan = $plan->id;
+                        $planStory->story = $storyID;
+                        $planStory->order = $order ++;
+                        $this->dao->replace(TABLE_PLANSTORY)->data($planStory)->exec();
+                    }
+                }
+
                 if(!isset($parentStories[$plan->parent])) $parentStories[$plan->parent] = 0;
                 if(!isset($parentBugs[$plan->parent]))    $parentBugs[$plan->parent]    = 0;
                 if(!isset($parentHour[$plan->parent]))    $parentHour[$plan->parent]    = 0;
@@ -292,8 +309,8 @@ class productplanModel extends model
 
     /**
      * Get Children plan.
-     * 
-     * @param  int    $planID 
+     *
+     * @param  int    $planID
      * @access public
      * @return array
      */
@@ -433,8 +450,8 @@ class productplanModel extends model
 
     /**
      * Change parent field by planID.
-     * 
-     * @param  int    $planID 
+     *
+     * @param  int    $planID
      * @access public
      * @return void
      */
@@ -560,10 +577,45 @@ class productplanModel extends model
         $this->loadModel('action')->create('bug', $bugID, 'unlinkedfromplan', '', $planID);
     }
 
+    /**
+     * Link project.
+     *
+     * @param  int    $projectID
+     * @param  array  $newPlans
+     * @param  array  $oldPlanStories
+     * @access public
+     * @return void
+     */
+    public function linkProject($projectID, $newPlans, $oldPlanStories = '')
+    {
+        if(!empty($oldPlanStories)) $this->dao->delete()->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->andWhere('story')->in(array_keys($oldPlanStories))->exec();
+
+        $this->loadModel('execution');
+        foreach($newPlans as $planID)
+        {
+            $planStories = $planProducts = array();
+            $planStory   = $this->loadModel('story')->getPlanStories($planID);
+            if(!empty($planStory))
+            {
+                foreach($planStory as $id => $story)
+                {
+                    if($story->status == 'draft')
+                    {
+                        unset($planStory[$id]);
+                        continue;
+                    }
+                    $planProducts[$story->id] = $story->product;
+                }
+                $planStories = array_keys($planStory);
+                $this->execution->linkStory($projectID, $planStories, $planProducts);
+            }
+        }
+    }
+
     /**
      * Reorder for children plans.
-     * 
-     * @param  array    $plans 
+     *
+     * @param  array    $plans
      * @access public
      * @return array
      */
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index 1fbe377f3c..d0e44604ae 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -35,7 +35,7 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->productplan->noPlan;?></span>
-      <?php if(common::canModify('product', $product) and common::hasPriv('productplan', 'create')):?>
+      <?php if(common::canModify('product', $product) and common::hasPriv('productplan', 'create') and $browseType != 'overdue'):?>
       <?php echo html::a($this->createLink('productplan', 'create', "productID=$product->id&branch=$branch"), "<i class='icon icon-plus'></i> " . $lang->productplan->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
@@ -56,7 +56,7 @@
         </th>
         <th class='w-160px'><?php common::printOrderLink('title', $orderBy, $vars, $lang->productplan->title);?></th>
         <?php if($this->session->currentProductType != 'normal'):?>
-        <th class='w-100px'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branch);?></th>
+        <th class='w-100px'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->productplan->branch);?></th>
         <?php endif;?>
         <th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
         <th class='w-100px'><?php common::printOrderLink('end',   $orderBy, $vars, $lang->productplan->end);?></th>
@@ -120,7 +120,7 @@
         <td class='text-center'><?php echo $plan->stories;?></td>
         <td class='text-center'><?php echo $plan->bugs;?></td>
         <td class='text-center'><?php echo $plan->hour;?></td>
-        <td class='text-center'><?php if(!empty($plan->projectID)) echo html::a(helper::createLink('project', 'task', 'projectID=' . $plan->projectID), '<i class="icon-search"></i>');?></td>
+        <td class='text-center'><?php if(!empty($plan->projectID)) echo html::a(helper::createLink('execution', 'task', 'projectID=' . $plan->projectID), '<i class="icon-search"></i>');?></td>
         <td class='text-left content'>
           <?php $desc = trim(strip_tags(str_replace(array('</p>', '<br />', '<br>', '<br/>'), "\n", str_replace(array("\n", "\r"), '', $plan->desc)), '<img>'));?>
           <div title='<?php echo $desc;?>'><?php echo nl2br($desc);?></div>
@@ -128,7 +128,18 @@
         <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $plan) . "</td>";?>
         <td class='c-actions'>
           <?php
-          if(common::hasPriv('project', 'create', $plan)) echo html::a('#projects', '<i class="icon-plus"></i>', '', "data-toggle='modal' data-id='$plan->id' onclick='getPlanID(this)' class='btn' title='{$lang->productplan->createExecution}'");
+          if(common::hasPriv('execution', 'create', $plan))
+          {
+              $executionLink = $config->systemMode == 'new' ? '#projects' : $this->createLink('execution', 'create', "projectID=0&executionID=0&copyExecutionID=0&plan=$plan->id");
+              if($config->systemMode == 'new')
+              {
+                  echo html::a($executionLink, '<i class="icon-plus"></i>', '', "data-toggle='modal' data-id='$plan->id' onclick='getPlanID(this)' class='btn' title='{$lang->productplan->createExecution}'");
+              }
+              else
+              {
+                  echo html::a($executionLink, '<i class="icon-plus"></i>', '', "class='btn' title='{$lang->productplan->createExecution}'");
+              }
+          }
           if(common::hasPriv('productplan', 'linkStory', $plan) and $plan->parent >= 0) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '<i class="icon-link"></i>', '', "class='btn' title='{$lang->productplan->linkStory}'");
           if(common::hasPriv('productplan', 'linkBug', $plan)) echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '<i class="icon-bug"></i>', '', "class='btn' title='{$lang->productplan->linkBug}'");
           common::printIcon('productplan', 'edit', "planID=$plan->id", $plan, 'list');
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index d149a5dbb2..21f3009dcb 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -56,7 +56,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td class='text-right'title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='text-right'title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td>
             <span class='status-story status-<?php echo $story->status?>'>
               <?php echo $this->processStatus('story', $story);?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 2c5a66f9f6..230ed30e44 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -154,7 +154,7 @@
                 </td>
                 <td><?php echo zget($users, $story->openedBy);?></td>
                 <td><?php echo zget($users, $story->assignedTo);?></td>
-                <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status?>'>
                     <?php echo $this->processStatus('story', $story);?>
diff --git a/module/program/control.php b/module/program/control.php
index e9a311f0e4..08d9c34aaf 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -18,21 +18,6 @@ class program extends control
         $this->loadModel('execution');
     }
 
-    /**
-     * Program create guide.
-     *
-     * @param  int    $programID
-     * @param  string $from
-     * @access public
-     * @return void
-     */
-    public function createGuide($programID = 0, $from = 'PRJ')
-    {
-        $this->view->from      = $from;
-        $this->view->programID = $programID;
-        $this->display();
-    }
-
     /**
      * Program list.
      *
@@ -43,11 +28,10 @@ class program extends control
      */
     public function browse($status = 'all', $orderBy = 'order_asc')
     {
-        $this->lang->program->mainMenuAction = html::a('javascript:history.go(-1);', '<i class="icon icon-back"></i> ' . $this->lang->goback, '', "class='btn btn-link'");
-
         if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-secondary'");
 
-        $this->app->session->set('programList', $this->app->getURI(true));
+        $this->session->set('programList', $this->app->getURI(true), 'program');
+        $this->session->set('projectList', $this->app->getURI(true), 'project');
 
         $programType = $this->cookie->programType ? $this->cookie->programType : 'bylist';
 
@@ -98,13 +82,11 @@ class program extends control
         $programID = $this->program->saveState($programID, $this->program->getPairs());
         setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
+        $this->program->setMenu($programID);
+
         $program = $this->program->getByID($programID);
         if(empty($program) || $program->type != 'program') die(js::error($this->lang->notFound) . js::locate('back'));
 
-        $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-        $this->lang->program->mainMenuAction = $this->program->getMainAction();
-        $this->program->setViewMenu($programID);
-
         /* Load pager and get tasks. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
@@ -142,10 +124,11 @@ class program extends control
 
         if($_POST)
         {
-            $projectID = $this->program->create();
+            $programID = $this->program->create();
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $programID));
 
-            $this->loadModel('action')->create('program', $projectID, 'opened');
+            $this->loadModel('action')->create('program', $programID, 'opened');
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
@@ -217,7 +200,7 @@ class program extends control
     public function close($programID)
     {
         $this->loadModel('action');
-        $program = $this->program->getByID($programID);
+        $program = $this->project->getByID($programID, 'program');
 
         if(!empty($_POST))
         {
@@ -260,7 +243,7 @@ class program extends control
 
         if(!empty($_POST))
         {
-            $changes = $this->project->start($programID);
+            $changes = $this->project->start($programID, 'program');
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
@@ -272,12 +255,12 @@ class program extends control
             die(js::reload('parent.parent'));
         }
 
-        $this->view->title      = $this->lang->project->start;
-        $this->view->position[] = $this->lang->project->start;
-        $this->view->program    = $this->program->getByID($programID);
+        $this->view->title      = $this->lang->program->start;
+        $this->view->position[] = $this->lang->program->start;
+        $this->view->project    = $this->project->getByID($programID, 'program');
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
         $this->view->actions    = $this->action->getList('program', $programID);
-        $this->display();
+        $this->display('project', 'start');
     }
 
     /**
@@ -290,7 +273,7 @@ class program extends control
     public function activate($programID = 0)
     {
         $this->loadModel('action');
-        $program = $this->program->getByID($programID);
+        $program = $this->project->getByID($programID, 'program');
 
         if(!empty($_POST))
         {
@@ -311,12 +294,12 @@ class program extends control
 
         $this->view->title      = $this->lang->program->activate;
         $this->view->position[] = $this->lang->program->activate;
-        $this->view->program    = $program;
+        $this->view->project    = $program;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
         $this->view->actions    = $this->action->getList('program', $programID);
         $this->view->newBegin   = $newBegin;
         $this->view->newEnd     = $newEnd;
-        $this->display();
+        $this->display('project', 'activate');
     }
 
     /**
@@ -344,11 +327,11 @@ class program extends control
             die(js::reload('parent.parent'));
         }
 
-        $this->view->title      = $this->lang->project->suspend;
-        $this->view->position[] = $this->lang->project->suspend;
+        $this->view->title      = $this->lang->program->suspend;
+        $this->view->position[] = $this->lang->program->suspend;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
         $this->view->actions    = $this->action->getList('program', $programID);
-        $this->view->project    = $this->program->getByID($programID);
+        $this->view->project    = $this->project->getByID($programID, 'program');
 
         $this->display('project', 'suspend');
     }
@@ -370,7 +353,7 @@ class program extends control
         if($confirm == 'no') die(js::confirm($this->lang->program->confirmDelete, $this->createLink('program', 'delete', "programID=$programID&confirm=yes")));
 
         $this->dao->update(TABLE_PROGRAM)->set('deleted')->eq(1)->where('id')->eq($programID)->exec();
-        $this->loadModel('action')->create('program', $programID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
+        $this->loadModel('action')->create('program', $programID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
 
         die(js::reload('parent'));
     }
@@ -387,18 +370,16 @@ class program extends control
      * @access public
      * @return void
      */
-    public function project($programID = 0, $browseType = 'doing', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
+    public function project($programID = 0, $browseType = 'all', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
         $programID = $this->program->saveState($programID, $this->program->getPairs());
-        if(!$programID) $this->locate($this->createLink('program', 'browse'));
         setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        if(!$programID) $this->locate($this->createLink('program', 'browse'));
 
-        $this->app->session->set('programProject', $this->app->getURI(true));
-        $this->app->session->set('projectList', $this->app->getURI(true));
+        $this->program->setMenu($programID);
 
-        $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-        $this->lang->program->mainMenuAction = $this->program->getMainAction();
-        $this->program->setViewMenu($programID);
+        $this->app->session->set('programProject', $this->app->getURI(true), 'program');
+        $this->app->session->set('projectList', $this->app->getURI(true), 'project');
 
         $this->loadModel('datatable');
 
@@ -438,9 +419,7 @@ class program extends control
      */
     public function stakeholder($programID = 0, $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
-        $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-        $this->lang->program->mainMenuAction = $this->program->getMainAction();
-        $this->program->setViewMenu($programID);
+        $this->program->setMenu($programID);
 
         /* Load pager and get tasks. */
         $this->app->loadClass('pager', $static = true);
@@ -475,9 +454,7 @@ class program extends control
         }
 
         $this->loadModel('user');
-        $this->lang->program->switcherMenu   = $this->program->getSwitcher($programID, true);
-        $this->lang->program->mainMenuAction = $this->program->getMainAction();
-        $this->program->setViewMenu($programID);
+        $this->lang->program->switcherMenu = $this->program->getSwitcher($programID, true);
 
         $this->loadModel('dept');
         $deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
@@ -723,7 +700,8 @@ class program extends control
      */
     public function view($programID)
     {
-        $program = $this->program->getByID($programID);
+        $programID = (int)$programID;
+        $program   = $this->program->getByID($programID);
         if(!$program) die(js::error($this->lang->notFound) . js::locate('back'));
 
         echo $this->fetch('program', 'product', "programID=$programID");
diff --git a/module/program/js/create.js b/module/program/js/create.js
index 54607ac1d9..a23674ec40 100644
--- a/module/program/js/create.js
+++ b/module/program/js/create.js
@@ -25,6 +25,17 @@ $(function()
             $('#end').removeAttr('disabled');
         }
     });
+
+    $('#end').change(function()
+    {
+        var beginDate = $('#begin').val();
+        var endDate   = $('#end').val();
+        var begin     = new Date(beginDate.replace(/-/g,"/"));
+        var end       = new Date(endDate.replace(/-/g,"/"));
+        var time      = end.getTime() - begin.getTime();
+        var days      = parseInt(time / (1000 * 60 * 60 * 24)) + 1;
+        if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked',false);
+    })
 });
 
 function setCopyProject(copiedProgramID)
diff --git a/module/program/js/edit.js b/module/program/js/edit.js
index 1dcb3582f2..2949acf5fa 100644
--- a/module/program/js/edit.js
+++ b/module/program/js/edit.js
@@ -27,5 +27,16 @@ $(function()
         }
     });
 
+    $('#end').change(function()
+    {
+        var beginDate = $('#begin').val();
+        var endDate   = $('#end').val();
+        var begin     = new Date(beginDate.replace(/-/g,"/"));
+        var end       = new Date(endDate.replace(/-/g,"/"));
+        var time      = end.getTime() - begin.getTime();
+        var days      = parseInt(time / (1000 * 60 * 60 * 24)) + 1;
+        if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked',false);
+    })
+
     $('#isCat').change();
 });
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index ae61763e88..3a5bd6ab3d 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -51,6 +51,9 @@ $lang->program->endGreaterParent        = "Parent end date: %s, end date should
 $lang->program->beginGreateChild        = "Child earliest begin: %s, parent begin date <                  = child earliest begin date.";
 $lang->program->endLetterChild          = "Child latest end: %s, parent end date >                        = child latest end date.";
 $lang->program->closeErrorMessage       = 'There are subprograms or projects that are not closed';
+$lang->program->confirmDelete           = "Do you want to delete it?";
+$lang->program->hasChildren             = 'It has child programs or projects. You cannot delete it.';
+$lang->program->readjustTime            = 'Change the program begin&end date.';
 
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
@@ -69,15 +72,15 @@ $lang->program->aclList['private'] = "Private (accessible to project portfolio h
 $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)";
-$lang->program->subAclList['open']    = "Default(user who can visit the program can access it)";
+$lang->program->subAclList['open']    = "Default (user who can visit the program can access it)";
 $lang->program->subAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
 
 $lang->program->subAcls['private'] = 'Private';
 $lang->program->subAcls['open']    = 'Default';
 $lang->program->subAcls['program'] = 'Open within the program';
 
-$lang->program->authList['extend'] = 'Inherit(program privileges and company privileges)';
-$lang->program->authList['reset']  = 'Reset(program privileges only)';
+$lang->program->authList['extend'] = 'Inherit (program privileges and company privileges)';
+$lang->program->authList['reset']  = 'Reset (program privileges only)';
 
 $lang->program->statusList['wait']      = 'Waiting';
 $lang->program->statusList['doing']     = 'Doing';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index ddc3574630..894a9636c7 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -43,6 +43,8 @@ $lang->program->confirmBatchUnlink      = "Do you want to batch unlink these sta
 $lang->program->stakeholderType         = 'Stakeholder type';
 $lang->program->isStakeholderKey        = 'Key stakeholder';
 $lang->program->importStakeholder       = 'Import program';
+$lang->program->unbindWhitelist         = 'Unbind Whitelist';
+$lang->program->importStakeholder       = 'Import from program';
 $lang->program->manageMembers           = 'Program Team';
 $lang->program->beyondParentBudget      = 'The remaining budget of the owned program has been exceeded.';
 $lang->program->parentBudget            = 'Parent program surplus budget：';
@@ -51,6 +53,9 @@ $lang->program->endGreaterParent        = "Parent end date: %s, end date should
 $lang->program->beginGreateChild        = "Child earliest begin: %s, parent begin date <                  = child earliest begin date.";
 $lang->program->endLetterChild          = "Child latest end: %s, parent end date >                        = child latest end date.";
 $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->confirmDelete           = "Do you want to delete it?";
+$lang->program->readjustTime            = 'Change the program begin&end date.';
 
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
@@ -69,15 +74,15 @@ $lang->program->aclList['private'] = "Private (accessible to project portfolio h
 $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)";
-$lang->program->subAclList['open']    = "Default(user who can visit the program can access it)";
+$lang->program->subAclList['open']    = "Default (user who can visit the program can access it)";
 $lang->program->subAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
 
 $lang->program->subAcls['private'] = 'Private';
 $lang->program->subAcls['open']    = 'Default';
 $lang->program->subAcls['program'] = 'Open within the program';
 
-$lang->program->authList['extend'] = 'Inherit(program privileges and company privileges)';
-$lang->program->authList['reset']  = 'Reset(program privileges only)';
+$lang->program->authList['extend'] = 'Inherit (program privileges and company privileges)';
+$lang->program->authList['reset']  = 'Reset (program privileges only)';
 
 $lang->program->statusList['wait']      = 'Waiting';
 $lang->program->statusList['doing']     = 'Doing';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index ae61763e88..3a5bd6ab3d 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -51,6 +51,9 @@ $lang->program->endGreaterParent        = "Parent end date: %s, end date should
 $lang->program->beginGreateChild        = "Child earliest begin: %s, parent begin date <                  = child earliest begin date.";
 $lang->program->endLetterChild          = "Child latest end: %s, parent end date >                        = child latest end date.";
 $lang->program->closeErrorMessage       = 'There are subprograms or projects that are not closed';
+$lang->program->confirmDelete           = "Do you want to delete it?";
+$lang->program->hasChildren             = 'It has child programs or projects. You cannot delete it.';
+$lang->program->readjustTime            = 'Change the program begin&end date.';
 
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
@@ -69,15 +72,15 @@ $lang->program->aclList['private'] = "Private (accessible to project portfolio h
 $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)";
-$lang->program->subAclList['open']    = "Default(user who can visit the program can access it)";
+$lang->program->subAclList['open']    = "Default (user who can visit the program can access it)";
 $lang->program->subAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
 
 $lang->program->subAcls['private'] = 'Private';
 $lang->program->subAcls['open']    = 'Default';
 $lang->program->subAcls['program'] = 'Open within the program';
 
-$lang->program->authList['extend'] = 'Inherit(program privileges and company privileges)';
-$lang->program->authList['reset']  = 'Reset(program privileges only)';
+$lang->program->authList['extend'] = 'Inherit (program privileges and company privileges)';
+$lang->program->authList['reset']  = 'Reset (program privileges only)';
 
 $lang->program->statusList['wait']      = 'Waiting';
 $lang->program->statusList['doing']     = 'Doing';
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index ddc3574630..9352ed6a5f 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -51,6 +51,9 @@ $lang->program->endGreaterParent        = "Parent end date: %s, end date should
 $lang->program->beginGreateChild        = "Child earliest begin: %s, parent begin date <                  = child earliest begin date.";
 $lang->program->endLetterChild          = "Child latest end: %s, parent end date >                        = child latest end date.";
 $lang->program->closeErrorMessage       = 'There are subprograms or projects that are not closed';
+$lang->program->confirmDelete           = "Do you want to delete it?";
+$lang->program->hasChildren             = 'It has child programs or projects. You cannot delete it.';
+$lang->program->readjustTime            = 'Change the program begin&end date.';
 
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
@@ -69,15 +72,15 @@ $lang->program->aclList['private'] = "Private (accessible to project portfolio h
 $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)";
-$lang->program->subAclList['open']    = "Default(user who can visit the program can access it)";
+$lang->program->subAclList['open']    = "Default (user who can visit the program can access it)";
 $lang->program->subAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
 
 $lang->program->subAcls['private'] = 'Private';
 $lang->program->subAcls['open']    = 'Default';
 $lang->program->subAcls['program'] = 'Open within the program';
 
-$lang->program->authList['extend'] = 'Inherit(program privileges and company privileges)';
-$lang->program->authList['reset']  = 'Reset(program privileges only)';
+$lang->program->authList['extend'] = 'Inherit (program privileges and company privileges)';
+$lang->program->authList['reset']  = 'Reset (program privileges only)';
 
 $lang->program->statusList['wait']      = 'Waiting';
 $lang->program->statusList['doing']     = 'Doing';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index b43f11ae82..ada4d56b10 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -12,8 +12,8 @@ $lang->program->progress  = '项目进度';
 $lang->program->children  = '子项目集';
 $lang->program->parent    = '父项目集';
 $lang->program->allInput  = '项目集总投入';
-$lang->program->teamCount = '项目集成员';
-$lang->program->longTime  = '长期项目';
+$lang->program->teamCount = '总人数';
+$lang->program->longTime  = '长期';
 $lang->program->view      = '项目集详情';
 
 /* Actions. */
@@ -43,6 +43,8 @@ $lang->program->confirmBatchUnlink      = "您确定要批量移除这些干系
 $lang->program->stakeholderType         = '干系人类型';
 $lang->program->isStakeholderKey        = '关键干系人';
 $lang->program->importStakeholder       = '从父项目集导入';
+$lang->program->unbindWhitelist         = '移除白名单';
+$lang->program->importStakeholder       = '从父项目集导入';
 $lang->program->manageMembers           = '项目集团队';
 $lang->program->beyondParentBudget      = '已超出所属项目集的剩余预算';
 $lang->program->parentBudget            = '所属项目集剩余预算：';
@@ -51,6 +53,9 @@ $lang->program->endGreaterParent        = "父项目集的完成日期：%s，
 $lang->program->beginGreateChild        = "子项目集的最小开始日期：%s，父项目集的开始日期不能大于子项目集的最小开始日期";
 $lang->program->endLetterChild          = "子项目的最大完成日期：%s，父项目的完成日期不能小于子项目的最大完成日期";
 $lang->program->closeErrorMessage       = '存在子项目集或项目为未关闭状态';
+$lang->program->hasChildren             = '该项目集有子项目集或项目存在，不能删除。';
+$lang->program->confirmDelete           = "您确定要删除吗？";
+$lang->program->readjustTime            = '重新调整项目集起止时间';
 
 $lang->program->stakeholderTypeList['inside']  = '内部';
 $lang->program->stakeholderTypeList['outside'] = '外部';
@@ -70,14 +75,14 @@ $lang->program->aclList['open']    = "公开（有项目集视图权限，即可
 
 $lang->program->subAclList['private'] = "私有（本项目集负责人和干系人可访问，干系人可后续维护）";
 $lang->program->subAclList['open']    = "全部公开（有项目集视图权限，即可访问）";
-$lang->program->subAclList['program'] = "项目集内公开 (所有上级项目集负责人和干系人、本项目集负责人和干系人可访问）";
+$lang->program->subAclList['program'] = "项目集内公开（所有上级项目集负责人和干系人、本项目集负责人和干系人可访问）";
 
 $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->program->authList['reset']  = '重新定义 (只取项目权限)';
 
 $lang->program->statusList['wait']      = '未开始';
 $lang->program->statusList['doing']     = '进行中';
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index 59bf585353..87fc76eba8 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -1,166 +1,68 @@
 <?php
-/* Actions. */
-$lang->program->createGuide          = '選擇項目模板';
-$lang->program->PRJIndex             = '項目儀表盤';
-$lang->program->PRJHome              = '項目主頁';
-$lang->program->PRJCreate            = '創建項目';
-$lang->program->PRJEdit              = '編輯項目';
-$lang->program->PRJView              = '項目概況';
-$lang->program->batchEdit            = '批量編輯';
-$lang->program->PRJBrowse            = '項目列表';
-$lang->program->PRJAll               = '所有項目';
-$lang->program->PRJStart             = '啟動項目';
-$lang->program->PRJFinish            = '完成項目';
-$lang->program->PRJSuspend           = '掛起項目';
-$lang->program->PRJDelete            = '刪除項目';
-$lang->program->PRJClose             = '關閉項目';
-$lang->program->PRJActivate          = '激活項目';
-$lang->program->PRJGroup             = '項目權限分組';
-$lang->program->PRJCreateGroup       = '項目創建分組';
-$lang->program->PRJEditGroup         = '項目編輯分組';
-$lang->program->PRJCopyGroup         = '項目複製分組';
-$lang->program->PRJManageView        = '項目維護視野';
-$lang->program->PRJManagePriv        = '項目維護權限';
-$lang->program->PRJManageMembers     = '項目團隊';
-$lang->program->export               = '導出';
-$lang->program->addProduct           = '新建產品';
-$lang->program->PRJManageGroupMember = '維護分組用戶';
-$lang->program->PRJModuleSetting     = '列表設置';
-$lang->program->PRJModuleOpen        = '顯示項目集名';
-$lang->program->PRJUpdateOrder       = '排序';
-$lang->program->PRJSort              = '項目排序';
-$lang->program->PRJWhitelist         = '項目白名單';
-$lang->program->PRJAddWhitelist      = '項目添加白名單';
-$lang->program->unbindWhitelist       = '項目刪除白名單';
-$lang->program->PRJManageProducts    = '關聯產品';
-$lang->program->view                 = '項目集詳情';
-$lang->program->copyTitle            = '請選擇要複製的項目';
-$lang->program->errorSameProducts    = '項目不能關聯多個相同的產品。';
-$lang->program->errorNoProducts      = '最少關聯一個產品';
-$lang->program->copyNoProject        = '沒有可用的項目來複制';
-$lang->project->searchByName         = '輸入項目名稱進行檢索';
-
 /* Fields. */
-$lang->program->common             = '項目集';
-$lang->program->project            = '項目';
-$lang->program->stage              = '階段';
-$lang->program->PM                 = '負責人';
-$lang->program->PRJName            = '項目名稱';
-$lang->program->PRJCategory        = '項目類型';
-$lang->program->PRJDesc            = '項目描述';
-$lang->program->PRJCode            = '項目代號';
-$lang->program->PRJCopy            = '複製項目';
-$lang->program->begin              = '計劃開始';
-$lang->program->end                = '計劃完成';
-$lang->program->PRJStatus          = '項目狀態';
-$lang->program->PRJPM              = '項目負責人';
-$lang->program->PRJBudget          = '項目預算';
-$lang->program->PRJTemplate        = '項目模板';
-$lang->program->PRJEstimate        = '預計';
-$lang->program->PRJConsume         = '消耗';
-$lang->program->PRJSurplus         = '剩餘';
-$lang->program->PRJProgress        = '進度';
-$lang->program->dateRange          = '起止日期';
-$lang->program->to                 = '至';
-$lang->program->realEnd            = '實際完成日期';
-$lang->program->realBegan          = '實際開始日期';
-$lang->program->bygrid             = '看板';
-$lang->program->bylist             = '列表';
-$lang->program->mine               = '我參與的';
-$lang->program->setPlanduration    = '設置工期';
-$lang->program->auth               = '權限控制';
-$lang->program->durationEstimation = '工作量估算';
-$lang->program->teamCount          = '人數';
-$lang->program->leftStories        = '剩餘需求';
-$lang->program->leftTasks          = '剩餘任務';
-$lang->program->leftBugs           = '剩餘Bug';
-$lang->program->PRJChildren        = '子項目';
-$lang->program->PRJParent          = '父項目';
-$lang->program->allStories         = '總需求';
-$lang->program->doneStories        = '已完成';
-$lang->program->allInput           = '項目總投入';
-$lang->program->weekly             = '項目周報';
-$lang->program->pv                 = 'PV';
-$lang->program->ev                 = 'EV';
-$lang->program->sv                 = 'SV%';
-$lang->program->ac                 = 'AC';
-$lang->program->cv                 = 'CV%';
-$lang->program->PRJTeamCount       = '項目成員';
-$lang->program->PRJLongTime        = '長期';
-$lang->program->future             = '待定';
-$lang->program->morePRJ            = '更多項目';
+$lang->program->name      = '項目集名稱';
+$lang->program->template  = '項目集模板';
+$lang->program->category  = '項目集類型';
+$lang->program->desc      = '項目集描述';
+$lang->program->copy      = '複製項目集';
+$lang->program->status    = '狀態';
+$lang->program->PM        = '負責人';
+$lang->program->budget    = '預算';
+$lang->program->progress  = '項目進度';
+$lang->program->children  = '子項目集';
+$lang->program->parent    = '父項目集';
+$lang->program->allInput  = '項目集總投入';
+$lang->program->teamCount = '總人數';
+$lang->program->longTime  = '長期';
+$lang->program->view      = '項目集詳情';
 
-$lang->program->productNotEmpty  = '請關聯產品或創建產品。';
-$lang->program->existProductName = '產品名稱已存在。';
+/* Actions. */
+$lang->program->common                  = '項目集';
+$lang->program->index                   = '項目集主頁';
+$lang->program->create                  = '添加項目集';
+$lang->program->createGuide             = '選擇項目模板';
+$lang->program->edit                    = '編輯項目集';
+$lang->program->browse                  = '項目集列表';
+$lang->program->product                 = '產品列表';
+$lang->program->project                 = '項目集項目列表';
+$lang->program->all                     = '所有項目集';
+$lang->program->start                   = '啟動項目集';
+$lang->program->finish                  = '完成項目集';
+$lang->program->suspend                 = '掛起項目集';
+$lang->program->delete                  = '刪除項目集';
+$lang->program->close                   = '關閉項目集';
+$lang->program->activate                = '激活項目集';
+$lang->program->export                  = '導出';
+$lang->program->stakeholder             = '干係人列表';
+$lang->program->createStakeholder       = '添加干係人';
+$lang->program->unlinkStakeholder       = '移除干係人';
+$lang->program->batchUnlinkStakeholders = '批量移除干係人';
+$lang->program->unlink                  = '移除';
+$lang->program->moreProgram             = '更多項目集';
+$lang->program->confirmBatchUnlink      = "您確定要批量移除這些干係人嗎？";
+$lang->program->stakeholderType         = '干係人類型';
+$lang->program->isStakeholderKey        = '關鍵干係人';
+$lang->program->importStakeholder       = '從父項目集導入';
+$lang->program->unbindWhitelist         = '移除白名單';
+$lang->program->importStakeholder       = '從父項目集導入';
+$lang->program->manageMembers           = '項目集團隊';
+$lang->program->beyondParentBudget      = '已超出所屬項目集的剩餘預算';
+$lang->program->parentBudget            = '所屬項目集剩餘預算：';
+$lang->program->beginLetterParent       = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
+$lang->program->endGreaterParent        = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
+$lang->program->beginGreateChild        = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
+$lang->program->endLetterChild          = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
+$lang->program->closeErrorMessage       = '存在子項目集或項目為未關閉狀態';
+$lang->program->hasChildren             = '該項目集有子項目集或項目存在，不能刪除。';
+$lang->program->confirmDelete           = "您確定要刪除嗎？";
+$lang->program->readjustTime            = '重新調整項目集起止時間';
 
-$lang->program->tenThousand = '萬';
+$lang->program->stakeholderTypeList['inside']  = '內部';
+$lang->program->stakeholderTypeList['outside'] = '外部';
 
-$lang->program->unitList['CNY'] = '人民幣';
-$lang->program->unitList['USD'] = '美元';
-$lang->program->unitList['HKD'] = '港元';
-$lang->program->unitList['NTD'] = '台元';
-$lang->program->unitList['EUR'] = '歐元';
-$lang->program->unitList['DEM'] = '馬克';
-$lang->program->unitList['CHF'] = '瑞士法郎';
-$lang->program->unitList['FRF'] = '法國法郎';
-$lang->program->unitList['GBP'] = '英鎊';
-$lang->program->unitList['NLG'] = '荷蘭盾';
-$lang->program->unitList['CAD'] = '加拿大元';
-$lang->program->unitList['RUR'] = '盧布';
-$lang->program->unitList['INR'] = '盧比';
-$lang->program->unitList['AUD'] = '澳大利亞元';
-$lang->program->unitList['NZD'] = '新西蘭元';
-$lang->program->unitList['THB'] = '泰國銖';
-$lang->program->unitList['SGD'] = '新加坡元';
-
-$lang->program->currencySymbol['CNY'] = '¥';
-$lang->program->currencySymbol['USD'] = '$';
-$lang->program->currencySymbol['HKD'] = 'HK$';
-$lang->program->currencySymbol['NTD'] = 'NT$';
-$lang->program->currencySymbol['EUR'] = '€';
-$lang->program->currencySymbol['DEM'] = 'DEM';
-$lang->program->currencySymbol['CHF'] = '₣';
-$lang->program->currencySymbol['FRF'] = '₣';
-$lang->program->currencySymbol['GBP'] = '£';
-$lang->program->currencySymbol['NLG'] = 'ƒ';
-$lang->program->currencySymbol['CAD'] = '$';
-$lang->program->currencySymbol['RUR'] = '₽';
-$lang->program->currencySymbol['INR'] = '₹';
-$lang->program->currencySymbol['AUD'] = 'A$';
-$lang->program->currencySymbol['NZD'] = 'NZ$';
-$lang->program->currencySymbol['THB'] = '฿';
-$lang->program->currencySymbol['SGD'] = 'S$';
-
-$lang->program->modelList['scrum']     = "Scrum";
-$lang->program->modelList['waterfall'] = "瀑布";
-
-$lang->program->PRJCategoryList['single']   = "單產品項目";
-$lang->program->PRJCategoryList['multiple'] = "多產品項目";
-
-$lang->program->PRJLifeTimeList['short'] = "短期";
-$lang->program->PRJLifeTimeList['long']  = "長期";
-$lang->program->PRJLifeTimeList['ops']   = "運維";
-
-$lang->program->featureBar['all']       = '所有';
-$lang->program->featureBar['doing']     = '進行中';
-$lang->program->featureBar['wait']      = '未開始';
-$lang->program->featureBar['suspended'] = '已掛起';
-$lang->program->featureBar['closed']    = '已關閉';
-
-$lang->program->PRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->program->PRJAclList['open']    = "公開(有項目視圖權限即可訪問)";
-
-$lang->program->PGMPRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->program->PGMPRJAclList['program'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
-$lang->program->PGMPRJAclList['open']    = "全部公開（有項目視圖權限即可訪問）";
-
-$lang->program->PRJAuthList['extend'] = '繼承(取系統權限與項目權限的合集)';
-$lang->program->PRJAuthList['reset']  = '重新定義(只取項目權限)';
-
-$lang->program->statusList['wait']      = '未開始';
-$lang->program->statusList['doing']     = '進行中';
-$lang->program->statusList['suspended'] = '已掛起';
-$lang->program->statusList['closed']    = '已關閉';
+$lang->program->noProgram  = '暫時沒有項目集';
+$lang->program->showClosed = '顯示已關閉';
+$lang->program->tips       = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
 
 $lang->program->endList[31]  = '一個月';
 $lang->program->endList[93]  = '三個月';
@@ -168,115 +70,23 @@ $lang->program->endList[186] = '半年';
 $lang->program->endList[365] = '一年';
 $lang->program->endList[999] = '長期';
 
-$lang->program->noPRJ                  = '暫時沒有項目';
-$lang->program->accessDenied           = '您無權訪問該項目！';
-$lang->program->chooseProgramType      = '選中項目管理模型';
-$lang->program->nextStep               = '下一步';
-$lang->program->hoursUnit              = "%s 工時";
-$lang->program->membersUnit            = '%s人';
-$lang->program->lastIteration          = '近期迭代';
-$lang->program->ongoingStage           = '進行中的階段';
-$lang->program->scrum                  = 'Scrum';
-$lang->program->waterfall              = '瀑布';
-$lang->program->waterfallTitle         = '瀑布式項目管理';
-$lang->program->cannotCreateChild      = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->program->hasChildren            = '該項目集有子項目集或項目存在，不能刪除。';
-$lang->program->confirmDelete          = "您確定要刪除嗎？";
-$lang->program->emptyPM                = '暫無';
-$lang->program->cannotChangeToCat      = "該項目已經有實際的內容，無法修改為父項目";
-$lang->program->cannotCancelCat        = "該項目下已經有子項目，無法取消父項目標記";
-$lang->program->parentBeginEnd         = "父項目起止時間：%s ~ %s";
-$lang->program->childLongTime          = "子項目中有長期項目，父項目也應該是長期項目";
-$lang->program->readjustTime           = '重新調整項目起止時間';
-$lang->program->notAllowRemoveProducts = '該產品中的需求已與項目進行了關聯，請取消關聯後再操作。';
+$lang->program->aclList['private'] = "私有（項目集負責人和干係人可訪問，干係人可後續維護）";
+$lang->program->aclList['open']    = "公開（有項目集視圖權限，即可訪問）";
 
-$lang->program->PRJProgramTitle['0']    = '不顯示';
-$lang->program->PRJProgramTitle['base'] = '只顯示一級項目集';
-$lang->program->PRJProgramTitle['end']  = '只顯示最後一級項目集';
+$lang->program->subAclList['private'] = "私有（本項目集負責人和干係人可訪問，干係人可後續維護）";
+$lang->program->subAclList['open']    = "全部公開（有項目集視圖權限，即可訪問）";
+$lang->program->subAclList['program'] = "項目集內公開（所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
 
-$lang->program->PRJAccessDenied      = '您無權訪問該項目！';
-$lang->program->PRJChooseProgramType = '選擇項目管理方式';
-$lang->program->scrumTitle           = '敏捷開發全流程項目管理';
-$lang->program->PRJCannotCreateChild = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->program->PRJHasChildren       = '該項目有子項目存在，不能刪除。';
-$lang->program->PRJConfirmDelete     = "您確定刪除項目[%s]嗎？";
-$lang->program->PRJCannotChangeToCat = "該項目已經有實際的內容，無法修改為父項目";
-$lang->program->PRJCannotCancelCat   = "該項目下已經有子項目，無法取消父項目標記";
-$lang->program->PRJParentBeginEnd    = "父項目起止時間：%s ~ %s";
-$lang->program->PRJParentBudget      = "父項目預算：%s";
-$lang->program->PRJBeginLetterParent = "父項目的開始日期：%s，開始日期不能小於父項目的開始日期";
-$lang->program->PRJEndGreaterParent  = "父項目的完成日期：%s，完成日期不能大於父項目的完成日期";
-$lang->program->PRJBeginGreateChild  = "項目集的最小開始日期：%s，項目的開始日期不能小於項目集的最小開始日期";
-$lang->program->PRJEndLetterChild    = "項目集的最大完成日期：%s，項目的完成日期不能大於項目集的最大完成日期";
-$lang->program->PRJChildLongTime     = "子項目中有長期項目，父項目也應該是長期項目";
+$lang->program->subAcls['private'] = '私有';
+$lang->program->subAcls['open']    = '全部公開';
+$lang->program->subAcls['program'] = '項目集內公開';
 
-/* Actions. */
-$lang->program->PGMCommon               = '項目集';
-$lang->program->PGMIndex                = '項目集主頁';
-$lang->program->PGMCreate               = '添加項目集';
-$lang->program->PGMCreateGuide          = '選擇項目模板';
-$lang->program->PGMEdit                 = '編輯項目集';
-$lang->program->PGMBrowse               = '項目集列表';
-$lang->program->PGMProduct              = '產品列表';
-$lang->program->PGMProject              = '項目集項目列表';
-$lang->program->PGMAll                  = '所有項目集';
-$lang->program->PGMStart                = '啟動項目集';
-$lang->program->PGMFinish               = '完成項目集';
-$lang->program->PGMSuspend              = '掛起項目集';
-$lang->program->PGMDelete               = '刪除項目集';
-$lang->program->PGMClose                = '關閉項目集';
-$lang->program->PGMActivate             = '激活項目集';
-$lang->program->PGMExport               = '導出';
-$lang->program->PGMStakeholder          = '干係人列表';
-$lang->program->createStakeholder       = '添加干係人';
-$lang->program->unlinkStakeholder       = '移除干係人';
-$lang->program->batchUnlinkStakeholders = '批量移除干係人';
-$lang->program->unlink                  = '移除';
-$lang->program->morePGM                 = '更多項目集';
-$lang->program->confirmBatchUnlink      = "您確定要批量移除這些干係人嗎？";
-$lang->program->stakeholderType         = '干係人類型';
-$lang->program->isStakeholderKey        = '關鍵干係人';
-$lang->program->importStakeholder       = '從父項目集導入';
-$lang->program->PGMManageMembers        = '項目集團隊';
-$lang->program->PGMParentBudget         = '所屬項目集剩餘預算：';
-$lang->program->beyondParentBudget      = '已超出所屬項目集的剩餘預算';
-$lang->program->PGMBeginLetterParent    = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
-$lang->program->PGMEndGreaterParent     = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
-$lang->program->PGMBeginGreateChild     = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
-$lang->program->PGMEndLetterChild       = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
-$lang->program->PGMCloseErrorMessage    = '存在子項目集或項目為未關閉狀態';
+$lang->program->authList['extend'] = '繼承 (取項目權限與組織權限的並集)';
+$lang->program->authList['reset']  = '重新定義 (只取項目權限)';
 
-$lang->program->stakeholderTypeList['inside']  = '內部';
-$lang->program->stakeholderTypeList['outside'] = '外部';
+$lang->program->statusList['wait']      = '未開始';
+$lang->program->statusList['doing']     = '進行中';
+$lang->program->statusList['suspended'] = '已掛起';
+$lang->program->statusList['closed']    = '已關閉';
 
-/* Fields. */
-$lang->program->PGMName      = '項目集名稱';
-$lang->program->PGMTemplate  = '項目集模板';
-$lang->program->PGMCategory  = '項目集類型';
-$lang->program->PGMDesc      = '項目集描述';
-$lang->program->PGMCopy      = '複製項目集';
-$lang->program->PGMStatus    = '狀態';
-$lang->program->PGMPM        = '負責人';
-$lang->program->PGMBudget    = '預算';
-$lang->program->PGMProgress  = '項目進度';
-$lang->program->PGMChildren  = '子項目集';
-$lang->program->PGMParent    = '父項目集';
-$lang->program->PGMAllInput  = '項目集總投入';
-$lang->program->PGMTeamCount = '項目整合員';
-$lang->program->PGMLongTime  = '長期項目';
-
-$lang->program->noPGM         = '暫時沒有項目集';
-$lang->program->PGMShowClosed = '顯示已關閉';
-$lang->program->PGMTips       = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
-
-$lang->program->PGMAclList['private'] = "私有（項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->program->PGMAclList['open']    = "公開（有項目集視圖權限，即可訪問）";
-
-$lang->program->subPGMAclList['private'] = "私有（本項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->program->subPGMAclList['open']    = "全部公開（有項目集視圖權限，即可訪問）";
-$lang->program->subPGMAclList['program'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
-
-$lang->program->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
-$lang->program->PGMAuthList['reset']  = '重新定義(只取項目權限)';
-
-$lang->program->PGMFeatureBar['all'] = '所有';
+$lang->program->featureBar['all'] = '所有';
diff --git a/module/program/model.php b/module/program/model.php
index 2ab4671d90..a0f28f6612 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -23,19 +23,6 @@ class programModel extends model
         return $this->session->program;
     }
 
-    /**
-     * Get program main menu action.
-     *
-     * @access public
-     * @return string
-     */
-    public function getMainAction()
-    {
-        $link = html::a(helper::createLink('program', 'browse'), "<i class='icon icon-list'></i>", '', "style='border: none;'");
-        $html = "<p style='padding-top:5px;'>" . $link . "</p>";
-        return common::hasPriv('program', 'pgmbrowse') ? $html : '';
-    }
-
     /**
      * Get program pairs.
      *
@@ -91,7 +78,9 @@ class programModel extends model
      */
     public function getByID($programID = 0)
     {
-        return $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->andWhere('`type`')->eq('program')->fetch();
+        $program = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->andWhere('`type`')->eq('program')->fetch();
+        $program = $this->loadModel('file')->replaceImgURL($program, 'desc');
+        return $program;
     }
 
     /**
@@ -109,8 +98,9 @@ class programModel extends model
             ->where('type')->in('program,project')
             ->andWhere('deleted')->eq(0)
             ->beginIF(!$this->app->user->admin)
-            ->andWhere('id')->in($this->app->user->view->programs)
+            ->andWhere('(id')->in($this->app->user->view->programs)
             ->orWhere('id')->in($this->app->user->view->projects)
+            ->markRight(1)
             ->fi()
             ->beginIF($status != 'all')->andWhere('status')->eq($status)->fi()
             ->beginIF(!$this->cookie->showClosed)->andWhere('status')->ne('closed')->fi()
@@ -212,29 +202,6 @@ class programModel extends model
             ->fetchAll();
     }
 
-    /**
-     * Set view menu.
-     *
-     * @param  int    $programID
-     * @access private
-     * @return void
-     */
-    public function setViewMenu($programID = 0)
-    {
-        foreach($this->lang->program->viewMenu as $label => $menu)
-        {
-            $this->lang->program->viewMenu->{$label}['link'] = is_array($menu) ? sprintf($menu['link'], $programID) : sprintf($menu, $programID);
-        }
-
-        foreach($this->lang->personnel->menu as $label => $menu)
-        {
-            $menu['link'] = is_array($menu) ? sprintf($menu['link'], $programID) : sprintf($menu, $programID);
-            $this->lang->personnel->menu->$label = $menu;
-        }
-
-        $this->lang->program->menu = $this->lang->program->viewMenu;
-    }
-
     /**
      * Create a program.
      *
@@ -296,7 +263,7 @@ class programModel extends model
             ->checkIF($program->begin != '', 'begin', 'date')
             ->checkIF($program->end != '', 'end', 'date')
             ->checkIF($program->end != '', 'end', 'gt', $program->begin)
-            ->checkIF(!empty($program->name), 'name', 'unique')
+            ->checkIF(!empty($program->name), 'name', 'unique', "`type`='program'")
             ->exec();
 
         if(!dao::isError())
@@ -351,6 +318,7 @@ class programModel extends model
 
             if($minChildBegin and $program->begin > $minChildBegin) dao::$errors['begin'] = sprintf($this->lang->program->beginGreateChild, $minChildBegin);
             if($maxChildEnd   and $program->end   < $maxChildEnd and $this->post->delta != 999) dao::$errors['end'] = sprintf($this->lang->program->endLetterChild, $maxChildEnd);
+            if(dao::isError()) return false;
         }
 
         if($program->parent)
@@ -385,7 +353,7 @@ class programModel extends model
             ->checkIF($program->begin != '', 'begin', 'date')
             ->checkIF($program->end != '', 'end', 'date')
             ->checkIF($program->end != '', 'end', 'gt', $program->begin)
-            ->check('name', 'unique', "id!=$programID and deleted='0'")
+            ->check('name', 'unique', "id!=$programID and deleted='0' and `type`='program'")
             ->where('id')->eq($programID)
             ->limit(1)
             ->exec();
@@ -407,7 +375,6 @@ class programModel extends model
      * Get program swapper.
      *
      * @param  int     $programID
-     * @param  bool    $active
      * @access private
      * @return string
      */
@@ -429,7 +396,7 @@ class programModel extends model
         }
 
         $dropMenuLink = helper::createLink('program', 'ajaxGetDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod");
-        $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProgramName}'><span class='text'><i class='icon icon-program'></i> {$currentProgramName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+        $output  = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProgramName}'><span class='text'>{$currentProgramName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
         $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>'; $output .= "</div></div>";
 
         return $output;
@@ -441,10 +408,12 @@ class programModel extends model
      * @param  int    $programID
      * @param  string $from
      * @param  string $vars
+     * @param  string $moduleName
+     * @param  string $methodName
      * @access public
      * @return string
      */
-    public function getTreeMenu($programID = 0, $from = 'program', $vars = '')
+    public function getTreeMenu($programID = 0, $from = 'program', $vars = '', $moduleName = '', $methodName = '')
     {
         $programMenu = array();
         $query = $this->dao->select('*')->from(TABLE_PROJECT)
@@ -464,8 +433,8 @@ class programModel extends model
 
         while($program = $stmt->fetch())
         {
-            $link = $from == 'program' ? helper::createLink('program', 'pgmproduct', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars);
-            $linkHtml = html::a($link, html::icon($this->lang->icons[$program->type], 'icon icon-sm text-muted') . ' ' . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name");
+            $link = $from == 'program' ? helper::createLink($moduleName, $methodName, "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars);
+            $linkHtml = html::a($link, $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name");
 
             if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id]))
             {
@@ -555,7 +524,7 @@ class programModel extends model
     public function hasUnfinished($program)
     {
         $unfinished = $this->dao->select("count(IF(id != {$program->id}, true, null)) as count")->from(TABLE_PROJECT)
-            ->where('type')->in('program,project')
+            ->where('type')->in('program, project')
             ->andWhere('path')->like($program->path . '%')
             ->andWhere('status')->ne('closed')
             ->andWhere('deleted')->eq('0')
@@ -686,11 +655,11 @@ class programModel extends model
      * @access public
      * @return array
      */
-    public function getParentPairs($model = '', $mode = '')
+    public function getParentPairs($model = '', $mode = 'noclosed')
     {
         $modules = $this->dao->select('id,name,parent,path,grade')->from(TABLE_PROGRAM)
             ->where('type')->eq('program')
-            ->beginIF(strpos($mode, 'noclosed') === false)->andWhere('status')->ne('closed')->fi()
+            ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
             ->andWhere('deleted')->eq(0)
             ->beginIF($model)->andWhere('model')->eq($model)->fi()
             ->orderBy('grade desc, `order`')
@@ -806,11 +775,8 @@ class programModel extends model
             $hour = (object)$emptyHour;
             foreach($projectTasks as $task)
             {
-                if($task->status != 'cancel')
-                {
-                    $hour->totalEstimate += $task->estimate;
-                    $hour->totalConsumed += $task->consumed;
-                }
+                $hour->totalEstimate += $task->estimate;
+                $hour->totalConsumed += $task->consumed;
                 if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
             }
             $hours[$projectID] = $hour;
@@ -867,4 +833,47 @@ class programModel extends model
 
         return $budgetUnitList;
     }
+
+    /**
+     * Get program team member pairs.
+     *
+     * @param  int  $programID
+     * @access public
+     * @return array
+     */
+    public function getTeamMemberPairs($programID = 0)
+    {
+      $projectList = $this->loadModel('project')->getPairsByProgram($programID);
+      if(!$projectList) return array('' => '');
+
+      $users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
+          ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
+          ->where('t1.root')->in(array_keys($projectList))
+          ->andWhere('t1.type')->eq('project')
+          ->andWhere('t2.deleted')->eq(0)
+          ->fetchAll('account');
+      if(!$users) return array('' => '');
+
+      foreach($users as $account => $user)
+      {
+        $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
+        if(!empty($this->config->isINT)) $firstLetter = '';
+        $users[$account] = $firstLetter . ($user->realname ? $user->realname : $user->account);
+      }
+
+      return array('' => '') + $users;
+    }
+
+    /*
+     * Set program menu.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return void
+     */
+    public function setMenu($programID)
+    {
+        $this->lang->switcherMenu = $this->getSwitcher($programID);
+        common::setMenuVars('program', $programID);
+    }
 }
diff --git a/module/program/view/activate.html.php b/module/program/view/activate.html.php
deleted file mode 100644
index 492f9c4b1e..0000000000
--- a/module/program/view/activate.html.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * The activate file of program 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      Chunsheng Wang<wwccss@gmail.com>
- * @package     program
- * @version     $Id: activate.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/kindeditor.html.php';?>
-<?php include '../../common/view/datepicker.html.php';?>
-<?php js::import($jsRoot . 'misc/date.js');?>
-<div id='mainContent' class='main-content'>
-  <div class='main-header'>
-    <h2>
-      <span class='prefix label-id'><strong><?php echo $program->id;?></strong></span>
-      <?php echo isonlybody() ? ("<span title='$program->name'>" . $program->name . '</span>') : html::a($this->createLink('program', 'view', 'program=' . $program->id), $program->name, '_blank');?>
-      <?php if(!isonlybody()):?>
-      <small><?php echo $lang->arrow . $lang->project->activate;?></small>
-      <?php endif;?>
-    </h2>
-  </div>
-  <form class='load-indicator main-form' method='post' target='hiddenwin'>
-    <table class='table table-form'>
-      <tr style='height:50px;'>
-        <th class='w-70px'><?php echo $lang->program->dateRange;?></th>
-        <td class='muted' colspan='2'>
-          <div id='sourceTimeBox'><?php echo $program->begin . ' ~ ' . $program->end;?></div>
-          <div id='readjustTimeBox' class='hide'>
-            <div class='input-group'>
-              <?php echo html::input('begin', $newBegin, "class='form-control form-date'")?>
-              <span class='input-group-addon'> ~ </span>
-              <?php echo html::input('end', $newEnd, "class='form-control form-date'");?>
-            </div>
-          </div>
-        </td>
-        <td colspan='3'>
-          <div class='clearfix row'>
-            <div class='col-md-6 pull-left'>
-              <div class="checkbox-primary"><input name="readjustTime" value="1" id="readjustTime" type="checkbox"><label for="readjustTime" class="no-margin"><?php echo $lang->program->readjustTime;?></label></div>
-            </div>
-          </div>
-        </td>
-      </tr>
-      <tr class='hide'>
-        <th><?php echo $lang->program->status;?></th>
-        <td><?php echo html::hidden('status', 'doing');?></td>
-      </tr>
-      <?php $this->printExtendFields($program, 'table', 'columns=5');?>
-      <tr>
-        <th><?php echo $lang->comment;?></th>
-        <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
-      </tr>
-      <tr>
-        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
-      </tr>
-    </table>
-  </form>
-  <hr class='small' />
-  <div class='main'><?php include '../../common/view/action.html.php';?></div>
-</div>
-<script>
-$(function()
-{
-    $('#readjustTime').change(function()
-    {
-        $('#sourceTimeBox').toggle(!$(this).prop('checked'))
-        $('#readjustTimeBox').toggle($(this).prop('checked'))
-        $('#readjustTaskBox').toggleClass('hidden')
-    })
-})
-</script>
-<?php include '../../common/view/footer.html.php';?>
diff --git a/module/program/view/ajaxgetdropmenu.html.php b/module/program/view/ajaxgetdropmenu.html.php
index 2e39bd3053..38da2a55c0 100644
--- a/module/program/view/ajaxgetdropmenu.html.php
+++ b/module/program/view/ajaxgetdropmenu.html.php
@@ -9,12 +9,12 @@ $programsPinYin = common::convert2Pinyin($programNames);
   <div class="table-col col-left">
     <div class='list-group'>
     <?php
-    echo $this->program->getPGMTreeMenu();
+    echo $this->program->getTreeMenu(0, 'program', '', $module, $method);
     ?>
     </div>
     <div class="col-footer">
       <div class='pull-right'>
-        <?php echo html::checkbox('showClosed', array('1' => $lang->program->PGMShowClosed), '', $this->cookie->showClosed ? 'checked=checked' : '');?>
+        <?php echo html::checkbox('showClosed', array('1' => $lang->program->showClosed), '', $this->cookie->showClosed ? 'checked=checked' : '');?>
       </div>
     </div>
   </div>
@@ -23,7 +23,7 @@ $programsPinYin = common::convert2Pinyin($programNames);
 .tree li.has-list.open:before {border-left: none;}
 #programTree li {padding: 0 0 0 8px;}
 #programTree li.has-list {padding-left: 20px;}
-#programTree li > a {display: block; padding: 5px 0; border-radius: 2px; padding-left: 6px; height: 30px;}
+#programTree li > a {display: block; padding: 6px 0; border-radius: 2px; padding-left: 6px; height: 30px;}
 #programTree li > a > span {display: inline-block;}
 #programTree li > a > span + span {margin-left: 8px;}
 #programTree li.selected > a {background-color: #E8F3FC;}
@@ -34,6 +34,7 @@ $programsPinYin = common::convert2Pinyin($programNames);
 #programTree li > a > span.title {color: #3C4353; white-space: nowrap; max-width: 60%; overflow: hidden; text-overflow: ellipsis; vertical-align: middle;}
 #programTree li > a > span.user {color: #838a9d;}
 #programTree li > a > span.user > .icon-person {font-size: 14px; position: relative; top: -1px; color: #a6aab8}
+#programTree li > a:first-child {padding-left: 18px;}
 
 #programTree li > .list-toggle {transform: rotate(0deg); width: 16px; height: 16px; border: 4px solid #a6aab8; border-radius: 2px; top: 7px;}
 #programTree li > .list-toggle:before {content: ' '; display: block; position: absolute; border: 1px solid #a6aab8; top: 2px; left: -3px; right: -3px; bottom: 2px; min-width: 0; transition: all .2s;}
@@ -58,11 +59,11 @@ $programsPinYin = common::convert2Pinyin($programNames);
 $('#programTree').tree();
 $(function()
 {
-    $('input[name^="showClosed"]').click(function()
+    $(document).on('change', 'input[name^="showClosed"]', function()
     {
         var showClosed = $(this).is(':checked') ? 1 : 0;
         $.cookie('showClosed', showClosed, {expires:config.cookieLife, path:config.webRoot});
-        window.location.reload();
+        $("#dropMenu > .list-group").load(createLink('program', 'ajaxgetdropmenu', 'programID=' + programID + '&module=' + module + '&method=' + method));
     });
 });
 </script>
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 470e165db5..aebfc2438d 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -1,12 +1,12 @@
 <?php $canOrder = (common::hasPriv('program', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
-<form class='main-table' id='programForm' method='post' data-ride='table' data-nested='true' data-expand-nest-child='false' data-checkable='false'>
+<form class='main-table' id='programForm' method='post' data-ride='table' data-nested='true' data-expand-nest-child='false' data-checkable='false' data-enable-empty-nested-row='true'>
   <table class='table has-sort-head table-fixed table-nested' id='programList'>
     <?php $vars = "status=$status&orderBy=%s";?>
     <thead>
       <tr>
         <th class='table-nest-title'>
-          <a class='table-nest-toggle table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse; ?>'></a>
-          <?php echo $lang->program->name;?>
+          <a class='table-nest-toggle table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse;?>'></a>
+          <?php echo $lang->nameAB;?>
         </th>
         <th class='w-100px'><?php common::printOrderLink('PM',     $orderBy, $vars, $lang->program->PM);?></th>
         <th class='text-right w-100px'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->project->budget);?></th>
@@ -45,7 +45,8 @@
 
       <tr <?php echo $trAttrs;?>>
         <td class='c-name text-left <?php if($canOrder) echo 'sort-handler';?>' title='<?php echo $program->name?>'>
-          <span class="table-nest-icon icon icon-<?php echo $program->type; ?>"></span>
+          <?php $class = $program->type == 'program' ? ' table-nest-toggle' : '';?>
+          <span class="table-nest-icon icon icon-<?php echo $program->type;?> <?php echo $class;?>"></span>
           <?php if($program->type == 'program'):?>
           <?php echo html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name);?>
           <?php else:?>
@@ -56,7 +57,7 @@
           <?php $userID = isset($PMList[$program->PM]) ? $PMList[$program->PM]->id : ''?>
           <?php if(!empty($program->PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $program->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?>
         </td>
-        <?php $programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $program->budget >= 10000 ? number_format($program->budget / 10000, 1) . $lang->project->tenThousand : number_format((float)$program->budget, 1);?>
+        <?php $programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$program->budget / 10000, 2) . $lang->project->tenThousand : round((float)$program->budget, 2);?>
         <td class='text-right'><?php echo $program->budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?></td>
         <td class='c-status'><span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status, '');?></span></td>
         <td><?php echo $program->begin;?></td>
@@ -78,7 +79,7 @@
           </div>
           <?php endif;?>
           <?php common::printIcon('program', 'edit',   "programID=$program->id", '', 'list', 'edit');?>
-          <?php common::printIcon('program', 'create', "programID=$program->id", '', 'list', 'split', '', '', '', '', $this->lang->program->children);?>
+          <?php common::printIcon('program', 'create', "programID=$program->id", '', 'list', 'split', '', '', '', $program->status == 'closed' ? 'disabled' : '', $this->lang->program->children);?>
           <?php if(common::hasPriv('program', 'delete')) echo html::a($this->createLink("program", "delete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->delete}'");?>
 
           <?php else:?>
@@ -95,15 +96,15 @@
             </ul>
           </div>
           <?php endif;?>
-          <?php common::printIcon('project', 'edit', "projectID=$program->id&from=browse", $program, 'list', 'edit', '', '', '', "data-group='program'", '', $program->id);?>
-          <?php common::printIcon('project', 'manageMembers', "projectID=$program->id", $program, 'list', 'group', '', '', '', 'data-group="program"', '', $program->id);?>
-          <?php common::printIcon('project', 'group',         "projectID=$program->id", $program, 'list', 'lock', '', '', '', 'data-group="program"', '', $program->id);?>
+          <?php common::printIcon('project', 'edit', "projectID=$program->id", $program, 'list', 'edit', '', 'iframe', true, '', '', $program->id);?>
+          <?php common::printIcon('project', 'manageMembers', "projectID=$program->id", $program, 'list', 'group', '', '', '', 'data-app="project"', '', $program->id);?>
+          <?php common::printIcon('project', 'group',         "projectID=$program->id", $program, 'list', 'lock', '', '', '', 'data-app="project"', '', $program->id);?>
           <?php if(common::hasPriv('project', 'manageProducts') || common::hasPriv('project', 'whitelist') || common::hasPriv('project', 'delete')):?>
           <div class='btn-group'>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
             <ul class='dropdown-menu pull-right text-center' role='menu'>
-              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&programID=0&from=browse", $program, 'list', 'link', '', '', '', "data-group='program'", '', $program->id);?>
-              <?php common::printIcon('project', 'whitelist',      "projectID=$program->id&programID=0&module=program&from=browse", $program, 'list', 'shield-check', '', '', '', "data-group='program'", '', $program->id);?>
+              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', '', '', "data-app='project'", '', $program->id);?>
+              <?php common::printIcon('project', 'whitelist',      "projectID=$program->id&module=project&from=browse", $program, 'list', 'shield-check', '', '', '', "data-app='project'", '', $program->id);?>
               <?php if(common::hasPriv('project','delete')) echo html::a($this->createLink("project", "delete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->delete}' data-group='program'");?>
             </ul>
           </div>
@@ -120,9 +121,10 @@
 #programTableList.sortable-sorting > tr.drag-row {opacity: 1;}
 #programTableList > tr.drop-not-allowed {opacity: 0.1!important}
 #programList .c-actions {overflow: visible;}
+#programList > thead > tr > th .table-nest-toggle-global {top: 6px}
+#programList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;}
 #programTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
-#programTableList .icon-project:before, #programTableList .no-nest .icon-program:before, #programTableList .is-nest-child .icon-program:before {content: '\e99c'; width: 22px; height: 22px; background: none; color: #16a8f8; top: 0; line-height: 22px; margin-right: 2px; font-size: 14px}
-#programTableList .no-nest .icon-program:before, #programTableList .is-nest-child .icon-program:before {content: '\e944'; color: #ffe066; font-size: 16px;}
+#programTableList .icon-project:before {content: '\e99c'; width: 22px; height: 22px; background: none; color: #16a8f8; top: 0; line-height: 22px; margin-right: 2px; font-size: 14px}
 </style>
 <?php js::set('originOrders', $originOrders);?>
 <script>
diff --git a/module/program/view/createguide.html.php b/module/program/view/createguide.html.php
index 902200237a..02cffa1fe6 100644
--- a/module/program/view/createguide.html.php
+++ b/module/program/view/createguide.html.php
@@ -18,14 +18,14 @@
       <div class='row'>
         <div class='col-xs-6'>
           <div class='program-type text-center'>
-            <?php echo html::a($this->createLink("program", "PRJCreate", "model=scrum&programID=$programID&from=$from"), "<img class='program-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', $group)?>
+            <?php echo html::a($this->createLink("project", "create", "model=scrum&programID=$programID&from=$from"), "<img class='program-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', $group)?>
             <h3><?php echo $lang->program->scrum; ?></h3>
             <p><?php echo $lang->program->scrumTitle; ?></p>
           </div>
         </div>
         <div class='col-xs-6'>
           <div class='program-type text-center'>
-            <?php echo html::a($this->createLink("program", "PRJCreate", "model=waterfall&programID=$programID&from=$from"), "<img class='program-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', $group)?>
+            <?php echo html::a($this->createLink("project", "create", "model=waterfall&programID=$programID&from=$from"), "<img class='program-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', $group)?>
             <h3><?php echo $lang->program->waterfall; ?></h3>
             <p><?php echo $lang->program->waterfallTitle; ?></p>
           </div>
diff --git a/module/program/view/product.html.php b/module/program/view/product.html.php
index 7af83b8d25..387dd97ea9 100644
--- a/module/program/view/product.html.php
+++ b/module/program/view/product.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The html product list file of pgmproduct method of program module of ZenTaoPMS.
+ * The html product list file of product method of program 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)
diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php
index ed27ef503c..6abb22e1a5 100644
--- a/module/program/view/project.html.php
+++ b/module/program/view/project.html.php
@@ -16,7 +16,8 @@ js::set('programID', $programID);
 js::set('browseType', $browseType);
 ?>
 <style>
-.project-type-label.label-outline {width: 47px;}
+.project-type-label.label-outline {width: 50px; min-width: 50px;}
+.project-type-label.label {overflow: unset !important; text-overflow: unset !important; white-space: unset !important;}
 </style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolBar pull-left">
@@ -30,9 +31,9 @@ js::set('browseType', $browseType);
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(isset($this->config->maxVersion)):?>
-    <?php common::printLink('project', 'createGuide', "programID=$programID&from=program", '<i class="icon icon-plus"></i>' . $lang->program->PRJCreate, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
+    <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
     <?php elseif($this->config->systemMode == 'new'):?>
-    <?php common::printLink('project', 'create', "mode=scrum&programID=$programID&from=program", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary"');?>
     <?php endif;?>
   </div>
 </div>
@@ -43,9 +44,9 @@ js::set('browseType', $browseType);
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
         <?php if(isset($this->config->maxVersion)):?>
-        <?php common::printLink('program', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
+        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
         <?php elseif($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'create', "mode=scrum&programID=$programID&from=program", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>
+        <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>
         <?php endif;?>
       </p>
     </div>
@@ -56,13 +57,13 @@ js::set('browseType', $browseType);
         $setting = $this->datatable->getSetting('program');
       ?>
       <table class='table has-sort-head'>
-      <?php $canBatchEdit = common::hasPriv('program', 'PRJBatchEdit');?>
+      <?php $canBatchEdit = common::hasPriv('project', 'batchEdit');?>
         <thead>
           <tr>
             <?php
               foreach($setting as $value)
               {
-                if($value->id == 'PRJStatus' and $browseType !== 'all') $value->show = false;
+                if($value->id == 'projectStatus' and $browseType !== 'all') $value->show = false;
                 if($value->show) $this->datatable->printHead($value, $orderBy, $vars, $canBatchEdit);
               }
             ?>
@@ -85,7 +86,7 @@ js::set('browseType', $browseType);
         <?php
         if($canBatchEdit)
         {
-            $actionLink = $this->createLink('program', 'PRJBatchEdit', "from=pgmproject&programID=$programID");
+            $actionLink = $this->createLink('project', 'batchEdit', "from=pgmproject&programID=$programID");
             $misc       = "data-form-action='$actionLink'";
             echo html::commonButton($lang->edit, $misc);
         }
diff --git a/module/program/view/start.html.php b/module/program/view/start.html.php
deleted file mode 100644
index e6e826a4dd..0000000000
--- a/module/program/view/start.html.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * The prjstart view file of program 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      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     program
- * @version     $Id: prjstart.html.php 4769 2013-05-05 07:24:21Z wwccss $
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/kindeditor.html.php';?>
-<div id='mainContent' class='main-content'>
-  <div class='main-header'>
-    <h2>
-      <span class='prefix label-id'><strong><?php echo $program->id;?></strong></span>
-      <?php echo isonlybody() ? ("<span title='$program->name'>" . $program->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $program->id), $program->name, '_blank');?>
-      <?php if(!isonlybody()):?>
-      <small><?php echo $lang->arrow . $lang->project->start;?></small>
-      <?php endif;?>
-    </h2>
-  </div>
-  <form class='load-indicator main-form' method='post' target='hiddenwin'>
-    <table class='table table-form'>
-      <tbody>
-        <tr>
-          <th class='w-100px'><?php echo $lang->program->realBegan;?></th>
-          <td><?php echo html::input('realBegan', helper::today(), "class='form-control form-date'");?></td>
-          <td></td>
-        </tr>
-        <tr>
-          <th class='w-40px'><?php echo $lang->comment;?></th>
-          <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
-        </tr>
-        <tr>
-          <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton($lang->project->start);?>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </form>
-  <hr class='small' />
-  <div class='main'>
-    <?php include '../../common/view/action.html.php';?>
-  </div>
-</div>
-<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/config.php b/module/project/config.php
index 3e000a43ec..cea74baa0d 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -8,7 +8,7 @@ $config->project->editor->close    = array('id' => 'comment', 'tools' => 'simple
 $config->project->editor->suspend  = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->project->editor->start    = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools');
-$config->project->editor->view     = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->view     = array('id' => 'lastComment', 'tools' => 'simpleTools');
 
 $config->project->list = new stdclass();
 $config->project->list->exportFields = 'id,name,code,template,product,status,begin,end,budget,PM,end,desc';
@@ -33,65 +33,80 @@ $config->project->datatable->fieldList['id']['title']    = 'ID';
 $config->project->datatable->fieldList['id']['fixed']    = 'left';
 $config->project->datatable->fieldList['id']['width']    = '60';
 $config->project->datatable->fieldList['id']['required'] = 'yes';
+$config->project->datatable->fieldList['id']['pri']      = '1';
 
 $config->project->datatable->fieldList['name']['title']    = 'name';
 $config->project->datatable->fieldList['name']['fixed']    = 'left';
 $config->project->datatable->fieldList['name']['width']    = 'auto';
+$config->project->datatable->fieldList['name']['minWidth'] = '180';
 $config->project->datatable->fieldList['name']['required'] = 'yes';
 $config->project->datatable->fieldList['name']['sort']     = 'no';
+$config->project->datatable->fieldList['name']['pri']      = '1';
 
 $config->project->datatable->fieldList['PM']['title']    = 'PM';
 $config->project->datatable->fieldList['PM']['fixed']    = 'no';
 $config->project->datatable->fieldList['PM']['width']    = '80';
 $config->project->datatable->fieldList['PM']['required'] = 'yes';
 $config->project->datatable->fieldList['PM']['sort']     = 'no';
+$config->project->datatable->fieldList['PM']['pri']      = '2';
 
 $config->project->datatable->fieldList['status']['title']    = 'status';
 $config->project->datatable->fieldList['status']['fixed']    = 'left';
 $config->project->datatable->fieldList['status']['width']    = '80';
 $config->project->datatable->fieldList['status']['required'] = 'no';
 $config->project->datatable->fieldList['status']['sort']     = 'yes';
+$config->project->datatable->fieldList['status']['pri']      = '2';
 
 $config->project->datatable->fieldList['begin']['title']    = 'begin';
 $config->project->datatable->fieldList['begin']['fixed']    = 'no';
-$config->project->datatable->fieldList['begin']['width']    = '100';
+$config->project->datatable->fieldList['begin']['width']    = '90';
 $config->project->datatable->fieldList['begin']['required'] = 'no';
+$config->project->datatable->fieldList['begin']['pri']      = '9';
 
 $config->project->datatable->fieldList['end']['title']    = 'end';
 $config->project->datatable->fieldList['end']['fixed']    = 'no';
-$config->project->datatable->fieldList['end']['width']    = '100';
+$config->project->datatable->fieldList['end']['width']    = '90';
 $config->project->datatable->fieldList['end']['required'] = 'no';
+$config->project->datatable->fieldList['end']['pri']      = '3';
 
 $config->project->datatable->fieldList['budget']['title']    = 'budget';
 $config->project->datatable->fieldList['budget']['fixed']    = 'no';
 $config->project->datatable->fieldList['budget']['width']    = '80';
 $config->project->datatable->fieldList['budget']['required'] = 'yes';
+$config->project->datatable->fieldList['budget']['pri']      = '3';
 
 $config->project->datatable->fieldList['teamCount']['title']    = 'teamCount';
 $config->project->datatable->fieldList['teamCount']['fixed']    = 'no';
-$config->project->datatable->fieldList['teamCount']['width']    = '40';
+$config->project->datatable->fieldList['teamCount']['width']    = '70';
 $config->project->datatable->fieldList['teamCount']['required'] = 'no';
 $config->project->datatable->fieldList['teamCount']['sort']     = 'no';
+$config->project->datatable->fieldList['teamCount']['pri']      = '8';
 
 $config->project->datatable->fieldList['estimate']['title']    = 'estimate';
 $config->project->datatable->fieldList['estimate']['fixed']    = 'no';
-$config->project->datatable->fieldList['estimate']['width']    = '60';
+$config->project->datatable->fieldList['estimate']['width']    = '70';
+$config->project->datatable->fieldList['estimate']['maxWidth'] = '80';
 $config->project->datatable->fieldList['estimate']['required'] = 'no';
 $config->project->datatable->fieldList['estimate']['sort']     = 'no';
+$config->project->datatable->fieldList['estimate']['pri']      = '8';
 
 $config->project->datatable->fieldList['consume']['title']    = 'consume';
 $config->project->datatable->fieldList['consume']['fixed']    = 'no';
-$config->project->datatable->fieldList['consume']['width']    = '60';
+$config->project->datatable->fieldList['consume']['width']    = '70';
+$config->project->datatable->fieldList['consume']['maxWidth'] = '80';
 $config->project->datatable->fieldList['consume']['required'] = 'no';
 $config->project->datatable->fieldList['consume']['sort']     = 'no';
+$config->project->datatable->fieldList['consume']['pri']      = '7';
 
 $config->project->datatable->fieldList['progress']['title']    = 'progress';
 $config->project->datatable->fieldList['progress']['fixed']    = 'right';
 $config->project->datatable->fieldList['progress']['width']    = '60';
 $config->project->datatable->fieldList['progress']['required'] = 'no';
 $config->project->datatable->fieldList['progress']['sort']     = 'no';
+$config->project->datatable->fieldList['progress']['pri']      = '6';
 
 $config->project->datatable->fieldList['actions']['title']    = 'actions';
 $config->project->datatable->fieldList['actions']['fixed']    = 'right';
 $config->project->datatable->fieldList['actions']['width']    = '180';
 $config->project->datatable->fieldList['actions']['required'] = 'yes';
+$config->project->datatable->fieldList['actions']['pri']      = '1';
diff --git a/module/project/control.php b/module/project/control.php
index 2141ff2022..94d1240df2 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -10,14 +10,6 @@
  */
 class project extends control
 {
-    public function __construct($moduleName = '', $methodName = '')
-    {
-        parent::__construct($moduleName, $methodName);
-        $this->loadModel('program');
-        $this->loadModel('execution');
-        $this->loadModel('group');
-    }
-
     /**
      * Project create guide.
      *
@@ -115,18 +107,24 @@ class project extends control
      */
     public function ajaxGetDropMenu($projectID = 0, $module, $method)
     {
-        $programs = $this->dao->select('id, name')->from(TABLE_PROGRAM)->where('type')->eq('program')->andWhere('deleted')->eq(0)->orderBy('order_asc')->fetchPairs();
-        $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($this->app->user->view->projects)->andWhere('deleted')->eq(0)->orderBy('order_asc')->fetchAll('id');
+        /* Load module. */
+        $this->loadModel('program');
 
-        /* Sort project by program. */
+        /* Sort project. */
+        $programs        = array();
         $orderedProjects = array();
-        foreach($programs as $programID => $programName)
+        $objects         = $this->program->getList('all', 'order_asc', null, true);
+        foreach($objects as $objectID => $object)
         {
-            foreach($projects as $project)
+            if($object->type == 'program')
             {
-                if($project->parent and $project->parent != $programID) continue;
-                $orderedProjects[] = $project;
-                unset($projects[$project->id]);
+                $programs[$objectID] = $object->name;
+            }
+            else
+            {
+                $object->parent = $this->program->getTopByID($object->parent);
+                $orderedProjects[] = $object;
+                unset($objects[$object->id]);
             }
         }
 
@@ -173,9 +171,13 @@ class project extends control
      */
     public function index($projectID = 0)
     {
-        $this->lang->noMenuModule[] = 'project';
         $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
 
+        if($projectID == 0 and common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'create'));
+        if($projectID == 0 and !common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'browse'));
+
+        $this->project->setMenu($projectID);
+
         $project = $this->project->getByID($projectID);
         if(empty($project) || $project->type != 'project') die(js::error($this->lang->notFound) . js::locate('back'));
 
@@ -202,23 +204,19 @@ class project extends control
      * @access public
      * @return void
      */
-    public function browse($programID = 0, $browseType = 'doing', $param = 0, $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
+    public function browse($programID = 0, $browseType = 'doing', $param = 0, $orderBy = 'order_asc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
-        $this->lang->noMenuModule[] = 'project';
-        if($this->session->moreProjectLink) $this->lang->project->mainMenuAction = html::a($this->session->moreProjectLink, '<i class="icon icon-back"></i> ' . $this->lang->goback, '', "class='btn btn-link'");
-        $this->app->session->set('projectBrowse', $this->app->getURI(true));
         $this->loadModel('datatable');
-        $this->session->set('projectList', $this->app->getURI(true));
+        $this->loadModel('execution');
+        $this->session->set('projectList', $this->app->getURI(true), 'project');
 
         /* Load pager and get tasks. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         $queryID = ($browseType == 'bysearch') ? (int)$param : 0;
-        $projectTitle = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=project&key=projectTitle');
-        $order        = explode('_', $orderBy);
-        $sortField    = zget($this->config->project->sortFields, $order[0], 'id') . '_' . $order[1];
-        $projectStats = $this->program->getProjectStats($programID, $browseType, $queryID, $sortField, $pager, $projectTitle);
+        $programTitle = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=project&key=programTitle');
+        $projectStats = $this->loadModel('program')->getProjectStats($programID, $browseType, $queryID, $orderBy, $pager, $programTitle);
 
         $this->view->title      = $this->lang->project->browse;
         $this->view->position[] = $this->lang->project->browse;
@@ -227,7 +225,7 @@ class project extends control
         $this->view->pager        = $pager;
         $this->view->programID    = $programID;
         $this->view->program      = $this->program->getByID($programID);
-        $this->view->projectTree  = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list');
+        $this->view->programTree  = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list');
         $this->view->users        = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted');
         $this->view->browseType   = $browseType;
         $this->view->param        = $param;
@@ -242,17 +240,17 @@ class project extends control
      * @access public
      * @return void
      */
-    public function projectTitle()
+    public function programTitle()
     {
         $this->loadModel('setting');
         if($_POST)
         {
-            $projectTitle = $this->post->projectTitle;
-            $this->setting->setItem($this->app->user->account . '.project.projectTitle', $projectTitle);
+            $programTitle = $this->post->programTitle;
+            $this->setting->setItem($this->app->user->account . '.project.programTitle', $programTitle);
             die(js::reload('parent.parent'));
         }
 
-        $status = $this->setting->getItem('owner=' . $this->app->user->account . '&module=project&key=projectTitle');
+        $status = $this->setting->getItem('owner=' . $this->app->user->account . '&module=project&key=programTitle');
         $this->view->status = empty($status) ? '0' : $status;
         $this->display();
     }
@@ -266,8 +264,10 @@ class project extends control
      * @access public
      * @return void
      */
-    public function create($model = 'waterfall', $programID = 0, $copyProjectID = 0)
+    public function create($model = 'scrum', $programID = 0, $copyProjectID = 0)
     {
+        $this->loadModel('execution');
+
         if($_POST)
         {
             $projectID = $this->project->create();
@@ -275,24 +275,54 @@ class project extends control
 
             $this->loadModel('action')->create('project', $projectID, 'opened');
 
+            /* Link the plan stories. */
+            if(!empty($_POST['plans']))
+            {
+                foreach($_POST['plans'] as $planID)
+                {
+                    $planStories = $planProducts = array();
+                    $planStory   = $this->loadModel('story')->getPlanStories($planID);
+                    if(!empty($planStory))
+                    {
+                        foreach($planStory as $id => $story)
+                        {
+                            if($story->status == 'draft')
+                            {
+                                unset($planStory[$id]);
+                                continue;
+                            }
+                            $planProducts[$story->id] = $story->product;
+                        }
+                        $planStories = array_keys($planStory);
+                        $this->execution->linkStory($projectID, $planStories, $planProducts);
+                    }
+                }
+            }
+
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $projectID));
+
             if($this->app->openApp == 'program')
             {
                 $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('program', 'browse')));
             }
+            elseif($this->app->openApp == 'doc')
+            {
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'objectLibs', "type=project&objectID=$projectID")));
+            }
             else
             {
                 if($model == 'waterfall')
                 {
                     $productID = $this->loadModel('product')->getProductIDByProject($projectID, true);
-                    $this->session->set('projectPlanList', $this->createLink('projectplan', 'browse', "projectID=$projectID&productID=$productID&type=lists", '', '', $projectID));
-                    $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('projectplan', 'create', "projectID=$projectID", '', '', $projectID)));
+                    $this->session->set('projectPlanList', $this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=lists", '', '', $projectID), 'project');
+                    $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('programplan', 'create', "projectID=$projectID", '', '', $projectID)));
                 }
 
-                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('project', 'create', '', '', '', $projectID)));
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('project', 'browse', "programID=0&browseType=all", '', '', $projectID)));
             }
         }
 
-        $this->lang->noMenuModule[] = 'project';
+        if($this->app->openApp == 'program') $this->loadModel('program')->setMenu($programID);
 
         $name      = '';
         $code      = '';
@@ -356,25 +386,32 @@ class project extends control
      * Edit a project.
      *
      * @param  int    $projectID
-     * @param  string $from  project|program|programProject
      * @access public
      * @return void
      */
-    public function edit($projectID = 0, $from = 'project')
+    public function edit($projectID = 0)
     {
-        $this->app->loadLang('custom');
-        $this->app->loadLang('project');
-        $this->loadModel('productplan');
         $this->loadModel('action');
+        $this->loadModel('custom');
+        $this->loadModel('productplan');
+        $this->loadModel('user');
+        $this->loadModel('program');
+        $this->loadModel('execution');
 
         $project   = $this->project->getByID($projectID);
         $programID = $project->parent;
-
-        /* Navigation stay in program when enter from program list. */
-        $this->adjustNavigation($from, $programID);
+        $this->project->setMenu($projectID);
 
         if($_POST)
         {
+            $oldPlans = $this->dao->select('plan')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs('plan');
+            $oldPlanStories = $this->dao->select('t1.story')->from(TABLE_PROJECTSTORY)->alias('t1')
+                ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.project=t2.project')
+                ->where('t1.project')->eq($projectID)
+                ->andWhere('t2.plan')->in(array_keys($oldPlans))
+                ->fetchAll('story');
+            $diffResult = array_diff($oldPlans, $_POST['plans']);
+
             $changes = $this->project->update($projectID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
@@ -384,13 +421,18 @@ class project extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('view', "projectID=$projectID");
-            if($from == 'program')  $locateLink = $this->createLink('program', 'browse');
-            if($from == 'programProject') $locateLink = $this->session->programProject ? $this->session->programProject : $this->createLink('program', 'project', "projectID=$projectID");
+            /* Link the plan stories. */
+            if(!empty($_POST['plans']) and !empty($diffResult))
+            {
+                $this->loadModel('productplan')->linkProject($projectID, $_POST['plans'], $oldPlanStories);
+            }
+
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+
+            $locateLink = $this->session->projectList ? $this->session->projectList : inLink('view', "projectID=$projectID");
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
         }
 
-
         $linkedBranches = array();
         $productPlans   = array(0 => '');
         $allProducts    = $this->program->getProductPairs($project->parent, 'assign', 'noclosed');
@@ -419,7 +461,7 @@ class project extends control
         $this->view->title      = $this->lang->project->edit;
         $this->view->position[] = $this->lang->project->edit;
 
-        $this->view->PMUsers              = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst',  $project->PM);
+        $this->view->PMUsers              = $this->user->getPairs('noclosed|nodeleted|pmfirst',  $project->PM);
         $this->view->users                = $this->user->getPairs('noclosed|nodeleted');
         $this->view->project              = $project;
         $this->view->programList          = $this->program->getParentPairs();
@@ -429,10 +471,9 @@ class project extends control
         $this->view->linkedProducts       = $linkedProducts;
         $this->view->unmodifiableProducts = $unmodifiableProducts;
         $this->view->branchGroups         = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
-        $this->view->URSRPairs            = $this->loadModel('custom')->getURSRPairs();
-        $this->view->from                 = $from;
+        $this->view->URSRPairs            = $this->custom->getURSRPairs();
         $this->view->parentProject        = $parentProject;
-        $this->view->parentProgram        = $this->loadModel('program')->getByID($project->parent);
+        $this->view->parentProgram        = $this->program->getByID($project->parent);
         $this->view->availableBudget      = $this->program->getBudgetLeft($parentProject) + (float)$project->budget;
         $this->view->budgetUnitList       = $this->project->getBudgetUnitList();
 
@@ -450,9 +491,7 @@ class project extends control
     public function batchEdit($from = 'browse', $projectID = 0)
     {
         $this->loadModel('action');
-
-        /* Navigation stay in project when enter from project list. */
-        $this->adjustNavigation($from, $projectID);
+        $this->loadModel('execution');
 
         if($this->post->names)
         {
@@ -480,7 +519,7 @@ class project extends control
         $this->view->position[] = $this->lang->project->batchEdit;
 
         $this->view->projects      = $projects;
-        $this->view->programList   = $this->program->getParentPairs();
+        $this->view->programList   = $this->loadModel('program')->getParentPairs();
         $this->view->PMUsers       = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst',  $appendPMUsers);
 
         $this->display();
@@ -495,13 +534,11 @@ class project extends control
      */
     public function view($projectID = 0)
     {
-        $this->app->loadLang('bug');
-        $this->lang->navGroup->project = 'project';
-        $this->lang->project->menu = $this->lang->scrum->setMenu;
-        $moduleIndex = array_search('project', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
+        $projectID = (int)$projectID;
+        $project   = $this->project->getById($projectID);
+        if(empty($project) || strpos('scrum,waterfall', $project->model) === false) die(js::error($this->lang->notFound) . js::locate('back'));
 
-        $this->app->session->set('projectBrowse', $this->app->getURI(true));
+        $this->project->setMenu($projectID);
 
         $products = $this->loadModel('product')->getProducts($projectID);
         $linkedBranches = array();
@@ -517,7 +554,7 @@ class project extends control
         $this->view->title        = $this->lang->project->view;
         $this->view->position     = $this->lang->project->view;
         $this->view->projectID    = $projectID;
-        $this->view->project      = $this->project->getByID($projectID);
+        $this->view->project      = $project;
         $this->view->products     = $products;
         $this->view->actions      = $this->loadModel('action')->getList('project', $projectID);
         $this->view->users        = $this->loadModel('user')->getPairs('noletter');
@@ -541,10 +578,8 @@ class project extends control
      */
     public function group($projectID = 0, $programID = 0)
     {
-        $this->lang->navGroup->project = 'project';
-        $this->lang->project->menu = $this->lang->scrum->setMenu;
-        $moduleIndex = array_search('project', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
+        $this->loadModel('group');
+        $this->project->setMenu($projectID);
 
         $title      = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->browse;
         $position[] = $this->lang->group->browse;
@@ -573,11 +608,14 @@ class project extends control
      */
     public function createGroup($projectID = 0)
     {
+        $this->loadModel('group');
+
         if(!empty($_POST))
         {
             $_POST['project'] = $projectID;
-            $this->group->create();
+            $groupID = $this->group->create();
             if(dao::isError()) die(js::error(dao::getError()));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $groupID));
             die(js::closeModal('parent.parent'));
         }
 
@@ -601,20 +639,25 @@ class project extends control
      */
     public function dynamic($projectID = 0, $type = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
-        $this->lang->noMenuModule[] = 'project';
+        $this->project->setMenu($projectID);
 
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('executionList',   $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+
+        if(isset($this->config->maxVersion))
+        {
+            $this->session->set('riskList', $uri, 'project');
+            $this->session->set('issueList', $uri, 'project');
+        }
 
         /* Append id for secend sort. */
         $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
@@ -633,7 +676,7 @@ class project extends control
         }
         $period  = $type == 'account' ? 'all'  : $type;
         $date    = empty($date) ? '' : date('Y-m-d', $date);
-        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', $projectID, $date, $direction);
+        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', $projectID, 'all', $date, $direction);
 
         /* The header and position. */
         $project = $this->project->getByID($projectID);
@@ -641,8 +684,8 @@ class project extends control
         $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
         $this->view->position[] = $this->lang->project->dynamic;
 
-        $this->view->userIdPairs  = $this->project->getTeamMemberPairs($project->parent);
-        $this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
+        $this->view->userIdPairs  = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project');
+        $this->view->accountPairs = $this->user->getPairs('noletter|nodeleted');
 
         /* Assign. */
         $this->view->projectID  = $projectID;
@@ -659,15 +702,269 @@ class project extends control
     /**
      * Execution list.
      *
+     * @param  string $status
+     * @param  int    $projectID
+     * @param  string $orderBy
+     * @param  int    $productID
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
-    public function execution()
+    public function execution($status = 'all', $projectID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
     {
-        $PRJ = $this->session->PRJ;
-        if(!$PRJ) $PRJ = current(explode(',', $this->app->user->view->projects));
+        $uri = $this->app->getURI(true);
+        $this->app->session->set('executionList', $uri, 'project');
 
-        $this->locate($this->createLink('execution', 'all', "status=all&executionID=0&from=project", '', false, $PRJ));
+        echo $this->fetch('execution', 'all', "status=$status&projectID=$projectID&orderBy=$orderBy&productID=$productID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+    }
+
+    /**
+     * Project qa dashboard.
+     *
+     * @param  int $projectID
+     * @access public
+     * @return void
+     */
+    public function qa($projectID = 0)
+    {
+        $this->project->setMenu($projectID);
+        $this->view->title = $this->lang->project->qa;
+        $this->display();
+    }
+
+    /**
+     * Project bug list.
+     *
+     * @param  int    $projectID
+     * @param  int    $productID
+     * @param  string $orderBy
+     * @param  int    $build
+     * @param  string $type
+     * @param  int    $param
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function bug($projectID = 0, $productID = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        /* Load these two models. */
+        $this->loadModel('bug');
+        $this->loadModel('user');
+        $this->loadModel('product');
+
+        /* Save session. */
+        $this->session->set('bugList', $this->app->getURI(true), 'project');
+        $this->project->setMenu($projectID);
+
+        $project  = $this->project->getByID($projectID);
+        $type     = strtolower($type);
+        $queryID  = ($type == 'bysearch') ? (int)$param : 0;
+        $products = $this->project->getProducts($projectID);
+        $branchID = isset($products[$productID]) ? $products[$productID]->branch : 0;
+
+        $productPairs = array('0' => $this->lang->product->all);
+        foreach($products as $product) $productPairs[$product->id] = $product->name;
+        $this->lang->modulePageNav = $this->product->select($productPairs, $productID, 'project', 'bug', '', $branchID, 0, '', false);
+
+        /* Header and position. */
+        $title      = $project->name . $this->lang->colon . $this->lang->bug->common;
+        $position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
+        $position[] = $this->lang->bug->common;
+
+        /* Load pager and get bugs, user. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager($recTotal, $recPerPage, $pageID);
+        $sort  = $this->loadModel('common')->appendOrder($orderBy);
+        $bugs  = $this->bug->getProjectBugs($projectID, $productID, $build, $type, $param, $sort, '', $pager);
+        $users = $this->user->getPairs('noletter');
+
+        /* team member pairs. */
+        $memberPairs   = array();
+        $memberPairs[] = "";
+        $teamMembers   = $this->project->getTeamMembers($projectID);
+        foreach($teamMembers as $key => $member) $memberPairs[$key] = $member->realname;
+
+        /* Build the search form. */
+        $actionURL = $this->createLink('project', 'bug', "projectID=$projectID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
+        $this->loadModel('execution')->buildBugSearchForm($products, $queryID, $actionURL, 'project');
+
+        /* Assign. */
+        $this->view->title       = $title;
+        $this->view->position    = $position;
+        $this->view->bugs        = $bugs;
+        $this->view->tabID       = 'bug';
+        $this->view->build       = $this->loadModel('build')->getById($build);
+        $this->view->buildID     = $this->view->build ? $this->view->build->id : 0;
+        $this->view->pager       = $pager;
+        $this->view->orderBy     = $orderBy;
+        $this->view->users       = $users;
+        $this->view->productID   = $productID;
+        $this->view->project     = $this->project->getById($projectID);
+        $this->view->branchID    = empty($this->view->build->branch) ? $branchID : $this->view->build->branch;
+        $this->view->memberPairs = $memberPairs;
+        $this->view->type        = $type;
+        $this->view->param       = $param;
+
+        $this->display();
+    }
+
+    /**
+     * Project case list.
+     *
+     * @param  int    $projectID
+     * @param  int    $productID
+     * @param  int    $branch
+     * @param  string $browseType
+     * @param  int    $param
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function testcase($projectID = 0, $productID = 0, $branch = 0, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        $this->loadModel('product');
+        $products = array('0' => $this->lang->product->all) + $this->project->getProducts($projectID, false);
+        $this->lang->modulePageNav = $this->product->select($products, $productID, 'project', 'testcase', '', $branch, 0, '', false);
+
+        echo $this->fetch('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=$orderBy&recTotal=$orderBy&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
+    }
+
+    /**
+     * List of test reports for the project.
+     *
+     * @param  int    $projectID
+     * @param  string $objectType   project|execution|product
+     * @param  string $extra
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function testreport($projectID = 0, $objectType = 'project', $extra = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        echo $this->fetch('testreport', 'browse', "objectID=$projectID&objectType=$objectType&extra=$extra&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+    }
+
+    /**
+     * Project test task list.
+     *
+     * @param  int    $projectID
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function testtask($projectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    {
+        $this->loadModel('testtask');
+        $this->app->loadLang('testreport');
+
+        /* Save session. */
+        $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
+
+        $this->project->setMenu($projectID);
+
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = pager::init($recTotal, $recPerPage, $pageID);
+
+        $productTasks = array();
+
+        $project = $this->project->getByID($projectID);
+        $tasks = $this->testtask->getProjectTasks($projectID, $orderBy, $pager);
+        foreach($tasks as $key => $task) $productTasks[$task->product][] = $task;
+
+        $this->view->title        = $project->name . $this->lang->colon . $this->lang->project->common;
+        $this->view->position[]   = html::a($this->createLink('project', 'testtask', "projectID=$projectID"), $project->name);
+        $this->view->position[]   = $this->lang->testtask->common;
+        $this->view->project      = $project;
+        $this->view->projectID    = $projectID;
+        $this->view->projectName  = $project->name;
+        $this->view->pager        = $pager;
+        $this->view->orderBy      = $orderBy;
+        $this->view->tasks        = $productTasks;
+        $this->view->users        = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->products     = $this->loadModel('product')->getPairs('', 0);
+        $this->view->canBeChanged = common::canModify('project', $project); // Determines whether an object is editable.
+
+        $this->display();
+    }
+
+    /**
+     * Browse builds of a project.
+     *
+     * @param  string $type      all|product|bysearch
+     * @param  int    $param
+     * @access public
+     * @return void
+     */
+    public function build($projectID = 0, $type = 'all', $param = 0)
+    {
+        /* Load module and get project. */
+        $this->loadModel('build');
+        $project = $this->project->getByID($projectID);
+        $this->project->setMenu($projectID);
+
+        $this->session->set('buildList', $this->app->getURI(true), 'project');
+
+        /* Get products' list. */
+        $products = $this->project->getProducts($projectID, false);
+        $products = array('' => '') + $products;
+
+        /* Build the search form. */
+        $type      = strtolower($type);
+        $queryID   = ($type == 'bysearch') ? (int)$param : 0;
+        $actionURL = $this->createLink('project', 'build', "projectID=$projectID&type=bysearch&queryID=myQueryID");
+
+        $executions = $this->loadModel('execution')->getByProject($projectID, 'all', '', true);
+        $this->config->build->search['fields']['execution'] = $this->project->lang->executionCommon;
+        $this->config->build->search['params']['execution'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $executions);
+
+        $this->project->buildProjectBuildSearchForm($products, $queryID, $actionURL, 'project');
+
+        if($type == 'bysearch')
+        {
+            $builds = $this->build->getProjectBuildsBySearch((int)$projectID, (int)$param);
+        }
+        else
+        {
+            $builds = $this->build->getProjectBuilds((int)$projectID, $type, $param);
+        }
+
+        /* Set project builds. */
+        $projectBuilds = array();
+        if(!empty($builds))
+        {
+            foreach($builds as $build) $projectBuilds[$build->product][] = $build;
+        }
+
+        /* Header and position. */
+        $this->view->title      = $project->name . $this->lang->colon . $this->lang->execution->build;
+        $this->view->position[] = $this->lang->execution->build;
+
+        $this->view->users         = $this->loadModel('user')->getPairs('noletter');
+        $this->view->buildsTotal   = count($builds);
+        $this->view->projectBuilds = $projectBuilds;
+        $this->view->product       = $type == 'product' ? $param : 'all';
+        $this->view->projectID     = $projectID;
+        $this->view->project       = $project;
+        $this->view->products      = $products;
+        $this->view->executions    = $executions;
+        $this->view->type          = $type;
+
+        $this->display();
     }
 
     /**
@@ -681,11 +978,7 @@ class project extends control
      */
     public function manageView($groupID, $projectID, $programID)
     {
-        $this->lang->navGroup->project = 'project';
-        $this->lang->project->menu = $this->lang->scrum->setMenu;
-        $moduleIndex = array_search('project', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
+        $this->loadModel('group');
         if($_POST)
         {
             $this->group->updateView($groupID);
@@ -694,6 +987,8 @@ class project extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('group', "projectID=$projectID&programID=$programID")));
         }
 
+        $this->project->setMenu($projectID);
+
         $group = $this->group->getById($groupID);
 
         $this->view->title      = $group->name . $this->lang->colon . $this->lang->group->manageView;
@@ -710,6 +1005,7 @@ class project extends control
     /**
      * Manage privleges of a group.
      *
+     * @param  int       $projectID
      * @param  string    $type
      * @param  int       $param
      * @param  string    $menu
@@ -717,13 +1013,9 @@ class project extends control
      * @access public
      * @return void
      */
-    public function managePriv($type = 'byGroup', $param = 0, $menu = '', $version = '')
+    public function managePriv($projectID, $type = 'byGroup', $param = 0, $menu = '', $version = '')
     {
-        $this->lang->navGroup->project = 'project';
-        $this->lang->project->menu = $this->lang->scrum->setMenu;
-        $moduleIndex = array_search('project', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
+        $this->loadModel('group');
         if($type == 'byGroup')
         {
             $groupID = $param;
@@ -744,6 +1036,8 @@ class project extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('group', "projectID=$group->project")));
         }
 
+        $this->project->setMenu($projectID);
+
         if($type == 'byGroup')
         {
             $this->group->sortResource();
@@ -758,13 +1052,14 @@ class project extends control
             $changelog = array();
             foreach($this->lang->changelog as $currentVersion => $currentChangeLog)
             {
-                if(version_compare($currentVersion, $realVersion, '>=')) $changelog[] = join($currentChangeLog, ',');
+                if(version_compare($currentVersion, $realVersion, '>=')) $changelog[] = join(',', $currentChangeLog);
             }
 
             $this->view->group      = $group;
-            $this->view->changelogs = ',' . join($changelog, ',') . ',';
+            $this->view->changelogs = ',' . join(',', $changelog) . ',';
             $this->view->groupPrivs = $groupPrivs;
             $this->view->groupID    = $groupID;
+            $this->view->projectID  = $projectID;
             $this->view->menu       = $menu;
             $this->view->version    = $version;
 
@@ -789,21 +1084,20 @@ class project extends control
      */
     public function manageMembers($projectID, $dept = '')
     {
-        $this->lang->navGroup->project = 'project';
-        $this->lang->project->menu = $this->lang->scrum->setMenu;
-        $moduleIndex = array_search('project', $this->lang->noMenuModule);
-        if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-
-        if(!empty($_POST))
-        {
-            $this->execution->manageMembers($projectID);
-            $link = $this->createLink('project', 'manageMembers', "projectID=$projectID");
-            $this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'locate' => $link));
-        }
-
         /* Load model. */
         $this->loadModel('user');
         $this->loadModel('dept');
+        $this->loadModel('execution');
+        $this->project->setMenu($projectID);
+
+        if(!empty($_POST))
+        {
+            $this->project->manageMembers($projectID);
+            $this->loadModel('action')->create('team', $projectID, 'ManagedTeam');
+
+            $link = $this->createLink('project', 'manageMembers', "projectID=$projectID");
+            $this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'locate' => $link));
+        }
 
         $project   = $this->project->getById($projectID);
         $users     = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback');
@@ -833,6 +1127,7 @@ class project extends control
      */
     public function manageGroupMember($groupID, $deptID = 0)
     {
+        $this->loadModel('group');
         if(!empty($_POST))
         {
             $this->group->updateUser($groupID);
@@ -845,6 +1140,12 @@ class project extends control
         $allUsers   = $this->loadModel('dept')->getDeptUserPairs($deptID);
         $otherUsers = array_diff_assoc($allUsers, $groupUsers);
 
+        if($this->config->systemMode == 'new')
+        {
+            $outsideUsers = $this->loadModel('user')->getPairs('outside|noclosed|noletter|noempty');
+            $this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers);
+        }
+
         $title      = $group->name . $this->lang->colon . $this->lang->group->manageMember;
         $position[] = $group->name;
         $position[] = $this->lang->group->manageMember;
@@ -868,6 +1169,7 @@ class project extends control
      */
     public function copyGroup($groupID)
     {
+        $this->loadModel('group');
         if(!empty($_POST))
          {
              $group = $this->group->getByID($groupID);
@@ -893,7 +1195,8 @@ class project extends control
      */
     public function editGroup($groupID)
     {
-       if(!empty($_POST))
+        $this->loadModel('group');
+        if(!empty($_POST))
         {
             $this->group->update($groupID);
             die(js::closeModal('parent.parent', 'this'));
@@ -995,7 +1298,7 @@ class project extends control
         $this->view->actions    = $this->action->getList('project', $projectID);
         $this->view->project    = $this->project->getByID($projectID);
 
-        $this->display('project', 'suspend');
+        $this->display();
     }
 
     /**
@@ -1042,6 +1345,7 @@ class project extends control
     public function activate($projectID)
     {
         $this->loadModel('action');
+        $this->app->loadLang('execution');
         $project = $this->project->getByID($projectID);
 
         if(!empty($_POST))
@@ -1070,7 +1374,7 @@ class project extends control
         $this->view->newEnd     = $newEnd;
         $this->view->project    = $project;
 
-        $this->display('project', 'activate');
+        $this->display();
     }
 
     /**
@@ -1091,13 +1395,22 @@ class project extends control
         }
         else
         {
-            $projectIdList = $this->project->getExecutionsByProject($projectID);
-            $this->project->delete(TABLE_PROJECT, $projectID);
-            $this->dao->update(TABLE_PROJECT)->set('deleted')->eq(1)->where('id')->in(array_keys($projectIdList))->exec();
-            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec();
-            $this->project->updateUserView($projectID);
-            $this->session->set('project', '');
+            $this->loadModel('user');
+            $this->loadModel('action');
 
+            $this->project->delete(TABLE_PROJECT, $projectID);
+            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('execution')->eq($projectID)->exec();
+            $this->user->updateUserView($projectID, 'project');
+
+            /* Delete the execution under the project. */
+            $executionIdList = $this->loadModel('execution')->getByProject($projectID);
+            if(empty($executionIdList)) die(js::reload('parent'));
+
+            $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->in(array_keys($executionIdList))->exec();
+            foreach($executionIdList as $executionID => $execution) $this->action->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
+            $this->user->updateUserView($executionIdList, 'sprint');
+
+            $this->session->set('project', '');
             die(js::reload('parent'));
         }
     }
@@ -1131,7 +1444,6 @@ class project extends control
     /**
      * Get white list personnel.
      *
-     * @param  int    $programID
      * @param  int    $projectID
      * @param  string $module
      * @param  string $from  project|program|programProject
@@ -1143,23 +1455,8 @@ class project extends control
      * @access public
      * @return void
      */
-    public function whitelist($programID = 0, $projectID = 0, $module = 'project', $from = 'project', $objectType = 'project', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function whitelist($projectID = 0, $module = 'project', $from = 'project', $objectType = 'project', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        if($from == 'project')
-        {
-            $this->lang->navGroup->project = 'project';
-            $this->lang->project->menu = $this->lang->scrum->setMenu;
-            $moduleIndex = array_search('project', $this->lang->noMenuModule);
-            if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-        }
-        if($from == 'programproject')
-        {
-            $this->app->rawMethod = 'programproject';
-            $this->lang->navGroup->project     = 'project';
-            $this->lang->project->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true);
-            $this->program->setViewMenu($programID);
-        }
-
         echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID&from=$from");
     }
 
@@ -1175,9 +1472,6 @@ class project extends control
      */
     public function addWhitelist($projectID = 0, $deptID = 0, $programID = 0, $from = 'project')
     {
-        /* Navigation stay in project when enter from project list. */
-        $this->adjustNavigation($from, $projectID);
-
         echo $this->fetch('personnel', 'addWhitelist', "objectID=$projectID&dept=$deptID&objectType=project&module=project&programID=$programID&from=$from");
     }
 
@@ -1197,16 +1491,15 @@ class project extends control
     /**
      * Manage products.
      *
-     * @param  int     $projectID
-     * @param  int     $programID
+     * @param  int    $projectID
      * @param  string $from  project|program|programproject
      * @access public
      * @return void
      */
-    public function manageProducts($projectID, $programID = 0, $from = 'project')
+    public function manageProducts($projectID, $from = 'project')
     {
-        /* Navigation stay in project when enter from project list. */
-        $this->adjustNavigation($from, $projectID);
+        $this->loadModel('product');
+        $this->loadModel('program');
 
         if(!empty($_POST))
         {
@@ -1226,19 +1519,25 @@ class project extends control
             $diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
             if($diffProducts) $this->loadModel('action')->create('project', $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
 
-            $locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('manageProducts', "projectID=$projectID");
+            $locateLink = inLink('manageProducts', "projectID=$projectID");
             if($from == 'program')  $locateLink = $this->createLink('program', 'browse');
             if($from == 'programproject') $locateLink = $this->session->programProject ? $this->session->programProject : inLink('programProject', "projectID=$projectID");
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
         }
 
-        $this->loadModel('product');
-        $this->loadModel('program');
         $project = $this->project->getById($projectID);
+        if($this->app->openApp == 'program')
+        {
+            $this->program->setMenu($project->parent);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $this->project->setMenu($projectID);
+        }
 
-        $allProducts        = $this->program->getProductPairs($project->parent, 'assign', 'noclosed');
-        $linkedProducts     = $this->product->getProducts($project->id);
-        $linkedBranches     = array();
+        $allProducts    = $this->program->getProductPairs($project->parent, 'assign', 'noclosed');
+        $linkedProducts = $this->product->getProducts($project->id);
+        $linkedBranches = array();
 
         /* If the story of the product which linked the project, you don't allow to remove the product. */
         $unmodifiableProducts = array();
@@ -1301,33 +1600,4 @@ class project extends control
         }
         die(json_encode($response));
     }
-
-    /**
-     * Adjust the navigation.
-     *
-     * @param  string $from
-     * @param  int    $projectID
-     * @access public
-     * @return void
-     */
-    public function adjustNavigation($from = '', $projectID = 0)
-    {
-        if($from == 'browse') $this->lang->project->menu = $this->lang->project->menu;
-        if($from == 'program') $this->lang->navGroup->project = 'project';
-
-        if($from == 'project')
-        {
-            $this->lang->navGroup->project = 'project';
-            $this->lang->project->menu = $this->lang->scrum->setMenu;
-            $moduleIndex = array_search('project', $this->lang->noMenuModule);
-            if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-        }
-
-        if($from == 'pgmproject')
-        {
-            $this->app->rawMethod = 'pgmproject';
-            $this->lang->project->switcherMenu = $this->project->getPGMSwitcher($projectID, true);
-            $this->project->setPGMViewMenu($projectID);
-        }
-    }
 }
diff --git a/module/project/css/browse.css b/module/project/css/browse.css
index 26af2131ec..3c5a1c9361 100644
--- a/module/project/css/browse.css
+++ b/module/project/css/browse.css
@@ -2,5 +2,6 @@
 .side-col {padding-right: 20px; width: 18%;}
 #sidebar>.cell {width: 100%;}
 
+th.c-budget,{text-align:right;}
 td.c-actions {overflow: visible;}
 .c-actions .btn {overflow: visible;}
diff --git a/module/project/css/testtask.css b/module/project/css/testtask.css
new file mode 100644
index 0000000000..7d167eb581
--- /dev/null
+++ b/module/project/css/testtask.css
@@ -0,0 +1,7 @@
+.table-group-btns {width: 200px;}
+.table-footer,
+.table-grouped {box-shadow: none !important;}
+.table-footer {margin-left: 205px; margin-top: 10px;}
+.table-grouped > thead>tr>th.c-id,
+.table-grouped > tbody>tr>td.c-id {padding-left: 15px;}
+.table-grouped > tbody>tr>td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/project/js/batchedit.js b/module/project/js/batchedit.js
index 81aa03cabc..0ee2ec95cc 100644
--- a/module/project/js/batchedit.js
+++ b/module/project/js/batchedit.js
@@ -3,13 +3,13 @@ $(function()
     $("select[name^='parents']").change(function()
     {
         var $this     = $(this);
-        var projectID = $this.val();
+        var programID = $this.val();
         var projectID = $this.attr("data-id");
         var oldParent = $this.attr("data-parent");
         var title     = changeProgram.replace('%s', $this.attr("data-name"));
 
-        /* Determine whether the project can change the project set. */
-        link = createLink('project', 'ajaxCheckProduct', 'projectID=' + projectID + '&projectID=' + projectID);
+        /* Determine whether the project can change the program set. */
+        link = createLink('project', 'ajaxCheckProduct', 'programID=' + programID + '&projectID=' + projectID);
         $.getJSON(link, function(data)
         {
             var changed = true;
diff --git a/module/project/js/browse.js b/module/project/js/browse.js
index ab1080090f..6f812d1ef3 100644
--- a/module/project/js/browse.js
+++ b/module/project/js/browse.js
@@ -8,4 +8,4 @@ $(function()
     });
 });
 
-$(".tree .active").parent('li').addClass('active');
+$(".tree #program" + programID).parent('li').addClass('active');
diff --git a/module/project/js/build.js b/module/project/js/build.js
new file mode 100644
index 0000000000..2079622260
--- /dev/null
+++ b/module/project/js/build.js
@@ -0,0 +1,25 @@
+$(function()
+{
+    $('#createBuild').click(function()
+    {
+        if(executions.length == 0)
+        {
+            alert(createExecution);
+            location.href = createLink('execution', 'create', 'projectID=' + projectID);
+            return false;
+        }
+    });
+});
+
+/**
+ * Change product.
+ *
+ * @param  int    $productID
+ * @access public
+ * @return void
+ */
+function changeProduct(productID)
+{
+    link = createLink('project', 'build', 'projectID=' + projectID + '&type=product&param=' + productID);
+    location.href = link;
+}
diff --git a/module/project/js/common.js b/module/project/js/common.js
index d06bc51632..7e2ab51d43 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -75,6 +75,12 @@ function computeWorkDays(currentID)
     {
         beginDate = $('#begin').val();
         endDate   = $('#end').val();
+
+        var begin = new Date(beginDate.replace(/-/g,"/"));
+        var end   = new Date(endDate.replace(/-/g,"/"));
+        var time  = end.getTime() - begin.getTime();
+        var days  = parseInt(time / (1000 * 60 * 60 * 24)) + 1;
+        if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked',false);
     }
 
     if(beginDate && endDate)
@@ -105,10 +111,14 @@ function computeEndDate(delta)
     {
         $('#end').val(longTime);
         $('#end').attr('disabled', 'disabled');
+        $('#days').attr('disabled', 'disabled');
+        $('#daysBox').addClass('hidden');
         return false;
     }
     else
     {
+        $('#days').removeAttr('disabled');
+        $('#daysBox').removeClass('hidden');
         $('#end').removeAttr('disabled');
     }
 
@@ -246,19 +256,19 @@ function adjustPlanBoxMargin()
 $(function()
 {
     $('#privList > tbody > tr > th input[type=checkbox]').change(function()
-    {   
+    {
         var id      = $(this).attr('id');
         var checked = $(this).prop('checked');
 
         if(id == 'allChecker')
-        {   
+        {
             $('input[type=checkbox]').prop('checked', checked);
-        }   
+        }
         else
-        {   
+        {
             $(this).parents('tr').find('input[type=checkbox]').prop('checked', checked);
-        }   
-    }); 
+        }
+    });
 })
 
 /**
diff --git a/module/project/js/create.js b/module/project/js/create.js
index 797ffd5a67..f88883caaa 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -27,12 +27,12 @@ $(function()
 /**
  * Set parent program.
  *
+ * @param  $parentProgram
  * @access public
  * @return void
  */
-function setParentProgram()
+function setParentProgram(parentProgram)
 {
-    var parentProgram = $("#parent").val();
     location.href = createLink('project', 'create', 'model=' + model + '&programID=' + parentProgram);
 }
 
@@ -78,13 +78,13 @@ function addNewProduct(obj)
 /**
  * Set access control box.
  *
- * @param  int $projectID
+ * @param  int $programID
  * @access public
  * @return void
  */
-function setAclList(projectID)
+function setAclList(programID)
 {
-    if(projectID != 0)
+    if(programID != 0)
     {
         $('.aclBox').html($('#programAcl').html());
     }
diff --git a/module/project/js/edit.js b/module/project/js/edit.js
index 115059a858..f9d3c0e2bf 100644
--- a/module/project/js/edit.js
+++ b/module/project/js/edit.js
@@ -3,6 +3,7 @@ $(function()
     $('#parent').change(function()
     {
         var programID = $(this).val();
+        setAclList(programID);
 
         /* Determine whether the project can change the project set. */
         link = createLink('project', 'ajaxCheckProduct', 'programID=' + programID + '&projectID=' + projectID);
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 439ff81b84..e41a23d520 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -28,17 +28,26 @@ $lang->project->addProduct        = 'Add product';
 $lang->project->manageGroupMember = 'Manage Group';
 $lang->project->moduleSetting     = 'List Settings';
 $lang->project->moduleOpen        = 'Program Name';
+$lang->project->dynamic           = 'Dynamic';
+$lang->project->execution         = 'Execution';
+$lang->project->qa                = 'QA';
+$lang->project->bug               = 'Bug List';
+$lang->project->testcase          = 'Case List';
+$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->unbindWhitelist   = 'Project Remove Whitelist';
 $lang->project->manageProducts    = 'Manage Products';
 $lang->project->copyTitle         = 'Please select an project to copy';
 $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.';
 $lang->project->errorNoProducts   = 'At least one product is associated';
 $lang->project->copyNoProject     = 'There are no items available to copy.';
 $lang->project->searchByName      = 'Enter the project name to search';
+$lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
+$lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
 
 /* Fields. */
 $lang->project->common             = 'Program';
@@ -89,7 +98,7 @@ $lang->project->sv                 = 'SV%';
 $lang->project->ac                 = 'AC';
 $lang->project->cv                 = 'CV%';
 $lang->project->teamCount          = 'Team';
-$lang->project->longTime           = 'Long-Term Project';
+$lang->project->longTime           = 'Long-Term Program';
 $lang->project->future             = 'TBD';
 $lang->project->moreProject        = 'More Project';
 $lang->project->days               = 'Manntage';
@@ -101,6 +110,7 @@ $lang->project->changeProgramTip       = 'After modifying the project set, the p
 $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->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
+$lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 
 $lang->project->tenThousand = '';
 
@@ -155,6 +165,10 @@ $lang->project->aclList['open']    = "Open (accessible with project view permiss
 $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->authList['extend'] = 'Inherit (system privilege and project privilege)';
 $lang->project->authList['reset']  = 'Reset (project privilege only)';
 
@@ -175,13 +189,12 @@ $lang->project->chooseProgramType      = 'Select the project management model';
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
-$lang->project->lastIteration          = 'Recent iterations';
+$lang->project->lastIteration          = "Recent {$lang->executionCommon}";
 $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = 'CMMI';
 $lang->project->waterfallTitle         = 'CMMI';
 $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            = 'It has child projects or projects. You cannot delete it.';
 $lang->project->confirmDelete          = "Do you want to delete [%s]?";
 $lang->project->emptyPM                = 'No manager';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 028e07b1fc..0cc3c43396 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -28,17 +28,28 @@ $lang->project->addProduct        = 'Add Product';
 $lang->project->manageGroupMember = 'Manage Group';
 $lang->project->moduleSetting     = 'List Settings';
 $lang->project->moduleOpen        = 'Program Name';
+$lang->project->dynamic           = 'Dynamic';
+$lang->project->execution         = 'Execution';
+$lang->project->qa                = 'QA';
+$lang->project->bug               = 'Bug List';
+$lang->project->testcase          = 'Case List';
+$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->unbindWhitelist   = 'Project Remove Whitelist';
 $lang->project->manageProducts    = 'Manage Products';
 $lang->project->copyTitle         = 'Please select an project to copy';
 $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.';
 $lang->project->errorNoProducts   = 'At least one product is associated';
 $lang->project->copyNoProject     = 'There are no items available to copy.';
 $lang->project->searchByName      = 'Enter the project name to retrieve';
+$lang->project->deleted           = 'Deleted';
+$lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
+$lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
+$lang->project->testreport        = 'Test Report';
 
 /* Fields. */
 $lang->project->common             = 'Project';
@@ -52,7 +63,6 @@ $lang->project->copy               = 'Copy';
 $lang->project->begin              = 'Begin';
 $lang->project->end                = 'End';
 $lang->project->status             = 'Status';
-$lang->project->PM                 = 'Manager';
 $lang->project->budget             = 'Budget';
 $lang->project->template           = 'Template';
 $lang->project->estimate           = 'Estimates';
@@ -72,7 +82,6 @@ $lang->project->acl                = 'Access control';
 $lang->project->setPlanduration    = 'Set Duration';
 $lang->project->auth               = 'Access Control';
 $lang->project->durationEstimation = 'Estimated Workload';
-$lang->project->teamCount          = 'Man';
 $lang->project->leftStories        = 'Left Stories';
 $lang->project->leftTasks          = 'Left Tasks';
 $lang->project->leftBugs           = 'Left Bugs';
@@ -88,8 +97,13 @@ $lang->project->ev                 = 'EV';
 $lang->project->sv                 = 'SV%';
 $lang->project->ac                 = 'AC';
 $lang->project->cv                 = 'CV%';
+$lang->project->pvTitle            = 'Planed Value';
+$lang->project->evTitle            = 'Earn Value';
+$lang->project->svTitle            = 'Schedule Variance';
+$lang->project->acTitle            = 'Actual Cost';
+$lang->project->cvTitle            = 'Cost Variance';
 $lang->project->teamCount          = 'Team';
-$lang->project->longTime           = 'Long-Term Project';
+$lang->project->longTime           = 'Long-Term Program';
 $lang->project->future             = 'TBD';
 $lang->project->moreProject        = 'More Project';
 $lang->project->days               = 'Available Days';
@@ -101,6 +115,7 @@ $lang->project->changeProgramTip       = 'After modifying the project set, the p
 $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->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
+$lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 
 $lang->project->tenThousand = '';
 
@@ -155,6 +170,10 @@ $lang->project->aclList['open']    = "Open (accessible with project view permiss
 $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->authList['extend'] = 'Inherit (system privilege and project privilege)';
 $lang->project->authList['reset']  = 'Reset (project privilege only)';
 
@@ -175,13 +194,12 @@ $lang->project->chooseProgramType      = 'Select the project management model';
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
-$lang->project->lastIteration          = 'Recent iterations';
+$lang->project->lastIteration          = "Recent {$lang->executionCommon}";
 $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = 'CMMI';
 $lang->project->waterfallTitle         = 'CMMI';
 $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            = 'It has child projects or projects. You cannot delete it.';
 $lang->project->confirmDelete          = "Do you want to delete [%s]?";
 $lang->project->emptyPM                = 'No manager';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 62b00a54fa..b3c42a7497 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -28,17 +28,26 @@ $lang->project->addProduct        = 'Add Product';
 $lang->project->manageGroupMember = 'Manage Group';
 $lang->project->moduleSetting     = 'List Settings';
 $lang->project->moduleOpen        = 'Program Name';
+$lang->project->dynamic           = 'Dynamic';
+$lang->project->execution         = 'Execution';
+$lang->project->qa                = 'QA';
+$lang->project->bug               = 'Bug List';
+$lang->project->testcase          = 'Case List';
+$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->unbindWhitelist   = 'Project Remove Whitelist';
 $lang->project->manageProducts    = 'Manage Products';
 $lang->project->copyTitle         = 'Please select an project to copy';
 $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.';
 $lang->project->errorNoProducts   = 'At least one product is associated';
 $lang->project->copyNoProject     = 'There are no items available to copy.';
 $lang->project->searchByName      = 'Enter the project name to retrieve';
+$lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
+$lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
 
 /* Fields. */
 $lang->project->common             = 'Project';
@@ -89,7 +98,7 @@ $lang->project->sv                 = 'SV%';
 $lang->project->ac                 = 'AC';
 $lang->project->cv                 = 'CV%';
 $lang->project->teamCount          = 'Team';
-$lang->project->longTime           = 'Long-Term Project';
+$lang->project->longTime           = 'Long-Term Program';
 $lang->project->future             = 'TBD';
 $lang->project->moreProject        = 'More Project';
 $lang->project->days               = 'Available Days';
@@ -101,6 +110,7 @@ $lang->project->changeProgramTip       = 'After modifying the project set, the p
 $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->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
+$lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 
 $lang->project->tenThousand = '';
 
@@ -155,6 +165,10 @@ $lang->project->aclList['open']    = "Open (accessible with project view permiss
 $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->authList['extend'] = 'Inherit (system privilege and project privilege)';
 $lang->project->authList['reset']  = 'Reset (project privilege only)';
 
@@ -175,13 +189,12 @@ $lang->project->chooseProgramType      = 'Select the project management model';
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
-$lang->project->lastIteration          = 'Recent iterations';
+$lang->project->lastIteration          = "Recent {$lang->executionCommon}";
 $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = 'CMMI';
 $lang->project->waterfall              = 'CMMI';
 $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            = 'It has child projects or projects. You cannot delete it.';
 $lang->project->confirmDelete          = "Do you want to delete [%s]?";
 $lang->project->emptyPM                = 'No manager';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
@@ -191,9 +204,9 @@ $lang->project->childLongTime          = "If a child as long-term projects, the
 $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->PRJProgramTitle['0']    = 'Hide';
-$lang->project->PRJProgramTitle['base'] = 'Base-level project only';
-$lang->project->PRJProgramTitle['end']  = 'End-level project only';
+$lang->project->programTitle['0']    = 'Hide';
+$lang->project->programTitle['base'] = 'Base-level project only';
+$lang->project->programTitle['end']  = 'End-level project only';
 
 $lang->project->accessDenied      = 'Access denied to this project';
 $lang->project->chooseProgramType = 'Select management type';
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index ced76f81f8..f2b435f3aa 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -28,17 +28,26 @@ $lang->project->addProduct        = 'Add Product';
 $lang->project->manageGroupMember = 'Manage Group';
 $lang->project->moduleSetting     = 'List Settings';
 $lang->project->moduleOpen        = 'Program Name';
+$lang->project->dynamic           = 'Dynamic';
+$lang->project->execution         = 'Execution';
+$lang->project->qa                = 'QA';
+$lang->project->bug               = 'Bug List';
+$lang->project->testcase          = 'Case List';
+$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->unbindWhitelist   = 'Project Remove Whitelist';
 $lang->project->manageProducts    = 'Manage Products';
 $lang->project->copyTitle         = 'Please select an project to copy';
 $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.';
 $lang->project->errorNoProducts   = 'At least one product is associated';
 $lang->project->copyNoProject     = 'There are no items available to copy.';
 $lang->project->searchByName      = 'Enter the project name to retrieve';
+$lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
+$lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
 
 /* Fields. */
 $lang->project->common             = 'Project';
@@ -89,7 +98,7 @@ $lang->project->sv                 = 'SV%';
 $lang->project->ac                 = 'AC';
 $lang->project->cv                 = 'CV%';
 $lang->project->teamCount          = 'Team';
-$lang->project->longTime           = 'Long-Term Project';
+$lang->project->longTime           = 'Long-Term Program';
 $lang->project->future             = 'TBD';
 $lang->project->moreProject        = 'More Project';
 $lang->project->days               = 'Available Days';
@@ -101,6 +110,7 @@ $lang->project->changeProgramTip       = 'After modifying the project set, the p
 $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->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
+$lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 
 $lang->project->tenThousand = '';
 
@@ -155,6 +165,10 @@ $lang->project->aclList['open']    = "Open (accessible with project view permiss
 $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->authList['extend'] = 'Inherit (system privilege and project privilege)';
 $lang->project->authList['reset']  = 'Reset (project privilege only)';
 
@@ -175,13 +189,12 @@ $lang->project->chooseProgramType      = 'Select the project management model';
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
-$lang->project->lastIteration          = 'Recent iterations';
+$lang->project->lastIteration          = "Recent {$lang->executionCommon}";
 $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = 'CMMI';
 $lang->project->waterfallTitle         = 'CMMI';
 $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            = 'It has child projects or projects. You cannot delete it.';
 $lang->project->confirmDelete          = "Do you want to delete [%s]?";
 $lang->project->emptyPM                = 'No manager';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index b5bae6ff57..15222d4003 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -29,17 +29,27 @@ $lang->project->manageGroupMember = '维护分组用户';
 $lang->project->moduleSetting     = '列表设置';
 $lang->project->moduleOpen        = '显示项目集名';
 $lang->project->dynamic           = '动态';
+$lang->project->execution         = '执行列表';
+$lang->project->qa                = '测试仪表盘';
+$lang->project->bug               = 'Bug列表';
+$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->unbindWhitelist   = '项目删除白名单';
 $lang->project->manageProducts    = '关联产品';
 $lang->project->copyTitle         = '请选择要复制的项目';
 $lang->project->errorSameProducts = '项目不能关联多个相同的产品。';
 $lang->project->errorNoProducts   = '最少关联一个产品';
 $lang->project->copyNoProject     = '没有可用的项目来复制';
 $lang->project->searchByName      = '输入项目名称进行检索';
+$lang->project->deleted           = '已删除';
+$lang->project->linkedProducts    = '已关联';
+$lang->project->unlinkedProducts  = '未关联';
+$lang->project->testreport        = '测试报告';
 
 /* Fields. */
 $lang->project->common             = '项目';
@@ -52,9 +62,8 @@ $lang->project->code               = '项目代号';
 $lang->project->copy               = '复制项目';
 $lang->project->begin              = '计划开始';
 $lang->project->end                = '计划完成';
-$lang->project->status             = '项目状态';
-$lang->project->PM                 = '项目负责人';
-$lang->project->budget             = '项目预算';
+$lang->project->status             = '状态';
+$lang->project->budget             = '预算';
 $lang->project->template           = '项目模板';
 $lang->project->estimate           = '预计';
 $lang->project->consume            = '消耗';
@@ -67,18 +76,17 @@ $lang->project->realBegan          = '实际开始日期';
 $lang->project->bygrid             = '看板';
 $lang->project->bylist             = '列表';
 $lang->project->mine               = '我参与的';
-$lang->project->myProject          = '我参与：';
+$lang->project->myProject          = '我负责：';
 $lang->project->other              = '其他：';
 $lang->project->acl                = '访问控制';
 $lang->project->setPlanduration    = '设置工期';
 $lang->project->auth               = '权限控制';
 $lang->project->durationEstimation = '工作量估算';
-$lang->project->teamCount          = '人数';
 $lang->project->leftStories        = '剩余需求';
 $lang->project->leftTasks          = '剩余任务';
 $lang->project->leftBugs           = '剩余Bug';
 $lang->project->children           = '子项目';
-$lang->project->parent             = '父项目集';
+$lang->project->parent             = '所属项目集';
 $lang->project->allStories         = '总需求';
 $lang->project->doneStories        = '已完成';
 $lang->project->doneProjects       = '已结束';
@@ -86,10 +94,15 @@ $lang->project->allInput           = '项目总投入';
 $lang->project->weekly             = '项目周报';
 $lang->project->pv                 = 'PV';
 $lang->project->ev                 = 'EV';
-$lang->project->sv                 = 'SV%';
+$lang->project->sv                 = 'SV';
 $lang->project->ac                 = 'AC';
-$lang->project->cv                 = 'CV%';
-$lang->project->teamCount          = '项目成员';
+$lang->project->cv                 = 'CV';
+$lang->project->pvTitle            = '计划完成';
+$lang->project->evTitle            = '实际完成';
+$lang->project->svTitle            = '进度偏差';
+$lang->project->acTitle            = '实际花费';
+$lang->project->cvTitle            = '成本偏差';
+$lang->project->teamCount          = '人数';
 $lang->project->longTime           = '长期';
 $lang->project->future             = '待定';
 $lang->project->moreProject        = '更多项目';
@@ -102,6 +115,7 @@ $lang->project->changeProgramTip       = '修改项目集后，该项目关联
 $lang->project->linkedProjectsTip      = '关联的项目如下';
 $lang->project->multiLinkedProductsTip = '该项目关联的如下产品还关联了其他项目，请取消关联后再操作';
 $lang->project->linkStoryByPlanTips    = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此项目中";
+$lang->project->createExecution        = "该项目下没有{$lang->executionCommon}，请先创建{$lang->executionCommon}";
 
 $lang->project->tenThousand = '万';
 
@@ -150,14 +164,18 @@ $lang->project->featureBar['wait']      = '未开始';
 $lang->project->featureBar['suspended'] = '已挂起';
 $lang->project->featureBar['closed']    = '已关闭';
 
-$lang->project->aclList['private'] = "私有(只有项目团队成员和干系人可访问)";
-$lang->project->aclList['open']    = "公开(有项目视图权限即可访问)";
+$lang->project->aclList['private'] = "私有 (只有项目团队成员和干系人可访问)";
+$lang->project->aclList['open']    = "公开 (有项目视图权限即可访问)";
 
 $lang->project->acls['private'] = '私有';
 $lang->project->acls['open']    = '公开';
 
-$lang->project->authList['extend'] = '继承(取系统权限与项目权限的合集)';
-$lang->project->authList['reset']  = '重新定义(只取项目权限)';
+$lang->project->subAclList['private'] = "私有 (只有本项目负责人、团队成员和干系人可访问)";
+$lang->project->subAclList['open']    = "公开 (有项目视图权限即可访问)";
+$lang->project->subAclList['program'] = '项目集内公开（所有上级项目集负责人和干系人、本项目负责人、团队成员和干系人可访问）';
+
+$lang->project->authList['extend'] = '继承 (取系统权限与项目权限的合集)';
+$lang->project->authList['reset']  = '重新定义 (只取项目权限)';
 
 $lang->project->statusList['wait']      = '未开始';
 $lang->project->statusList['doing']     = '进行中';
@@ -176,13 +194,12 @@ $lang->project->chooseProgramType      = '选中项目管理模型';
 $lang->project->nextStep               = '下一步';
 $lang->project->hoursUnit              = '%s 工时';
 $lang->project->membersUnit            = '%s人';
-$lang->project->lastIteration          = '近期迭代';
+$lang->project->lastIteration          = "近期{$lang->executionCommon}";
 $lang->project->ongoingStage           = '进行中的阶段';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = '瀑布';
 $lang->project->waterfallTitle         = '瀑布式项目管理';
 $lang->project->cannotCreateChild      = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
-$lang->project->hasChildren            = '该项目集有子项目集或项目存在，不能删除。';
 $lang->project->confirmDelete          = "您确定要删除吗？";
 $lang->project->emptyPM                = '暂无';
 $lang->project->cannotChangeToCat      = "该项目已经有实际的内容，无法修改为父项目";
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index d989579b09..38a7de86ce 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -1,65 +1,74 @@
 <?php
 /* Actions. */
-$lang->project->createGuide          = '選擇項目模板';
-$lang->project->PRJIndex             = '項目儀表盤';
-$lang->project->PRJHome              = '項目主頁';
-$lang->project->PRJCreate            = '創建項目';
-$lang->project->PRJEdit              = '編輯項目';
-$lang->project->PRJView              = '項目概況';
-$lang->project->batchEdit            = '批量編輯';
-$lang->project->PRJBrowse            = '項目列表';
-$lang->project->PRJAll               = '所有項目';
-$lang->project->PRJStart             = '啟動項目';
-$lang->project->PRJFinish            = '完成項目';
-$lang->project->PRJSuspend           = '掛起項目';
-$lang->project->PRJDelete            = '刪除項目';
-$lang->project->PRJClose             = '關閉項目';
-$lang->project->PRJActivate          = '激活項目';
-$lang->project->PRJGroup             = '項目權限分組';
-$lang->project->PRJCreateGroup       = '項目創建分組';
-$lang->project->PRJEditGroup         = '項目編輯分組';
-$lang->project->PRJCopyGroup         = '項目複製分組';
-$lang->project->PRJManageView        = '項目維護視野';
-$lang->project->PRJManagePriv        = '項目維護權限';
-$lang->project->PRJManageMembers     = '項目團隊';
-$lang->project->export               = '導出';
-$lang->project->addProduct           = '新建產品';
-$lang->project->PRJManageGroupMember = '維護分組用戶';
-$lang->project->PRJModuleSetting     = '列表設置';
-$lang->project->PRJModuleOpen        = '顯示項目集名';
-$lang->project->PRJUpdateOrder       = '排序';
-$lang->project->PRJSort              = '項目排序';
-$lang->project->PRJWhitelist         = '項目白名單';
-$lang->project->PRJAddWhitelist      = '項目添加白名單';
-$lang->project->unbindWhitelist       = '項目刪除白名單';
-$lang->project->PRJManageProducts    = '關聯產品';
-$lang->project->view                 = '項目集詳情';
-$lang->project->copyTitle            = '請選擇要複製的項目';
-$lang->project->errorSameProducts    = '項目不能關聯多個相同的產品。';
-$lang->project->errorNoProducts      = '最少關聯一個產品';
-$lang->project->copyNoProject        = '沒有可用的項目來複制';
-$lang->project->searchByName         = '輸入項目名稱進行檢索';
+$lang->project->createGuide       = '選擇項目模板';
+$lang->project->index             = '項目儀表盤';
+$lang->project->home              = '項目主頁';
+$lang->project->create            = '創建項目';
+$lang->project->edit              = '編輯項目';
+$lang->project->batchEdit         = '批量編輯項目';
+$lang->project->view              = '項目概況';
+$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->manageMembers     = '項目團隊';
+$lang->project->export            = '導出';
+$lang->project->addProduct        = '新建產品';
+$lang->project->manageGroupMember = '維護分組用戶';
+$lang->project->moduleSetting     = '列表設置';
+$lang->project->moduleOpen        = '顯示項目集名';
+$lang->project->dynamic           = '動態';
+$lang->project->execution         = '執行列表';
+$lang->project->qa                = '測試儀表盤';
+$lang->project->bug               = 'Bug列表';
+$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->copyTitle         = '請選擇要複製的項目';
+$lang->project->errorSameProducts = '項目不能關聯多個相同的產品。';
+$lang->project->errorNoProducts   = '最少關聯一個產品';
+$lang->project->copyNoProject     = '沒有可用的項目來複制';
+$lang->project->searchByName      = '輸入項目名稱進行檢索';
+$lang->project->deleted           = '已刪除';
+$lang->project->linkedProducts    = '已關聯';
+$lang->project->unlinkedProducts  = '未關聯';
+$lang->project->testreport        = '測試報告';
 
 /* Fields. */
-$lang->project->common             = '項目集';
-$lang->project->project            = '項目';
+$lang->project->common             = '項目';
 $lang->project->stage              = '階段';
 $lang->project->PM                 = '負責人';
-$lang->project->PRJName            = '項目名稱';
-$lang->project->PRJCategory        = '項目類型';
-$lang->project->PRJDesc            = '項目描述';
-$lang->project->PRJCode            = '項目代號';
-$lang->project->PRJCopy            = '複製項目';
+$lang->project->name               = '項目名稱';
+$lang->project->category           = '項目類型';
+$lang->project->desc               = '項目描述';
+$lang->project->code               = '項目代號';
+$lang->project->copy               = '複製項目';
 $lang->project->begin              = '計劃開始';
 $lang->project->end                = '計劃完成';
-$lang->project->PRJStatus          = '項目狀態';
-$lang->project->PRJPM              = '項目負責人';
-$lang->project->PRJBudget          = '項目預算';
-$lang->project->PRJTemplate        = '項目模板';
-$lang->project->PRJEstimate        = '預計';
-$lang->project->PRJConsume         = '消耗';
-$lang->project->PRJSurplus         = '剩餘';
-$lang->project->PRJProgress        = '進度';
+$lang->project->status             = '狀態';
+$lang->project->budget             = '預算';
+$lang->project->template           = '項目模板';
+$lang->project->estimate           = '預計';
+$lang->project->consume            = '消耗';
+$lang->project->surplus            = '剩餘';
+$lang->project->progress           = '進度';
 $lang->project->dateRange          = '起止日期';
 $lang->project->to                 = '至';
 $lang->project->realEnd            = '實際完成日期';
@@ -67,31 +76,46 @@ $lang->project->realBegan          = '實際開始日期';
 $lang->project->bygrid             = '看板';
 $lang->project->bylist             = '列表';
 $lang->project->mine               = '我參與的';
+$lang->project->myProject          = '我負責：';
+$lang->project->other              = '其他：';
+$lang->project->acl                = '訪問控制';
 $lang->project->setPlanduration    = '設置工期';
 $lang->project->auth               = '權限控制';
 $lang->project->durationEstimation = '工作量估算';
-$lang->project->teamCount          = '人數';
 $lang->project->leftStories        = '剩餘需求';
 $lang->project->leftTasks          = '剩餘任務';
 $lang->project->leftBugs           = '剩餘Bug';
-$lang->project->PRJChildren        = '子項目';
-$lang->project->PRJParent          = '父項目';
+$lang->project->children           = '子項目';
+$lang->project->parent             = '所屬項目集';
 $lang->project->allStories         = '總需求';
 $lang->project->doneStories        = '已完成';
+$lang->project->doneProjects       = '已結束';
 $lang->project->allInput           = '項目總投入';
 $lang->project->weekly             = '項目周報';
 $lang->project->pv                 = 'PV';
 $lang->project->ev                 = 'EV';
-$lang->project->sv                 = 'SV%';
+$lang->project->sv                 = 'SV';
 $lang->project->ac                 = 'AC';
-$lang->project->cv                 = 'CV%';
-$lang->project->PRJTeamCount       = '項目成員';
-$lang->project->PRJLongTime        = '長期';
+$lang->project->cv                 = 'CV';
+$lang->project->pvTitle            = '計劃完成';
+$lang->project->evTitle            = '實際完成';
+$lang->project->svTitle            = '進度偏差';
+$lang->project->acTitle            = '實際花費';
+$lang->project->cvTitle            = '成本偏差';
+$lang->project->teamCount          = '人數';
+$lang->project->longTime           = '長期';
 $lang->project->future             = '待定';
-$lang->project->morePRJ            = '更多項目';
+$lang->project->moreProject        = '更多項目';
+$lang->project->days               = '可用工作日';
 
-$lang->project->productNotEmpty  = '請關聯產品或創建產品。';
-$lang->project->existProductName = '產品名稱已存在。';
+$lang->project->productNotEmpty        = '請關聯產品或創建產品。';
+$lang->project->existProductName       = '產品名稱已存在。';
+$lang->project->changeProgram          = '%s > 修改項目集';
+$lang->project->changeProgramTip       = '修改項目集後，該項目關聯的產品也會同時修改所屬項目集，請確認是否修改。';
+$lang->project->linkedProjectsTip      = '關聯的項目如下';
+$lang->project->multiLinkedProductsTip = '該項目關聯的如下產品還關聯了其他項目，請取消關聯後再操作';
+$lang->project->linkStoryByPlanTips    = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此項目中";
+$lang->project->createExecution        = "該項目下沒有{$lang->executionCommon}，請先創建{$lang->executionCommon}";
 
 $lang->project->tenThousand = '萬';
 
@@ -134,28 +158,20 @@ $lang->project->currencySymbol['SGD'] = 'S$';
 $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "瀑布";
 
-$lang->project->PRJCategoryList['single']   = "單產品項目";
-$lang->project->PRJCategoryList['multiple'] = "多產品項目";
-
-$lang->project->PRJLifeTimeList['short'] = "短期";
-$lang->project->PRJLifeTimeList['long']  = "長期";
-$lang->project->PRJLifeTimeList['ops']   = "運維";
-
 $lang->project->featureBar['all']       = '所有';
 $lang->project->featureBar['doing']     = '進行中';
 $lang->project->featureBar['wait']      = '未開始';
 $lang->project->featureBar['suspended'] = '已掛起';
 $lang->project->featureBar['closed']    = '已關閉';
 
-$lang->project->PRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->project->PRJAclList['open']    = "公開(有項目視圖權限即可訪問)";
+$lang->project->aclList['private'] = "私有 (只有項目團隊成員和干係人可訪問)";
+$lang->project->aclList['open']    = "公開 (有項目視圖權限即可訪問)";
 
-$lang->project->PGMPRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->project->PGMPRJAclList['project'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
-$lang->project->PGMPRJAclList['open']    = "全部公開（有項目視圖權限即可訪問）";
+$lang->project->acls['private'] = '私有';
+$lang->project->acls['open']    = '公開';
 
-$lang->project->PRJAuthList['extend'] = '繼承(取系統權限與項目權限的合集)';
-$lang->project->PRJAuthList['reset']  = '重新定義(只取項目權限)';
+$lang->project->authList['extend'] = '繼承 (取系統權限與項目權限的合集)';
+$lang->project->authList['reset']  = '重新定義 (只取項目權限)';
 
 $lang->project->statusList['wait']      = '未開始';
 $lang->project->statusList['doing']     = '進行中';
@@ -168,19 +184,18 @@ $lang->project->endList[186] = '半年';
 $lang->project->endList[365] = '一年';
 $lang->project->endList[999] = '長期';
 
-$lang->project->noPRJ                  = '暫時沒有項目';
+$lang->project->empty                  = '暫時沒有項目';
 $lang->project->accessDenied           = '您無權訪問該項目！';
 $lang->project->chooseProgramType      = '選中項目管理模型';
 $lang->project->nextStep               = '下一步';
-$lang->project->hoursUnit              = "%s 工時";
+$lang->project->hoursUnit              = '%s 工時';
 $lang->project->membersUnit            = '%s人';
-$lang->project->lastIteration          = '近期迭代';
+$lang->project->lastIteration          = "近期{$lang->executionCommon}";
 $lang->project->ongoingStage           = '進行中的階段';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = '瀑布';
 $lang->project->waterfallTitle         = '瀑布式項目管理';
 $lang->project->cannotCreateChild      = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->project->hasChildren            = '該項目集有子項目集或項目存在，不能刪除。';
 $lang->project->confirmDelete          = "您確定要刪除嗎？";
 $lang->project->emptyPM                = '暫無';
 $lang->project->cannotChangeToCat      = "該項目已經有實際的內容，無法修改為父項目";
@@ -190,93 +205,22 @@ $lang->project->childLongTime          = "子項目中有長期項目，父項
 $lang->project->readjustTime           = '重新調整項目起止時間';
 $lang->project->notAllowRemoveProducts = '該產品中的需求已與項目進行了關聯，請取消關聯後再操作。';
 
-$lang->project->PRJProgramTitle['0']    = '不顯示';
-$lang->project->PRJProgramTitle['base'] = '只顯示一級項目集';
-$lang->project->PRJProgramTitle['end']  = '只顯示最後一級項目集';
+$lang->project->programTitle['0']    = '不顯示';
+$lang->project->programTitle['base'] = '只顯示一級項目集';
+$lang->project->programTitle['end']  = '只顯示最後一級項目集';
 
-$lang->project->PRJAccessDenied      = '您無權訪問該項目！';
-$lang->project->PRJChooseProgramType = '選擇項目管理方式';
-$lang->project->scrumTitle           = '敏捷開發全流程項目管理';
-$lang->project->PRJCannotCreateChild = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->project->PRJHasChildren       = '該項目有子項目存在，不能刪除。';
-$lang->project->PRJConfirmDelete     = "您確定刪除項目[%s]嗎？";
-$lang->project->PRJCannotChangeToCat = "該項目已經有實際的內容，無法修改為父項目";
-$lang->project->PRJCannotCancelCat   = "該項目下已經有子項目，無法取消父項目標記";
-$lang->project->PRJParentBeginEnd    = "父項目起止時間：%s ~ %s";
-$lang->project->PRJParentBudget      = "父項目預算：%s";
-$lang->project->PRJBeginLetterParent = "父項目的開始日期：%s，開始日期不能小於父項目的開始日期";
-$lang->project->PRJEndGreaterParent  = "父項目的完成日期：%s，完成日期不能大於父項目的完成日期";
-$lang->project->PRJBeginGreateChild  = "項目集的最小開始日期：%s，項目的開始日期不能小於項目集的最小開始日期";
-$lang->project->PRJEndLetterChild    = "項目集的最大完成日期：%s，項目的完成日期不能大於項目集的最大完成日期";
-$lang->project->PRJChildLongTime     = "子項目中有長期項目，父項目也應該是長期項目";
-
-/* Actions. */
-$lang->project->PGMCommon               = '項目集';
-$lang->project->PGMIndex                = '項目集主頁';
-$lang->project->PGMCreate               = '添加項目集';
-$lang->project->PGMCreateGuide          = '選擇項目模板';
-$lang->project->PGMEdit                 = '編輯項目集';
-$lang->project->PGMBrowse               = '項目集列表';
-$lang->project->PGMProduct              = '產品列表';
-$lang->project->PGMProject              = '項目集項目列表';
-$lang->project->PGMAll                  = '所有項目集';
-$lang->project->PGMStart                = '啟動項目集';
-$lang->project->PGMFinish               = '完成項目集';
-$lang->project->PGMSuspend              = '掛起項目集';
-$lang->project->PGMDelete               = '刪除項目集';
-$lang->project->PGMClose                = '關閉項目集';
-$lang->project->PGMActivate             = '激活項目集';
-$lang->project->PGMExport               = '導出';
-$lang->project->PGMStakeholder          = '干係人列表';
-$lang->project->createStakeholder       = '添加干係人';
-$lang->project->unlinkStakeholder       = '移除干係人';
-$lang->project->batchUnlinkStakeholders = '批量移除干係人';
-$lang->project->unlink                  = '移除';
-$lang->project->morePGM                 = '更多項目集';
-$lang->project->confirmBatchUnlink      = "您確定要批量移除這些干係人嗎？";
-$lang->project->stakeholderType         = '干係人類型';
-$lang->project->isStakeholderKey        = '關鍵干係人';
-$lang->project->importStakeholder       = '從父項目集導入';
-$lang->project->PGMManageMembers        = '項目集團隊';
-$lang->project->PGMParentBudget         = '所屬項目集剩餘預算：';
-$lang->project->beyondParentBudget      = '已超出所屬項目集的剩餘預算';
-$lang->project->PGMBeginLetterParent    = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
-$lang->project->PGMEndGreaterParent     = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
-$lang->project->PGMBeginGreateChild     = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
-$lang->project->PGMEndLetterChild       = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
-$lang->project->PGMCloseErrorMessage    = '存在子項目集或項目為未關閉狀態';
-
-$lang->project->stakeholderTypeList['inside']  = '內部';
-$lang->project->stakeholderTypeList['outside'] = '外部';
-
-/* Fields. */
-$lang->project->PGMName      = '項目集名稱';
-$lang->project->PGMTemplate  = '項目集模板';
-$lang->project->PGMCategory  = '項目集類型';
-$lang->project->PGMDesc      = '項目集描述';
-$lang->project->PGMCopy      = '複製項目集';
-$lang->project->PGMStatus    = '狀態';
-$lang->project->PGMPM        = '負責人';
-$lang->project->PGMBudget    = '預算';
-$lang->project->PGMProgress  = '項目進度';
-$lang->project->PGMChildren  = '子項目集';
-$lang->project->PGMParent    = '父項目集';
-$lang->project->PGMAllInput  = '項目集總投入';
-$lang->project->PGMTeamCount = '項目整合員';
-$lang->project->PGMLongTime  = '長期項目';
-
-$lang->project->noPGM         = '暫時沒有項目集';
-$lang->project->PGMShowClosed = '顯示已關閉';
-$lang->project->PGMTips       = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
-
-$lang->project->PGMAclList['private'] = "私有（項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->project->PGMAclList['open']    = "公開（有項目集視圖權限，即可訪問）";
-
-$lang->project->subPGMAclList['private'] = "私有（本項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->project->subPGMAclList['open']    = "全部公開（有項目集視圖權限，即可訪問）";
-$lang->project->subPGMAclList['project'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
-
-$lang->project->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
-$lang->project->PGMAuthList['reset']  = '重新定義(只取項目權限)';
-
-$lang->project->PGMFeatureBar['all'] = '所有';
+$lang->project->accessDenied      = '您無權訪問該項目！';
+$lang->project->chooseProgramType = '選擇項目管理方式';
+$lang->project->scrumTitle        = '敏捷開發全流程項目管理';
+$lang->project->cannotCreateChild = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
+$lang->project->hasChildren       = '該項目有子項目存在，不能刪除。';
+$lang->project->confirmDelete     = "您確定刪除項目[%s]嗎？";
+$lang->project->cannotChangeToCat = "該項目已經有實際的內容，無法修改為父項目";
+$lang->project->cannotCancelCat   = "該項目下已經有子項目，無法取消父項目標記";
+$lang->project->parentBeginEnd    = "父項目起止時間：%s ~ %s";
+$lang->project->parentBudget      = "父項目預算：";
+$lang->project->beginLetterParent = "父項目的開始日期：%s，開始日期不能小於父項目的開始日期";
+$lang->project->endGreaterParent  = "父項目的完成日期：%s，完成日期不能大於父項目的完成日期";
+$lang->project->beginGreateChild  = "項目集的最小開始日期：%s，項目的開始日期不能小於項目集的最小開始日期";
+$lang->project->endLetterChild    = "項目集的最大完成日期：%s，項目的完成日期不能大於項目集的最大完成日期";
+$lang->project->childLongTime     = "子項目中有長期項目，父項目也應該是長期項目";
diff --git a/module/project/model.php b/module/project/model.php
index dd57f56a74..a0a5db50f2 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -34,12 +34,7 @@ class projectModel extends model
     {
         echo(js::alert($this->lang->project->accessDenied));
 
-        if(!$this->server->http_referer) die(js::locate(helper::createLink('project', 'browse')));
-
-        $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('project', 'browse')));
-
-        die(js::locate('back'));
+        die(js::locate(helper::createLink('project', 'index')));
     }
 
     /**
@@ -121,14 +116,14 @@ class projectModel extends model
     {
         if($projectID > 0) $this->session->set('project', (int)$projectID);
         if($projectID == 0 and $this->cookie->lastProject) $this->session->set('project', (int)$this->cookie->lastProject);
-        if($projectID == 0 and $this->session->PRJ == '') $this->session->set('project', key($projects));
-        if(!isset($projects[$this->session->PRJ]))
+        if($projectID == 0 and $this->session->project == '') $this->session->set('project', key($projects));
+        if(!isset($projects[$this->session->project]))
         {
             $this->session->set('project', key($projects));
-            if($projectID && strpos(",{$this->app->user->view->projects},", ",{$this->session->PRJ},") === false) $this->accessDenied();
+            if($projectID && strpos(",{$this->app->user->view->projects},", ",{$this->session->project},") === false) $this->accessDenied();
         }
 
-        return $this->session->PRJ;
+        return $this->session->project;
     }
 
     /*
@@ -142,7 +137,7 @@ class projectModel extends model
      */
     public function getSwitcher($projectID, $currentModule, $currentMethod)
     {
-        $this->session->set('moreProjectLink', $this->app->getURI(true));
+        if($currentModule == 'project' and $currentMethod == 'browse') return;
 
         $currentProjectName = $this->lang->project->common;
         if($projectID)
@@ -152,41 +147,28 @@ class projectModel extends model
         }
 
         $dropMenuLink = helper::createLink('project', 'ajaxGetDropMenu', "objectID=$projectID&module=$currentModule&method=$currentMethod");
-        $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProjectName}'><span class='text'><i class='icon icon-project'></i> {$currentProjectName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+        $output  = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProjectName}'><span class='text'>{$currentProjectName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
         $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
         $output .= "</div></div>";
 
         return $output;
     }
 
-    /**
-     * Get project main menu action.
-     *
-     * @param  string $module
-     * @param  string $method
-     * @access public
-     * @return string
-     */
-    public function getMainAction($module, $method)
-    {
-        $link = html::a(helper::createLink('project', 'browse'), "<i class='icon icon-list'></i>", '', "style='border: none;'");
-        $html = "<p style='padding-top:5px;'>" . $link . "</p>";
-        return common::hasPriv('project', 'browse') ? $html : '';
-    }
-
     /**
      * Get a project by id.
      *
      * @param  int    $projectID
+     * @param  string $type  project|sprint,stage
      * @access public
      * @return object
      */
-    public function getByID($projectID)
+    public function getByID($projectID, $type = 'project')
     {
-        $project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->andWhere('`type`')->eq('project')->fetch();
+        $project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->andWhere('`type`')->in($type)->fetch();
         if(!$project) return false;
 
         if($project->end == '0000-00-00') $project->end = '';
+        $project = $this->loadModel('file')->replaceImgURL($project, 'desc');
         return $project;
     }
 
@@ -267,7 +249,8 @@ class projectModel extends model
             ->where('type')->eq('project')
             ->andWhere('deleted')->eq(0)
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
-            ->beginIF($queryType == 'bystatus' and $param != 'all')->andWhere('status')->eq($param)->fi()
+            ->beginIF($queryType == 'bystatus' and $param == 'undone')->andWhere('status')->notIN('done,closed')->fi()
+            ->beginIF($queryType == 'bystatus' and $param != 'all' and $param != 'undone')->andWhere('status')->eq($param)->fi()
             ->beginIF($queryType == 'byid')->andWhere('id')->eq($param)->fi()
             ->orderBy($orderBy)
             ->limit($limit)
@@ -276,11 +259,14 @@ class projectModel extends model
         if(empty($projects)) return array();
         $projectIdList = array_keys($projects);
 
-        $teams = $this->dao->select('root, count(*) as teams')->from(TABLE_TEAM)->where('root')->in($projectIdList)->groupBy('root')->fetchPairs();
+        $teams = $this->dao->select('root, count(*) as teams')->from(TABLE_TEAM)
+            ->where('root')->in($projectIdList)
+            ->andWhere('type')->eq('project')
+            ->groupBy('root')->fetchPairs();
 
         $hours = $this->dao->select('project,
-            cast(sum(consumed) as decimal(10,2)) as consumed,
-            cast(sum(estimate) as decimal(10,2)) as estimate')
+            sum(consumed) as consumed,
+            sum(estimate) as estimate')
             ->from(TABLE_TASK)
             ->where('project')->in($projectIdList)
             ->andWhere('deleted')->eq(0)
@@ -295,12 +281,14 @@ class projectModel extends model
             ->groupBy('project')
             ->fetchPairs();
 
+        $this->loadModel('product');
         foreach($projectIdList as $projectID)
         {
-            $productIdList = $this->loadModel('product')->getProductIDByProject($projectID, false);
-            $allStories[$projectID]  = $this->product->getTotalStoriesByProduct($productIdList, 'story');
-            $doneStories[$projectID] = $this->product->getTotalStoriesByProduct($productIdList, 'story', 'closed');
-            $leftStories[$projectID] = $this->product->getTotalStoriesByProduct($productIdList, 'story', 'active');
+            $productIdList = $this->product->getProductIDByProject($projectID, false);
+
+            $allStories[$projectID]  = $this->getTotalStoriesByProject($projectID, $productIdList, 'story');
+            $doneStories[$projectID] = $this->getTotalStoriesByProject($projectID, $productIdList, 'story', 'closed');
+            $leftStories[$projectID] = $this->getTotalStoriesByProject($projectID, $productIdList, 'story', 'active');
         }
 
         $leftBugs = $this->getTotalBugByProject($projectIdList, 'active');
@@ -309,8 +297,8 @@ class projectModel extends model
 
         foreach($projects as $projectID => $project)
         {
-            $project->consumed    = isset($hours[$projectID]) ? $hours[$projectID]->consumed : 0;
-            $project->estimate    = isset($hours[$projectID]) ? $hours[$projectID]->estimate : 0;
+            $project->consumed    = isset($hours[$projectID]) ? (float)$hours[$projectID]->consumed : 0;
+            $project->estimate    = isset($hours[$projectID]) ? (float)$hours[$projectID]->estimate : 0;
             $project->teamCount   = isset($teams[$projectID]) ? $teams[$projectID] : 0;
             $project->leftTasks   = isset($leftTasks[$projectID]) ? $leftTasks[$projectID] : 0;
             $project->leftBugs    = isset($leftBugs[$projectID])  ? $leftBugs[$projectID]  : 0;
@@ -319,11 +307,38 @@ class projectModel extends model
             $project->allStories  = $allStories[$projectID];
             $project->doneStories = $doneStories[$projectID];
             $project->leftStories = $leftStories[$projectID];
+
+            if(is_float($project->consumed)) $project->consumed = round($project->consumed, 1);
+            if(is_float($project->estimate)) $project->estimate = round($project->estimate, 1);
         }
 
         return $projects;
     }
 
+    /**
+     * Get the number of stories associated with the project.
+     *
+     * @param  int     $projectID
+     * @param  array   $productIdList
+     * @param  string  $type          story|requirement
+     * @param  string  $status        all|closed|active
+     * @access public
+     * @return int
+     */
+    public function getTotalStoriesByProject($projectID = 0, $productIdList, $type = 'story', $status = 'all')
+    {
+        return $this->dao->select('count(t2.id) as stories')->from(TABLE_PROJECTSTORY)->alias('t1')
+            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
+            ->where('t1.project')->eq($projectID)
+            ->andWhere('t2.type')->eq($type)
+            ->andWhere('t2.product')->in($productIdList)
+            ->beginIF($status == 'active')->andWhere('t2.status')->in('active,changed')->fi()
+            ->beginIF($status == 'closed')->andWhere('t2.status')->eq('closed')->fi()
+            ->beginIF($status == 'closed')->andWhere('t2.closedReason')->eq('done')->fi()
+            ->andWhere('deleted')->eq('0')
+            ->fetch('stories');
+    }
+
     /**
      * Get project workhour info.
      *
@@ -340,7 +355,7 @@ class projectModel extends model
             ROUND(SUM(consumed), 2) AS totalConsumed,
             ROUND(SUM(`left`), 2) AS totalLeft')
             ->from(TABLE_TASK)
-            ->where('project')->in(array_keys($executions))
+            ->where('execution')->in(array_keys($executions))
             ->andWhere('deleted')->eq(0)
             ->andWhere('parent')->lt(1)
             ->fetch();
@@ -387,36 +402,6 @@ class projectModel extends model
         return $statData;
     }
 
-    /**
-     * Get project team member pairs.
-     *
-     * @param  int  $programID
-     * @access public
-     * @return array
-     */
-    public function getTeamMemberPairs($programID = 0)
-    {
-      $projectList = $this->getPairsByProgram($programID);
-      if(!$projectList) return array('' => '');
-
-      $users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
-          ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
-          ->where('t1.root')->in(array_keys($projectList))
-          ->andWhere('t1.type')->eq('project')
-          ->andWhere('t2.deleted')->eq(0)
-          ->fetchAll('account');
-      if(!$users) return array('' => '');
-
-      foreach($users as $account => $user)
-      {
-        $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
-        if(!empty($this->config->isINT)) $firstLetter = '';
-        $users[$account] = $firstLetter . ($user->realname ? $user->realname : $user->account);
-      }
-
-      return array('' => '') + $users;
-    }
-
     /**
      * Get project pairs by programID.
      *
@@ -500,9 +485,9 @@ class projectModel extends model
     public function getProducts($projectID, $withBranch = true)
     {
         $query = $this->dao->select('t2.id, t2.name, t2.type, t1.branch, t1.plan')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')
-            ->on('t1.product = t2.id')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->where('t1.project')->eq((int)$projectID)
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
             ->andWhere('t2.deleted')->eq(0);
         if(!$withBranch) return $query->fetchPairs('id', 'name');
         return $query->fetchAll('id');
@@ -512,11 +497,10 @@ class projectModel extends model
      * Build the query.
      *
      * @param  int    $projectID
-     * @param  string $type   list|dropmenu
      * @access public
      * @return object
      */
-    public function buildMenuQuery($projectID = 0, $type = 'list')
+    public function buildMenuQuery($projectID = 0)
     {
         $path    = '';
         $project = $this->getByID($projectID);
@@ -524,11 +508,9 @@ class projectModel extends model
 
         return $this->dao->select('*')->from(TABLE_PROJECT)
             ->where('deleted')->eq('0')
-            ->beginIF($type == 'list')->andWhere('type')->eq('project')->fi()
-            ->beginIF($type == 'dropmenu')->andWhere('type')->in('project,project')->fi()
+            ->andWhere('type')->eq('program')->fi()
             ->andWhere('status')->ne('closed')
-            ->beginIF(!$this->app->user->admin and $type == 'list')->andWhere('id')->in($this->app->user->view->projects)->fi()
-            ->beginIF(!$this->app->user->admin and $type == 'dropmenu')->andWhere('id')->in($this->app->user->view->projects . ',' . $this->app->user->view->projects)->fi()
+            ->andWhere('id')->in($this->app->user->view->programs)->fi()
             ->beginIF($projectID > 0)->andWhere('path')->like($path . '%')->fi()
             ->orderBy('grade desc, `order`')
             ->get();
@@ -540,17 +522,17 @@ class projectModel extends model
      * @param  array  $products
      * @param  int    $queryID
      * @param  string $actionURL
-     * @param  string $type execution|execution
+     * @param  string $type project|execution
      * @access public
      * @return void
      */
-    public function buildProjectBuildSearchForm($products, $queryID, $actionURL, $type = 'execution')
+    public function buildProjectBuildSearchForm($products, $queryID, $actionURL, $type = 'project')
     {
         $this->loadModel('build');
 
         /* Set search param. */
         if($type == 'execution') $this->config->build->search['module'] = 'executionBuild';
-        if($type == 'execution')   $this->config->build->search['module'] = 'executionBuild';
+        if($type == 'project') $this->config->build->search['module'] = 'projectBuild';
         $this->config->build->search['actionURL'] = $actionURL;
         $this->config->build->search['queryID']   = $queryID;
         $this->config->build->search['params']['product']['values'] = $products;
@@ -584,14 +566,13 @@ class projectModel extends model
      * @param  int       $projectID
      * @param  string    $userFunc
      * @param  int       $param
-     * @param  string    $type  list|dropmenu
      * @access public
      * @return string
      */
-    public function getTreeMenu($projectID = 0, $userFunc, $param = 0, $type = 'list')
+    public function getTreeMenu($projectID = 0, $userFunc, $param = 0)
     {
         $projectMenu = array();
-        $stmt        = $this->dbh->query($this->buildMenuQuery($projectID, $type));
+        $stmt        = $this->dbh->query($this->buildMenuQuery($projectID));
 
         while($project = $stmt->fetch())
         {
@@ -618,7 +599,7 @@ class projectModel extends model
         }
 
         krsort($projectMenu);
-        $projectMenu = implode('', $projectMenu);
+        $projectMenu = array_pop($projectMenu);
         $lastMenu    = "<ul class='tree' data-ride='tree' id='projectTree' data-name='tree-project'>{$projectMenu}</ul>\n";
 
         return $lastMenu;
@@ -634,11 +615,10 @@ class projectModel extends model
     public function createManageLink($project)
     {
         $link = $project->type == 'program' ? helper::createLink('project', 'browse', "projectID={$project->id}&status=all") : helper::createLink('project', 'index', "projectID={$project->id}", '', '', $project->id);
-        $icon = $project->type == 'program' ? "<i class='icon icon-program'></i> " : "<i class='icon icon-project'></i> ";
 
         if($this->app->rawModule == 'execution') $link = helper::createLink('execution', 'all', "status=all&projectID={$project->id}");
 
-        return html::a($link, $icon . $project->name, '_self', "id=project{$project->id} title='{$project->name}' class='text-ellipsis'");
+        return html::a($link, $project->name, '_self', "id=program{$project->id} title='{$project->name}' class='text-ellipsis'");
     }
 
     /**
@@ -695,7 +675,7 @@ class projectModel extends model
             if(isset($project->budget) and $program->budget != 0)
             {
                 $availableBudget = $this->loadModel('program')->getBudgetLeft($program);
-                if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->project->beyondParentBudget;
+                if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
             }
 
             /* Judge products not empty. */
@@ -739,7 +719,7 @@ class projectModel extends model
         $this->dao->insert(TABLE_PROJECT)->data($project)
             ->autoCheck()
             ->batchcheck($requiredFields, 'notempty')
-            ->checkIF(!empty($project->name), 'name', 'unique')
+            ->checkIF(!empty($project->name), 'name', 'unique', "`type`='project'")
             ->exec();
 
         /* Add the creater to the team. */
@@ -762,20 +742,31 @@ class projectModel extends model
             $this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
             if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
 
+            /* Create doc lib. */
+            $this->app->loadLang('doc');
+            $lib = new stdclass();
+            $lib->project = $projectID;
+            $lib->name    = $this->lang->doclib->main['project'];
+            $lib->type    = 'project';
+            $lib->main    = '1';
+            $lib->acl     = $project->acl != 'program' ? $project->acl : 'custom';
+            $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
+
             $this->updateProducts($projectID);
 
             if(isset($_POST['newProduct']) || (!$project->parent && empty($linkedProductsCount)))
             {
                 /* If parent not empty, link products or create products. */
                 $product = new stdclass();
-                $product->name         = $this->post->productName ? $this->post->productName : $project->name;
-                $product->bind         = $this->post->productName ? 0 : 1;
-                $product->program      = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
-                $product->acl          = $project->acl = 'open' ? 'open' : 'private';
-                $product->PO           = $project->PM;
-                $product->createdBy    = $this->app->user->account;
-                $product->createdDate  = helper::now();
-                $product->status       = 'normal';
+                $product->name           = $this->post->productName ? $this->post->productName : $project->name;
+                $product->bind           = $this->post->parent ? 0 : 1;
+                $product->program        = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
+                $product->acl            = $project->acl = 'open' ? 'open' : 'private';
+                $product->PO             = $project->PM;
+                $product->createdBy      = $this->app->user->account;
+                $product->createdDate    = helper::now();
+                $product->status         = 'normal';
+                $product->createdVersion = $this->config->version;
 
                 $this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
                 $productID = $this->dao->lastInsertId();
@@ -826,6 +817,8 @@ class projectModel extends model
                 $this->dao->replace(TABLE_USERGROUP)->data($groupPriv)->exec();
             }
 
+            if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
+
             return $projectID;
         }
     }
@@ -879,7 +872,7 @@ class projectModel extends model
             if($project->budget != 0 and $program->budget != 0)
             {
                 $availableBudget = $this->loadModel('program')->getBudgetLeft($program);
-                if($project->budget > $availableBudget + $oldProject->budget) dao::$errors['budget'] = $this->lang->project->beyondParentBudget;
+                if($project->budget > $availableBudget + $oldProject->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
             }
         }
 
@@ -912,7 +905,7 @@ class projectModel extends model
             ->checkIF($project->begin != '', 'begin', 'date')
             ->checkIF($project->end != '', 'end', 'date')
             ->checkIF($project->end != '', 'end', 'gt', $project->begin)
-            ->check('name', 'unique', "id != $projectID and deleted='0'")
+            ->check('name', 'unique', "id != $projectID and deleted='0' and `type`='project'")
             ->where('id')->eq($projectID)
             ->exec();
 
@@ -926,7 +919,7 @@ class projectModel extends model
             $this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
             if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
 
-            if($oldProject->parent != $project->parent) $this->processNode($projectID, $project->parent, $oldProject->path, $oldProject->grade);
+            if($oldProject->parent != $project->parent) $this->loadModel('program')->processNode($projectID, $project->parent, $oldProject->path, $oldProject->grade);
 
             return common::createChanges($oldProject, $project);
         }
@@ -1001,7 +994,7 @@ class projectModel extends model
                 $linkedProducts = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs();
                 $this->updateProductProgram($oldProject->parent, $project->parent, $linkedProducts);
 
-                if($oldProject->parent != $project->parent) $this->processNode($projectID, $project->parent, $oldProject->path, $oldProject->grade);
+                if($oldProject->parent != $project->parent) $this->loadModel('program')->processNode($projectID, $project->parent, $oldProject->path, $oldProject->grade);
                 /* When acl is open, white list set empty. When acl is private,update user view. */
                 if($project->acl == 'open') $this->loadModel('personnel')->updateWhitelist('', 'project', $projectID);
                 if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
@@ -1015,12 +1008,13 @@ class projectModel extends model
      * Start project.
      *
      * @param  int    $projectID
+     * @param  string $type
      * @access public
      * @return array
      */
-    public function start($projectID)
+    public function start($projectID, $type = 'project')
     {
-        $oldProject = $this->getById($projectID);
+        $oldProject = $this->getById($projectID, $type);
         $now        = helper::now();
 
         $project = fixer::input('post')
@@ -1204,7 +1198,7 @@ class projectModel extends model
             foreach($products as $productID => $product)
             {
                 $oldProduct = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
-                $this->dao->update(TABLE_PRODUCT)->set('project')->eq((int)$newTopProgram)->where('id')->eq((int)$productID)->exec();
+                $this->dao->update(TABLE_PRODUCT)->set('program')->eq((int)$newTopProgram)->where('id')->eq((int)$productID)->exec();
                 $newProduct = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
                 $changes    = common::createChanges($oldProduct, $newProduct);
                 $actionID   = $this->action->create('product', $productID, 'edited');
@@ -1213,28 +1207,82 @@ class projectModel extends model
         }
     }
 
+    /**
+     * Manage team members.
+     *
+     * @param  int    $projectID
+     * @access public
+     * @return void
+     */
+    public function manageMembers($projectID)
+    {
+        $project = $this->getByID($projectID);
+        $data    = (array)fixer::input('post')->get();
+
+        extract($data);
+        $projectID   = (int)$projectID;
+        $projectType = 'project';
+        $accounts    = array_unique($accounts);
+        $limited     = array_values($limited);
+        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs();
+        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->exec();
+
+        $projectMember = array();
+        foreach($accounts as $key => $account)
+        {
+            if(empty($account)) continue;
+
+            $member = new stdclass();
+            $member->role    = $roles[$key];
+            $member->days    = $days[$key];
+            $member->hours   = $hours[$key];
+            $member->limited = $limited[$key];
+
+            $member->root    = $projectID;
+            $member->account = $account;
+            $member->join    = isset($oldJoin[$account]) ? $oldJoin[$account] : helper::today();
+            $member->type    = $projectType;
+
+            $projectMember[$account] = $member;
+            $this->dao->insert(TABLE_TEAM)->data($member)->exec();
+        }
+
+        /* Only changed account update userview. */
+        $oldAccounts     = array_keys($oldJoin);
+        $changedAccounts = array_diff($accounts, $oldAccounts);
+        $changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
+        $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);
+
+        $this->loadModel('user')->updateUserView(array($projectID), 'project', $changedAccounts);
+        if(!empty($childSprints))   $this->user->updateUserView($childSprints, 'sprint', $changedAccounts);
+        if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', $changedAccounts);
+    }
+
     /**
      * Print datatable cell.
      *
      * @param  object $col
      * @param  object $project
      * @param  array  $users
-     * @param  int    $projectID
+     * @param  int    $programID
      * @access public
      * @return void
      */
-    public function printCell($col, $project, $users, $projectID = 0)
+    public function printCell($col, $project, $users, $programID = 0)
     {
         $canOrder     = common::hasPriv('project', 'updateOrder');
         $canBatchEdit = common::hasPriv('project', 'batchEdit');
-        $projectLink  = $this->config->systemMode == 'new' ? helper::createLink('project', 'index', "projectID=$project->id", '', '', $project->id) : helper::createLink('project', 'task', "projectID=$project->id");
+        $projectLink  = $this->config->systemMode == 'new' ? helper::createLink('project', 'index', "projectID=$project->id", '', '', $project->id) : helper::createLink('execution', 'task', "projectID=$project->id");
         $account      = $this->app->user->account;
         $id           = $col->id;
 
         if($col->show)
         {
             $title = '';
-            $class = "c-$id" . (in_array($id, ['budget', 'teamCount']) ? ' c-number' : ' c-name');
+            $class = "c-$id" . (in_array($id, array('budget', 'teamCount', 'estimate', 'consume')) ? ' c-number' : '');
 
             if($id == 'id') $class .= ' cell-id';
 
@@ -1246,7 +1294,7 @@ class projectModel extends model
 
             if($id == 'budget')
             {
-                $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->project->tenThousand : number_format((float)$project->budget, 1);
+                $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);
                 $budgetTitle   = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;
 
                 $title = "title='$budgetTitle'";
@@ -1270,8 +1318,11 @@ class projectModel extends model
                     }
                     break;
                 case 'name':
-                    if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span> ";
-                    if($project->model === 'scrum')     echo "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span> ";
+                    if(isset($this->config->maxVersion))
+                    {
+                        if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span> ";
+                        if($project->model === 'scrum')     echo "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span> ";
+                    }
                     echo html::a($projectLink, $project->name);
                     break;
                 case 'PM':
@@ -1296,13 +1347,13 @@ class projectModel extends model
                     echo $project->teamCount;
                     break;
                 case 'estimate':
-                    echo $project->hours->totalEstimate . ' ' . $this->lang->execution->workHourUnit;
+                    echo $project->hours->totalEstimate . $this->lang->execution->workHourUnit;
                     break;
                 case 'consume':
-                    echo $project->hours->totalConsumed . ' ' . $this->lang->execution->workHourUnit;
+                    echo $project->hours->totalConsumed . $this->lang->execution->workHourUnit;
                     break;
                 case 'surplus':
-                    echo $project->hours->totalLeft     . ' ' . $this->lang->execution->workHourUnit;
+                    echo $project->hours->totalLeft     . $this->lang->execution->workHourUnit;
                     break;
                 case 'progress':
                     echo "<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}</div></div>";
@@ -1324,19 +1375,20 @@ class projectModel extends model
                         echo "</div>";
                     }
 
-                    $from      = $project->from == 'project' ? 'project' : 'pgmproject';
-                    $openApp   = $project->from == 'project' ? 'project' : 'project';
-                    common::printIcon('project', 'edit', "projectID=$project->id&from=$from", $project, 'list', 'edit', '', '', '', "data-app=$openApp", '', $project->id);
-                    common::printIcon('project', 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', '', $this->lang->execution->team, $project->id);
-                    if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&projectID=$projectID", $project, 'list', 'lock', '', '', '', '', '', $project->id);
+                    $from     = $project->from == 'project' ? 'project' : 'pgmproject';
+                    $iframe   = $this->app->openApp == 'program' ? 'iframe' : '';
+                    $onlyBody = $this->app->openApp == 'program' ? true : '';
+                    common::printIcon('project', 'edit', "projectID=$project->id", $project, 'list', 'edit', '', $iframe, $onlyBody, "data-app=project", '', $project->id);
+                    common::printIcon('project', 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', "data-app=project", $this->lang->execution->team, $project->id);
+                    if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', "data-app=project", '', $project->id);
 
-                    if(common::hasPriv('project','manageProducts') || common::hasPriv('project','whitelist') || common::hasPriv('project','delete'))
+                    if(common::hasPriv('project','manageProducts') || common::hasPriv('project', 'whitelist') || common::hasPriv('project', 'delete'))
                     {
                         echo "<div class='btn-group'>";
                         echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                         echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                        common::printIcon('project', 'manageProducts', "projectID=$project->id&projectID=$projectID&from=$from", $project, 'list', 'link', '', 'btn-action', '', "data-app=$openApp", $this->lang->project->manageProducts, $project->id);
-                        if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&projectID=$projectID&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', "data-app=$openApp", '', $project->id);
+                        common::printIcon('project', 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', "data-app=project", $this->lang->project->manageProducts, $project->id);
+                        if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', "data-app=project", '', $project->id);
                         if(common::hasPriv('project','delete')) echo html::a(inLink("delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
                         echo "</ul>";
                         echo "</div>";
@@ -1426,6 +1478,29 @@ class projectModel extends model
             ->fetchAll('account');
     }
 
+    /**
+     * Get team member pairs by projectID.
+     *
+     * @param  int    $projectID
+     * @access public
+     * @return array
+     */
+    public function getTeamMemberPairs($projectID)
+    {
+        $project = $this->getByID($projectID);
+        $type    = $this->config->systemMode == 'new' ? $project->type : 'project';
+        if(empty($project)) return array();
+
+        $members =  $this->dao->select("t1.account, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
+            ->where('t1.root')->eq((int)$projectID)
+            ->andWhere('t1.type')->eq($type)
+            ->andWhere('t2.deleted')->eq('0')
+            ->fetchPairs('account', 'realname');
+
+        return array('' => '') + $members;
+    }
+
     /**
      * Get project stats.
      *
@@ -1442,11 +1517,21 @@ class projectModel extends model
     {
         if(empty($productID))
         {
+            $myExecutionIDList = array();
+            if($status == 'involved')
+            {
+                $myExecutionIDList = $this->dao->select('root')->from(TABLE_TEAM)
+                    ->where('account')->eq($this->app->user->account)
+                    ->andWhere('type')->eq('execution')
+                    ->fetchPairs();
+            }
+
             $executions = $this->dao->select('*')->from(TABLE_EXECUTION)
                 ->where('type')->in('sprint,stage')
                 ->beginIF($projectID != 0)->andWhere('project')->eq($projectID)->fi()
+                ->beginIF(!empty($myExecutionIDList))->andWhere('id')->in(array_keys($myExecutionIDList))->fi()
                 ->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi()
-                ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->eq($status)->fi()
+                ->beginIF($status != 'all' and $status != 'undone' and $status != 'involved')->andWhere('status')->eq($status)->fi()
                 ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
                 ->andWhere('deleted')->eq('0')
                 ->orderBy($orderBy)
@@ -1485,11 +1570,8 @@ class projectModel extends model
             $hour = (object)$emptyHour;
             foreach($executionTasks as $task)
             {
-                if($task->status != 'cancel')
-                {
-                    $hour->totalEstimate += $task->estimate;
-                    $hour->totalConsumed += $task->consumed;
-                }
+                $hour->totalEstimate += $task->estimate;
+                $hour->totalConsumed += $task->consumed;
                 if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
             }
             $hours[$executionID] = $hour;
@@ -1561,7 +1643,7 @@ class projectModel extends model
         }
 
         /* In the case of the waterfall model, calculate the sub-stage. */
-        $project = $this->getByID($this->session->PRJ);
+        $project = $this->getByID($projectID);
         if($project and $project->model == 'waterfall')
         {
             foreach($parents as $id => $execution)
@@ -1576,4 +1658,30 @@ class projectModel extends model
 
         return array_merge($parents, $orphan);
     }
+
+    /**
+     * Set menu of project module.
+     *
+     * @param  int    $objectID  projectID
+     * @access public
+     * @return void
+     */
+    public function setMenu($objectID)
+    {
+        global $lang;
+        $project = $this->getByID($objectID);
+
+        $model = 'scrum';
+        if($project) $model = $project->model;
+
+        if(isset($lang->$model))
+        {
+            $lang->project->menu        = $lang->{$model}->menu;
+            $lang->project->menuOrder   = $lang->{$model}->menuOrder;
+            $lang->project->dividerMenu = $lang->{$model}->dividerMenu;
+        }
+
+        $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
+        common::setMenuVars('project', $objectID);
+    }
 }
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index 13d3b7a022..082fe99d56 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -20,7 +20,7 @@
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
       <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
-      <small><?php echo $lang->arrow . $lang->project->activate;?></small>
+      <small><?php echo $lang->arrow . $lang->{$project->type}->activate;?></small>
       <?php endif;?>
     </h2>
   </div>
@@ -41,7 +41,7 @@
         <td colspan='3'>
           <div class='clearfix row'>
             <div class='col-md-6 pull-left'>
-              <div class="checkbox-primary"><input name="readjustTime" value="1" id="readjustTime" type="checkbox"><label for="readjustTime" class="no-margin"><?php echo $lang->project->readjustTime;?></label></div>
+              <div class="checkbox-primary"><input name="readjustTime" value="1" id="readjustTime" type="checkbox"><label for="readjustTime" class="no-margin"><?php echo $lang->{$project->type}->readjustTime;?></label></div>
             </div>
             <div class='col-md-6 pull-left'>
               <div id='readjustTaskBox' class='checkbox-primary hidden'><input name="readjustTask" value="1" id="readjustTask" type="checkbox"> <label for='readjustTask' class='no-margin'><?php echo $lang->execution->readjustTask?></label></div>
@@ -59,7 +59,7 @@
         <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton($lang->{$project->type}->activate) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index ec39df6304..195acc662a 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -20,45 +20,43 @@ $projectsPinYin = common::convert2Pinyin($projectNames);
 
 foreach($projects as $project)
 {
-    $link = helper::createLink('project', 'index', "projectID=%s", '', '', $project->id);
+    $selected    = $project->id == $projectID ? 'selected' : '';
+    $link        = helper::createLink('project', 'index', "projectID=%s", '', '', $project->id);
     $projectName = zget($programs, $project->parent, '') ? zget($programs, $project->parent) . '/' . $project->name : $project->name;
     if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
     {
-        $myProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='text-important' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
+        $myProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='text-important $selected' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
     }
     else if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
     {
-        $normalProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
+        $normalProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='$selected' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
     }
-    else if($project->status == 'done' or $project->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
+    else if($project->status == 'done' or $project->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='$selected' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
 }
 ?>
 <div class="table-row">
   <div class="table-col col-left">
     <div class='list-group'>
-    <?php
-    if(!empty($myProjectsHtml))
-    {
-        echo "<div class='heading'>{$lang->project->myProject}</div>";
-        echo $myProjectsHtml;
-        if(!empty($myProjectsHtml))
-        {
-            echo "<div class='heading'>{$lang->project->other}</div>";
-        }
-    }
-    echo $normalProjectsHtml;
-    ?>
+      <?php
+      if(!empty($myProjectsHtml))
+      {
+          echo "<div class='heading'>{$lang->project->myProject}</div>";
+          echo $myProjectsHtml;
+          if(!empty($myProjectsHtml))
+          {
+              echo "<div class='heading'>{$lang->project->other}</div>";
+          }
+      }
+      echo $normalProjectsHtml;
+      ?>
     </div>
     <div class="col-footer">
-      <?php echo html::a(helper::createLink('project', 'browse', 'programID=0&browseType=all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
+      <?php //echo html::a(helper::createLink('project', 'browse', 'programID=0&browseType=all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->project->doneProjects?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>
   <div class="table-col col-right">
-   <div class='list-group'>
-    <?php
-    echo $closedProjectsHtml;
-    ?>
-    </div>
+   <div class='list-group'><?php echo $closedProjectsHtml;?></div>
   </div>
 </div>
+<script>scrollToSelected();</script>
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index a358b795a7..26b4903ab9 100644
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -57,7 +57,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="4" class="text-center form-actions">
+          <td colspan="7" class="text-center form-actions">
             <?php echo html::submitButton();?>
             <?php echo html::backButton();?>
           </td>
diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php
index 7a2eb6e585..22a6f3e066 100644
--- a/module/project/view/browse.html.php
+++ b/module/project/view/browse.html.php
@@ -17,13 +17,14 @@ js::set('programID', $programID);
 js::set('browseType', $browseType);
 ?>
 <style>
-.project-type-label.label-outline {width: 47px;}
+.project-type-label.label-outline {width: 50px; min-width: 50px;}
+.project-type-label.label {overflow: unset !important; text-overflow: unset !important; white-space: unset !important;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if($this->config->systemMode == 'new'):?>
   <div id="sidebarHeader">
     <div class="title">
-      <?php echo empty($project) ? $lang->project->common : $project->name;?>
+      <?php echo $programID ? $program->name : $lang->project->parent;?>
       <?php if($programID) echo html::a(inLink('browse', 'programID=0'), "<i class='icon icon-sm icon-close'></i>", '', 'class="text-muted"');?>
     </div>
   </div>
@@ -52,9 +53,9 @@ js::set('browseType', $browseType);
   <div id="sidebar" class="side-col">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
-      <?php echo $projectTree;?>
+      <?php echo $programTree;?>
       <div class="text-center">
-        <?php common::printLink('project', 'projectProgramTitle', '', $lang->project->moduleSetting, '', "class='btn btn-info btn-wide iframe'", true, true);?>
+        <?php common::printLink('project', 'programTitle', '', $lang->project->moduleSetting, '', "class='btn btn-info btn-wide iframe'", true, true);?>
       </div>
     </div>
   </div>
@@ -87,11 +88,12 @@ js::set('browseType', $browseType);
         <thead>
           <tr>
             <?php
-              foreach($setting as $value)
-              {
-                if($value->id == 'status' and $browseType !== 'all') $value->show = false;
-                if($value->show) $this->datatable->printHead($value, $orderBy, $vars, $canBatchEdit);
-              }
+            foreach($setting as $value)
+            {
+              if($value->id == 'status' and $browseType !== 'all') $value->show = false;
+              if($value->id == 'teamCount' and $browseType == 'all') $value->show = false;
+              if($value->show) $this->datatable->printHead($value, $orderBy, $vars, $canBatchEdit);
+            }
             ?>
           </tr>
         </thead>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
new file mode 100644
index 0000000000..aa454ec187
--- /dev/null
+++ b/module/project/view/bug.html.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * The bug view file of project 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      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     project
+ * @version     $Id: bug.html.php 4894 2013-06-25 01:28:39Z wyd621@gmail.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<style>
+#subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;}
+#subHeader #dropMenu .col-left {padding-bottom: 0px;}
+</style>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php
+    $buildName = $build ? " <span class='label label-danger'>Build:{$build->name}</span>" : '';
+    echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&orderBy=status,id_desc&build=$buildID&type=all"), "<span class='text'>{$lang->bug->allBugs}</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}&orderBy=status,id_desc&build=$buildID&type=unresolved"), "<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' : '') . "'");
+    ?>
+    <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->bug->search;?></a>
+  </div>
+  <div class="btn-toolbar pull-right">
+    <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=&projectID=$project->id", "<i class='icon icon-export muted'> </i>" . $lang->bug->export, '', "class='btn btn-link export'");?>
+    <?php if(common::canModify('project', $project)) common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extras=projectID=$project->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
+  </div>
+</div>
+<div id="mainContent">
+  <div class="cell <?php if($type == 'bysearch') echo 'show';?>" id="queryBox" data-module='projectBug'></div>
+  <?php if(empty($bugs)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $lang->bug->noBug;?></span>
+      <?php if(common::canModify('project', $project) and common::hasPriv('bug', 'create')):?>
+      <?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info' data-app='project'");?>
+      <?php endif;?>
+    </p>
+  </div>
+  <?php else:?>
+  <form class='main-table' method='post' id='projectBugForm' data-ride="table">
+    <table class='table has-sort-head' id='bugList'>
+      <?php $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');?>
+      <?php $vars = "projectID={$project->id}&productID=$productID&orderBy=%s&build=$buildID&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+      <thead>
+        <tr>
+          <th class='c-id'>
+            <?php if($canBatchAssignTo):?>
+            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+              <label></label>
+            </div>
+            <?php endif;?>
+            <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+          </th>
+          <th class='w-80px'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+          <th class='c-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
+          <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+          <th class='w-110px c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+          <th class='w-100px'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
+          <th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
+          <th class='c-actions-5'><?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <?php
+      $hasCustomSeverity = false;
+      foreach($lang->bug->severityList as $severityKey => $severityValue)
+      {
+          if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+          {
+              $hasCustomSeverity = true;
+              break;
+          }
+      }
+      ?>
+      <tbody>
+      <?php foreach($bugs as $bug):?>
+      <?php
+      $canBeChanged = common::canBeChanged('bug', $bug);
+      $arrtibute    = $canBeChanged ? '' : 'disabled';
+      $viewLink     = helper::createLink('bug', 'view', "bugID=$bug->id");
+      ?>
+      <tr>
+        <td class='cell-id'>
+          <?php if($canBatchAssignTo):?>
+          <?php echo html::checkbox('bugIDList', array($bug->id => ''), '', $arrtibute) . html::a($viewLink, sprintf('%03d', $bug->id), '', "data-app={$this->app->openApp}");?>
+          <?php else:?>
+          <?php printf('%03d', $bug->id);?>
+          <?php endif;?>
+        </td>
+        <td>
+          <?php if($hasCustomSeverity):?>
+          <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
+          <?php else:?>
+          <span class='<?php echo 'label-severity';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'></span>
+          <?php endif;?>
+        </td>
+        <td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
+        <td class='text-left c-name' title="<?php echo $bug->title?>"><?php echo html::a($viewLink, $bug->title, null, "style='color: $bug->color' data-app={$this->app->openApp}");?></td>
+        <td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
+        <td class='c-assignedTo has-btn text-left'><?php $this->bug->printAssignedHtml($bug, $users);?></td>
+        <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
+        <td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>
+        <td class='c-actions'>
+          <?php
+          if($canBeChanged)
+          {
+              $params = "bugID=$bug->id,projectID={$project->id}";
+              common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'ok',      '', 'iframe', true);
+              common::printIcon('bug', 'resolve',    $params, $bug, 'list', 'checked', '', 'iframe', true);
+              common::printIcon('bug', 'close',      $params, $bug, 'list', '',        '', 'iframe', true);
+              common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy');
+              common::printIcon('bug', 'edit',   $params, $bug, 'list');
+          }
+          ?>
+        </td>
+      </tr>
+      <?php endforeach;?>
+      </tbody>
+    </table>
+    <div class='table-footer'>
+      <?php if($canBatchAssignTo):?>
+      <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <div class="table-actions btn-toolbar">
+        <div class="btn-group dropup">
+          <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->bug->assignedTo?> <span class="caret"></span></button>
+          <?php
+          $withSearch = count($memberPairs) > 10;
+          $actionLink = $this->createLink('bug', 'batchAssignTo', "projectID={$project->id}&type=project");
+          echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
+
+          if($withSearch)
+          {
+              echo "<div class='dropdown-menu search-list search-box-sink' data-ride='searchList'>";
+              echo '<div class="input-control search-box has-icon-left has-icon-right search-example">';
+              echo '<input id="userSearchBox" type="search" class="form-control search-input" autocomplete="off" />';
+              echo '<label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>';
+              echo '<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>';
+              echo '</div>';
+              $membersPinYin = common::convert2Pinyin($memberPairs);
+          }
+          else
+          {
+              echo "<div class='dropdown-menu search-list'>";
+          }
+          echo '<div class="list-group">';
+          foreach($memberPairs as $key => $value)
+          {
+              if(empty($key)) continue;
+              $searchKey = $withSearch ? ('data-key="' . zget($membersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
+              echo html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', $searchKey);
+          }
+          echo "</div>";
+          echo "</div>";
+          ?>
+        </div>
+      </div>
+      <?php endif;?>
+      <?php $pager->show('right', 'pagerjs');?>
+    </div>
+  </form>
+  <?php endif;?>
+</div>
+<?php js::set('replaceID', 'bugList');?>
+<?php js::set('browseType', $type);?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/projectbuild/view/browse.html.php b/module/project/view/build.html.php
similarity index 71%
rename from module/projectbuild/view/browse.html.php
rename to module/project/view/build.html.php
index 95b912eb6e..f1c2bf24f9 100644
--- a/module/projectbuild/view/browse.html.php
+++ b/module/project/view/build.html.php
@@ -11,9 +11,10 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php js::set('confirmDelete', $lang->build->confirmDelete)?>
+<?php js::set('executions', $executions)?>
 <?php js::set('projectID', $projectID)?>
-<?php js::set('PRJID', $this->session->PRJ)?>
+<?php js::set('createExecution', $lang->project->createExecution)?>
+<?php js::set('confirmDelete', $lang->build->confirmDelete)?>
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <?php
@@ -24,22 +25,20 @@
         $active = 'btn-active-text';
         $label .= " <span class='label label-light label-badge'>{$buildsTotal}</span>";
     }
-    echo html::a(inlink('browse', "projectID={$projectID}&type=all"), $label, '', "class='btn btn-link $active' id='all'")
+    echo html::a(inlink('build', "projectID=$projectID&type=all"), $label, '', "class='btn btn-link $active' id='all'")
     ?>
     <div class="input-control space w-150px"><?php echo html::select('product', $products, $product, "onchange='changeProduct(this.value)' class='form-control chosen' data-placeholder='{$lang->productCommon}'");?></div>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->execution->byQuery;?></a>
   </div>
+  <div class="btn-toolbar pull-right">
+    <?php if(common::canModify('project', $project)) common::printLink('build', 'create', "executionID=&productID=&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary' id='createBuild'");?>
+  </div>
 </div>
 <div id="mainContent">
   <div class="cell <?php if($type == 'bysearch') echo 'show';?>" id="queryBox" data-module='projectBuild'></div>
   <?php if(empty($projectBuilds)):?>
   <div class="table-empty-tip">
-    <p>
-      <span class="text-muted"><?php echo $lang->build->noBuild;?></span>
-      <?php if(common::canModify('project', $project) and common::hasPriv('build', 'create')):?>
-      <?php echo html::a('#projects', "<i class='icon icon-plus'></i> " . $lang->build->create, '', "data-toggle='modal' class='btn btn-info'");?>
-      <?php endif;?>
-    </p>
+    <p><span class="text-muted"><?php echo $lang->build->noBuild;?></span></p>
   </div>
   <?php else:?>
   <div class='main-table' data-ride="table" data-checkable="false">
@@ -61,13 +60,13 @@
         <?php foreach($projectBuilds as $productID => $builds):?>
         <?php foreach($builds as $index => $build):?>
         <tr data-id="<?php echo $productID;?>">
-          <td class="c-id-sm text-muted"><?php echo html::a(helper::createLink('build', 'view', "buildID=$build->id"), sprintf('%03d', $build->id));?></td>
+          <td class="c-id-sm text-muted"><?php echo html::a(helper::createLink('build', 'view', "buildID=$build->id"), sprintf('%03d', $build->id), '', "data-app='project'");?></td>
           <td class="c-name text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
           <td class="c-name">
             <?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
-            <?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?>
+            <?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name, '', "data-app='project'");?>
           </td>
-          <td class="c-name text-left" title='<?php echo $build->projectName;?>'><?php echo $build->projectName;?></td>
+          <td class="c-name text-left" title='<?php echo $build->executionName;?>'><?php echo $build->executionName;?></td>
           <td class="c-url" title="<?php echo $build->scmPath?>"><?php  echo strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath;?></td>
           <td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
           <td class="c-date"><?php echo $build->date?></td>
@@ -76,16 +75,16 @@
             <?php
             if(common::hasPriv('build', 'linkstory') and common::hasPriv('build', 'view') and common::canBeChanged('build', $build))
             {
-                echo html::a($this->createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "<i class='icon icon-link'></i>", '', "class='btn' title='{$lang->build->linkStory}'");
+                echo html::a($this->createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "<i class='icon icon-link'></i>", '', "class='btn' title='{$lang->build->linkStory}' data-app='project'");
             }
-            common::printIcon('testtask', 'create', "product=$build->product&project={$build->execution}&build=$build->id", $build, 'list', 'bullhorn');
-            $lang->project->bug = $lang->execution->viewBug;
-            common::printIcon('project', 'bug',  "project={$build->execution}&orderBy=status&build=$build->id", $build, 'list');
+            common::printIcon('testtask', 'create', "product=$build->product&executionID={$build->execution}&build=$build->id&projectID=$projectID", $build, 'list', 'bullhorn', '', '', '', "data-app='project'");
+            $lang->build->view = $lang->project->bug;
+            common::printIcon('build', 'view', "buildID=$build->id&type=generatedBug", $build, 'list', 'bug', '', '', '', "data-app='project'");
             common::printIcon('build',   'edit', "buildID=$build->id", $build, 'list');
             if(common::hasPriv('build',  'delete', $build))
             {
                 $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes");
-                echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"buildList\", confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->build->delete}'");
+                echo html::a("###", '<i class="icon-trash"></i>', '', "onclick='ajaxDelete(\"$deleteURL\", \"buildList\", confirmDelete)' class='btn' title='{$lang->build->delete}'");
             }
             ?>
           </td>
@@ -97,20 +96,4 @@
   </div>
   <?php endif;?>
 </div>
-<div class="modal fade" id="projects">
-  <div class="modal-dialog mw-500px">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
-        <h4 class="modal-title"><?php echo $lang->projectbuild->project;?></h4>
-      </div>
-      <div class="modal-body">
-        <div class='input-group'>
-          <?php echo html::select('executions', $executions, '', "class='form-control chosen' id=project");?>
-          <span class='input-group-btn'><?php echo html::commonButton($lang->build->create, "id='createBuildButton'", 'btn btn-primary');?></span>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index 5dbd4bb68d..9cdb9c957e 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -18,7 +18,7 @@
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
       <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
-      <small> <?php echo $lang->arrow . $lang->project->close;?></small>
+      <small> <?php echo $lang->arrow . $lang->{$project->type}->close;?></small>
       <?php endif;?>
     </h2>
   </div>
@@ -35,7 +35,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td class='text-center form-actions' colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->PRJList, 'self', '', 'btn btn-wide'); ?></td>
+          <td class='text-center form-actions' colspan='2'><?php echo html::submitButton($lang->{$project->type}->close) . html::linkButton($lang->goback, $this->session->projectList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index b4b005f207..5116b031bd 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -80,7 +80,7 @@
           <td colspan='2'><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></td>
         </tr>
         <?php if($model == 'scrum'):?>
-        <tr>
+        <tr id='daysBox'>
           <th><?php echo $lang->execution->days;?></th>
           <td>
             <div class='input-group'>
@@ -200,6 +200,6 @@
   <?php echo nl2br(html::radio('acl', $lang->project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <div id='programAcl' class='hidden'>
-  <?php echo nl2br(html::radio('acl', $lang->program->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
+  <?php echo nl2br(html::radio('acl', $lang->project->subAclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php
index 5d7c1ffe5c..db2a858226 100644
--- a/module/project/view/createguide.html.php
+++ b/module/project/view/createguide.html.php
@@ -10,7 +10,6 @@
   #guideDialog .project-type-img:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,0,.25);}
   #guideDialog .project-type.active img {border-color: #006AF1; border-width: 2px; margin-top: 0}
   </style>
-  <?php $group = $from == 'PGM' ? "data-group='project'" : "data-group='project'";?>
   <div class='modal-content'>
     <div class='modal-body'>
       <button class="close" data-dismiss="modal">x</button>
@@ -18,14 +17,14 @@
       <div class='row'>
         <div class='col-xs-6'>
           <div class='project-type text-center'>
-            <?php echo html::a($this->createLink("project", "create", "model=scrum&projectID=$projectID&from=$from"), "<img class='project-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', $group)?>
+            <?php echo html::a($this->createLink("project", "create", "model=scrum&projectID=$projectID"), "<img class='project-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', "data-app='{$app->openApp}'")?>
             <h3><?php echo $lang->project->scrum; ?></h3>
             <p><?php echo $lang->project->scrumTitle; ?></p>
           </div>
         </div>
         <div class='col-xs-6'>
           <div class='project-type text-center'>
-            <?php echo html::a($this->createLink("project", "create", "model=waterfall&projectID=$projectID&from=$from"), "<img class='project-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', $group)?>
+            <?php echo html::a($this->createLink("project", "create", "model=waterfall&projectID=$projectID"), "<img class='project-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', "data-app='{$app->openApp}'")?>
             <h3><?php echo $lang->project->waterfall; ?></h3>
             <p><?php echo $lang->project->waterfallTitle; ?></p>
           </div>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 3c73615844..8c52ae4ae2 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -18,11 +18,10 @@
 <?php js::set('oldParent', $project->parent);?>
 <?php js::set('projectID', $project->id);?>
 <?php js::set('longTime', $lang->project->longTime);?>
-<?php js::set('from', $from);?>
 <?php js::set('unmodifiableProducts', $unmodifiableProducts)?>
 <?php js::set('tip', $lang->project->notAllowRemoveProducts);?>
 <?php js::set('linkedProjectsTip', $lang->project->linkedProjectsTip);?>
-<?php $aclList = $project->parent ? $lang->program->subAclList : $lang->project->aclList;?>
+<?php $aclList = $project->parent ? $lang->project->subAclList : $lang->project->aclList;?>
 <?php $requiredFields = $config->project->edit->requiredFields;?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
@@ -83,7 +82,7 @@
           <td colspan='2'><?php echo html::radio('delta', $lang->project->endList , $deltaValue, "onclick='computeEndDate(this.value)'");?></td>
         </tr>
         <?php if($project->model == 'scrum'):?>
-        <tr>
+        <tr id='daysBox' <?php if($project->end == LONG_TIME) echo "class='hidden'";?>>
           <th><?php echo $lang->project->days;?></th>
           <td>
             <div class='input-group'>
@@ -160,7 +159,8 @@
             <?php
               echo html::hidden('model', $project->model);
               echo html::submitButton();
-              echo html::backButton();
+              $browseLink = $this->session->projectList ? $this->session->projectList : $this->createLink('project', 'browse');
+              if(!isonlybody()) echo html::a($browseLink, $lang->goback, '', 'class="btn btn-back btn-wide"');
             ?>
           </td>
         </tr>
@@ -172,7 +172,7 @@
   <?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl == 'project' ? 'private' : 'open', "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <div id='programAcl' class='hidden'>
-  <?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
+  <?php echo nl2br(html::radio('acl', $lang->project->subAclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <div class="modal fade" id="promptBox">
   <div class="modal-dialog mw-600px">
diff --git a/module/project/view/group.html.php b/module/project/view/group.html.php
index cc00319457..a200072aa7 100644
--- a/module/project/view/group.html.php
+++ b/module/project/view/group.html.php
@@ -15,7 +15,7 @@
 <?php js::set('confirmDelete', $lang->group->confirmDelete);?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::backButton($lang->goback, '', 'btn-secondary');?>
+    <?php // echo html::backButton($lang->goback, '', 'btn-secondary');?>
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->group->browse;?></span></span>
   </div>
   <div class='btn-toolbar pull-right'>
@@ -45,7 +45,7 @@
           <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
           <?php $disabled = $group->role == 'limited' ? 'disabled' : '';?>
           <?php common::printIcon('project', 'manageView', "groupID=$group->id&projectID=$projectID&programID=$project->parent", $group, 'list', 'eye', '', $disabled);?>
-          <?php common::printIcon('project', 'managePriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
+          <?php common::printIcon('project', 'managePriv', "projectID=$projectID&type=byGroup&param=$group->id", $group, 'list', 'lock', '', '', '', "data-app='project'");?>
           <?php $lang->group->managemember = $lang->group->manageMember;?>
           <?php common::printIcon('project', 'manageGroupMember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='90%'");?>
           <?php common::printIcon('project', 'editGroup', "groupID=$group->id", $group, 'list', 'edit', '', 'iframe', 'yes', "data-width='550'");?>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index f0d0ccdbbb..a21c11d5f4 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -10,5 +10,5 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php echo $this->fetch('block', 'dashboard', "module=project&type={$project->model}");?>
+<?php echo $this->fetch('block', 'dashboard', "module=project&type={$project->model}&projectID={$project->id}");?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 968b5caa5b..30c8ee11d6 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -4,7 +4,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <span class='btn btn-link btn-active-text'>
-      <?php echo html::a($this->createLink('project', 'prjmanagemembers', "projectID={$project->id}"), "<span class='text'> {$lang->project->manageMembers}</span>");?>
+      <?php echo html::a($this->createLink('project', 'managemembers', "projectID={$project->id}"), "<span class='text'> {$lang->project->manageMembers}</span>");?>
     </span>
     <div class='input-group space w-200px'>
       <span class='input-group-addon'><?php echo $lang->execution->selectDept?></span>
@@ -54,7 +54,7 @@
           <td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $roles[$deptAccount]?>'/></td>
           <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
           <td>
-            <input type='text'   name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $config->project->defaultWorkhours?>' />
+            <input type='text'   name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' />
           </td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
           <td class='c-actions text-center'>
@@ -102,7 +102,7 @@
       <td><input type='text' name='roles[]' id='role<?php  echo ($i);?>' class='form-control' /></td>
       <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
       <td>
-        <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->project->defaultWorkhours?>' />
+        <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' />
       </td>
       <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
       <td class='c-actions text-center'>
diff --git a/module/project/view/managepriv.html.php b/module/project/view/managepriv.html.php
index ffc6326693..6c8eae9057 100644
--- a/module/project/view/managepriv.html.php
+++ b/module/project/view/managepriv.html.php
@@ -22,7 +22,7 @@
 .checkbox-right{padding-left:0px !important;}
 
 td.menus {border-right: 0;padding-right: 0;width: 220px !important;}
-td.menus + td {border-left: 0;} 
+td.menus + td {border-left: 0;}
 .menus .checkbox-primary {float: left; width: 220px;}
 .menus .checkbox-primary:first-child {float: left; width: auto;}
 .menus a {margin-left: 10px;}
@@ -67,8 +67,8 @@ td.menus + td {border-left: 0;}
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
   <span id='groupName'><i class='icon-lock'></i> <?php echo $group->name;?> <i class="icon icon-chevron-right"></i></span>
-    <?php $params = "type=byGroup&param=$groupID";?>
-    <?php echo html::a(inlink('pgmmanagepriv', $params), "<span class='text'>{$lang->group->all}</span>", '', "class='btn btn-link btn-active-text'")?>
+    <?php $params = "projectID=$projectID&type=byGroup&param=$groupID";?>
+    <?php echo html::a(inlink('managepriv', $params), "<span class='text'>{$lang->group->all}</span>", '', "class='btn btn-link btn-active-text'")?>
   </div>
 </div>
 <div id='mainContent' class='main-content'>
@@ -164,7 +164,7 @@ $(document).ready(function()
     })
 
     /**
-     * 勾选浏览列表标签时，自动勾选下面的所有标签。 
+     * 勾选浏览列表标签时，自动勾选下面的所有标签。
      * Check all tabs when the Browse list tab is selected.
      */
     $('.menus input[value=browse]').change(function()
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 6714dfcf68..d55f9ac8df 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -20,7 +20,7 @@
   <div class='cell'>
     <form class='main-form form-ajax' method='post' id='productsBox' enctype='multipart/form-data'>
       <div class='detail'>
-        <div class='detail-title'><?php echo $lang->execution->linkedProducts;?></div>
+        <div class='detail-title'><?php echo $lang->project->linkedProducts;?></div>
         <div class='detail-content row'>
           <?php foreach($allProducts as $productID => $productName):?>
           <?php if(isset($linkedProducts[$productID])):?>
@@ -43,7 +43,7 @@
         </div>
       </div>
       <div class='detail'>
-        <div class='detail-title'><?php echo $lang->execution->unlinkedProducts;?></div>
+        <div class='detail-title'><?php echo $lang->project->unlinkedProducts;?></div>
         <div class='detail-content row'>
           <?php foreach($allProducts as $productID => $productName):?>
           <div class='col-sm-4'>
diff --git a/module/project/view/projecttitle.html.php b/module/project/view/projecttitle.html.php
deleted file mode 100644
index 2bc8ae2eca..0000000000
--- a/module/project/view/projecttitle.html.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * The prjprojecttitle view file of project 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      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     project
- * @version     $Id: prjprojecttitle.html.php 4769 2013-05-05 07:24:21Z wwccss $
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.lite.html.php';?>
-<div class="modal-header">
-  <h4 class="modal-title"><i class="icon-cog"></i><?php echo $lang->project->moduleSetting;?></h4>
-</div>
-<div class="modal-body" style="max-height: 564px; overflow: visible;">
-  <form class="form-condensed" method="post" target="hiddenwin">
-    <table class="table table-form">
-      <tbody>
-        <tr>
-          <td class="w-180px"><?php echo $lang->project->moduleOpen;?></td>
-          <td><?php echo html::radio('programTitle', $lang->project->programTitle, $status);?></td>
-        </tr>
-        <tr>
-          <td colspan="2" class="text-center"><?php echo html::submitButton();?></td>
-        </tr>
-      </tbody>
-    </table>
-  </form>
-</div>
-<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/qa.html.php b/module/project/view/qa.html.php
new file mode 100644
index 0000000000..679560fa37
--- /dev/null
+++ b/module/project/view/qa.html.php
@@ -0,0 +1,2 @@
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php
index 2170db29da..60b775c4d0 100644
--- a/module/project/view/start.html.php
+++ b/module/project/view/start.html.php
@@ -18,7 +18,7 @@
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
       <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
-      <small><?php echo $lang->arrow . $lang->project->start;?></small>
+      <small><?php echo $lang->arrow . $lang->{$project->type}->start;?></small>
       <?php endif;?>
     </h2>
   </div>
@@ -36,7 +36,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton($lang->project->start);?>
+            <?php echo html::submitButton($lang->{$project->type}->start);?>
           </td>
         </tr>
       </tbody>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index 2e686dcbf4..fefae82bd5 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -18,7 +18,7 @@
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
       <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
-      <small><?php echo $lang->arrow . $lang->project->suspend;?></small>
+      <small><?php echo $lang->arrow . $lang->{$project->type}->suspend;?></small>
       <?php endif;?>
     </h2>
   </div>
@@ -34,7 +34,7 @@
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton($lang->{$project->type}->suspend) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
new file mode 100644
index 0000000000..58a961ce5f
--- /dev/null
+++ b/module/project/view/testtask.html.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * The browse view file of testtask 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      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     testtask
+ * @version     $Id: browse.html.php 1914 2011-06-24 10:11:25Z yidong@cnezsoft.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php if(!empty($tasks)):?>
+    <div class="pull-left table-group-btns">
+      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->testtask->collapseAll;?> <i class="icon-fold-all muted"></i></button>
+      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->testtask->expandAll;?> <i class="icon-unfold-all muted"></i></button>
+    </div>
+    <?php endif;?>
+    <?php $total = 0;?>
+    <?php foreach($tasks as $productTasks) $total += count($productTasks);?>
+    <a href='' class='btn btn-link btn-active-text'>
+      <span class='text'><?php echo $lang->testtask->browse;?></span>
+      <span class="label label-light label-badge"><?php echo $total;?></span>
+    </a>
+  </div>
+  <div class="btn-toolbar pull-right">
+    <?php if(common::canModify('project', $project)):?>
+    <?php common::printLink('testtask', 'create', "product=0&executionID=0&build=0&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
+    <?php endif;?>
+  </div>
+</div>
+<div id="mainContent">
+  <?php if(empty($tasks)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
+      <?php if(common::canModify('project', $project) and common::hasPriv('testtask', 'create')):?>
+      <?php echo html::a($this->createLink('testtask', 'create', "product=0&executionID=0&build=0&projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info' data-app={$this->app->openApp}");?>
+      <?php endif;?>
+    </p>
+  </div>
+  <?php else:?>
+  <form class="main-table table-testtask" data-ride="table" data-group="true" method="post" target='hiddenwin' id='testtaskForm'>
+    <table class="table table-grouped has-sort-head" id='taskList'>
+      <thead>
+        <?php $vars = "projectID=$projectID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+        <?php $canTestReport = ($canBeChanged and common::hasPriv('testreport', 'browse'));?>
+        <tr class='<?php if($total) echo 'divider'; ?>'>
+          <th class='c-side text-center'><?php common::printOrderLink('product', $orderBy, $vars, $lang->testtask->product);?></th>
+          <th class="c-id">
+            <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+          </th>
+          <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
+          <th><?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
+          <th class='w-user'><?php common::printOrderLink('owner', $orderBy, $vars, $lang->testtask->owner);?></th>
+          <th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
+          <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
+          <th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='<?php echo $project->model == 'scrum' ? 'c-actions-5' : 'c-actions-4';?> text-center'><?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($tasks as $product => $productTasks):?>
+        <?php $productName = zget($products, $product, '');?>
+        <?php foreach($productTasks as $task):?>
+        <tr data-id='<?php echo $product;?>' <?php if($task == reset($productTasks)) echo "class='divider-top'";?>>
+          <?php if($task == reset($productTasks)):?>
+          <td rowspan='<?php echo count($productTasks);?>' class='c-side text-left group-toggle'>
+            <a class='text-primary' title='<?php echo $productName;?>'><i class='icon icon-caret-down'></i> <?php echo $productName;?></a>
+            <div class='small'><span class='text-muted'><?php echo $lang->testtask->allTasks;?></span> <?php echo count($productTasks);?></div>
+          </td>
+          <?php endif;?>
+          <td class="c-id">
+            <?php printf('%03d', $task->id);?>
+          </td>
+          <td class='text-left' title="<?php echo $task->name?>"><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
+          <td title="<?php echo $task->buildName?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName);?></td>
+          <td><?php echo zget($users, $task->owner);?></td>
+          <td><?php echo $task->begin?></td>
+          <td><?php echo $task->end?></td>
+          <?php $status = $this->processStatus('testtask', $task);?>
+          <td title='<?php echo $status;?>'>
+            <span class='status-testtask status-<?php echo $task->status?>'><?php echo $status;?></span>
+          </td>
+          <td class='c-actions'>
+            <?php
+            if($canBeChanged)
+            {
+                common::printIcon('testtask', 'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
+                common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link');
+                if(common::hasPriv('execution', 'testreport') and $project->model == 'scrum')
+                {
+                    echo html::a($this->createLink('execution', 'testreport', "executionID=$task->execution&objectType=execution&extra=$task->id"), '<i class="icon-testreport-browse icon-flag"></i>', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="project"');
+                }
+                common::printIcon('testtask', 'edit',   "taskID=$task->id", $task, 'list');
+                common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'list', 'trash', 'hiddenwin');
+            }
+            ?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+        <tr data-id='<?php echo $product;?>' class='group-toggle group-summary divider hidden'>
+          <td class='c-side text-left'>
+            <a title='<?php echo $productName;?>'><i class='icon-caret-right text-muted'></i> <?php echo $productName;?></a>
+          </td>
+          <td colspan='8' class='text-left'>
+            <div class='small with-padding'>
+              <span class='text-muted'><?php echo $lang->testtask->allTasks;?></span> <?php echo count($productTasks);?>
+            </div>
+          </td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <div class="table-footer">
+      <?php $pager->show('right', 'pagerjs');?>
+    </div>
+  </form>
+  <?php endif;?>
+</div>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 1f2475e520..c62d77ab46 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -90,8 +90,9 @@
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php
-        $params = "project=$project->id";
-        common::printBack(inlink('prjbrowse'));
+        $params     = "project=$project->id";
+        $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse');
+        common::printBack($browseLink);
         if(!$project->deleted)
         {
             echo "<div class='divider'></div>";
@@ -168,7 +169,7 @@
                   <tr>
                     <td colspan="4">
                       <?php $progress = ($workhour->totalConsumed + $workhour->totalLeft) ? floor($workhour->totalConsumed / ($workhour->totalConsumed + $workhour->totalLeft) * 1000) / 1000 * 100 : 0;?>
-                      <?php echo $lang->project->progress;?> <em><?php echo $progress . $lang->percent;?></em> &nbsp;
+                      <?php echo $lang->project->progress;?> <?php echo $progress . $lang->percent;?> &nbsp;
                       <div class="progress inline-block">
                         <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $progress . $lang->percent;?>"></div>
                       </div>
@@ -178,23 +179,23 @@
                     <th><?php echo $lang->project->begin;?></th>
                     <td><?php echo $project->begin;?></td>
                     <th><?php echo $lang->execution->totalEstimate;?></th>
-                    <td><em><?php echo (float)$workhour->totalEstimate . $lang->execution->workHour;?></em></td>
+                    <td><?php echo (float)$workhour->totalEstimate . $lang->execution->workHour;?></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->project->end;?></th>
                     <td><?php echo $project->end;?></td>
                     <th><?php echo $lang->execution->totalConsumed;?></th>
-                    <td><em><?php echo (float)$workhour->totalConsumed . $lang->execution->workHour;?></em></td>
+                    <td><?php echo (float)$workhour->totalConsumed . $lang->execution->workHour;?></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->execution->totalDays;?></th>
                     <td><?php echo $project->days;?></td>
                     <th><?php echo $lang->execution->totalLeft;?></th>
-                    <td><em><?php echo (float)$workhour->totalLeft . $lang->execution->workHour;?></em></td>
+                    <td><?php echo (float)$workhour->totalLeft . $lang->execution->workHour;?></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->execution->totalHours;?></th>
-                    <td><em><?php echo (float)$workhour->totalHours . $lang->execution->workHour;?></em></td>
+                    <td><?php echo (float)$workhour->totalHours . $lang->execution->workHour;?></td>
                   </tr>
                 </tbody>
               </table>
@@ -207,11 +208,11 @@
                 <tbody>
                   <tr>
                     <th><?php echo $lang->story->common;?></th>
-                    <td><em><?php echo $statData->storyCount;?></em></td>
+                    <td><?php echo $statData->storyCount;?></td>
                     <th><?php echo $lang->task->common;?></th>
-                    <td><em><?php echo $statData->taskCount;?></em></td>
+                    <td><?php echo $statData->taskCount;?></td>
                     <th><?php echo $lang->bug->common;?></th>
-                    <td><em><?php echo $statData->bugCount;?></em></td>
+                    <td><?php echo $statData->bugCount;?></td>
                   </tr>
                 </tbody>
               </table>
diff --git a/module/projectbuild/control.php b/module/projectbuild/control.php
index 9237ec454e..2b068277cd 100644
--- a/module/projectbuild/control.php
+++ b/module/projectbuild/control.php
@@ -40,6 +40,7 @@ class projectBuild extends control
         $this->config->build->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $executions);
 
         $this->project->buildProjectBuildSearchForm($products, $queryID, $actionURL, 'project');
+        commonModel::setAppObjectID('project', $projectID);
 
         if($type == 'bysearch')
         {
diff --git a/module/projectbuild/js/browse.js b/module/projectbuild/js/browse.js
deleted file mode 100644
index a0aec4aa34..0000000000
--- a/module/projectbuild/js/browse.js
+++ /dev/null
@@ -1,20 +0,0 @@
-$(function()
-{
-    $('#createBuildButton').on('click', function()
-    {
-        var projectID = $('#project').val();
-        parent.location.href = createLink('build', 'create', 'projectID=' + projectID, '', '', PRJID);
-    })
-});
-/**
- * Change product.
- *
- * @param  int    $productID
- * @access public
- * @return void
- */
-function changeProduct(productID)
-{
-    link = createLink('projectbuild', 'browse', 'projectID=' + projectID + '&type=product&param=' + productID);
-    location.href = link;
-}
diff --git a/module/projectbuild/lang/de.php b/module/projectbuild/lang/de.php
index 81dd597cdd..91d431abba 100644
--- a/module/projectbuild/lang/de.php
+++ b/module/projectbuild/lang/de.php
@@ -1,5 +1,13 @@
 <?php
-$lang->projectbuild->common = 'Project Build';
-$lang->projectbuild->browse = 'Build List';
-
-$lang->projectbuild->project = "Please select {$lang->executionCommon}";
+/**
+ * The project build module en file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@cnezsoft.com>
+ * @package     projectrelease
+ * @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->browse   = 'Build List';
diff --git a/module/projectbuild/lang/en.php b/module/projectbuild/lang/en.php
index 81dd597cdd..91d431abba 100644
--- a/module/projectbuild/lang/en.php
+++ b/module/projectbuild/lang/en.php
@@ -1,5 +1,13 @@
 <?php
-$lang->projectbuild->common = 'Project Build';
-$lang->projectbuild->browse = 'Build List';
-
-$lang->projectbuild->project = "Please select {$lang->executionCommon}";
+/**
+ * The project build module en file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@cnezsoft.com>
+ * @package     projectrelease
+ * @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->browse   = 'Build List';
diff --git a/module/projectbuild/lang/fr.php b/module/projectbuild/lang/fr.php
index 81dd597cdd..91d431abba 100644
--- a/module/projectbuild/lang/fr.php
+++ b/module/projectbuild/lang/fr.php
@@ -1,5 +1,13 @@
 <?php
-$lang->projectbuild->common = 'Project Build';
-$lang->projectbuild->browse = 'Build List';
-
-$lang->projectbuild->project = "Please select {$lang->executionCommon}";
+/**
+ * The project build module en file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@cnezsoft.com>
+ * @package     projectrelease
+ * @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->browse   = 'Build List';
diff --git a/module/projectbuild/lang/vi.php b/module/projectbuild/lang/vi.php
index 81dd597cdd..91d431abba 100644
--- a/module/projectbuild/lang/vi.php
+++ b/module/projectbuild/lang/vi.php
@@ -1,5 +1,13 @@
 <?php
-$lang->projectbuild->common = 'Project Build';
-$lang->projectbuild->browse = 'Build List';
-
-$lang->projectbuild->project = "Please select {$lang->executionCommon}";
+/**
+ * The project build module en file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@cnezsoft.com>
+ * @package     projectrelease
+ * @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->browse   = 'Build List';
diff --git a/module/projectbuild/lang/zh-cn.php b/module/projectbuild/lang/zh-cn.php
index abfbf6155c..802e90f069 100644
--- a/module/projectbuild/lang/zh-cn.php
+++ b/module/projectbuild/lang/zh-cn.php
@@ -1,5 +1,13 @@
 <?php
-$lang->projectbuild->common = '项目版本';
-$lang->projectbuild->browse = '版本列表';
-
-$lang->projectbuild->project = "请选择所属{$lang->executionCommon}";
+/**
+ * The project build module zh-cn file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@cnezsoft.com>
+ * @package     projectrelease
+ * @version     $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $
+ * @link        http://www.zentao.net
+ */
+$lang->projectbuild->common   = '项目版本';
+$lang->projectbuild->browse   = '版本列表';
diff --git a/module/projectbuild/lang/zh-tw.php b/module/projectbuild/lang/zh-tw.php
index 5aba86e958..a3e2b33848 100644
--- a/module/projectbuild/lang/zh-tw.php
+++ b/module/projectbuild/lang/zh-tw.php
@@ -1,5 +1,13 @@
 <?php
-$lang->projectbuild->common = '項目版本';
-$lang->projectbuild->browse = '版本列表';
-
-$lang->projectbuild->project = "請選擇所屬{$lang->executionCommon}";
+/**
+ * The project build module zh-tw file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2020 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@cnezsoft.com>
+ * @package     projectrelease
+ * @version     $Id: zh-tw.php 4129 2020-11-27 01:58:14Z wwccss $
+ * @link        http://www.zentao.net
+ */
+$lang->projectbuild->common   = '項目版本';
+$lang->projectbuild->browse   = '版本列表';
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 693f61771b..6ea6de21f8 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -27,63 +27,76 @@ class projectrelease extends control
         $products = array();
         $this->loadModel('product');
         $this->loadModel('release');
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
-        if(empty($this->view->products)) $this->locate($this->createLink('product', 'create'));
+        $this->loadModel('project');
     }
 
     /**
      * Common actions.
      *
+     * @param  int    $projectID
      * @param  int    $productID
      * @param  int    $branch
      * @access public
      * @return void
      */
-    public function commonAction($productID = 0, $branch = 0)
+    public function commonAction($projectID = 0, $productID = 0, $branch = 0)
     {
-        $this->lang->product->menu         = $this->lang->product->viewMenu;
         $this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
 
         /* Get product and product list by project. */
-        $products = $this->product->getProductPairsByProject($this->session->PRJ);
-        if(!$productID) $productID = key($products);
+        $this->products = $this->product->getProductPairsByProject($projectID);
+        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=projectrelease&projectID=' . $projectID)));
+        if(!$productID) $productID = key($this->products);
         $product = $this->product->getById($productID);
 
-        $this->view->products = $products;
+        $this->view->products = $this->products;
         $this->view->product  = $product;
         $this->view->branches = (isset($product->type) and $product->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID);
         $this->view->branch   = $branch;
-        $this->view->project  = $this->loadModel('project')->getByID($this->session->PRJ);
+        $this->view->project  = $this->project->getByID($projectID);
     }
 
     /**
      * Browse releases.
      *
+     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $type
      * @access public
      * @return void
      */
-    public function browse($type = 'all')
+    public function browse($projectID = 0, $executionID = 0, $type = 'all')
     {
-        $this->session->set('releaseList', $this->app->getURI(true));
-        $execution = $this->loadModel('execution')->getById($this->session->PRJ);
+        $this->session->set('releaseList', $this->app->getURI(true), 'project');
+        $project   = $this->project->getById($projectID);
+        $execution = $this->loadModel('execution')->getById($executionID);
 
-        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->release->browse;
-        $this->view->position[] = $this->lang->release->browse;
-        $this->view->execution  = $execution;
-        $this->view->products   = $this->loadModel('product')->getProducts($this->session->PRJ);
-        $this->view->releases   = $this->projectrelease->getList($this->session->PRJ, $type);
-        $this->view->type       = $type;
+        if($projectID) $this->project->setMenu($projectID);
+        if($executionID) $this->loadModel('execution')->setMenu($executionID, $this->app->rawModule, $this->app->rawMethod);
+
+        $objectName = isset($project->name) ? $project->name : $execution->name;
+
+        $this->view->title       = $objectName . $this->lang->colon . $this->lang->release->browse;
+        $this->view->position[]  = $this->lang->release->browse;
+        $this->view->execution   = $execution;
+        $this->view->project     = $project;
+        $this->view->products    = $this->loadModel('product')->getProducts($projectID);
+        $this->view->releases    = $this->projectrelease->getList($projectID, $type);
+        $this->view->projectID   = $projectID;
+        $this->view->executionID = $executionID;
+        $this->view->type        = $type;
+        $this->view->from        = $this->app->openApp;
         $this->display();
     }
 
     /**
      * Create a release.
      *
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function create()
+    public function create($projectID)
     {
         $this->app->loadConfig('release');
         $this->config->projectrelease->create = $this->config->release->create;
@@ -95,22 +108,26 @@ class projectrelease extends control
             $this->loadModel('action')->create('release', $releaseID, 'opened');
 
             $this->executeHooks($releaseID);
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $releaseID));
+
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
 
         /* Get the builds that can select. */
-        $productPairs  = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $productPairs  = $this->loadModel('product')->getProductPairsByProject($projectID);
         $productIdList = array_keys($productPairs);
         $builds        = $this->loadModel('build')->getProductBuildPairs($productIdList, 0, 0, 'notrunk');
-        $releaseBuilds = $this->projectrelease->getReleaseBuilds($this->session->PRJ);
+        $releaseBuilds = $this->projectrelease->getReleaseBuilds($projectID);
         foreach($releaseBuilds as $build) unset($builds[$build]);
         unset($builds['trunk']);
 
-        $this->commonAction();
+        $this->project->setMenu($projectID);
+        $this->commonAction($projectID);
+
         $this->view->title       = $this->view->project->name . $this->lang->colon . $this->lang->release->create;
         $this->view->position[]  = $this->lang->release->create;
         $this->view->builds      = $builds;
-        $this->view->lastRelease = $this->projectrelease->getLast($this->session->PRJ);
+        $this->view->lastRelease = $this->projectrelease->getLast($projectID);
         $this->display();
     }
 
@@ -147,14 +164,17 @@ class projectrelease extends control
 
         /* Get release and build. */
         $release = $this->projectrelease->getById((int)$releaseID);
-        $this->commonAction($release->product, $release->branch);
+        $this->commonAction($release->project, $release->product, $release->branch);
         $build = $this->build->getById($release->build);
 
+        /* Set project menu. */
+        $this->project->setMenu($release->project);
+
         $this->view->title      = $this->view->product->name . $this->lang->colon . $this->lang->release->edit;
         $this->view->position[] = $this->lang->release->edit;
         $this->view->release    = $release;
         $this->view->build      = $build;
-        $this->view->builds     = $this->loadModel('build')->getProjectBuildPairs($this->session->PRJ, $release->product, $release->branch, 'notrunk|withbranch');
+        $this->view->builds     = $this->loadModel('build')->getProjectBuildPairs($release->project, $release->product, $release->branch, 'notrunk|withbranch');
         $this->display();
     }
 
@@ -174,8 +194,8 @@ class projectrelease extends control
      */
     public function view($releaseID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        if($type == 'story') $this->session->set('storyList', $this->app->getURI(true));
-        if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $this->app->getURI(true));
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
+        $this->session->set('storyList', $this->app->getURI(true), $this->app->openApp);
 
         $this->loadModel('story');
         $this->loadModel('bug');
@@ -211,27 +231,31 @@ class projectrelease extends control
             ->fetchAll();
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'leftBugs');
 
-        $this->commonAction($release->product);
+        $this->commonAction($release->project, $release->product);
         $product = $this->product->getById($release->product);
 
+        /* Set menu. */
+        $this->project->setMenu($release->project);
+
         $this->executeHooks($releaseID);
 
-        $this->view->title         = "RELEASE #$release->id $release->name/" . $product->name;
-        $this->view->position[]    = $this->lang->release->view;
-        $this->view->release       = $release;
-        $this->view->stories       = $stories;
-        $this->view->bugs          = $bugs;
-        $this->view->leftBugs      = $leftBugs;
-        $this->view->actions       = $this->loadModel('action')->getList('release', $releaseID);
-        $this->view->users         = $this->loadModel('user')->getPairs('noletter');
-        $this->view->type          = $type;
-        $this->view->link          = $link;
-        $this->view->param         = $param;
-        $this->view->orderBy       = $orderBy;
-        $this->view->branchName    = $release->productType == 'normal' ? '' : $this->loadModel('branch')->getById($release->branch);
-        $this->view->storyPager    = $storyPager;
-        $this->view->bugPager      = $bugPager;
-        $this->view->leftBugPager  = $leftBugPager;
+        $this->view->title        = "RELEASE #$release->id $release->name/" . $product->name;
+        $this->view->position[]   = $this->lang->release->view;
+        $this->view->release      = $release;
+        $this->view->stories      = $stories;
+        $this->view->bugs         = $bugs;
+        $this->view->leftBugs     = $leftBugs;
+        $this->view->actions      = $this->loadModel('action')->getList('release', $releaseID);
+        $this->view->users        = $this->loadModel('user')->getPairs('noletter');
+        $this->view->type         = $type;
+        $this->view->link         = $link;
+        $this->view->param        = $param;
+        $this->view->orderBy      = $orderBy;
+        $this->view->branchName   = $release->productType == 'normal' ? '' : $this->loadModel('branch')->getById($release->branch);
+        $this->view->storyPager   = $storyPager;
+        $this->view->bugPager     = $bugPager;
+        $this->view->leftBugPager = $leftBugPager;
+        $this->view->projectID    = $release->project;
         $this->display();
     }
 
@@ -408,11 +432,11 @@ class projectrelease extends control
             $this->projectrelease->linkStory($releaseID);
             die(js::locate(inlink('view', "releaseID=$releaseID&type=story"), 'parent'));
         }
-        $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), $this->app->openApp);
 
         $release = $this->projectrelease->getByID($releaseID);
         $build   = $this->loadModel('build')->getByID($release->build);
-        $this->commonAction($release->product);
+        $this->commonAction($release->project, $release->product);
         $this->loadModel('story');
         $this->loadModel('tree');
         $this->loadModel('product');
@@ -461,6 +485,7 @@ class projectrelease extends control
         $this->view->browseType     = $browseType;
         $this->view->param          = $param;
         $this->view->pager          = $pager;
+        $this->view->projectID      = $release->project;
         $this->display();
     }
 
@@ -528,11 +553,11 @@ class projectrelease extends control
             die(js::locate(inlink('view', "releaseID=$releaseID&type=$type"), 'parent'));
         }
 
-        $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa');
         /* Set menu. */
         $release = $this->projectrelease->getByID($releaseID);
         $build   = $this->loadModel('build')->getByID($release->build);
-        $this->commonAction($release->product);
+        $this->commonAction($release->project, $release->product);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -547,7 +572,7 @@ class projectrelease extends control
         $this->config->bug->search['style']     = 'simple';
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getForProducts(array($release->product => $release->product));
         $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($release->product, $viewType = 'bug', $startModuleID = 0);
-        $this->config->bug->search['params']['execution']['values']     = $this->loadModel('product')->getExecutionPairsByProduct($release->product, 0, 'id_desc', $this->session->PRJ);
+        $this->config->bug->search['params']['execution']['values']     = $this->loadModel('product')->getExecutionPairsByProduct($release->product, 0, 'id_desc', $release->project);
         $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($release->product, $branch = 0, $params = '');
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
         if($this->session->currentProductType == 'normal')
diff --git a/module/projectrelease/lang/de.php b/module/projectrelease/lang/de.php
index 737cdcaa9b..f7f41369b1 100644
--- a/module/projectrelease/lang/de.php
+++ b/module/projectrelease/lang/de.php
@@ -25,3 +25,4 @@ $lang->projectrelease->batchUnlinkBug   = "Mehrere Bugs entfernen";
 $lang->projectrelease->unlinkStory      = "Unlink {$lang->SRCommon}";
 $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
+$lang->projectrelease->browseAction     = "Release List";
diff --git a/module/projectrelease/lang/en.php b/module/projectrelease/lang/en.php
index d8bfcdab4b..c2e1b0c5bf 100644
--- a/module/projectrelease/lang/en.php
+++ b/module/projectrelease/lang/en.php
@@ -25,3 +25,4 @@ $lang->projectrelease->batchUnlinkBug   = "Batch Unlink Bugs";
 $lang->projectrelease->unlinkStory      = "Unlink {$lang->SRCommon}";
 $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
+$lang->projectrelease->browseAction     = "Release List";
diff --git a/module/projectrelease/lang/fr.php b/module/projectrelease/lang/fr.php
index 2d1cff3421..d0d822381a 100644
--- a/module/projectrelease/lang/fr.php
+++ b/module/projectrelease/lang/fr.php
@@ -25,3 +25,4 @@ $lang->projectrelease->batchUnlinkBug   = "Retirer Bugs par Lot";
 $lang->projectrelease->unlinkStory      = "Unlink {$lang->SRCommon}";
 $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export HTML';
+$lang->projectrelease->browseAction     = "Release List";
diff --git a/module/projectrelease/lang/vi.php b/module/projectrelease/lang/vi.php
index 392750309b..ea615b6c8a 100644
--- a/module/projectrelease/lang/vi.php
+++ b/module/projectrelease/lang/vi.php
@@ -25,3 +25,4 @@ $lang->projectrelease->batchUnlinkBug   = "Hủy liên kết Bug hàng loạt";
 $lang->projectrelease->unlinkStory      = "Unlink {$lang->SRCommon}";
 $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Xuất ra HTML';
+$lang->projectrelease->browseAction     = "Release List";
diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php
index dd028508fe..ec193c6017 100644
--- a/module/projectrelease/lang/zh-cn.php
+++ b/module/projectrelease/lang/zh-cn.php
@@ -25,3 +25,4 @@ $lang->projectrelease->batchUnlinkBug   = "批量移除Bug";
 $lang->projectrelease->unlinkStory      = "移除{$lang->SRCommon}";
 $lang->projectrelease->unlinkBug        = '移除Bug';
 $lang->projectrelease->export           = '导出HTML';
+$lang->projectrelease->browseAction     = "发布列表";
diff --git a/module/projectrelease/lang/zh-tw.php b/module/projectrelease/lang/zh-tw.php
index 1af64da7db..cbd0078bcf 100644
--- a/module/projectrelease/lang/zh-tw.php
+++ b/module/projectrelease/lang/zh-tw.php
@@ -25,3 +25,5 @@ $lang->projectrelease->batchUnlinkBug   = "批量移除Bug";
 $lang->projectrelease->unlinkStory      = "移除{$lang->SRCommon}";
 $lang->projectrelease->unlinkBug        = '移除Bug';
 $lang->projectrelease->export           = '導出HTML';
+
+$lang->projectrelease->browseAction = "發佈列表";
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index bd373d9ecf..d8a7c3d3df 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -122,7 +122,7 @@ class projectreleaseModel extends model
         }
 
         $release = fixer::input('post')
-            ->add('project', $this->session->PRJ)
+            ->add('project', $this->session->project)
             ->add('product', (int)$productID)
             ->add('branch',  (int)$branch)
             ->setDefault('stories', '')
@@ -151,7 +151,7 @@ class projectreleaseModel extends model
             else
             {
                 $build = new stdclass();
-                $build->project   = $this->session->PRJ;
+                $build->project   = $this->session->project;
                 $build->product   = (int)$productID;
                 $build->branch    = (int)$branch;
                 $build->name      = $release->name;
diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 033f4849c6..d2e63a7baa 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -16,15 +16,13 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    echo html::a(inlink('browse', "type=all"), "<span class='text'>{$lang->release->all}</span>" . ($type == 'all' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink('browse', "type=normal"), "<span class='text'>{$lang->release->statusList['normal']}</span>" . ($type == 'normal' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='normalTab' class='btn btn-link" . ('normal' == $type ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink('browse', "type=terminate"), "<span class='text'>{$lang->release->statusList['terminate']}</span>" . ($type == 'terminate' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='terminateTab' class='btn btn-link" . ('terminate' == $type ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink('browse', "projectID=$projectID&executionID=$executionID&type=all"), "<span class='text'>{$lang->release->all}</span>" . ($type == 'all' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "' data-app='$from'");
+    echo html::a(inlink('browse', "projectID=$projectID&executionID=$executionID&type=normal"), "<span class='text'>{$lang->release->statusList['normal']}</span>" . ($type == 'normal' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='normalTab' class='btn btn-link" . ('normal' == $type ? ' btn-active-text' : '') . "' data-app='$from'");
+    echo html::a(inlink('browse', "projectID=$projectID&executionID=$executionID&type=terminate"), "<span class='text'>{$lang->release->statusList['terminate']}</span>" . ($type == 'terminate' ? ' <span class="label label-light label-badge">' . count($releases) . '</span>' : ''), '', "id='terminateTab' class='btn btn-link" . ('terminate' == $type ? ' btn-active-text' : '') . "' data-app='$from'");
     ?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php if(common::canModify('execution', $execution)):?>
-    <?php common::printLink('projectrelease', 'create', '', "<i class='icon icon-plus'></i> {$lang->release->create}", '', "class='btn btn-primary'");?>
-    <?php endif;?>
+    <?php common::printLink('projectrelease', 'create', "projectID=$projectID", "<i class='icon icon-plus'></i> {$lang->release->create}", '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent" class='main-table'>
@@ -32,8 +30,8 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->release->noRelease;?></span>
-      <?php if(common::canModify('execution', $execution) and common::hasPriv('projectrelease', 'create')):?>
-      <?php echo html::a($this->createLink('projectrelease', 'create'), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
+      <?php if(common::hasPriv('projectrelease', 'create')):?>
+      <?php echo html::a($this->createLink('projectrelease', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
   </div>
@@ -63,7 +61,7 @@
         <td>
           <?php
           $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';
-          echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
+          echo html::a(inlink('view', "release=$release->id"), $release->name, '', "data-app='$from'") . $flagIcon;
           ?>
         </td>
         <td title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php
index a8bb6c8ba6..aad3005c38 100644
--- a/module/projectrelease/view/linkstory.html.php
+++ b/module/projectrelease/view/linkstory.html.php
@@ -51,12 +51,12 @@
           <td class='text-left nobr' title='<?php echo $story->title?>'>
             <?php
             if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
-            echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
+            echo html::a($this->createLink('story', 'view', "storyID={$story->id}&version=0&param=$projectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
             ?>
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td><span class='status-story status-<?php echo $story->status?>'><?php echo $this->processStatus('story', $story);?></span></td>
           <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         </tr>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 3fa35f6376..19a2b34524 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -96,7 +96,7 @@
                 </thead>
                 <tbody>
                   <?php foreach($stories as $storyID => $story):?>
-                  <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
+                  <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id&version=0&param=$projectID", '', true);?>
                   <tr>
                     <td class='c-id text-left'>
                       <?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
@@ -115,7 +115,7 @@
                       ?>
                     </td>
                     <td><?php echo zget($users, $story->openedBy);?></td>
-                    <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                    <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
                     <td>
                       <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
                     </td>
@@ -146,7 +146,7 @@
 
                   if(common::hasPriv('story', 'batchClose'))
                   {
-                      $closeURL = $this->createLink('story', 'batchClose', "productID=$release->product");
+                      $closeURL = $this->createLink('story', 'batchClose');
                       echo html::a("###", $lang->story->batchClose, '', "onclick='setFormAction(\"$closeURL\", \"\", this)' class='btn'");
                   }
                   ?>
diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index eed79d5b6a..ce582bc4ba 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -10,26 +10,18 @@
  */
 class projectStory extends control
 {
-    public $products = array();
-
     /**
-     * Get the products associated with the project.
+     * All products.
      *
-     * @param  string  $moduleName
-     * @param  string  $methodName
+     * @var    array
      * @access public
-     * @return void
      */
-    public function __construct($moduleName = '', $methodName = '')
-    {
-        parent::__construct($moduleName, $methodName);
-        $this->products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
-        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=projectstory&moduleGroup=' . $this->lang->navGroup->projectstory . '&activeMenu=projectstory')));
-    }
+    public $products = array();
 
     /**
      * Get software requirements from product.
      *
+     * @param  int    $projectID
      * @param  int    $productID
      * @param  int    $branch
      * @param  string $browseType
@@ -42,18 +34,11 @@ class projectStory extends control
      * @access public
      * @return void
      */
-    public function story($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function story($projectID = 0, $productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->session->set('storyList', $this->app->getURI(true));
-
-        $this->lang->menugroup->product       = 'projectstory';
-
-        $this->lang->story->title             = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->title);
-        $this->lang->story->createRequirement = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->createRequirement);
-        $this->lang->story->createStory       = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->createStory);
-        $this->lang->story->noStory           = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->noStory);
-
-        echo $this->fetch('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&from=project");
+        $this->products = $this->loadModel('product')->getProductPairsByProject($projectID);
+        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=story&projectID=' . $projectID)));
+        echo $this->fetch('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
     }
 
     /**
@@ -67,15 +52,12 @@ class projectStory extends control
      * @access public
      * @return void
      */
-    public function track($productID = 0, $branch = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function track($projectID = 0, $productID = 0, $branch = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        if(empty($productID)) $productID = key($this->products);
-        $this->lang->menugroup->projectstory = 'track';
+        $products = $this->loadModel('product')->getProductPairsByProject($projectID);
+        if(empty($productID)) $productID = key($products);
 
-        $this->lang->story->requirement = str_replace($this->lang->URCommon, $this->lang->URCommon, $this->lang->story->requirement);
-        $this->lang->story->story       = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->story);
-
-        echo $this->fetch('story', 'track', "productID=$productID&branch=$branch&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        echo $this->fetch('story', 'track', "productID=$productID&branch=$branch&projectID=$projectID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
     /**
@@ -88,7 +70,7 @@ class projectStory extends control
     public function view($storyID)
     {
         $story = $this->loadModel('story')->getByID($storyID);
-        echo $this->fetch('story', 'view', "storyID=$storyID&version=$story->version&param=" . $this->session->PRJ);
+        echo $this->fetch('story', 'view', "storyID=$storyID&version=$story->version&param=" . $this->session->project);
     }
 
     /**
@@ -121,5 +103,19 @@ class projectStory extends control
     {
         echo $this->fetch('execution', 'unlinkStory', "projectID=$projectID&storyID=$storyID&confirm=$confirm");
     }
+
+    /**
+     * Import plan stories.
+     *
+     * @param  int    $projectID
+     * @param  int    $planID
+     * @param  int    $productID
+     * @access public
+     * @return void
+     */
+    public function importPlanStories($projectID, $planID, $productID = 0)
+    {
+        echo $this->fetch('execution', 'importPlanStories', "projectID=$projectID&planID=$planID&productID=$productID");
+    }
 }
 
diff --git a/module/projectstory/lang/de.php b/module/projectstory/lang/de.php
index e7b910f23a..226894ba3a 100644
--- a/module/projectstory/lang/de.php
+++ b/module/projectstory/lang/de.php
@@ -10,14 +10,9 @@ $lang->projectstory->importplanstories = 'Linked by plan' . $lang->SRCommon;
 
 global $app;
 $app->loadLang('product');
-$lang->projectstory->featureBarList['allstory']               = $lang->product->allStory;
-$lang->projectstory->featureBarList['unclosed']               = $lang->product->unclosed;
-$lang->projectstory->featureBarList['willclose']              = $lang->product->willClose;
-$lang->projectstory->featureBarList['status']['draftstory']   = $lang->product->draftStory;
-$lang->projectstory->featureBarList['status']['activestory']  = $lang->product->activeStory;
-$lang->projectstory->featureBarList['status']['changedstory'] = $lang->product->changedStory;
-$lang->projectstory->featureBarList['status']['closedstory']  = $lang->product->closedStory;
-$lang->projectstory->featureBarList['other']['openedbyme']    = $lang->product->openedByMe;
-$lang->projectstory->featureBarList['other']['assignedtome']  = $lang->product->assignedToMe;
-$lang->projectstory->featureBarList['other']['reviewedbyme']  = $lang->product->reviewedByMe;
-$lang->projectstory->featureBarList['other']['closedbyme']    = $lang->product->closedByMe;
+
+$lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
+$lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
+$lang->projectstory->featureBar['story']['changed']  = $lang->product->changedStory;
+$lang->projectstory->featureBar['story']['closed']   = $lang->product->closedStory;
+
diff --git a/module/projectstory/lang/en.php b/module/projectstory/lang/en.php
index e7b910f23a..5afc5da727 100644
--- a/module/projectstory/lang/en.php
+++ b/module/projectstory/lang/en.php
@@ -7,17 +7,13 @@ $lang->projectstory->track             = 'Tracking Matrix';
 $lang->projectstory->linkStory         = 'Linked' . $lang->SRCommon;
 $lang->projectstory->unlinkStory       = 'Unlinked' . $lang->SRCommon;
 $lang->projectstory->importplanstories = 'Linked by plan' . $lang->SRCommon;
+$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->trackAction = 'Matrix';
 
 global $app;
 $app->loadLang('product');
-$lang->projectstory->featureBarList['allstory']               = $lang->product->allStory;
-$lang->projectstory->featureBarList['unclosed']               = $lang->product->unclosed;
-$lang->projectstory->featureBarList['willclose']              = $lang->product->willClose;
-$lang->projectstory->featureBarList['status']['draftstory']   = $lang->product->draftStory;
-$lang->projectstory->featureBarList['status']['activestory']  = $lang->product->activeStory;
-$lang->projectstory->featureBarList['status']['changedstory'] = $lang->product->changedStory;
-$lang->projectstory->featureBarList['status']['closedstory']  = $lang->product->closedStory;
-$lang->projectstory->featureBarList['other']['openedbyme']    = $lang->product->openedByMe;
-$lang->projectstory->featureBarList['other']['assignedtome']  = $lang->product->assignedToMe;
-$lang->projectstory->featureBarList['other']['reviewedbyme']  = $lang->product->reviewedByMe;
-$lang->projectstory->featureBarList['other']['closedbyme']    = $lang->product->closedByMe;
+$lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
+$lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
+$lang->projectstory->featureBar['story']['changed']  = $lang->product->changedStory;
+$lang->projectstory->featureBar['story']['closed']   = $lang->product->closedStory;
diff --git a/module/projectstory/lang/fr.php b/module/projectstory/lang/fr.php
index e7b910f23a..3817c007aa 100644
--- a/module/projectstory/lang/fr.php
+++ b/module/projectstory/lang/fr.php
@@ -10,14 +10,7 @@ $lang->projectstory->importplanstories = 'Linked by plan' . $lang->SRCommon;
 
 global $app;
 $app->loadLang('product');
-$lang->projectstory->featureBarList['allstory']               = $lang->product->allStory;
-$lang->projectstory->featureBarList['unclosed']               = $lang->product->unclosed;
-$lang->projectstory->featureBarList['willclose']              = $lang->product->willClose;
-$lang->projectstory->featureBarList['status']['draftstory']   = $lang->product->draftStory;
-$lang->projectstory->featureBarList['status']['activestory']  = $lang->product->activeStory;
-$lang->projectstory->featureBarList['status']['changedstory'] = $lang->product->changedStory;
-$lang->projectstory->featureBarList['status']['closedstory']  = $lang->product->closedStory;
-$lang->projectstory->featureBarList['other']['openedbyme']    = $lang->product->openedByMe;
-$lang->projectstory->featureBarList['other']['assignedtome']  = $lang->product->assignedToMe;
-$lang->projectstory->featureBarList['other']['reviewedbyme']  = $lang->product->reviewedByMe;
-$lang->projectstory->featureBarList['other']['closedbyme']    = $lang->product->closedByMe;
+$lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
+$lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
+$lang->projectstory->featureBar['story']['changed']  = $lang->product->changedStory;
+$lang->projectstory->featureBar['story']['closed']   = $lang->product->closedStory;
diff --git a/module/projectstory/lang/vi.php b/module/projectstory/lang/vi.php
index e7b910f23a..3817c007aa 100644
--- a/module/projectstory/lang/vi.php
+++ b/module/projectstory/lang/vi.php
@@ -10,14 +10,7 @@ $lang->projectstory->importplanstories = 'Linked by plan' . $lang->SRCommon;
 
 global $app;
 $app->loadLang('product');
-$lang->projectstory->featureBarList['allstory']               = $lang->product->allStory;
-$lang->projectstory->featureBarList['unclosed']               = $lang->product->unclosed;
-$lang->projectstory->featureBarList['willclose']              = $lang->product->willClose;
-$lang->projectstory->featureBarList['status']['draftstory']   = $lang->product->draftStory;
-$lang->projectstory->featureBarList['status']['activestory']  = $lang->product->activeStory;
-$lang->projectstory->featureBarList['status']['changedstory'] = $lang->product->changedStory;
-$lang->projectstory->featureBarList['status']['closedstory']  = $lang->product->closedStory;
-$lang->projectstory->featureBarList['other']['openedbyme']    = $lang->product->openedByMe;
-$lang->projectstory->featureBarList['other']['assignedtome']  = $lang->product->assignedToMe;
-$lang->projectstory->featureBarList['other']['reviewedbyme']  = $lang->product->reviewedByMe;
-$lang->projectstory->featureBarList['other']['closedbyme']    = $lang->product->closedByMe;
+$lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
+$lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
+$lang->projectstory->featureBar['story']['changed']  = $lang->product->changedStory;
+$lang->projectstory->featureBar['story']['closed']   = $lang->product->closedStory;
diff --git a/module/projectstory/lang/zh-cn.php b/module/projectstory/lang/zh-cn.php
index a6baedf642..2d027bd772 100644
--- a/module/projectstory/lang/zh-cn.php
+++ b/module/projectstory/lang/zh-cn.php
@@ -7,17 +7,13 @@ $lang->projectstory->track             = '矩阵';
 $lang->projectstory->linkStory         = '关联' . $lang->SRCommon;
 $lang->projectstory->unlinkStory       = '移除' . $lang->SRCommon;
 $lang->projectstory->importplanstories = '按计划关联' . $lang->SRCommon;
+$lang->projectstory->whyNoStories      = "看起来没有{$lang->SRCommon}可以关联。请检查下项目关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
+
+$lang->projectstory->trackAction = '跟踪矩阵';
 
 global $app;
 $app->loadLang('product');
-$lang->projectstory->featureBarList['allstory']               = $lang->product->allStory;
-$lang->projectstory->featureBarList['unclosed']               = $lang->product->unclosed;
-$lang->projectstory->featureBarList['willclose']              = $lang->product->willClose;
-$lang->projectstory->featureBarList['status']['draftstory']   = $lang->product->draftStory;
-$lang->projectstory->featureBarList['status']['activestory']  = $lang->product->activeStory;
-$lang->projectstory->featureBarList['status']['changedstory'] = $lang->product->changedStory;
-$lang->projectstory->featureBarList['status']['closedstory']  = $lang->product->closedStory;
-$lang->projectstory->featureBarList['other']['openedbyme']    = $lang->product->openedByMe;
-$lang->projectstory->featureBarList['other']['assignedtome']  = $lang->product->assignedToMe;
-$lang->projectstory->featureBarList['other']['reviewedbyme']  = $lang->product->reviewedByMe;
-$lang->projectstory->featureBarList['other']['closedbyme']    = $lang->product->closedByMe;
+$lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
+$lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
+$lang->projectstory->featureBar['story']['changed']  = $lang->product->changedStory;
+$lang->projectstory->featureBar['story']['closed']   = $lang->product->closedStory;
diff --git a/module/projectstory/lang/zh-tw.php b/module/projectstory/lang/zh-tw.php
index 0b0ee3b409..5d60ab4f89 100644
--- a/module/projectstory/lang/zh-tw.php
+++ b/module/projectstory/lang/zh-tw.php
@@ -1,21 +1,19 @@
 <?php
-$lang->projectstory->common      = '項目' . $lang->SRCommon;
-$lang->projectstory->index       = $lang->SRCommon . '主頁';
-$lang->projectstory->view        = $lang->SRCommon . '詳情';
-$lang->projectstory->track       = '矩陣';
-$lang->projectstory->linkStory   = '關聯' . $lang->SRCommon;
-$lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;
+$lang->projectstory->common            = "項目{$lang->SRCommon}";
+$lang->projectstory->index             = "{$lang->SRCommon}主頁";
+$lang->projectstory->view              = "{$lang->SRCommon}詳情";
+$lang->projectstory->story             = "{$lang->SRCommon}列表";
+$lang->projectstory->track             = '矩陣';
+$lang->projectstory->linkStory         = '關聯' . $lang->SRCommon;
+$lang->projectstory->unlinkStory       = '移除' . $lang->SRCommon;
+$lang->projectstory->importplanstories = '按計劃關聯' . $lang->SRCommon;
+$lang->projectstory->whyNoStories      = "看起來沒有{$lang->SRCommon}可以關聯。請檢查下項目關聯的{$lang->productCommon}中有沒有{$lang->SRCommon}，而且要確保它們已經審核通過。";
+
+$lang->projectstory->trackAction = '跟蹤矩陣';
 
 global $app;
 $app->loadLang('product');
-$lang->projectstory->featureBarList['allstory']               = $lang->product->allStory;
-$lang->projectstory->featureBarList['unclosed']               = $lang->product->unclosed;
-$lang->projectstory->featureBarList['willclose']              = $lang->product->willClose;
-$lang->projectstory->featureBarList['status']['draftstory']   = $lang->product->draftStory;
-$lang->projectstory->featureBarList['status']['activestory']  = $lang->product->activeStory;
-$lang->projectstory->featureBarList['status']['changedstory'] = $lang->product->changedStory;
-$lang->projectstory->featureBarList['status']['closedstory']  = $lang->product->closedStory;
-$lang->projectstory->featureBarList['other']['openedbyme']    = $lang->product->openedByMe;
-$lang->projectstory->featureBarList['other']['assignedtome']  = $lang->product->assignedToMe;
-$lang->projectstory->featureBarList['other']['reviewedbyme']  = $lang->product->reviewedByMe;
-$lang->projectstory->featureBarList['other']['closedbyme']    = $lang->product->closedByMe;
+$lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
+$lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
+$lang->projectstory->featureBar['story']['changed']  = $lang->product->changedStory;
+$lang->projectstory->featureBar['story']['closed']   = $lang->product->closedStory;
diff --git a/module/qa/config.php b/module/qa/config.php
index b85214fb7b..2077db491c 100644
--- a/module/qa/config.php
+++ b/module/qa/config.php
@@ -1,2 +1,3 @@
 <?php
-$config->qa->menuList = array('caselib', 'testreport', 'testsuite', 'testtask', 'testcase', 'bug', 'qa', 'automation');
+$config->qa->menuList         = array('caselib', 'testreport', 'testsuite', 'testtask', 'testcase', 'bug', 'qa', 'automation');
+$config->qa->noDropMenuModule = array('qa', 'caselib', 'automation');
diff --git a/module/qa/control.php b/module/qa/control.php
index 8a6e0b0227..b2b35c4e3e 100644
--- a/module/qa/control.php
+++ b/module/qa/control.php
@@ -11,57 +11,25 @@
  */
 class qa extends control
 {
-    /**
-     * Project id.
-     *
-     * @var    int
-     * @access public
-     */
-    public $projectID;
-
-    /**
-     * Construct.
-     *
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        /* Set qa menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID)
-        {
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-            $this->lang->noMenuModule[] = $this->app->rawModule;
-        }
-        else 
-        {    
-            $this->lang->qa->menu    = $this->lang->projectQa->menu;
-            $this->lang->qa->subMenu = $this->lang->projectQa->subMenu;
-        }
-    }
-
     /**
      * The index of qa, go to bug's browse page.
      *
      * @access public
      * @return void
      */
-    public function index($locate = 'auto', $productID = 0)
+    public function index($locate = 'auto', $productID = 0, $projectID = 0)
     {
-        $this->products = $this->loadModel('product')->getProductPairsByProject($this->projectID, 'noclosed');
-        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=qa&moduleGroup=' . $this->lang->navGroup->qa . '&activeMenu=index')));
+        $products = $this->loadModel('product')->getProductPairsByProject($projectID, 'noclosed');
+        if(empty($products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=qa&activeMenu=index")));
         if($locate == 'yes') $this->locate($this->createLink('bug', 'browse'));
 
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->product->saveState($productID, $products);
         $branch    = (int)$this->cookie->preBranch;
-        $this->qa->setMenu($this->products, $productID, $branch);
+        $this->qa->setMenu($products, $productID, $branch);
 
         $this->view->title      = $this->lang->qa->index;
         $this->view->position[] = $this->lang->qa->index;
-        $this->view->products   = $this->products;
+        $this->view->products   = $products;
         $this->display();
     }
 }
diff --git a/module/qa/lang/de.php b/module/qa/lang/de.php
index 0e9e094ac1..6becfe71c6 100644
--- a/module/qa/lang/de.php
+++ b/module/qa/lang/de.php
@@ -9,5 +9,5 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->qa->common = 'QS';
-$lang->qa->index  = 'QS Home';
+$lang->qa->index       = 'QS Home';
+$lang->qa->indexAction = 'QA Index';
diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php
index 4ff765c054..82934725fa 100644
--- a/module/qa/lang/en.php
+++ b/module/qa/lang/en.php
@@ -9,5 +9,5 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->qa->common = 'QA';
-$lang->qa->index  = 'QA Home';
+$lang->qa->index       = 'QA Home';
+$lang->qa->indexAction = 'QA Index';
diff --git a/module/qa/lang/fr.php b/module/qa/lang/fr.php
index 4ee94ec05b..2ca6ab5c9f 100644
--- a/module/qa/lang/fr.php
+++ b/module/qa/lang/fr.php
@@ -9,5 +9,5 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        https://www.zentao.pm
  */
-$lang->qa->common = 'QA';
-$lang->qa->index  = 'Accueil Qualité';
+$lang->qa->index       = 'Accueil Qualité';
+$lang->qa->indexAction = 'QA Index';
diff --git a/module/qa/lang/vi.php b/module/qa/lang/vi.php
index 12c04ec548..94c50dbf0c 100644
--- a/module/qa/lang/vi.php
+++ b/module/qa/lang/vi.php
@@ -9,5 +9,5 @@
  * @version  $Id: vi.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link  http://www.zentao.net
  */
-$lang->qa->common = 'QA';
-$lang->qa->index  = 'Trang QA';
+$lang->qa->index       = 'Trang QA';
+$lang->qa->indexAction = 'QA Index';
diff --git a/module/qa/lang/zh-cn.php b/module/qa/lang/zh-cn.php
index 8e0e2683e6..eb6b7390cf 100644
--- a/module/qa/lang/zh-cn.php
+++ b/module/qa/lang/zh-cn.php
@@ -9,5 +9,5 @@
  * @version     $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->qa->common = '测试视图';
-$lang->qa->index  = '测试主页';
+$lang->qa->index       = '测试主页';
+$lang->qa->indexAction = '测试仪表盘';
diff --git a/module/qa/lang/zh-tw.php b/module/qa/lang/zh-tw.php
index 7c674a782a..8968c36858 100644
--- a/module/qa/lang/zh-tw.php
+++ b/module/qa/lang/zh-tw.php
@@ -9,5 +9,6 @@
  * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->qa->common = '測試視圖';
 $lang->qa->index  = '測試主頁';
+
+$lang->qa->indexAction = '測試儀表盤';
diff --git a/module/qa/model.php b/module/qa/model.php
index 2df7c0f569..7635bf30d5 100644
--- a/module/qa/model.php
+++ b/module/qa/model.php
@@ -23,32 +23,9 @@ class qaModel extends model
      */
     public function setMenu($products, $productID, $branch = 0, $extra = '')
     {
-        $this->loadModel('product')->setMenu($products, $productID, $branch);
-        $selectHtml = $this->product->select($products, $productID, 'qa', 'index', $extra, $branch);
-
-        $productIndex = '';
-        $isMobile     = $this->app->viewType == 'mhtml';
-        if($isMobile)
-        {
-            $productIndex  = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
-            $productIndex .= $selectHtml;
-        }
-        else
-        {
-            $currentMethod = $this->app->getMethodName();
-            $productIndex .= $selectHtml;
-        }
-
-        $this->lang->modulePageNav = $productIndex;
-        foreach($this->lang->qa->menu as $key => $menu)
-        {
-            if($this->config->global->flow == 'full' && $this->lang->navGroup->qa != 'qa') $this->setSubMenu('qa', $key, $productID);
-            $replace = $productID;
-            if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->qa->menu, $key, $replace);
-        }
-
-        if($this->lang->navGroup->qa == 'qa') $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, $extra, $branch);
+        if(!in_array($this->app->rawModule, $this->config->qa->noDropMenuModule)) $this->lang->switcherMenu = $this->loadModel('product')->getSwitcher($productID, $extra, $branch);
+        if($this->app->rawModule == 'product' and $this->app->rawMethod == 'showerrornone') $this->lang->switcherMenu = '';
+        common::setMenuVars('qa', $productID);
     }
 
     /**
diff --git a/module/release/control.php b/module/release/control.php
index e4dc421afe..9d1d2998cb 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -21,18 +21,14 @@ class release extends control
      */
     public function commonAction($productID, $branch = 0)
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->loadModel('product')->getSwitcher($productID, '', $branch);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
+        $this->loadModel('product')->setMenu($productID, $branch);
 
-        $this->loadModel('product');
         $product = $this->product->getById($productID);
         if(empty($product)) $this->locate($this->createLink('product', 'create'));
         $this->view->product  = $product;
         $this->view->branch   = $branch;
         $this->view->branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($product->id);
         $this->view->position[] = html::a($this->createLink('product', 'browse', "productID={$this->view->product->id}&branch=$branch"), $this->view->product->name);
-        $this->product->setMenu($this->product->getPairs(), $productID, $branch);
     }
 
     /**
@@ -47,7 +43,7 @@ class release extends control
     public function browse($productID, $branch = 0, $type = 'all')
     {
         $this->commonAction($productID, $branch);
-        $this->session->set('releaseList', $this->app->getURI(true));
+        $this->session->set('releaseList', $this->app->getURI(true), 'product');
 
         $this->view->title      = $this->view->product->name . $this->lang->colon . $this->lang->release->browse;
         $this->view->position[] = $this->lang->release->browse;
@@ -74,6 +70,7 @@ class release extends control
 
             $this->executeHooks($releaseID);
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $releaseID));
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProductBuilds($productID)"));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
@@ -150,11 +147,12 @@ class release extends control
      */
     public function view($releaseID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $release = $this->release->getByID((int)$releaseID, true);
+        $releaseID = (int)$releaseID;
+        $release   = $this->release->getByID($releaseID, true);
         if(!$release) die(js::error($this->lang->notFound) . js::locate('back'));
 
-        if($type == 'story') $this->session->set('storyList', $this->app->getURI(true));
-        if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $this->app->getURI(true));
+        if($type == 'story') $this->session->set('storyList', $this->app->getURI(true), 'product');
+        if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $this->app->getURI(true), 'qa');
 
         $this->loadModel('story');
         $this->loadModel('bug');
@@ -384,7 +382,7 @@ class release extends control
             $this->release->linkStory($releaseID);
             die(js::locate(inlink('view', "releaseID=$releaseID&type=story"), 'parent'));
         }
-        $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'product');
 
         $release = $this->release->getById($releaseID);
         $build   = $this->loadModel('build')->getByID($release->build);
@@ -504,7 +502,7 @@ class release extends control
             die(js::locate(inlink('view', "releaseID=$releaseID&type=$type"), 'parent'));
         }
 
-        $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
+        $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa');
         /* Set menu. */
         $release = $this->release->getByID($releaseID);
         $build   = $this->loadModel('build')->getByID($release->build);
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 668cdae08a..7ad42950d8 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -9,7 +9,7 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = 'Release';
+$lang->release->common           = 'Product Release';
 $lang->release->create           = "Erstellen";
 $lang->release->edit             = "Bearbeiten";
 $lang->release->linkStory        = "Story verknüpfen";
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index b8c0f7a668..614f409cc5 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -9,7 +9,7 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = 'Release';
+$lang->release->common           = 'Product Release';
 $lang->release->create           = "Create Release";
 $lang->release->edit             = "Edit Release";
 $lang->release->linkStory        = "Link Story";
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 08a8186be9..794a18a0cb 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -9,7 +9,7 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        https://www.zentao.pm
  */
-$lang->release->common           = 'Release';
+$lang->release->common           = 'Product Release';
 $lang->release->create           = "Créer Release";
 $lang->release->edit             = "Editer Release";
 $lang->release->linkStory        = "Intégrer Story";
diff --git a/module/release/lang/vi.php b/module/release/lang/vi.php
index aca0ed642b..57607a8d2a 100644
--- a/module/release/lang/vi.php
+++ b/module/release/lang/vi.php
@@ -9,7 +9,7 @@
  * @version  $Id: vi.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link  http://www.zentao.net
  */
-$lang->release->common           = 'Phát hành';
+$lang->release->common           = 'Product Release';
 $lang->release->create           = "Tạo phát hành";
 $lang->release->edit             = "Sửa phát hành";
 $lang->release->linkStory        = "Liên kết câu chuyện";
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 81a9260366..e108611d91 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = '发布';
+$lang->release->common           = '产品发布';
 $lang->release->create           = "创建发布";
 $lang->release->edit             = "编辑发布";
 $lang->release->linkStory        = "关联{$lang->SRCommon}";
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 71f1596925..62c488f2d7 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = '發佈';
+$lang->release->common           = '產品發佈';
 $lang->release->create           = "創建發佈";
 $lang->release->edit             = "編輯發佈";
 $lang->release->linkStory        = "關聯{$lang->SRCommon}";
diff --git a/module/release/model.php b/module/release/model.php
index f208b8555f..6e3c0d92cc 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -169,7 +169,12 @@ class releaseModel extends model
             }
         }
 
-        if($release->build) $release->branch = $this->dao->select('branch')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch('branch');
+        if($release->build) 
+        {
+            $buildInfo = $this->dao->select('project, branch')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch();
+            $release->branch  = $buildInfo->branch;
+            $release->project = $buildInfo->project;
+        }
 
         $release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_RELEASE)->data($release)
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index 0e746d0e2d..507da2c9c5 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -56,7 +56,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td><span class='status-story status-<?php echo $story->status?>'><?php echo $this->processStatus('story', $story);?></span></td>
           <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         </tr>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 07d9673527..cb7b8bc7d0 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -77,7 +77,7 @@
                 <?php $vars = "releaseID={$release->id}&type=story&link=$link&param=$param&orderBy=%s";?>
                 <thead>
                   <tr>
-                    <th class='c-id text-left'>
+                    <th class='c-id text-left w-110px'>
                       <?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                       <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
                         <label></label>
@@ -115,7 +115,7 @@
                       ?>
                     </td>
                     <td><?php echo zget($users, $story->openedBy);?></td>
-                    <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                    <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
                     <td>
                       <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
                     </td>
diff --git a/module/repo/config.php b/module/repo/config.php
index 86e31f4308..ebb573a0fe 100644
--- a/module/repo/config.php
+++ b/module/repo/config.php
@@ -34,12 +34,18 @@ $config->repo->editor->view   = array('id' => 'commentText', 'tools' => 'simpleT
 $config->repo->editor->diff   = array('id' => 'commentText', 'tools' => 'simpleTools');
 
 $config->repo->create = new stdclass();
-$config->repo->create->requiredFields = 'SCM,name,path,encoding,client';
+$config->repo->create->requiredFields = 'product,SCM,name,path,encoding,client';
+
 $config->repo->edit = new stdclass();
-$config->repo->edit->requiredFields = 'SCM,name,path,encoding,client';
+$config->repo->edit->requiredFields = 'product,SCM,name,path,encoding,client';
+
 $config->repo->svn = new stdclass();
 $config->repo->svn->requiredFields = 'account,password';
 
+$config->repo->gitlab = new stdclass;
+$config->repo->gitlab->perPage = 300;
+$config->repo->gitlab->apiPath = "%s/api/v4/projects/%s/repository/";
+
 $config->repo->rules['module']['task']     = 'Task';
 $config->repo->rules['module']['bug']      = 'Bug';
 $config->repo->rules['module']['story']    = 'Story';
diff --git a/module/repo/control.php b/module/repo/control.php
index 9e3d74f5ef..4a747571c8 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -20,6 +20,8 @@ class repo extends control
     {
         parent::__construct();
 
+        $this->scm = $this->app->loadClass('scm');
+
         $disFuncs = str_replace(' ', '', ini_get('disable_functions'));
         if(stripos(",$disFuncs,", ',exec,') !== false or stripos(",$disFuncs,", ',shell_exec,') !== false)
         {
@@ -27,27 +29,45 @@ class repo extends control
             die(js::locate('back'));
         }
 
-        /* Set repo menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
-        if(!$this->projectID)
-        {
-            $this->lang->navGroup->repo    = 'repo';
-            $this->lang->navGroup->jenkins = 'repo';
-            $this->lang->navGroup->job     = 'repo';
-            $this->lang->navGroup->compile = 'repo';
-        }
-
-        $this->scm       = $this->app->loadClass('scm');
-        $this->repos     = $this->repo->getRepoPairs($this->projectID);
-        if(empty($this->repos) and $this->methodName != 'create') die(js::locate($this->repo->createLink('create')));
+        $this->projectID = $this->session->project ? $this->session->project : 0;
 
         /* Unlock session for wait to get data of repo. */
         session_write_close();
     }
 
+    /**
+     * Common actions.
+     *
+     * @param  int    $repoID
+     * @param  int    $objectID  projectID|executionID
+     * @access public
+     * @return void
+     */
+    public function commonAction($repoID = 0, $objectID = 0)
+    {
+        $openApp     = $this->app->openApp;
+        $this->repos = $this->repo->getRepoPairs($openApp, $objectID);
+
+        if($openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($objectID);
+        }
+        else if($openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($objectID);
+        }
+        else
+        {
+            $this->repo->setMenu($this->repos, $repoID);
+        }
+
+        if(empty($this->repos) and $this->methodName != 'create') die($this->locate($this->repo->createLink('create', "objectID=$objectID")));
+    }
+
     /**
      * List all repo.
      *
+     * @param  int    $objectID
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -55,25 +75,31 @@ class repo extends control
      * @access public
      * @return void
      */
-    public function maintain($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function maintain($objectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $repoID = $this->session->repoID;
-        $this->repo->setMenu($this->repos, $repoID, false);
+        $this->lang->switcherMenu = '';
         if(common::hasPriv('repo', 'create')) $this->lang->TRActions = html::a(helper::createLink('repo', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->repo->create, '', "class='btn btn-primary'");
 
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager($recTotal, $recPerPage, $pageID);
+        $repoID = $this->repo->saveState(0, $objectID);
+        $this->commonAction($repoID, $objectID);
 
-        $this->view->repoList   = $this->repo->getList($this->projectID, $orderBy, $pager);
+        $repoList = $this->repo->getList(0, $orderBy);
+
+        /* Pager. */
+        $this->app->loadClass('pager', $static = true);
+        $recTotal   = count($repoList);
+        $pager      = new pager($recTotal, $recPerPage, $pageID);
+        $repoList   = array_chunk($repoList, $pager->recPerPage);
 
         $this->view->title      = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->browse;
         $this->view->position[] = $this->lang->repo->common;
         $this->view->position[] = $this->lang->repo->browse;
 
-        $this->view->repoID     = $repoID;
-        $this->view->orderBy    = $orderBy;
-        $this->view->pager      = $pager;
-        $this->view->products   = $this->projectID ? $this->loadModel('product')->getProductPairsByProject($this->projectID) : $this->loadModel('product')->getPairs();
+        $this->view->orderBy  = $orderBy;
+        $this->view->objectID = $objectID;
+        $this->view->pager    = $pager;
+        $this->view->repoList = empty($repoList) ? $repoList: $repoList[$pageID - 1];;
+        $this->view->products = $this->loadModel('product')->getPairs();
 
         $this->display();
     }
@@ -81,10 +107,11 @@ class repo extends control
     /**
      * Create a repo.
      *
+     * @param  int    $objectID  projectID|executionID
      * @access public
      * @return void
      */
-    public function create()
+    public function create($objectID = 0)
     {
         if($_POST)
         {
@@ -92,19 +119,21 @@ class repo extends control
 
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $link = $this->repo->createLink('showSyncCommit', "repoID=$repoID", '', false, $this->projectID);
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $repoID));
+            $link = $this->repo->createLink('showSyncCommit', "repoID=$repoID&objectID=$objectID", '', false);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
         }
 
-        array_push($this->lang->noMenuModule, 'repo');
+        $repoID = $this->repo->saveState(0, $objectID);
+        $this->commonAction($repoID, $objectID);
+
         $this->app->loadLang('action');
-        $this->repo->setMenu($this->repos, '', false);
 
         $this->view->title      = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->create;
         $this->view->position[] = $this->lang->repo->create;
         $this->view->groups     = $this->loadModel('group')->getPairs();
         $this->view->users      = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted');
-        $this->view->products   = $this->loadModel('product')->getProductPairsByProject($this->projectID);
+        $this->view->products   = $this->loadModel('product')->getProductPairsByProject($objectID);
 
         $this->display();
     }
@@ -113,11 +142,14 @@ class repo extends control
      * Edit a repo.
      *
      * @param  int $repoID
+     * @param  int $objectID
      * @access public
      * @return void
      */
-    public function edit($repoID)
+    public function edit($repoID, $objectID = 0)
     {
+        $this->commonAction($repoID, $objectID);
+
         $repo = $this->repo->getRepoByID($repoID);
         if($_POST)
         {
@@ -132,15 +164,23 @@ class repo extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('maintain')));
         }
 
-        $this->repo->setMenu($this->repos, $repo->id, false);
         $this->app->loadLang('action');
 
+        if($repo->SCM == 'Gitlab')
+        {
+            $projects = $this->repo->getGitlabProjects($repo->client, $repo->password);
+            $options  = array();
+            foreach($projects as $project) $options[$project->id] = $project->name . ':' . $project->http_url_to_repo;
+            $this->view->projects = $options;
+        }
+
         $repo->repoType       = $repo->id . '-' . $repo->SCM;
         $this->view->repo     = $repo;
         $this->view->repoID   = $repoID;
+        $this->view->objectID = $objectID;
         $this->view->groups   = $this->loadModel('group')->getPairs();
         $this->view->users    = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted');
-        $this->view->products = $this->projectID ? $this->loadModel('product')->getProductPairsByProject($this->projectID) : $this->loadModel('product')->getPairs();
+        $this->view->products = $objectID ? $this->loadModel('product')->getProductPairsByProject($objectID) : $this->loadModel('product')->getPairs();
 
         $this->view->title      = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->edit;
         $this->view->position[] = html::a(inlink('maintain'), $this->lang->repo->common);
@@ -153,15 +193,16 @@ class repo extends control
      * Delete repo.
      *
      * @param  int    $repoID
+     * @param  int    $objectID
      * @param  string $confirm
      * @access public
      * @return void
      */
-    public function delete($repoID, $confirm = 'no')
+    public function delete($repoID, $objectID = 0, $confirm = 'no')
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&confirm=yes")));
+            die(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&objectID=$objectID&confirm=yes")));
         }
 
         $relationID = $this->dao->select('id')->from(TABLE_RELATION)->where('extra')->eq($repoID)->fetch();
@@ -183,6 +224,7 @@ class repo extends control
      * View repo file.
      *
      * @param  int    $repoID
+     * @param  int    $objectID
      * @param  string $entry
      * @param  string $revision
      * @param  string $showBug
@@ -190,10 +232,9 @@ class repo extends control
      * @access public
      * @return void
      */
-    public function view($repoID, $entry, $revision = 'HEAD', $showBug = 'false', $encoding = '')
+    public function view($repoID, $objectID = 0, $entry = '', $revision = 'HEAD', $showBug = 'false', $encoding = '')
     {
         if($this->get->repoPath) $entry = $this->get->repoPath;
-        $this->repo->setMenu($this->repos, $repoID);
         $this->repo->setBackSession('view', $withOtherModule = true);
         if($repoID == 0) $repoID = $this->session->repoID;
 
@@ -202,9 +243,11 @@ class repo extends control
             $oldRevision = isset($this->post->revision[1]) ? $this->post->revision[1] : '';
             $newRevision = isset($this->post->revision[0]) ? $this->post->revision[0] : '';
 
-            $this->locate($this->repo->createLink('diff', "repoID=$repoID&entry=$entry&oldrevision=$oldRevision&newRevision=$newRevision"));
+            $this->locate($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=$entry&oldrevision=$oldRevision&newRevision=$newRevision"));
         }
 
+        $this->commonAction($repoID, $objectID);
+
         $file  = $entry;
         $repo  = $this->repo->getRepoByID($repoID);
         $entry = $this->repo->decodePath($entry);
@@ -212,7 +255,7 @@ class repo extends control
         $this->scm->setEngine($repo);
         $info = $this->scm->info($entry, $revision);
         $path = $entry ? $info->path : '';
-        if($info->kind == 'dir') $this->locate($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($path) . "&revision=$revision"));
+        if($info->kind == 'dir') $this->locate($this->repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID&path=" . $this->repo->encodePath($path) . "&revision=$revision"));
         $content  = $this->scm->cat($entry, $revision);
         $entry    = urldecode($entry);
         $pathInfo = pathinfo($entry);
@@ -243,14 +286,14 @@ class repo extends control
         foreach($revisions as $log)
         {
             if($revision == 'HEAD' and $i == 0) $revision = $log->revision;
-            if($revision == $log->revision) $revisionName = $repo->SCM == 'Git' ?  $this->repo->getGitRevisionName($log->revision, $log->commit) : $log->revision;
+            if($revision == $log->revision) $revisionName = strpos($repo->SCM, 'Git') !== false ?  $this->repo->getGitRevisionName($log->revision, $log->commit) : $log->revision;
             $log->committer = zget($commiters, $log->committer, $log->committer);
             $i++;
         }
         if(!isset($revisionName))
         {
-            if($repo->SCM == 'Git') $gitCommit = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('revision')->eq($revision)->andWhere('repo')->eq($repo->id)->fetch('commit');
-            $revisionName = ($repo->SCM == 'Git' and isset($gitCommit)) ? $this->repo->getGitRevisionName($revision, $gitCommit) : $revision;
+            if(strpos($repo->SCM, 'Git') !== false) $gitCommit = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('revision')->eq($revision)->andWhere('repo')->eq($repo->id)->fetch('commit');
+            $revisionName = (strpos($repo->SCM, 'Git') !== false and isset($gitCommit)) ? $this->repo->getGitRevisionName($revision, $gitCommit) : $revision;
         }
 
         $this->view->revisions    = $revisions;
@@ -259,6 +302,8 @@ class repo extends control
         $this->view->showBug      = $showBug;
         $this->view->encoding     = str_replace('-', '_', $encoding);
         $this->view->repoID       = $repoID;
+        $this->view->branchID     = $this->cookie->repoBranch;
+        $this->view->objectID     = $objectID;
         $this->view->repo         = $repo;
         $this->view->revision     = $revision;
         $this->view->revisionName = $revisionName;
@@ -282,27 +327,53 @@ class repo extends control
      * Browse repo.
      *
      * @param  int    $repoID
+     * @param  string $branchID
+     * @param  int    $objectID
      * @param  string $path
      * @param  string $revision
      * @param  int    $refresh
      * @access public
      * @return void
      */
-    public function browse($repoID = 0, $path = '', $revision = 'HEAD', $refresh = 0)
+    public function browse($repoID = 0, $branchID = '', $objectID = 0, $path = '', $revision = 'HEAD', $refresh = 0)
     {
+        $repoID = $this->repo->saveState($repoID, $objectID);
+
         /* Get path and refresh. */
         if($this->get->repoPath) $path = $this->get->repoPath;
         if(empty($refresh) and $this->cookie->repoRefresh) $refresh = $this->cookie->repoRefresh;
 
         /* Set menu and session. */
-        $this->repo->setMenu($this->repos, $repoID);
+        $this->commonAction($repoID, $objectID);
         $this->repo->setBackSession('list', $withOtherModule = true);
-        if($repoID == 0) $repoID = $this->session->repoID;
+
+        session_start();
+        $this->session->set('revisionList', $this->app->getURI(true));
+        session_write_close();
 
         /* Get repo and synchronous commit. */
         $repo = $this->repo->getRepoByID($repoID);
         if(!$repo->synced) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID"));
 
+        /* Set branch for git. */
+        $branches = array();
+        if(strpos($repo->SCM, 'Git') !== false)
+        {
+            $branches = $this->repo->getBranches($repo);
+
+            if(empty($branchID) and $this->cookie->repoBranch) $branchID = $this->cookie->repoBranch;
+            if($branchID) $this->repo->setRepoBranch($branchID);
+            if(!isset($branches[$branchID]))
+            {
+                $branchID = key($branches);
+                $this->repo->setRepoBranch($branchID);
+            }
+        }
+        else
+        {
+            $this->repo->setRepoBranch('');
+        }
+
         /* Decrypt path and get cacheFile. */
         $path      = $this->repo->decodePath($path);
         $cacheFile = $this->repo->getCacheFile($repoID, $path, $revision);
@@ -317,7 +388,7 @@ class repo extends control
             $oldRevision = isset($this->post->revision[1]) ? $this->post->revision[1] : '';
             $newRevision = isset($this->post->revision[0]) ? $this->post->revision[0] : '';
 
-            $this->locate($this->repo->createLink('diff', "repoID=$repoID&entry=" . $this->repo->encodePath($path) . "&oldrevision=$oldRevision&newRevision=$newRevision"));
+            $this->locate($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($path) . "&oldrevision=$oldRevision&newRevision=$newRevision"));
         }
 
         /* Cache infos. */
@@ -331,7 +402,7 @@ class repo extends control
                 /* Update code commit history. */
                 $commentGroup = $this->loadModel('job')->getTriggerGroup('commit', array($repo->id));
 
-                if($refresh and $repo->SCM == 'Git')
+                if($refresh and strpos($repo->SCM, 'Git') !== false)
                 {
                     $branch = $this->cookie->repoBranch;
                     $this->loadModel('git')->updateCommit($repo, $commentGroup, false);
@@ -366,12 +437,14 @@ class repo extends control
         {
             $infos = unserialize(file_get_contents($cacheFile));
         }
-        if($this->cookie->repoRefresh) setcookie('repoRefresh', 0, 0, $this->config->webRoot);
+        if($this->cookie->repoRefresh) setcookie('repoRefresh', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
-        /* Set logType and revisions and synchronous commit. */
+        /* Set logType and revisions. */
         $logType   = 'dir';
         $revisions = $this->repo->getCommits($repo, $path, $revision, $logType, $pager);
-        if($repo->SCM == 'Git' and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID&branch=" . base64_encode($this->cookie->repoBranch)));
+
+        /* Synchronous commit only in root path. */
+        if(strpos($repo->SCM, 'Git') !== false and empty($path) and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID&objectID=$objectID&branch=" . base64_encode($this->cookie->repoBranch)));
 
         /* Set committers. */
         $commiters = $this->loadModel('user')->getCommiters();
@@ -380,10 +453,14 @@ class repo extends control
 
         $this->view->title     = $this->lang->repo->common;
         $this->view->repo      = $repo;
+        $this->view->repos     = $this->repos;
         $this->view->revisions = $revisions;
         $this->view->revision  = $revision;
         $this->view->infos     = $infos;
         $this->view->repoID    = $repoID;
+        $this->view->branches  = $branches;
+        $this->view->branchID  = $branchID;
+        $this->view->objectID  = $objectID;
         $this->view->pager     = $pager;
         $this->view->path      = urldecode($path);
         $this->view->logType   = $logType;
@@ -396,6 +473,7 @@ class repo extends control
      * show repo log.
      *
      * @param  int    $repoID
+     * @param  int    $objectID
      * @param  string $entry
      * @param  string $revision
      * @param  string $type
@@ -405,10 +483,9 @@ class repo extends control
      * @access public
      * @return void
      */
-    public function log($repoID = 0, $entry = '', $revision = 'HEAD', $type = 'dir', $recTotal = 0, $recPerPage = 50, $pageID = 1)
+    public function log($repoID = 0, $objectID = 0, $entry = '', $revision = 'HEAD', $type = 'dir', $recTotal = 0, $recPerPage = 50, $pageID = 1)
     {
         if($this->get->repoPath) $entry = $this->get->repoPath;
-        $this->repo->setMenu($this->repos, $repoID);
         $this->repo->setBackSession('log', $withOtherModule = true);
         if($repoID == 0) $repoID = $this->session->repoID;
 
@@ -424,9 +501,10 @@ class repo extends control
             $oldRevision = isset($this->post->revision[1]) ? $this->post->revision[1] : '';
             $newRevision = isset($this->post->revision[0]) ? $this->post->revision[0] : '';
 
-            $this->locate($this->repo->createLink('diff', "repoID=$repoID&entry=" . $this->repo->encodePath($path) . "&oldrevision=$oldRevision&newRevision=$newRevision"));
+            $this->locate($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($path) . "&oldrevision=$oldRevision&newRevision=$newRevision"));
         }
 
+        $this->commonAction($repoID, $objectID);
         $this->scm->setEngine($repo);
         $info = $this->scm->info($entry, $revision);
 
@@ -439,6 +517,8 @@ class repo extends control
         $this->view->logs       = $logs;
         $this->view->revision   = $revision;
         $this->view->repoID     = $repoID;
+        $this->view->objectID   = $objectID;
+        $this->view->branchID   = $this->cookie->repoBranch;
         $this->view->entry      = urldecode($entry);
         $this->view->path       = urldecode($entry);
         $this->view->file       = urldecode($file);
@@ -451,6 +531,7 @@ class repo extends control
      * Show repo revision.
      *
      * @param int    $repoID
+     * @param int    $objectID
      * @param int    $revision
      * @param string $root
      * @param string $type
@@ -458,25 +539,23 @@ class repo extends control
      * @access public
      * @return void
      */
-    public function revision($repoID, $revision, $root = '', $type = 'dir')
+    public function revision($repoID, $objectID = 0, $revision = '', $root = '', $type = 'dir')
     {
-        if($this->get->repoPath) $root = $this->get->repoPath;
-
-        $this->repo->setMenu($this->repos, $repoID);
         $this->repo->setBackSession();
         if($repoID == 0) $repoID = $this->session->repoID;
         $repo = $this->repo->getRepoByID($repoID);
 
         /* Save session. */
-        $this->session->set('revisionList', $this->app->getURI(true));
+        $this->session->set('revisionList', $this->app->getURI(true), 'repo');
 
+        $this->commonAction($repoID, $objectID);
         $this->scm->setEngine($repo);
         $log = $this->scm->log('', $revision, $revision);
 
         $history = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('revision')->eq($log[0]->revision)->andWhere('repo')->eq($repoID)->fetch();
         if($history)
         {
-            if($repo->SCM == 'Git')
+            if(strpos($repo->SCM, 'Git') !== false)
             {
                 $thisAndPrevRevisions = $this->scm->exec("rev-list -n 2 {$history->revision} --");
 
@@ -494,7 +573,7 @@ class repo extends control
         if(empty($oldRevision))
         {
             $oldRevision = '^';
-            if($history and $repo->SCM == 'Git') $oldRevision = "{$history->revision}^";
+            if($history and strpos($repo->SCM, 'Git') !== false) $oldRevision = "{$history->revision}^";
         }
 
         $changes  = array();
@@ -506,13 +585,13 @@ class repo extends control
             $encodePath = $this->repo->encodePath($path);
             if($change['kind'] == '' or $change['kind'] == 'file')
             {
-                $change['view'] = $viewPriv ? html::a($this->repo->createLink('view', "repoID=$repoID&entry=$encodePath&revision=$revision"), $this->lang->repo->viewA) : '';
-                if($change['action'] == 'M') $change['diff'] = $diffPriv ? html::a($this->repo->createLink('diff', "repoID=$repoID&entry=$encodePath&oldRevision=$oldRevision&newRevision=$revision"), $this->lang->repo->diffAB) : '';
+                $change['view'] = $viewPriv ? html::a($this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision=$revision"), $this->lang->repo->viewA, '', "data-app='{$this->app->openApp}'") : '';
+                if($change['action'] == 'M') $change['diff'] = $diffPriv ? html::a($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=$encodePath&oldRevision=$oldRevision&newRevision=$revision"), $this->lang->repo->diffAB, '', "data-app='{$this->app->openApp}'") : '';
             }
             else
             {
-                $change['view'] = $viewPriv ? html::a($this->repo->createLink('browse', "repoID=$repoID&path=$encodePath&revision=$revision"), $this->lang->repo->browse) : '';
-                if($change['action'] == 'M') $change['diff'] = $diffPriv ? html::a($this->repo->createLink('diff', "repoID=$repoID&entry=$encodePath&oldRevision=$oldRevision&newRevision=$revision"), $this->lang->repo->diffAB) : '';
+                $change['view'] = $viewPriv ? html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID&path=$encodePath&revision=$revision"), $this->lang->repo->browse, '', "data-app='{$this->app->openApp}'") : '';
+                if($change['action'] == 'M') $change['diff'] = $diffPriv ? html::a($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=$encodePath&oldRevision=$oldRevision&newRevision=$revision"), $this->lang->repo->diffAB, '', "data-app='{$this->app->openApp}'") : '';
             }
             $changes[$path] = $change;
         }
@@ -534,6 +613,8 @@ class repo extends control
         $this->view->type        = $type;
         $this->view->changes     = $changes;
         $this->view->repoID      = $repoID;
+        $this->view->branchID    = $this->cookie->repoBranch;
+        $this->view->objectID    = $objectID;
         $this->view->revision    = $log[0]->revision;
         $this->view->parentDir   = $parent;
         $this->view->oldRevision = $oldRevision;
@@ -550,16 +631,18 @@ class repo extends control
      * Blame repo file.
      *
      * @param  int    $repoID
+     * @param  int    $objectID
      * @param  string $entry
      * @param  string $revision
      * @param  string $encoding
      * @access public
      * @return void
      */
-    public function blame($repoID, $entry, $revision = 'HEAD', $encoding = '')
+    public function blame($repoID, $objectID = 0, $entry = '', $revision = 'HEAD', $encoding = '')
     {
+        $this->commonAction($repoID, $objectID);
+
         if($this->get->repoPath) $entry = $this->get->repoPath;
-        $this->repo->setMenu($this->repos, $repoID);
         if($repoID == 0) $repoID = $this->session->repoID;
         $repo  = $this->repo->getRepoByID($repoID);
         $file  = $entry;
@@ -576,17 +659,19 @@ class repo extends control
             if($encoding != 'utf-8') $blames[$i]['content'] = helper::convertEncoding($blame['content'], $encoding);
         }
 
-        $log = $repo->SCM == 'Git' ? $this->dao->select('revision,commit')->from(TABLE_REPOHISTORY)->where('revision')->eq($revision)->andWhere('repo')->eq($repo->id)->fetch() : '';
+        $log = strpos($repo->SCM, 'Git') !== false ? $this->dao->select('revision,commit')->from(TABLE_REPOHISTORY)->where('revision')->eq($revision)->andWhere('repo')->eq($repo->id)->fetch() : '';
 
         $this->view->title        = $this->lang->repo->common;
         $this->view->repoID       = $repoID;
+        $this->view->branchID     = $this->cookie->repoBranch;
+        $this->view->objectID     = $objectID;
         $this->view->repo         = $repo;
         $this->view->revision     = $revision;
         $this->view->entry        = $entry;
         $this->view->file         = $file;
         $this->view->encoding     = str_replace('-', '_', $encoding);
-        $this->view->historys     = $repo->SCM == 'Git' ? $this->dao->select('revision,commit')->from(TABLE_REPOHISTORY)->where('revision')->in($revisions)->andWhere('repo')->eq($repo->id)->fetchPairs() : '';
-        $this->view->revisionName = ($log and $repo->SCM == 'Git') ? $this->repo->getGitRevisionName($log->revision, $log->commit) : $revision;
+        $this->view->historys     = strpos($repo->SCM, 'Git') !== false ? $this->dao->select('revision,commit')->from(TABLE_REPOHISTORY)->where('revision')->in($revisions)->andWhere('repo')->eq($repo->id)->fetchPairs() : '';
+        $this->view->revisionName = ($log and strpos($repo->SCM, 'Git') !== false) ? $this->repo->getGitRevisionName($log->revision, $log->commit) : $revision;
         $this->view->blames       = $blames;
         $this->display();
     }
@@ -595,6 +680,7 @@ class repo extends control
      * Show diff.
      *
      * @param  int    $repoID
+     * @param  int    $objectID
      * @param  string $entry
      * @param  string $oldRevision
      * @param  string $newRevision
@@ -603,14 +689,14 @@ class repo extends control
      * @access public
      * @return void
      */
-    public function diff($repoID, $entry = '', $oldRevision = '0', $newRevision = 'HEAD', $showBug = 'false', $encoding = '')
+    public function diff($repoID, $objectID = 0, $entry = '', $oldRevision = '0', $newRevision = 'HEAD', $showBug = 'false', $encoding = '')
     {
+        $this->commonAction($repoID, $objectID);
+
         if($this->get->repoPath) $entry = $this->get->repoPath;
-        $this->repo->setMenu($this->repos, $repoID);
-        if($repoID == 0) $repoID = $this->session->repoID;
-        $file    = $entry;
-        $repo    = $this->repo->getRepoByID($repoID);
-        $entry   = $this->repo->decodePath($entry);
+        $file  = $entry;
+        $repo  = $this->repo->getRepoByID($repoID);
+        $entry = $this->repo->decodePath($entry);
 
         $pathInfo = pathinfo($entry);
         $suffix   = '';
@@ -629,7 +715,7 @@ class repo extends control
             }
             if($this->post->encoding) $encoding = $this->post->encoding;
 
-            $this->locate($this->repo->createLink('diff', "repoID=$repoID&entry=" . $this->repo->encodePath($entry) . "&oldrevision=$oldRevision&newRevision=$newRevision&showBug=&encoding=$encoding"));
+            $this->locate($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($entry) . "&oldrevision=$oldRevision&newRevision=$newRevision&showBug=&encoding=$encoding"));
         }
 
         $this->scm->setEngine($repo);
@@ -658,6 +744,7 @@ class repo extends control
         /* When arrange is appose then adjust data for show them easy.*/
         if($arrange == 'appose')
         {
+
             foreach($diffs as $diffFile)
             {
                 if(empty($diffFile->contents)) continue;
@@ -682,6 +769,8 @@ class repo extends control
         $this->view->suffix      = $suffix;
         $this->view->file        = $file;
         $this->view->repoID      = $repoID;
+        $this->view->branchID    = $this->cookie->repoBranch;
+        $this->view->objectID    = $objectID;
         $this->view->repo        = $repo;
         $this->view->encoding    = str_replace('-', '_', $encoding);
         $this->view->arrange     = $arrange;
@@ -689,7 +778,7 @@ class repo extends control
         $this->view->newRevision = $newRevision;
         $this->view->oldRevision = $oldRevision;
         $this->view->revision    = $newRevision;
-        $this->view->historys    = $repo->SCM == 'Git' ? $this->dao->select('revision,commit')->from(TABLE_REPOHISTORY)->where('revision')->in("$oldRevision,$newRevision")->andWhere('repo')->eq($repo->id)->fetchPairs() : '';
+        $this->view->historys    = strpos($repo->SCM, 'Git') !== false ? $this->dao->select('revision,commit')->from(TABLE_REPOHISTORY)->where('revision')->in("$oldRevision,$newRevision")->andWhere('repo')->eq($repo->id)->fetchPairs() : '';
         $this->view->info        = $info;
 
         $this->view->title      = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->diff;
@@ -715,8 +804,11 @@ class repo extends control
         if($this->get->repoPath) $path = $this->get->repoPath;
         $entry = $this->repo->decodePath($path);
         $repo  = $this->repo->getRepoByID($repoID);
+
+        $this->commonAction($repoID);
         $this->scm->setEngine($repo);
         $content = $type == 'file' ? $this->scm->cat($entry, $fromRevision) : $this->scm->diff($entry, $fromRevision, $toRevision, 'patch');
+
         $fileName = basename(urldecode($entry));
         if($type != 'file') $fileName .= "r$fromRevision--r$toRevision.patch";
         $extension = ltrim(strrchr($fileName, '.'), '.');
@@ -737,8 +829,9 @@ class repo extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('setRules')));
         }
 
-        array_push($this->lang->noMenuModule, 'repo');
-        $this->repo->setMenu($this->repos, $this->session->repoID, false);
+        $repoID = $this->session->repoID;
+        $this->commonAction($repoID);
+        $this->lang->switcherMenu = '';
 
         $this->app->loadLang('task');
         $this->app->loadLang('bug');
@@ -755,13 +848,15 @@ class repo extends control
      * Show sync comment.
      *
      * @param  int    $repoID
+     * @param  int    $objectID  projectID|executionID
      * @param  string $branch
      * @access public
      * @return void
      */
-    public function showSyncCommit($repoID = 0, $branch = '')
+    public function showSyncCommit($repoID = 0, $objectID = 0, $branch = '')
     {
-        $this->repo->setMenu($this->repos, $repoID);
+        $this->commonAction($repoID, $objectID);
+
         if($repoID == 0) $repoID = $this->session->repoID;
         if($branch) $branch = base64_decode($branch);
 
@@ -771,8 +866,9 @@ class repo extends control
         $latestInDB = $this->repo->getLatestCommit($repoID);
         $this->view->version    = $latestInDB ? (int)$latestInDB->commit : 1;
         $this->view->repoID     = $repoID;
+        $this->view->objectID   = $objectID;
         $this->view->branch     = $branch;
-        $this->view->browseLink = $this->repo->createLink('browse', "repoID=$repoID", '', false, $this->projectID);
+        $this->view->browseLink = $this->repo->createLink('browse', "repoID=$repoID&branchID=$branch&objectID=$objectID", '', false);
         $this->display();
     }
 
@@ -791,10 +887,11 @@ class repo extends control
         if(empty($repo)) die();
         if($repo->synced) die('finish');
 
+        $this->commonAction($repoID);
         $this->scm->setEngine($repo);
 
         $branchID = '';
-        if($repo->SCM == 'Git' and empty($branchID))
+        if(strpos($repo->SCM, 'Git') !== false and empty($branchID))
         {
             $branches = $this->scm->branch();
             if($branches)
@@ -816,7 +913,7 @@ class repo extends control
                 }
 
                 $this->repo->setRepoBranch($branchID);
-                setcookie("syncBranch", $branchID, 0, $this->config->webRoot);
+                setcookie("syncBranch", $branchID, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
             }
         }
 
@@ -824,6 +921,7 @@ class repo extends control
             ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision')
             ->where('t1.repo')->eq($repoID)
             ->beginIF($repo->SCM == 'Git' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
+            ->beginIF($repo->SCM == 'Gitlab' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
             ->orderBy('t1.time')
             ->limit(1)
             ->fetch();
@@ -845,12 +943,12 @@ class repo extends control
         {
             if(!$repo->synced)
             {
-                if($repo->SCM == 'Git')
+                if(strpos($repo->SCM, 'Git') !== false)
                 {
                     if($branchID) $this->repo->saveExistCommits4Branch($repo->id, $branchID);
 
                     $branchID = reset($branches);
-                    setcookie("syncBranch", $branchID, 0, $this->config->webRoot);
+                    setcookie("syncBranch", $branchID, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
                     if($branchID) $this->repo->fixCommit($repoID);
                 }
@@ -880,18 +978,18 @@ class repo extends control
         set_time_limit(0);
         $repo = $this->repo->getRepoByID($repoID);
         if(empty($repo)) die();
-        if($repo->SCM != 'Git') die('finish');
+        if(strpos($repo->SCM, 'Git') === false) die('finish');
         if($branch) $branch = base64_decode($branch);
 
         $this->scm->setEngine($repo);
 
         $this->repo->setRepoBranch($branch);
-        setcookie("syncBranch", $branch, 0, $this->config->webRoot);
+        setcookie("syncBranch", $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         $latestInDB = $this->dao->select('DISTINCT t1.*')->from(TABLE_REPOHISTORY)->alias('t1')
             ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision')
             ->where('t1.repo')->eq($repoID)
-            ->beginIF($repo->SCM == 'Git' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
+            ->beginIF(strpos($repo->SCM, 'Git') !== false and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
             ->orderBy('t1.time')
             ->limit(1)
             ->fetch();
@@ -899,6 +997,7 @@ class repo extends control
         $version  = empty($latestInDB) ? 1 : $latestInDB->commit + 1;
         $logs     = array();
         $revision = $version == 1 ? 'HEAD' : $latestInDB->commit;
+        if($repo->SCM == 'Gitlab' and $version > 1) $revision = $latestInDB->revision;
 
         $logs = $this->scm->getCommits($revision, $this->config->repo->batchNum, $branch);
         $commitCount = $this->repo->saveCommit($repoID, $logs, $version, $branch);
@@ -906,7 +1005,7 @@ class repo extends control
         {
             if($branch) $this->repo->saveExistCommits4Branch($repo->id, $branch);
 
-            setcookie("syncBranch", $branch, 0, $this->config->webRoot);
+            setcookie("syncBranch", $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
             $this->repo->markSynced($repoID);
             die('finish');
         }
@@ -920,6 +1019,7 @@ class repo extends control
      *
      * @param  int    $repoID
      * @param  string $path
+     * @param  int    $objectID
      * @param  string $type
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -927,7 +1027,7 @@ class repo extends control
      * @access public
      * @return void
      */
-    public function ajaxSideCommits($repoID, $path, $type = 'dir', $recTotal = 0, $recPerPage = 8, $pageID = 1)
+    public function ajaxSideCommits($repoID, $path, $objectID = 0,  $type = 'dir', $recTotal = 0, $recPerPage = 8, $pageID = 1)
     {
         if($this->get->repoPath) $path = $this->get->repoPath;
         $this->app->loadClass('pager', $static = true);
@@ -943,6 +1043,7 @@ class repo extends control
         $this->view->revisions  = $revisions;
         $this->view->pager      = $pager;
         $this->view->repoID     = $repoID;
+        $this->view->objectID   = $objectID;
         $this->view->logType    = $type;
         $this->view->path       = urldecode($path);
         $this->display();
@@ -977,4 +1078,75 @@ class repo extends control
         }
         die(json_encode($dirs));
     }
+
+    /**
+     * Ajax get drop menu.
+     *
+     * @param  int    $repoID
+     * @param  string $type
+     * @param  int    $objectID
+     * @access public
+     * @return void
+     */
+    public function ajaxGetDropMenu($repoID, $type = 'repo', $objectID = 0)
+    {
+        $repos = $this->repo->getRepoPairs($type, $objectID);
+        $reposHtml = "<div class='table-row'><div class='table-col col-left'><div class='list-group' style='margin-bottom: 0;'>";
+        foreach($repos as $id => $repoName)
+        {
+            $selected = $id == $repoID ? 'selected' : '';
+            $reposHtml .= html::a($this->createLink('repo', 'browse', "repoID=$id&branchID=&objectID=$objectID"), $repoName, '', "class='$selected' data-app='{$this->app->openApp}'");
+        }
+        $reposHtml .= '</div></div></div>';
+
+        die($reposHtml);
+    }
+
+	/**
+	 * Ajax get gitlab projects.
+	 *
+	 * @param  string    $host
+	 * @param  string    $token
+	 * @access public
+	 * @return void
+	 */
+	public function ajaxGetGitlabProjects($host, $token)
+	{
+		$host  = helper::safe64Decode($host);
+        $projects = $this->repo->getGitlabProjects($host, $token);
+
+		if(!$projects) $this->send(array('message' => array()));
+
+		$options = "<option value=''></option>";
+		foreach($projects as $project)
+		{
+			$options .= "<option value='{$project->id}' data-name='{$project->name}'>{$project->name}:{$project->http_url_to_repo}</option>";
+		}
+		die($options);
+	}
+
+    /**
+     * Ajax get branch drop menu.
+     *
+     * @param  int    $repoID
+     * @param  string $branchID
+     * @param  int    $objectID
+     * @access public
+     * @return void
+     */
+    public function ajaxGetBranchDropMenu($repoID, $branchID, $objectID)
+    {
+        $repo     = $this->repo->getRepoByID($repoID);
+        $branches = $this->repo->getBranches($repo);
+
+        $branchesHtml = "<div class='table-row'><div class='table-col col-left'><div class='list-group' style='margin-bottom: 0;'>";
+        foreach($branches as $id => $branchName)
+        {
+            $selected = $id == $branchID ? 'selected' : '';
+            $branchesHtml .= html::a($this->createLink('repo', 'browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID"), $branchName, '', "class='$selected' data-app='{$this->app->openApp}'");
+        }
+        $branchesHtml .= '</div></div></div>';
+
+        die($branchesHtml);
+    }
 }
diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css
index 373d732f0a..6d03a01e34 100644
--- a/module/repo/css/browse.css
+++ b/module/repo/css/browse.css
@@ -1,2 +1,4 @@
 #mainMenu > .btn-toolbar {height: 35px; line-height: 35px;}
+#sidebar>.sidebar-toggle>.icon {right: -2px; left: auto;}
+.main-row {width: 99%;}
 .btn-toolbar > .last-sync-time {display: inline-block; float: left; margin-right: 10px;}
diff --git a/module/repo/js/common.js b/module/repo/js/common.js
index d689b3d390..fc88f63bd3 100644
--- a/module/repo/js/common.js
+++ b/module/repo/js/common.js
@@ -1,9 +1,9 @@
 /**
  * Swtich repo.
- * 
- * @param  int    $repoID 
- * @param  string $module 
- * @param  string $method 
+ *
+ * @param  int    $repoID
+ * @param  string $module
+ * @param  string $method
  * @access public
  * @return void
  */
@@ -12,7 +12,7 @@ function switchRepo(repoID, module, method)
     if(typeof(eventKeyCode) == 'undefined') eventKeyCode = 0;
     if(eventKeyCode > 0 && eventKeyCode != 13) return false;
 
-    /* The projec id is a string, use it as the project model. */
+    /* The project id is a string, use it as the project model. */
     if(isNaN(repoID))
     {
         $.cookie('projectMode', repoID, {expires:config.cookieLife, path:config.webRoot});
@@ -26,8 +26,8 @@ function switchRepo(repoID, module, method)
 
 /**
  * Switch branch for git.
- * 
- * @param  string $branchID 
+ *
+ * @param  string $branchID
  * @access public
  * @return void
  */
@@ -39,7 +39,7 @@ function switchBranch(branchID)
 }
 
 /**
- * Limit select two. 
+ * Limit select two.
  * @return void
  */
 if($("input:checkbox[name='revision[]']:checked").length < 2)
@@ -49,7 +49,7 @@ if($("input:checkbox[name='revision[]']:checked").length < 2)
 $("input:checkbox[name='revision[]']").each(function(){ if(!$(this).is(':checked')) $(this).attr("disabled","disabled")});
 $("input:checkbox[name='revision[]']").click(function(){
     var checkNum = $("input:checkbox[name='revision[]']:checked").length;
-    if (checkNum >= 2) 
+    if (checkNum >= 2)
     {
         $("input:checkbox[name='revision[]']").each(function(){ if(!$(this).is(':checked')) $(this).attr("disabled","disabled")});
         $('#submit').removeAttr('disabled');
@@ -65,7 +65,7 @@ $(function()
 {
     $(document).on('click', '.ajaxPager', function()
     {
-        $('#sidebar .side-body').load($(this).attr('href'));
+        $('#sidebar .side-body').load($(this).attr('data-href'));
         return false;
     })
 
diff --git a/module/repo/js/create.js b/module/repo/js/create.js
index d1a57c1374..0af0d52404 100644
--- a/module/repo/js/create.js
+++ b/module/repo/js/create.js
@@ -6,20 +6,46 @@ $(function()
         $form = $(this).closest('form');
         $form.css('min-height', $form.height());
     })
+    
+    $('#gitlabHost, #gitlabToken').change(function()
+    {
+        host  = Base64.encode($('#gitlabHost').val());
+        token = $('#gitlabToken').val();
+        url   = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host + '&token=' + token);
+        if(host == '' || token == '') return false;
+
+        $.get(url, function(response)
+        {
+            $('#gitlabProject').html('').append(response);
+            $('#gitlabProject').chosen().trigger("chosen:updated");;
+        });
+    });
+    
+    $('#gitlabProject').change(function()
+    {
+        $option = $(this).find('option:selected');
+        $('#name').val($option.data('name'));
+    });
+    
 });
 
-function scmChanged(scm) {
+function scmChanged(scm)
+{
     if(scm == 'Git')
     {
         $('.account-fields').addClass('hidden');
 
         $('.tips-git').removeClass('hidden');
         $('.tips-svn').addClass('hidden');
-    } else
+    } 
+    else
     {
         $('.account-fields').removeClass('hidden');
 
         $('.tips-git').addClass('hidden');
         $('.tips-svn').removeClass('hidden');
     }
+
+    $('tr.gitlab').toggle(scm == 'Gitlab');
+    $('tr.hide-gitlab').toggle(scm != 'Gitlab');
 }
diff --git a/module/repo/js/edit.js b/module/repo/js/edit.js
index d1a57c1374..cc79cbb2a5 100644
--- a/module/repo/js/edit.js
+++ b/module/repo/js/edit.js
@@ -6,20 +6,48 @@ $(function()
         $form = $(this).closest('form');
         $form.css('min-height', $form.height());
     })
+
+    $('#gitlabHost, #gitlabToken').change(function()
+    {
+        host  = Base64.encode($('#gitlabHost').val());
+        token = $('#gitlabToken').val();
+        url   = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host + '&token=' + token);
+        if(host == '' || token == '') return false;
+
+        $.get(url, function(response)
+        {
+            $('#gitlabProject').html('').append(response);
+            $('#gitlabProject').chosen().trigger("chosen:updated");;
+        });
+    });
+    
+    $('#gitlabProject').change(function()
+    {
+        $option = $(this).find('option:selected');
+        if(!$option.data('name')) return false;
+        $('#name').val($option.data('name'));
+        $(this).chosen().trigger("chosen:updated");
+    });
+   
 });
 
-function scmChanged(scm) {
+function scmChanged(scm)
+{
     if(scm == 'Git')
     {
         $('.account-fields').addClass('hidden');
 
         $('.tips-git').removeClass('hidden');
         $('.tips-svn').addClass('hidden');
-    } else
+    }
+    else
     {
         $('.account-fields').removeClass('hidden');
 
         $('.tips-git').addClass('hidden');
         $('.tips-svn').removeClass('hidden');
     }
+
+    $('tr.gitlab').toggle(scm == 'Gitlab');
+    $('tr.hide-gitlab').toggle(scm != 'Gitlab');
 }
diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php
index 5a7cb805fb..bf3115dcdf 100644
--- a/module/repo/lang/de.php
+++ b/module/repo/lang/de.php
@@ -3,6 +3,7 @@ $lang->repo->common          = 'Repo';
 $lang->repo->browse          = 'View';
 $lang->repo->viewRevision    = 'View Revision';
 $lang->repo->product         = 'Product';
+$lang->repo->execution       = $lang->execution->common;
 $lang->repo->create          = 'Create';
 $lang->repo->createAction    = 'Create Repo';
 $lang->repo->maintain        = 'Repo List';
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index 35a166084d..b3e3dc2c0d 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -3,20 +3,16 @@ $lang->repo->common          = 'Repo';
 $lang->repo->browse          = 'View';
 $lang->repo->viewRevision    = 'View Revision';
 $lang->repo->product         = 'Product';
+$lang->repo->execution       = $lang->execution->common;
 $lang->repo->create          = 'Create';
-$lang->repo->createAction    = 'Create Repo';
 $lang->repo->maintain        = 'Repo List';
 $lang->repo->edit            = 'Edit';
-$lang->repo->editAction      = 'Edit Repo';
 $lang->repo->delete          = 'Delete Repo';
 $lang->repo->showSyncCommit  = 'Display Sync';
 $lang->repo->ajaxSyncCommit  = 'Interface: Ajax Sync Note';
 $lang->repo->setRules        = 'Set Rules';
 $lang->repo->download        = 'Download File';
 $lang->repo->downloadDiff    = 'Download Diff';
-$lang->repo->diffAction      = 'Revision Diff';
-$lang->repo->revisionAction  = 'Revision Detail';
-$lang->repo->blameAction     = 'Repo Blame';
 $lang->repo->addBug          = 'Add Review';
 $lang->repo->editBug         = 'Edit Bug';
 $lang->repo->deleteBug       = 'Delete Bug';
@@ -24,6 +20,15 @@ $lang->repo->addComment      = 'Add Comment';
 $lang->repo->editComment     = 'Edit Comment';
 $lang->repo->deleteComment   = 'Delete Comment';
 
+$lang->repo->browseAction    = 'Browse Repo';
+$lang->repo->createAction    = 'Create Repo';
+$lang->repo->editAction      = 'Edit Repo';
+$lang->repo->diffAction      = 'Diff Revision';
+$lang->repo->downloadAction  = 'Download File';
+$lang->repo->revisionAction  = 'Revision Detail';
+$lang->repo->blameAction     = 'Blame';
+$lang->repo->reviewAction    = 'Review List';
+
 $lang->repo->submit     = 'Submit';
 $lang->repo->cancel     = 'Cancel';
 $lang->repo->addComment = 'Add Comment';
@@ -120,6 +125,14 @@ $lang->repo->encodingList['gbk']   = 'GBK';
 
 $lang->repo->scmList['Git']        = 'Git';
 $lang->repo->scmList['Subversion'] = 'SVN';
+$lang->repo->scmList['Gitlab']     = 'Gitlab';
+
+$lang->repo->gitlabHost    = 'Gitlab Host';
+$lang->repo->gitlabToken   = 'Gitlab Token';
+$lang->repo->gitlabProject = 'Projects';
+
+$lang->repo->placeholder = new stdclass;
+$lang->repo->placeholder->gitlabHost = 'Input url of gitlab';
 
 $lang->repo->notice                 = new stdclass();
 $lang->repo->notice->syncing        = 'Synchronizing. Please wait ...';
diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php
index 3f011c9ee1..c721198dc5 100644
--- a/module/repo/lang/fr.php
+++ b/module/repo/lang/fr.php
@@ -3,6 +3,7 @@ $lang->repo->common          = 'Référentiel';
 $lang->repo->browse          = 'Aff';
 $lang->repo->viewRevision    = 'Aff Modifs';
 $lang->repo->product         = 'Product';
+$lang->repo->execution       = $lang->execution->common;
 $lang->repo->create          = 'Créer';
 $lang->repo->createAction    = 'Créer Ref';
 $lang->repo->maintain        = 'Liste Ref';
diff --git a/module/repo/lang/vi.php b/module/repo/lang/vi.php
index c10b46b417..8bb4b65b87 100644
--- a/module/repo/lang/vi.php
+++ b/module/repo/lang/vi.php
@@ -3,6 +3,7 @@ $lang->repo->common         = 'Repo';
 $lang->repo->browse         = 'Xem';
 $lang->repo->viewRevision   = 'Xem Revision';
 $lang->repo->product        = 'Product';
+$lang->repo->execution      = $lang->execution->common;
 $lang->repo->create         = 'Tạo';
 $lang->repo->createAction   = 'Tạo Repo';
 $lang->repo->maintain       = 'Repo danh sách';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index ec85f926b5..25fbf8e9a0 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -3,20 +3,16 @@ $lang->repo->common          = '代码';
 $lang->repo->browse          = '浏览';
 $lang->repo->viewRevision    = '查看修订';
 $lang->repo->product         = '所属产品';
+$lang->repo->execution       = '所属' . $lang->execution->common;
 $lang->repo->create          = '创建';
-$lang->repo->createAction    = '创建版本库';
 $lang->repo->maintain        = '版本库列表';
 $lang->repo->edit            = '编辑';
-$lang->repo->editAction      = '编辑版本库';
 $lang->repo->delete          = '删除版本库';
 $lang->repo->showSyncCommit  = '显示同步进度';
 $lang->repo->ajaxSyncCommit  = '接口：AJAX同步注释';
 $lang->repo->setRules        = '指令配置';
 $lang->repo->download        = '下载';
 $lang->repo->downloadDiff    = '下载Diff';
-$lang->repo->diffAction      = '版本对比';
-$lang->repo->revisionAction  = '版本详情';
-$lang->repo->blameAction     = '版本追溯';
 $lang->repo->addBug          = '添加评审';
 $lang->repo->editBug         = '编辑评审';
 $lang->repo->deleteBug       = '删除评审';
@@ -24,6 +20,15 @@ $lang->repo->addComment      = '添加备注';
 $lang->repo->editComment     = '编辑备注';
 $lang->repo->deleteComment   = '删除备注';
 
+$lang->repo->browseAction    = '浏览版本库';
+$lang->repo->createAction    = '创建版本库';
+$lang->repo->editAction      = '编辑版本库';
+$lang->repo->diffAction      = '版本对比';
+$lang->repo->downloadAction  = '下载代码库文件';
+$lang->repo->revisionAction  = '版本详情';
+$lang->repo->blameAction     = '版本追溯';
+$lang->repo->reviewAction    = '评审列表';
+
 $lang->repo->submit     = '提交';
 $lang->repo->cancel     = '取消';
 $lang->repo->addComment = '添加评论';
@@ -124,6 +129,14 @@ $lang->repo->encodingList['gbk']   = 'GBK';
 $lang->repo->scmList['Git']        = '本地 Git';
 $lang->repo->scmList['Gitlab']     = 'Gitlab';
 $lang->repo->scmList['Subversion'] = 'Subversion';
+$lang->repo->scmList['Gitlab']     = 'Gitlab';
+
+$lang->repo->gitlabHost    = 'Gitlab 地址';
+$lang->repo->gitlabToken   = 'Gitlab Token';
+$lang->repo->gitlabProject = '项目';
+
+$lang->repo->placeholder = new stdclass;
+$lang->repo->placeholder->gitlabHost = '请填写gitlab访问地址';
 
 $lang->repo->notice                 = new stdclass();
 $lang->repo->notice->syncing        = '正在同步中, 请稍等...';
diff --git a/module/repo/lang/zh-tw.php b/module/repo/lang/zh-tw.php
index 208a56f40f..66d1296f0d 100644
--- a/module/repo/lang/zh-tw.php
+++ b/module/repo/lang/zh-tw.php
@@ -3,20 +3,16 @@ $lang->repo->common          = '代碼';
 $lang->repo->browse          = '瀏覽';
 $lang->repo->viewRevision    = '查看修訂';
 $lang->repo->product         = '所屬產品';
+$lang->repo->execution       = '所屬' . $lang->execution->common;
 $lang->repo->create          = '創建';
-$lang->repo->createAction    = '創建版本庫';
 $lang->repo->maintain        = '版本庫列表';
 $lang->repo->edit            = '編輯';
-$lang->repo->editAction      = '編輯版本庫';
 $lang->repo->delete          = '刪除版本庫';
 $lang->repo->showSyncCommit  = '顯示同步進度';
 $lang->repo->ajaxSyncCommit  = '介面：AJAX同步註釋';
 $lang->repo->setRules        = '指令配置';
 $lang->repo->download        = '下載';
 $lang->repo->downloadDiff    = '下載Diff';
-$lang->repo->diffAction      = '版本對比';
-$lang->repo->revisionAction  = '版本詳情';
-$lang->repo->blameAction     = '版本追溯';
 $lang->repo->addBug          = '添加評審';
 $lang->repo->editBug         = '編輯評審';
 $lang->repo->deleteBug       = '刪除評審';
@@ -24,6 +20,15 @@ $lang->repo->addComment      = '添加備註';
 $lang->repo->editComment     = '編輯備註';
 $lang->repo->deleteComment   = '刪除備註';
 
+$lang->repo->browseAction    = '瀏覽版本庫';
+$lang->repo->createAction    = '創建版本庫';
+$lang->repo->editAction      = '編輯版本庫';
+$lang->repo->diffAction      = '版本對比';
+$lang->repo->downloadAction  = '下載代碼庫檔案';
+$lang->repo->revisionAction  = '版本詳情';
+$lang->repo->blameAction     = '版本追溯';
+$lang->repo->reviewAction    = '評審列表';
+
 $lang->repo->submit     = '提交';
 $lang->repo->cancel     = '取消';
 $lang->repo->addComment = '添加評論';
@@ -120,6 +125,14 @@ $lang->repo->encodingList['gbk']   = 'GBK';
 
 $lang->repo->scmList['Git']        = 'Git';
 $lang->repo->scmList['Subversion'] = 'Subversion';
+$lang->repo->scmList['Gitlab']     = 'Gitlab';
+
+$lang->repo->gitlabHost    = 'Gitlab 地址';
+$lang->repo->gitlabToken   = 'Gitlab Token';
+$lang->repo->gitlabProject = '項目';
+
+$lang->repo->placeholder = new stdclass;
+$lang->repo->placeholder->gitlabHost = '請填寫gitlab訪問地址';
 
 $lang->repo->notice                 = new stdclass();
 $lang->repo->notice->syncing        = '正在同步中, 請稍等...';
diff --git a/module/repo/model.php b/module/repo/model.php
index 27be9df645..c726c22366 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -35,6 +35,7 @@ class repoModel extends model
      */
     public function setMenu($repos, $repoID = '', $showSeleter = true)
     {
+        if(empty($repos)) $this->lang->switcherMenu = '';
         if(empty($repoID)) $repoID = $this->session->repoID ? $this->session->repoID : key($repos);
         if(!isset($repos[$repoID])) $repoID = key($repos);
 
@@ -55,11 +56,35 @@ class repoModel extends model
             }
         }
 
-        if($showSeleter && !empty($repos))
+        common::setMenuVars('devops', $repoID);
+        session_start();
+        $this->session->set('repoID', $repoID);
+        session_write_close();
+    }
+
+    /**
+     * Create the select code of repos.
+     *
+     * @param  array     $repos
+     * @param  int       $repoID
+     * @param  string    $type
+     * @param  int       $objectID
+     * @access public
+     * @return string
+     */
+    public function select($repos, $repoID, $type = 'repo', $objectID = 0)
+    {
+        $output = '';
+        if(!empty($repos))
         {
-            $repoIndex  = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . ($repo->SCM == 'Subversion' ? '[SVN] ' : '[GIT] ') . $repo->name . ' <span class="caret"></span></button>';
-            $repoIndex .= $this->select($repos, $repoID);
-            $repoIndex .= '</div></div>';
+            $dropMenuLink = helper::createLink('repo', 'ajaxGetDropMenu', "repoID=$repoID&type=$type&objectID=$objectID");
+
+            $repo    = $this->dao->findById($repoID)->from(TABLE_REPO)->fetch();
+            $scm     = $repo->SCM == 'Subversion' ? 'svn' : 'git';
+
+            $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$repo->name}'><span class='text'>[$scm] {$repo->name}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+            $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+            $output .= "</div></div>";
 
             $branches = $this->getBranches($repo);
             if(empty($branches))
@@ -77,58 +102,16 @@ class repoModel extends model
 
                 $this->setRepoBranch($branchID);
 
-                $repoIndex .= '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $branch . ' <span class="caret"></span></button>';
-                $repoIndex .= "<div class='dropdown-menu search-list' data-ride='searchList'>";
-                $repoIndex .= "<div class='list-group'>";
-                foreach($branches as $branch)
-                {
-                    if(empty($branch)) continue;
+                $branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
 
-                    $class = $branchID == $branch ? "class='active'" : '';
-                    $repoIndex .= html::a("javascript:switchBranch(\"$branch\")", $branch, '', $class);
-                }
-                $repoIndex .= "</div></div></div></div>";
+                $dropMenuLink = helper::createLink('repo', 'ajaxGetBranchDropMenu', "repID=$repoID&branchID=$branchID&objectID=$objectID");
+                $output .= "<div class='btn-group'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit'>{$branchName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+                $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+                $output .= "</div></div>";
             }
-
-            $this->lang->modulePageNav = $repoIndex;
         }
 
-        foreach($this->lang->repo->menu as $key => $menu)
-        {
-            common::setMenuVars($this->lang->repo->menu, $key, $repoID);
-        }
-
-        session_start();
-        $this->session->set('repoID', $repoID);
-        session_write_close();
-    }
-
-    /**
-     * Create the select code of repos.
-     *
-     * @param  array     $repos
-     * @param  int       $repoID
-     * @param  string    $currentModule
-     * @param  string    $currentMethod
-     * @access public
-     * @return string
-     */
-    public function select($repos, $repoID)
-    {
-        $selectHtml  = "<div class='dropdown-menu search-list' data-ride='searchList'>";
-        $selectHtml .= "<div class='input-control search-box has-icon-left has-icon-right search-example'>";
-        $selectHtml .= "<input id='repoSearchBox' type='search' autocomplete='off' class='form-control search-input empty'>";
-        $selectHtml .= "<label for='repoSearchBox' class='input-control-icon-left search-icon'><i class='icon icon-search'></i></label>";
-        $selectHtml .= "<a class='input-control-icon-right search-clear-btn'><i class='icon icon-close icon-sm'></i></a></div>";
-        $selectHtml .= "<div class='list-group'>";
-        foreach($repos as $id => $name)
-        {
-            $class = $repoID == $id ? "class='active'" : '';
-            $selectHtml .= html::a(helper::createLink('repo', 'browse', "repoID={$id}"), $name, '', $class);
-        }
-        $selectHtml .= "</div></div>";
-
-        return $selectHtml;
+        return $output;
     }
 
     /**
@@ -142,15 +125,13 @@ class repoModel extends model
      */
     public function getList($projectID = 0, $orderBy = 'id_desc', $pager = null)
     {
-        /* Get products. */
-        $productIdList = $this->loadModel('product')->getProductIDByProject($projectID, false);
-
         $repos = $this->dao->select('*')->from(TABLE_REPO)
             ->where('deleted')->eq('0')
-            ->andWhere('product')->in($productIdList)
             ->orderBy($orderBy)
             ->page($pager)->fetchAll('id');
 
+        /* Get products. */
+        $productIdList = $this->loadModel('product')->getProductIDByProject($projectID, false);
         foreach($repos as $i => $repo)
         {
             $repo->acl = json_decode($repo->acl);
@@ -160,7 +141,16 @@ class repoModel extends model
             }
             else
             {
-                if($projectID && !in_array($repo->product, $productIdList)) unset($repos[$i]);
+                if($projectID)
+                {
+                    $hasPriv = false;
+                    foreach(explode(',', $repo->product) as $productID)
+                    {
+                        if(isset($productIdList[$productID])) $hasPriv = true;
+                    }
+
+                    if(!$hasPriv) unset($repos[$i]);
+                }
             }
         }
 
@@ -178,7 +168,7 @@ class repoModel extends model
     public function getListBySCM($scm, $type = 'all')
     {
         $repos = $this->dao->select('*')->from(TABLE_REPO)->where('deleted')->eq('0')
-            ->andWhere('SCM')->eq($scm)
+            ->andWhere('SCM')->in($scm)
             ->andWhere('synced')->eq(1)
             ->orderBy('id')
             ->fetchAll();
@@ -203,11 +193,18 @@ class repoModel extends model
     {
         if(!$this->checkClient()) return false;
         if(!$this->checkConnection()) return false;
+
         $data = fixer::input('post')
+            ->setIf($this->post->SCM == 'Gitlab', 'password', $this->post->gitlabToken)
+            ->setIf($this->post->SCM == 'Gitlab', 'client', $this->post->gitlabHost)
+            ->setIf($this->post->SCM == 'Gitlab', 'extra', $this->post->gitlabProject)
             ->skipSpecial('path,client,account,password')
+            ->setDefault('product', '')
             ->join('product', ',')
             ->get();
 
+        if($this->post->SCM == 'Gitlab') $data->path = sprintf($this->config->repo->gitlab->apiPath, $data->gitlabHost, $this->post->gitlabProject);
+
         $data->acl = empty($data->acl) ? '' : json_encode($data->acl);
 
         if($data->SCM == 'Subversion')
@@ -220,8 +217,9 @@ class repoModel extends model
         }
 
         if($data->encrypt == 'base64') $data->password = base64_encode($data->password);
-        $this->dao->insert(TABLE_REPO)->data($data)
+        $this->dao->insert(TABLE_REPO)->data($data, $skip = 'gitlabHost,gitlabToken,gitlabProject')
             ->batchCheck($this->config->repo->create->requiredFields, 'notempty')
+            ->checkIF($data->SCM == 'GitLab', 'gitlabProject', 'notempty')
             ->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
             ->autoCheck()
             ->exec();
@@ -243,12 +241,19 @@ class repoModel extends model
         $repo = $this->getRepoByID($id);
 
         $data = fixer::input('post')
+            ->setIf($this->post->SCM == 'Gitlab', 'password', $this->post->gitlabToken)
+            ->setIf($this->post->SCM == 'Gitlab', 'client', $this->post->gitlabHost)
+            ->setIf($this->post->SCM == 'Gitlab', 'extra', $this->post->gitlabProject)
             ->setDefault('client', 'svn')
             ->setDefault('prefix', $repo->prefix)
-            ->setIF($this->post->path != $repo->path, 'synced', 0)
+            ->setDefault('product', '')
             ->skipSpecial('path,client,account,password')
             ->join('product', ',')
             ->get();
+
+        if($this->post->SCM == 'Gitlab') $data->path = sprintf($this->config->repo->gitlab->apiPath, $data->gitlabHost, $this->post->gitlabProject);
+        if($data->path != $repo->path) $data->synced = 0;
+
         $data->acl = empty($data->acl) ? '' : json_encode($data->acl);
 
         if($data->SCM == 'Subversion' and $data->path != $repo->path)
@@ -268,9 +273,10 @@ class repoModel extends model
         if(!$this->checkConnection()) return false;
 
         if($data->encrypt == 'base64') $data->password = base64_encode($data->password);
-        $this->dao->update(TABLE_REPO)->data($data)
+        $this->dao->update(TABLE_REPO)->data($data, $skip = 'gitlabHost,gitlabToken,gitlabProject')
             ->batchCheck($this->config->repo->edit->requiredFields, 'notempty')
             ->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
+            ->checkIF($data->SCM == 'GitLab', 'extra', 'notempty')
             ->autoCheck()
             ->where('id')->eq($id)->exec();
 
@@ -285,21 +291,48 @@ class repoModel extends model
         return true;
     }
 
+    /**
+     * Save repo state.
+     *
+     * @param  int    $repoID
+     * @param  int    $objectID
+     * @access public
+     * @return int
+     */
+    public function saveState($repoID = 0, $objectID = 0)
+    {
+        if($repoID > 0) $this->session->set('repoID', (int)$repoID);
+
+        $repos = $this->getRepoPairs($this->app->openApp, $objectID);
+        if($repoID == 0 and $this->session->repoID == '')
+        {
+            $this->session->set('repoID', key($repos));
+        }
+
+        if(!isset($repos[$this->session->repoID]))
+        {
+            $this->session->set('repoID', key($repos));
+        }
+
+        return $this->session->repoID;
+    }
+
     /**
      * Get repo pairs.
      *
+     * @param  string $type  project|execution|repo
      * @param  int    $projectID
      * @access public
      * @return array
      */
-    public function getRepoPairs($projectID = 0)
+    public function getRepoPairs($type, $projectID = 0)
     {
         $repos = $this->dao->select('*')->from(TABLE_REPO)
             ->where('deleted')->eq(0)
             ->fetchAll();
 
         /* Get products. */
-        $productIdList = $this->loadModel('product')->getProductIDByProject($projectID, false);
+        $productIdList = ($type == 'project' or $type == 'execution') ? $this->loadModel('product')->getProductIDByProject($projectID, false) : array();
 
         $repoPairs = array();
         foreach($repos as $repo)
@@ -308,7 +341,7 @@ class repoModel extends model
             $scm = $repo->SCM == 'Subversion' ? 'svn' : 'git';
             if($this->checkPriv($repo))
             {
-                if($projectID)
+                if($type == 'project' or $type == 'execution')
                 {
                     foreach($productIdList as $productID)
                     {
@@ -398,7 +431,7 @@ class repoModel extends model
             ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision')
             ->where('t1.repo')->eq($repoID)
             ->beginIF($revision != 'HEAD')->andWhere('t1.revision')->eq($revision)->fi()
-            ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
+            ->beginIF($repo->SCM != 'Subversion' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
             ->orderBy('time desc')
             ->limit(1)
             ->fetch('time');
@@ -413,7 +446,7 @@ class repoModel extends model
                 ->andWhere('t1.repo')->eq($repo->id)
                 ->andWhere('t2.`time`')->le($revisionTime)
                 ->andWhere('left(t2.comment, 12)')->ne('Merge branch')
-                ->beginIF($this->cookie->repoBranch)->andWhere('t3.branch')->eq($this->cookie->repoBranch)->fi()
+                ->beginIF($repo->SCM != 'Subversion' and $this->cookie->repoBranch)->andWhere('t3.branch')->eq($this->cookie->repoBranch)->fi()
                 ->beginIF($type == 'dir')
                 ->andWhere('t1.parent', true)->like(rtrim($entry, '/') . "/%")
                 ->orWhere('t1.parent')->eq(rtrim($entry, '/'))
@@ -430,7 +463,7 @@ class repoModel extends model
             ->where('t1.repo')->eq($repoID)
             ->andWhere('t1.`time`')->le($revisionTime)
             ->andWhere('left(t1.comment, 12)')->ne('Merge branch')
-            ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
+            ->beginIF($repo->SCM != 'Subversion' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi()
             ->beginIF($entry != '/' and !empty($entry))->andWhere('t1.id')->in($historyIdList)->fi()
             ->beginIF($begin)->andWhere('t1.time')->ge($begin)->fi()
             ->beginIF($end)->andWhere('t1.time')->le($end)->fi()
@@ -818,13 +851,12 @@ class repoModel extends model
      * @param  string $params
      * @param  string $viewType
      * @param  bool   $onlybody
-     * @param  int    $projectID
      * @access public
      * @return string
      */
-    public function createLink($method, $params = '', $viewType = '', $onlybody = false, $projectID = 0)
+    public function createLink($method, $params = '', $viewType = '', $onlybody = false)
     {
-        if($this->config->requestType == 'GET') return helper::createLink('repo', $method, $params, $viewType, $onlybody, $projectID);
+        if($this->config->requestType == 'GET') return helper::createLink('repo', $method, $params, $viewType, $onlybody);
 
         $parsedParams = array();
         parse_str($params, $parsedParams);
@@ -841,7 +873,7 @@ class repoModel extends model
         }
 
         $params = http_build_query($parsedParams);
-        $link   = helper::createLink('repo', $method, $params, $viewType, $onlybody, $projectID);
+        $link   = helper::createLink('repo', $method, $params, $viewType, $onlybody);
         if(empty($pathParams)) return $link;
 
         $link .= strpos($link, '?') === false ? '?' : '&';
@@ -867,8 +899,8 @@ class repoModel extends model
         if($type == 'list') unset($_SESSION['repoView']);
         if($withOtherModule)
         {
-            $this->session->set('bugList', $uri);
-            $this->session->set('taskList', $uri);
+            $this->session->set('bugList', $uri, 'qa');
+            $this->session->set('taskList', $uri, 'execution');
         }
         session_write_close();
     }
@@ -882,7 +914,7 @@ class repoModel extends model
      */
     public function setRepoBranch($branch)
     {
-        setcookie("repoBranch", $branch, 0, $this->config->webRoot);
+        setcookie("repoBranch", $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
         $_COOKIE['repoBranch'] = $branch;
     }
 
@@ -978,6 +1010,7 @@ class repoModel extends model
      */
     public function checkClient()
     {
+        if($this->post->SCM == 'Gitlab') return true;
         if(!$this->config->features->checkClient) return true;
         if(!$this->post->client) return true;
 
@@ -1695,4 +1728,28 @@ class repoModel extends model
 
         return $buildedURL;
     }
+
+	/**
+	 * Get gitlab projects.
+	 *
+	 * @param  string   $host
+	 * @param  string   $token
+	 * @access public
+	 * @return array
+	 */
+	public function getGitlabProjects($host, $token)
+	{
+		$host  = rtrim($host, '/');
+		$host .= '/api/v4/projects';
+
+		$allResults = array();
+		for($page = 1; true; $page ++)
+		{
+			$results = json_decode(file_get_contents($host . "?private_token=$token&simple=true&membership=true&page={$page}&per_page=100"));
+			if(empty($results) or $page > 10) break;
+			$allResults = $allResults + $results;
+		}
+
+		return $allResults;
+	}
 }
diff --git a/module/repo/view/ajaxsidecommits.html.php b/module/repo/view/ajaxsidecommits.html.php
index 613b537b19..68ec92166f 100644
--- a/module/repo/view/ajaxsidecommits.html.php
+++ b/module/repo/view/ajaxsidecommits.html.php
@@ -20,7 +20,7 @@ if(isset($entry)) $pathInfo .= '&type=file';
       <tr>
         <th class='w-40px'></th>
         <th class='w-80px'><?php echo $lang->repo->revisionA?></th>
-        <?php if($repo->SCM == 'Git'):?>
+        <?php if($repo->SCM != 'Subversion'):?>
         <th class='w-70px'><?php echo $lang->repo->commit?></th>
         <?php endif;?>
         <th class='w-80px'><?php echo $lang->repo->time?></th>
@@ -37,8 +37,8 @@ if(isset($entry)) $pathInfo .= '&type=file';
             <label></label>
           </div>
         </td>
-        <td class='versions'><span class="revision"><?php echo html::a($this->repo->createLink('revision', "repoID=$repoID&revision={$log->revision}" . $pathInfo), $repo->SCM == 'Git' ? substr($log->revision, 0, 10) : $log->revision);?></span></td>
-        <?php if($repo->SCM == 'Git'):?>
+        <td class='versions'><span class="revision"><?php echo html::a($this->repo->createLink('revision', "repoID=$repoID&objectID=$objectID&revision={$log->revision}" . $pathInfo), $repo->SCM != 'Subversion' ? substr($log->revision, 0, 10) : $log->revision, '', "data-app='{$this->app->openApp}'");?></span></td>
+        <?php if($repo->SCM != 'Subversion'):?>
         <td><?php echo $log->commit?></td>
         <?php endif;?>
         <td><?php echo substr($log->time, 0, 10);?></td>
@@ -51,17 +51,17 @@ if(isset($entry)) $pathInfo .= '&type=file';
   </table>
   <div class='table-footer'>
     <?php if(common::hasPriv('repo', 'diff')) echo html::submitButton($lang->repo->diff, '', count($revisions) < 2 ? 'disabled btn btn-primary' : 'btn btn-primary')?>
-    <?php echo html::a($this->repo->createLink('log', "repoID=$repoID&entry=" . $this->repo->encodePath($path) . "&revision=HEAD&type=$logType"), $lang->repo->allLog, '', "class='allLogs'");?>
+    <?php echo html::a($this->repo->createLink('log', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($path) . "&revision=HEAD&type=$logType"), $lang->repo->allLog, '', "class='allLogs' data-app='{$this->app->openApp}'");?>
     <div class='pull-right'>
       <div class='btn-group'>
         <?php
         $prePage  = $pager->pageID == 1 ? 1 : $pager->pageID - 1;
         $nextPage = $pager->pageID == $pager->pageTotal ? $pager->pageID : $pager->pageID + 1;
-        $params   = "repoID=$repoID&path=" . $this->repo->encodePath($path) . "&type=$logType&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+        $params   = "repoID=$repoID&path=" . $this->repo->encodePath($path) . "&objectID=$objectID&type=$logType&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
         $preLink  = $this->repo->createLink('ajaxSideCommits', "$params&pageID=$prePage");
         $nextLink = $this->repo->createLink('ajaxSideCommits', "$params&pageID=$nextPage");
-        echo html::a($preLink, "<i class='icon icon-angle-left'></i>", '', "class='ajaxPager btn" . ($prePage == $pager->pageID ? ' disabled' : '') . "'");
-        echo html::a($nextLink, "<i class='icon icon-angle-right'></i>", '', "class='ajaxPager btn" . ($nextPage == $pager->pageID ? ' disabled' : '') . "'");
+        echo html::commonButton("<i class='icon icon-angle-left'></i>",  "data-href='$preLink'",  "ajaxPager btn" . ($prePage == $pager->pageID ? ' disabled' : ''));
+        echo html::commonButton("<i class='icon icon-angle-right'></i>", "data-href='$nextLink'", "ajaxPager btn" . ($nextPage == $pager->pageID ? ' disabled' : ''));
         ?>
       </div>
     </div>
@@ -75,10 +75,10 @@ if($("input:checkbox[name='revision[]']:checked").length < 2)
 $("input:checkbox[name='revision[]']").each(function(){ if(!$(this).is(':checked')) $(this).attr("disabled","disabled")});
 $("input:checkbox[name='revision[]']").click(function(){
     var checkNum = $("input:checkbox[name='revision[]']:checked").length;
-    if (checkNum >= 2) 
+    if (checkNum >= 2)
     {
         $("input:checkbox[name='revision[]']").each(function(){ if(!$(this).is(':checked')) $(this).attr("disabled","disabled")});
-    } 
+    }
     else
     {
         $('#diffRepo').remove();
diff --git a/module/repo/view/blame.html.php b/module/repo/view/blame.html.php
index 56d8991a5e..f9f945b4d9 100644
--- a/module/repo/view/blame.html.php
+++ b/module/repo/view/blame.html.php
@@ -3,12 +3,12 @@
  * The create view file of repo module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
  * @package     repo
  * @version     $Id: blame.html.php $
  */
 ?>
-<?php 
+<?php
 include '../../common/view/header.html.php';
 js::import($jsRoot  . 'misc/highlight/highlight.pack.js');
 css::import($jsRoot . 'misc/highlight/styles/github.css');
@@ -20,7 +20,7 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
     $backURI = $this->session->repoView ? $this->session->repoView : $this->session->repoList;
     if($backURI)
     {
-        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link'");
+        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");
     }
     else
     {
@@ -31,14 +31,14 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
     <div class="page-title">
       <strong>
         <?php
-        echo html::a($this->repo->createLink('browse', "repoID=$repoID"), $repo->name);
-        $paths= explode('/', $entry);
+        echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'");
+        $paths = explode('/', $entry);
         $fileName = array_pop($paths);
         $postPath = '';
         foreach($paths as $pathName)
         {
             $postPath .= $pathName . '/';
-            echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'));
+            echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'");
         }
         echo '/' . ' ' . $fileName;
         echo " <span class='label label-info'>" . $revisionName . '</span>';
@@ -58,7 +58,7 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
         <?php echo html::commonButton(zget($lang->repo->encodingList, $encoding, $lang->repo->encoding) . "<span class='caret'></span>", "id='encoding' data-toggle='dropdown'", 'btn dropdown-toggle')?>
         <ul class='dropdown-menu' role='menu' aria-labelledby='encoding'>
           <?php foreach($lang->repo->encodingList as $key => $val):?>
-          <li><?php echo html::a($this->repo->createLink('blame', "repoID=$repoID&entry=$encodePath&revision=$revision&encoding=$key"), $val)?></li>
+          <li><?php echo html::a($this->repo->createLink('blame', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision=$revision&encoding=$key"), $val, '', "data-app='{$app->openApp}'")?></li>
           <?php endforeach;?>
         </ul>
       </div>
@@ -69,7 +69,7 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
       <thead>
         <tr>
           <td class='w-70px'><?php echo $lang->repo->revision?></td>
-          <?php if($repo->SCM == 'Git'):?>
+          <?php if($repo->SCM != 'Subversion'):?>
           <td class='w-50px'><?php echo $lang->repo->commit?></td>
           <?php endif;?>
           <td class='w-100px'><?php echo $lang->repo->committer?></td>
@@ -80,22 +80,22 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
       <tbody>
         <?php foreach($blames as $blame):?>
         <tr<?php if(isset($blame['lines'])) echo " class='topLine'";?>>
-          <?php 
+          <?php
           if(isset($blame['lines']))
           {
               $rowspan = $blame['lines'];
               echo '<td rowspan="' . $rowspan . '" class="info" title="' . $blame['revision'] . '">';
-              echo $repo->SCM == 'Git' ? substr($blame['revision'], 0, 10) : $blame['revision'];
+              echo $repo->SCM != 'Subversion' ? substr($blame['revision'], 0, 10) : $blame['revision'];
               echo '</td>';
-              if($repo->SCM == 'Git') echo '<td rowspan="' . $rowspan . '" class="info">' . zget($historys, $blame['revision'], '') . '</td>';
-              echo '<td rowspan="' . $rowspan . '" class="info">' . $blame['committer'] . '</td>'; 
+              if($repo->SCM != 'Subversion') echo '<td rowspan="' . $rowspan . '" class="info">' . zget($historys, $blame['revision'], '') . '</td>';
+              echo '<td rowspan="' . $rowspan . '" class="info">' . $blame['committer'] . '</td>';
           }
           ?>
           <td class="line"><?php echo $blame['line'];?></td>
           <td><pre><?php echo htmlspecialchars($blame['content']);?></pre></td>
         </tr>
         <?php endforeach?>
-      </tbody> 
+      </tbody>
     </table>
   </div>
 </div>
diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php
index 690787c432..b3ca9cf324 100644
--- a/module/repo/view/browse.html.php
+++ b/module/repo/view/browse.html.php
@@ -3,7 +3,7 @@
  * The browse view file of repo module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
  * @package     repo
  * @version     $Id: browse.html.php $
  */
@@ -11,27 +11,50 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
+    <div class='btn-group'>
+      <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><span class='text' title='<?php echo $repo->name;?>'><?php echo $repo->name;?></span> <span class='caret'></span></a>
+      <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
+        <?php
+        foreach($repos as $id => $repoName)
+        {
+            echo "<li>" . html::a($this->createLink('repo', 'browse', "repoID=$id&branchID=&objectID=$objectID"), $repoName, '', "title='{$repoName}' class='text-ellipsis' data-app='{$app->openApp}'") . "</li>";
+        }
+        ?>
+      </ul>
+    </div>
+    <?php if(!empty($branches)):?>
+    <div class='btn-group'>
+      <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><span class='text' title='<?php echo $branches[$branchID];?>'><?php echo $branches[$branchID];?></span> <span class='caret'></span></a>
+      <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
+        <?php
+        foreach($branches as $id => $branchName)
+        {
+            echo "<li>" . html::a($this->createLink('repo', 'browse', "repoID=$repoID&branchID=$id&objectID=$objectID"), $branchName, '', "title='{$branchName}' class='text-ellipsis' data-app='{$app->openApp}'") . "</li>";
+        }
+        ?>
+      </ul>
+    </div>
+    <?php endif;?>
     <div class="page-title">
       <strong>
         <?php
-        echo html::a($this->repo->createLink('browse', "repoID=$repoID"), $repo->name);
-        if(!empty($path))
+        echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'");
+        $paths= explode('/', $path);
+        $fileName = array_pop($paths);
+        $postPath = '';
+        foreach($paths as $pathName)
         {
-            $paths    = explode('/', $path);
-            $postPath = '';
-            foreach($paths as $pathName)
-            {
-                $postPath .= $pathName . '/';
-                echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($postPath) . "&revision=$revision"), trim($pathName, '/'));
-            }
+            $postPath .= $pathName . '/';
+            echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'");
         }
+        echo '/' . ' ' . $fileName;
         ?>
       </strong>
     </div>
   </div>
   <div class="btn-toolbar pull-right">
     <span class='last-sync-time'><?php echo $lang->repo->notice->lastSyncTime . $cacheTime?></span>
-    <?php echo html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), "<i class='icon icon-refresh'></i> ". $lang->refresh, '', "class='btn btn-primary'");?>
+    <?php echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), "<i class='icon icon-refresh'></i> " . $lang->refresh, '', "class='btn btn-primary' data-app={$app->openApp}");?>
   </div>
 </div>
 <div id="mainContent" class="main-row fade">
@@ -57,11 +80,11 @@
           <td>
           <?php
           $infoPath = trim($path . '/' . $info->name, '/');
-          $link = $info->kind == 'dir' ? $this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($infoPath)) : $this->repo->createLink('view', "repoID=$repoID&entry=" . $this->repo->encodePath($infoPath));
-          echo html::a($link, $info->name, '', "title='{$info->name}'");
+          $link = $info->kind == 'dir' ? $this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($infoPath)) : $this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($infoPath));
+          echo html::a($link, $info->name, '', "title='{$info->name}' data-app={$app->openApp}");
           ?>
           </td>
-          <td align='center'><?php echo $repo->SCM == 'Git' ? substr($info->revision, 0, 10) : $info->revision;?></td>
+          <td align='center'><?php echo $repo->SCM == 'Subversion' ? $info->revision : substr($info->revision, 0, 10);?></td>
           <td><?php echo substr($info->date, 0, 10)?></td>
           <td><?php echo $info->committer?></td>
           <?php $comment = htmlspecialchars($info->comment, ENT_QUOTES);?>
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index 29d0ce8536..446da06b4e 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -3,13 +3,14 @@
  * The create view file of repo module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
  * @package     repo
  * @version     $Id: create.html.php $
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::import($jsRoot . 'misc/base64.js');?>
 <?php if(common::checkNotCN()):?>
 <style>.user-addon {padding-right: 16px; padding-left: 16px;}</style>
 <?php endif;?>
@@ -18,7 +19,7 @@
   <div class='main-col main-content'>
     <div class='center-block'>
       <div class='main-header'>
-        <h2><?php echo $lang->repo->create; ?></h2>
+        <h2><?php echo $lang->repo->createAction;?></h2>
       </div>
       <form id='repoForm' method='post' class='form-ajax'>
         <table class='table table-form'>
@@ -31,12 +32,24 @@
             <td style="width:550px"><?php echo html::select('SCM', $lang->repo->scmList, 'Git', "onchange='scmChanged(this.value)' class='form-control'"); ?></td>
             <td class="tips-git"><?php echo $lang->repo->syncTips; ?></td>
           </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabHost;?></th>
+            <td><?php echo html::input('gitlabHost', '', "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabToken;?></th>
+            <td><?php echo html::input('gitlabToken', '', "class='form-control'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabProject;?></th>
+            <td><?php echo html::select('gitlabProject', array(''), '', "class='form-control chosen'");?>
+          </tr>
           <tr>
             <th><?php echo $lang->repo->name; ?></th>
             <td class='required'><?php echo html::input('name', '', "class='form-control'"); ?></td>
             <td></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->path; ?></th>
             <td class='required'><?php echo html::input('path', '', "class='form-control'"); ?></td>
             <td class='muted'>
@@ -49,7 +62,7 @@
             <td class='required'><?php echo html::input('encoding', 'utf-8', "class='form-control'"); ?></td>
             <td class='muted'><?php echo $lang->repo->encodingsTips; ?></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->client;?></th>
             <td class='required'><?php echo html::input('client', '', "class='form-control'")?></td>
             <td class='muted'>
@@ -57,11 +70,11 @@
                 <span class="tips-svn"><?php echo $lang->repo->example->client->svn;?></span>
             </td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields hide-gitlab">
             <th><?php echo $lang->repo->account;?></th>
             <td><?php echo html::input('account', '', "class='form-control'");?></td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields hide-gitlab">
             <th><?php echo $lang->repo->password;?></th>
             <td>
               <div class='input-group'>
diff --git a/module/repo/view/diff.html.php b/module/repo/view/diff.html.php
index a3a4313291..59e039f51c 100644
--- a/module/repo/view/diff.html.php
+++ b/module/repo/view/diff.html.php
@@ -3,7 +3,7 @@
  * The diff view file of repo module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
  * @package     repo
  * @version     $Id: browse.html.php $
  */
@@ -18,7 +18,7 @@
     $backURI = $this->session->repoView ? $this->session->repoView : $this->session->repoList;
     if($backURI)
     {
-        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link'");
+        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");
     }
     else
     {
@@ -28,20 +28,20 @@
     <div class="divider"></div>
     <div class="page-title">
       <?php
-      echo html::a($this->repo->createLink('browse', "repoID=$repoID"), $repo->name);
-      $paths= explode('/', $entry);
+      echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'");
+      $paths    = explode('/', $entry);
       $fileName = array_pop($paths);
       $postPath = '';
       foreach($paths as $pathName)
       {
           $postPath .= $pathName . '/';
-          echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'));
+          echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'");
       }
       echo '/' . ' ' . $fileName;
-      if($repo->SCM == 'Git')
+      if(strpos($repo->SCM, 'Subversion') === false)
       {
           $oldRevision = $oldRevision == '^' ? "$newRevision" : $oldRevision;
-          echo " <span class='label label-info'>" . substr($oldRevision, 0, 10) . " : " . substr($newRevision, 0, 10) . ' (' . $historys[$oldRevision] . ' : ' . $historys[$newRevision] . ')</span>';
+          echo " <span class='label label-info'>" . substr($oldRevision, 0, 10) . " : " . substr($newRevision, 0, 10) . ' (' . zget($historys, $oldRevision, '') . ' : ' . zget($historys, $newRevision, '') . ')</span>';
       }
       else
       {
@@ -120,7 +120,7 @@
             {
                 $newlc = $line->oldlc;
                 $line->type = 'custom';
-            } 
+            }
         }
         else
         {
@@ -155,7 +155,7 @@
 </div>
 <div class='revisions hidden'>
   <?php
-  if($repo->SCM == 'Git')
+  if(strpos($repo->SCM, 'Subversion') === false)
   {
       $oldRevision = $oldRevision == '^' ? "$newRevision" : $oldRevision;
       echo " <span class='label label-info'>" . substr($oldRevision, 0, 10) . " : " . substr($newRevision, 0, 10) . ' (' . $historys[$oldRevision] . ' : ' . $historys[$newRevision] . ')</span>';
diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php
index 914b0715ca..15f6d76846 100644
--- a/module/repo/view/edit.html.php
+++ b/module/repo/view/edit.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::import($jsRoot . 'misc/base64.js');?>
 <?php if(common::checkNotCN()):?>
 <style>
 .user-addon{padding-right: 16px; padding-left: 16px;}
@@ -37,12 +38,24 @@
                 <span class="tips-git"><?php echo $lang->repo->syncTips; ?></span>
             </td>
           </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabHost;?></th>
+            <td><?php echo html::input('gitlabHost', $repo->client, "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabToken;?></th>
+            <td><?php echo html::input('gitlabToken', $repo->password, "class='form-control'");?>
+          </tr>
+          <tr class='gitlab hide'>
+            <th><?php echo $lang->repo->gitlabProject;?></th>
+            <td><?php echo html::select('gitlabProject', $projects, $repo->extra, "class='form-control chosen'");?>
+          </tr>
           <tr>
             <th><?php echo $lang->repo->name; ?></th>
             <td class='required'><?php echo html::input('name', $repo->name, "class='form-control'"); ?></td>
             <td></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->path; ?></th>
             <td class='required'><?php echo html::input('path', $repo->path, "class='form-control'"); ?></td>
             <td class='muted'>
@@ -55,7 +68,7 @@
             <td class='required'><?php echo html::input('encoding', $repo->encoding, "class='form-control'"); ?></td>
             <td class='muted'><?php echo $lang->repo->encodingsTips; ?></td>
           </tr>
-          <tr>
+          <tr class='hide-gitlab'>
             <th><?php echo $lang->repo->client;?></th>
             <td class='required'><?php echo html::input('client',  $repo->client, "class='form-control'")?></td>
             <td class='muted'>
@@ -63,11 +76,11 @@
                 <span class="tips-svn"><?php echo $lang->repo->example->client->svn;?></span>
             </td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields hide-gitlab">
             <th><?php echo $lang->repo->account;?></th>
             <td><?php echo html::input('account', $repo->account, "class='form-control'");?></td>
           </tr>
-          <tr class="account-fields">
+          <tr class="account-fields  hide-gitlab">
             <th><?php echo $lang->repo->password;?></th>
             <td>
               <div class='input-group'>
diff --git a/module/repo/view/log.html.php b/module/repo/view/log.html.php
index 06a2eccba5..4e780f9653 100644
--- a/module/repo/view/log.html.php
+++ b/module/repo/view/log.html.php
@@ -3,7 +3,7 @@
  * The log view file of repo module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
  * @package     repo
  * @version     $Id: log.html.php $
  */
@@ -19,14 +19,14 @@
     <div class="page-title">
       <strong>
       <?php
-      echo html::a($this->repo->createLink('log', "repoID=$repoID"), $repo->name);
+      echo html::a($this->repo->createLink('log', "repoID=$repoID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'");
       $paths= explode('/', $entry);
       $fileName = array_pop($paths);
       $postPath = '';
       foreach($paths as $pathName)
       {
           $postPath .= $pathName . '/';
-          echo '/' . ' ' . html::a($this->repo->createLink('log', "repoID=$repoID&entry=" . $this->repo->encodePath($postPath)), trim($pathName, '/'));
+          echo '/' . ' ' . html::a($this->repo->createLink('log', "repoID=$repoID&ojbectID=$objectID&entry=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'");
       }
       echo '/' . ' ' . $fileName;
       ?>
@@ -40,9 +40,9 @@
     <ul class="nav nav-default">
       <?php $encodeEntry = $this->repo->encodePath($entry);?>
       <li><a><?php echo $lang->repo->log;?></a></li>
-      <li><?php echo html::a($this->repo->createLink('view', "repoID=$repoID&entry=$encodeEntry&revision=$revision"), $lang->repo->view);?></li>
+      <li><?php echo html::a($this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=$encodeEntry&revision=$revision"), $lang->repo->view, '', "data-app='{$app->openApp}'");?></li>
       <?php if($info->kind == 'file'):?>
-      <li><?php echo html::a($this->repo->createLink('blame', "repoID=$repoID&entry=$encodeEntry&revision=$revision"), $lang->repo->blame);?></li>
+      <li><?php echo html::a($this->repo->createLink('blame', "repoID=$repoID&objectID=$objectID*&entry=$encodeEntry&revision=$revision"), $lang->repo->blame, '', "data-app='{$app->openApp}'");?></li>
       <li><?php echo html::a($this->repo->createLink('download', "repoID=$repoID&path=$encodeEntry&fromRevision=$revision"), $lang->repo->download, 'hiddenwin');?></li>
       <?php endif;?>
     </ul>
@@ -53,7 +53,7 @@
         <tr>
           <th class='w-40px'></th>
           <th class='w-110px'><?php echo $lang->repo->revision?></th>
-          <?php if($repo->SCM == 'Git'):?>
+          <?php if($repo->SCM != 'Subversion'):?>
           <th class='w-90px'><?php echo $lang->repo->commit?></th>
           <?php endif;?>
           <th class='w-150px'><?php echo $lang->repo->date?></th>
@@ -70,8 +70,8 @@
               <label></label>
             </div>
           </td>
-          <td class='versions'><?php echo html::a($this->repo->createLink('revision', "repoID=$repoID&revision=" . $log->revision), substr($log->revision, 0, 10));?></td>
-          <?php if($repo->SCM == 'Git'):?>
+          <td class='versions'><?php echo html::a($this->repo->createLink('revision', "repoID=$repoID&objectID=$objectID&revision=" . $log->revision), substr($log->revision, 0, 10), '', "data-app='{$app->openApp}'");?></td>
+          <?php if($repo->SCM != 'Subversion'):?>
           <td><?php echo $log->commit?></td>
           <?php endif;?>
           <td><?php echo $log->time;?></td>
@@ -82,7 +82,7 @@
       </tbody>
     </table>
     <div class='table-footer'>
-      <?php echo html::submitButton($lang->repo->diff, '', 'btn btn-primary')?>
+      <?php echo html::submitButton($lang->repo->diff, '', count($logs) < 2 ? 'disabled btn btn-primary' : 'btn btn-primary')?>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
   </form>
diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php
index 0c158fbc4f..2cb0aced53 100644
--- a/module/repo/view/maintain.html.php
+++ b/module/repo/view/maintain.html.php
@@ -11,6 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<div id="mainMenu" class="clearfix">
+  <div class='pull-right'>
+    <?php if(common::hasPriv('repo', 'create')) echo html::a(helper::createLink('repo', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->repo->create, '', "class='btn btn-primary'");?>
+  </div>
+</div>
 <div id='mainContent'>
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='repoList' class='table has-sort-head table-fixed'>
@@ -26,11 +31,11 @@
         </tr>
       </thead>
       <tbody>
-        <?php foreach($repoList as $id => $repo):?>
+        <?php foreach($repoList as $repo):?>
         <tr>
-          <td class='text-center'><?php echo $id; ?></td>
+          <td class='text-center'><?php echo $repo->id; ?></td>
           <td class='text'><?php echo zget($lang->repo->scmList, $repo->SCM); ?></td>
-          <td class='text' title='<?php echo $repo->name; ?>'><?php echo html::a($this->createLink('repo', 'browse', "repoID={$repo->id}"), $repo->name);?></td>
+          <td class='text' title='<?php echo $repo->name; ?>'><?php echo html::a($this->createLink('repo', 'browse', "repoID={$repo->id}&branchID=&objectID=$objectID"), $repo->name);?></td>
           <td class='text'>
           <?php
           $productList = explode(',', str_replace(' ', '', $repo->product));
@@ -43,8 +48,8 @@
           <td class='text' title='<?php echo $repo->path; ?>'><?php echo $repo->path; ?></td>
           <td class='text-left c-actions'>
             <?php
-            common::printIcon('repo', 'edit', "repoID=$id", '', 'list',  'edit');
-            if(common::hasPriv('repo', 'delete')) echo html::a($this->createLink('repo', 'delete', "repoID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->repo->delete}' class='btn'");
+            common::printIcon('repo', 'edit', "repoID=$repo->id&objectID=$objectID", '', 'list',  'edit');
+            if(common::hasPriv('repo', 'delete')) echo html::a($this->createLink('repo', 'delete', "repoID=$repo->id&objectID=$objectID"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->repo->delete}' class='btn'");
             ?>
           </td>
         </tr>
diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php
index 02c605ab28..8da20df320 100644
--- a/module/repo/view/revision.html.php
+++ b/module/repo/view/revision.html.php
@@ -3,7 +3,7 @@
  * The revision view file of repo module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
  * @package     repo
  * @version     $Id: revision.html.php $
  */
@@ -19,11 +19,11 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php $browseLink = $app->session->revisionList != false ? $app->session->revisionList : $this->repo->createLink('browse', "repoID={$repoID}{$preDir}");?>
+    <?php $browseLink = $app->session->revisionList != false ? $app->session->revisionList : $this->repo->createLink('browse', "repoID={$repoID}&branchID=$branchID&objectID=$objectID{$preDir}");?>
     <?php echo html::a($browseLink, "<i class='icon icon-back'></i>" . $lang->goback, '', "class='btn btn-link'");?>
     <div class="divider"></div>
     <div class="page-title">
-      <?php echo $lang->repo->revisionA . ' ' . ($repo->SCM == 'Git' ? $this->repo->getGitRevisionName($revision, $log->commit) : $revision);?>
+      <?php echo $lang->repo->revisionA . ' ' . ($repo->SCM == 'Subversion' ? $revision : $this->repo->getGitRevisionName($revision, $log->commit));?>
     </div>
   </div>
 </div>
@@ -34,7 +34,7 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
       <div class='detail'>
         <div class='detail-title'>
           <?php echo $lang->repo->changes;?>
-          <div class='pull-right'><?php if(common::hasPriv('repo', 'diff')) echo html::a($this->repo->createLink('diff', "repoID=$repoID&entry=&fromRevision=$oldRevision&toRevision=$revision"), $lang->repo->diffAll);?></div>
+          <div class='pull-right'><?php if(common::hasPriv('repo', 'diff')) echo html::a($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=&fromRevision=$oldRevision&toRevision=$revision"), $lang->repo->diffAll, '', "data-app='{$app->openApp}'");?></div>
         </div>
         <div class='detail-content'>
           <table class='table no-margin'>
@@ -63,7 +63,7 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
               <th><?php echo $lang->repo->revisionA?></th>
               <td><?php echo $log->revision?></td>
             </tr>
-            <?php if($repo->SCM == 'Git'):?>
+            <?php if($repo->SCM != 'Subversion'):?>
             <tr>
               <th><?php echo $lang->repo->commit?></th>
               <td><?php echo $log->commit?></td>
@@ -85,8 +85,8 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
 </div>
 <div id="mainActions" class='main-actions'>
   <nav class="container">
-    <?php if(!empty($preAndNext->pre))  echo html::a($this->repo->createLink('revision', "repoID=$repoID&revision={$preAndNext->pre}" . $pathInfo . $typeInfo, "", 'html'), "<i class='icon-pre icon-chevron-left'></i>", '', "id='prevPage' class='btn btn-info' title='{$preAndNext->pre}'")?>
-    <?php if(!empty($preAndNext->next)) echo html::a($this->repo->createLink('revision', "repoID=$repoID&revision={$preAndNext->next}" . $pathInfo . $typeInfo, "", 'html'), "<i class='icon-pre icon-chevron-right'></i>", '', "id='nextPage' class='btn btn-info' title='{$preAndNext->next}'")?>
+    <?php if(!empty($preAndNext->pre))  echo html::a($this->repo->createLink('revision', "repoID=$repoID&objectID=$objectID&revision={$preAndNext->pre}" . $pathInfo . $typeInfo, 'html'), "<i class='icon-pre icon-chevron-left'></i>", '', "data-app='{$app->openApp}' id='prevPage' class='btn btn-info' title='{$preAndNext->pre}'")?>
+    <?php if(!empty($preAndNext->next)) echo html::a($this->repo->createLink('revision', "repoID=$repoID&objectID=$objectID&revision={$preAndNext->next}" . $pathInfo . $typeInfo, 'html'), "<i class='icon-pre icon-chevron-right'></i>", '', "data-app='{$app->openApp}' id='nextPage' class='btn btn-info' title='{$preAndNext->next}'")?>
   </nav>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/repo/view/view.html.php b/module/repo/view/view.html.php
index c83369e389..4f6cd0cef7 100644
--- a/module/repo/view/view.html.php
+++ b/module/repo/view/view.html.php
@@ -3,12 +3,12 @@
  * The create view file of repo module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
  * @package     repo
  * @version     $Id: create.html.php $
  */
 ?>
-<?php 
+<?php
 include '../../common/view/header.html.php';
 include '../../common/view/form.html.php';
 include '../../common/view/kindeditor.html.php';
@@ -20,19 +20,19 @@ $version = " <span class=\"label label-info\">$revisionName</span>";
 <?php if(!isonlybody()):?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::a($this->session->repoList, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <?php echo html::a($this->session->repoList, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");?>
     <div class="divider"></div>
     <div class="page-title">
       <strong>
         <?php
-        echo html::a($this->repo->createLink('browse', "repoID=$repoID"), $repo->name);
+        echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'");
         $paths= explode('/', $entry);
         $fileName = array_pop($paths);
         $postPath = '';
         foreach($paths as $pathName)
         {
             $postPath .= $pathName . '/';
-            echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'));
+            echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'");
         }
         echo '/' . ' ' . $fileName;
         echo $version;
@@ -41,7 +41,7 @@ $version = " <span class=\"label label-info\">$revisionName</span>";
     </div>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php echo html::a($this->repo->createLink('revision', "repoID=$repoID&revision=$revision"), $lang->repo->allChanges, '', "class='btn btn-primary'")?>
+    <?php echo html::a($this->repo->createLink('revision', "repoID=$repoID&objectID=$objectID&revision=$revision"), $lang->repo->allChanges, '', "class='btn btn-primary' data-app='{$app->openApp}'")?>
   </div>
 </div>
 <?php endif;?>
@@ -55,8 +55,8 @@ $version = " <span class=\"label label-info\">$revisionName</span>";
         <div class='panel-title'><?php echo $entry?></div>
         <div class='panel-actions'>
           <?php if($suffix != 'binary' and strpos($config->repo->images, "|$suffix|") === false):?>
-          <?php 
-          if(common::hasPriv('repo', 'blame')) echo html::a($this->repo->createLink('blame', "repoID=$repoID&entry=$encodePath&revision=$revision&encoding=$encoding"), html::icon('random') . $lang->repo->blame, '', "class='btn btn-sm btn-primary'");
+          <?php
+          if(common::hasPriv('repo', 'blame')) echo html::a($this->repo->createLink('blame', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision=$revision&encoding=$encoding"), html::icon('random') . $lang->repo->blame, '', "class='btn btn-sm btn-primary' data-app='{$app->openApp}'");
           if(common::hasPriv('repo', 'download')) echo html::a($this->repo->createLink('download', "repoID=$repoID&path=$encodePath&fromRevision=$revision"), html::icon('download-alt') . $lang->repo->download, 'hiddenwin', "class='btn btn-sm btn-primary'");
           ?>
           <?php endif;?>
@@ -64,7 +64,7 @@ $version = " <span class=\"label label-info\">$revisionName</span>";
             <?php echo html::commonButton(zget($lang->repo->encodingList, $encoding, $lang->repo->encoding) . "<span class='caret'></span>", "id='encoding' data-toggle='dropdown'", 'btn btn-sm btn-primary dropdown-toggle')?>
             <ul class='dropdown-menu' role='menu' aria-labelledby='encoding'>
               <?php foreach($lang->repo->encodingList as $key => $val):?>
-              <li><?php echo html::a($this->repo->createLink('view', "repoID=$repoID&entry=$encodePath&revision=$revision&showBug=$showBug&encoding=$key", 'html', isonlybody()), $val)?></li>
+              <li><?php echo html::a($this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision=$revision&showBug=$showBug&encoding=$key", 'html', isonlybody()), $val, '', "data-app='{$app->openApp}'")?></li>
               <?php endforeach;?>
             </ul>
           </div>
@@ -91,8 +91,8 @@ $version = " <span class=\"label label-info\">$revisionName</span>";
 <?php if(!isonlybody()):?>
 <div id="mainActions" class='main-actions'>
   <nav class="container">
-    <?php if(!empty($preAndNext->pre))  echo html::a($this->repo->createLink('view', "repoID=$repoID&entry=$encodePath&revision={$preAndNext->pre}&showBug=$showBug", 'html', isonlybody()), "<i class='icon-pre icon-chevron-left'></i>", '', "id='prevPage' class='btn btn-info' title='{$preAndNext->pre}'")?>
-    <?php if(!empty($preAndNext->next)) echo html::a($this->repo->createLink('view', "repoID=$repoID&entry=$encodePath&revision={$preAndNext->next}&showBug=$showBug", 'html', isonlybody()), "<i class='icon-pre icon-chevron-right'></i>", '', "id='nextPage' class='btn btn-info' title='{$preAndNext->next}'")?>
+    <?php if(!empty($preAndNext->pre))  echo html::a($this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision={$preAndNext->pre}&showBug=$showBug", 'html', isonlybody()), "<i class='icon-pre icon-chevron-left'></i>", '', "id='prevPage' class='btn btn-info' data-app='{$app->openApp}' title='{$preAndNext->pre}'")?>
+    <?php if(!empty($preAndNext->next)) echo html::a($this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision={$preAndNext->next}&showBug=$showBug", 'html', isonlybody()), "<i class='icon-pre icon-chevron-right'></i>", '', "id='nextPage' class='btn btn-info' data-app='{$app->openApp}' title='{$preAndNext->next}'")?>
   </nav>
 </div>
 <?php endif;?>
diff --git a/module/report/control.php b/module/report/control.php
index 9ff3af112e..daeca7d8cf 100644
--- a/module/report/control.php
+++ b/module/report/control.php
@@ -32,18 +32,12 @@ class report extends control
         /* Set report menu group. */
         $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
         if(!$this->projectID) $this->lang->navGroup->report = 'report';
-        if($this->lang->navGroup->report == 'project' && isset($this->config->maxVersion))
-        {
-            $index = array_search('report', $this->lang->noMenuModule);
-            unset($this->lang->noMenuModule[$index]);
-            $this->lang->report->menu = $this->lang->report->projectMenu;
-        }
 
         if((isset($this->config->proVersion) || isset($this->config->bizVersion)) && $this->lang->navGroup->report == 'report' && common::hasPriv('report', 'custom')) $this->lang->report->mainMenuAction = html::a(helper::createLink('report', 'custom'), $this->lang->crystal->custom, '', "class='btn btn-link'");
     }
 
     /**
-     * The index of report, goto execution deviation.
+     * The index of report, goto project deviation.
      *
      * @access public
      * @return void
@@ -54,23 +48,23 @@ class report extends control
     }
 
     /**
-     * Execution deviation report.
+     * Project deviation report.
      *
      * @access public
      * @return void
      */
-    public function executionDeviation($begin = 0, $end = 0)
+    public function projectDeviation($begin = 0, $end = 0)
     {
         $begin = $begin ? date('Y-m-d', strtotime($begin)) : '';
         $end   = $end   ? date('Y-m-d', strtotime($end))   : '';
 
-        $this->view->title      = $this->lang->report->executionDeviation;
-        $this->view->position[] = $this->lang->report->executionDeviation;
+        $this->view->title      = $this->lang->report->projectDeviation;
+        $this->view->position[] = $this->lang->report->projectDeviation;
 
         $this->view->executions = $this->report->getExecutions($begin, $end);
         $this->view->begin      = $begin;
         $this->view->end        = $end;
-        $this->view->submenu    = 'execution';
+        $this->view->submenu    = 'project';
         $this->display();
     }
 
diff --git a/module/report/js/executiondeviation.js b/module/report/js/projectdeviation.js
similarity index 85%
rename from module/report/js/executiondeviation.js
rename to module/report/js/projectdeviation.js
index a693a947ac..2d979b1d73 100644
--- a/module/report/js/executiondeviation.js
+++ b/module/report/js/projectdeviation.js
@@ -23,6 +23,6 @@ function changeDate(begin, end)
             end = end + endarray[i];
         }
     }
-    link = createLink('report', 'executiondeviation', 'begin=' + begin + '&end=' + end);
+    link = createLink('report', 'projectdeviation', 'begin=' + begin + '&end=' + end);
     location.href=link;
 }
diff --git a/module/report/lang/de.php b/module/report/lang/de.php
index 068205cd5a..c9719d9154 100644
--- a/module/report/lang/de.php
+++ b/module/report/lang/de.php
@@ -9,16 +9,15 @@
  * @version     $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->report->common          = 'Berichte';
-$lang->report->index           = 'Home';
-$lang->report->list            = 'Liste';
-$lang->report->item            = 'Eintrag';
-$lang->report->value           = 'Wert';
-$lang->report->percent         = '%';
-$lang->report->undefined       = 'Undefiniert';
-$lang->report->query           = 'Abfrage';
-$lang->report->annual          = 'Annual Summary';
-$lang->report->executionCommon = 'Execution';
+$lang->report->index     = 'Home';
+$lang->report->list      = 'Liste';
+$lang->report->item      = 'Eintrag';
+$lang->report->value     = 'Wert';
+$lang->report->percent   = '%';
+$lang->report->undefined = 'Undefiniert';
+$lang->report->query     = 'Abfrage';
+$lang->report->annual    = 'Annual Summary';
+$lang->report->project   = 'Project';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -38,30 +37,30 @@ $lang->report->assign['assign']   = 'Zugeordnet';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->executionDeviation = 'Durchgeführt Abweichung';
-$lang->report->productSummary     = $lang->productCommon . ' Zusammenfassung';
-$lang->report->bugCreate          = 'Bug gemeldet';
-$lang->report->bugAssign          = 'Bug zugeordnet';
-$lang->report->workload           = 'Team Arbeitslast ';
-$lang->report->workloadAB         = 'Arbeitslast';
-$lang->report->bugOpenedDate      = 'Bug gemeldet am';
-$lang->report->beginAndEnd        = ' : von';
-$lang->report->begin              = 'Begin';
-$lang->report->end                = 'End';
-$lang->report->dept               = 'Abteilung';
-$lang->report->deviationChart     = 'Durchgeführt Abweichnungs Chart';
+$lang->report->projectDeviation = 'Projektabweichungsbericht';
+$lang->report->productSummary   = $lang->productCommon . ' Zusammenfassung';
+$lang->report->bugCreate        = 'Bug gemeldet';
+$lang->report->bugAssign        = 'Bug zugeordnet';
+$lang->report->workload         = 'Team Arbeitslast ';
+$lang->report->workloadAB       = 'Arbeitslast';
+$lang->report->bugOpenedDate    = 'Bug gemeldet am';
+$lang->report->beginAndEnd      = ' : von';
+$lang->report->begin            = 'Begin';
+$lang->report->end              = 'End';
+$lang->report->dept             = 'Abteilung';
+$lang->report->deviationChart   = 'Projektabweichungskurve';
 
 $lang->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
+$lang->reportList->project = new stdclass();
 $lang->reportList->product = new stdclass();
 $lang->reportList->test    = new stdclass();
 $lang->reportList->staff   = new stdclass();
 
-$lang->reportList->execution->lists[10] = 'Durchgeführt Abweichnung|report|executiondeviation';
-$lang->reportList->product->lists[10]   = $lang->productCommon . ' Zusammenfassung|report|productsummary';
-$lang->reportList->test->lists[10]      = 'Bugs gemeldet|report|bugcreate';
-$lang->reportList->test->lists[13]      = 'Bugs zugeordnet|report|bugassign';
-$lang->reportList->staff->lists[10]     = 'Team Arbeitslast|report|workload';
+$lang->reportList->project->lists[10] = 'Durchgeführt Abweichnung|reportprojectdeviation';
+$lang->reportList->product->lists[10] = $lang->productCommon . ' Zusammenfassung|report|productsummary';
+$lang->reportList->test->lists[10]    = 'Bugs gemeldet|report|bugcreate';
+$lang->reportList->test->lists[13]    = 'Bugs zugeordnet|report|bugassign';
+$lang->reportList->staff->lists[10]   = 'Team Arbeitslast|report|workload';
 
 $lang->report->id            = 'ID';
 $lang->report->execution     = $lang->executionCommon;
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 7868b6f881..0ce194211b 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -9,16 +9,15 @@
  * @version     $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->report->common          = 'Report';
-$lang->report->index           = 'Report Home';
-$lang->report->list            = 'Report';
-$lang->report->item            = 'Item';
-$lang->report->value           = 'Value';
-$lang->report->percent         = '%';
-$lang->report->undefined       = 'Undefined';
-$lang->report->query           = 'Query';
-$lang->report->annual          = 'Annual Summary';
-$lang->report->executionCommon = 'Execution';
+$lang->report->index     = 'Report Home';
+$lang->report->list      = 'Report';
+$lang->report->item      = 'Item';
+$lang->report->value     = 'Value';
+$lang->report->percent   = '%';
+$lang->report->undefined = 'Undefined';
+$lang->report->query     = 'Query';
+$lang->report->annual    = 'Annual Summary';
+$lang->report->project   = 'Project';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -38,30 +37,30 @@ $lang->report->assign['assign']   = 'Assigned';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->executionDeviation = 'Execution Deviation';
-$lang->report->productSummary     = $lang->productCommon . ' Summary';
-$lang->report->bugCreate          = 'Bug Reported Summary';
-$lang->report->bugAssign          = 'Bug Assigned Summary';
-$lang->report->workload           = 'Team Workload Summary';
-$lang->report->workloadAB         = 'Workload';
-$lang->report->bugOpenedDate      = 'Bug reported from';
-$lang->report->begin              = 'Begin';
-$lang->report->end                = 'End';
-$lang->report->beginAndEnd        = ' From';
-$lang->report->dept               = 'Department';
-$lang->report->deviationChart     = 'Execution Deviation Chart';
+$lang->report->projectDeviation = 'Project Deviation';
+$lang->report->productSummary   = $lang->productCommon . ' Summary';
+$lang->report->bugCreate        = 'Bug Reported Summary';
+$lang->report->bugAssign        = 'Bug Assigned Summary';
+$lang->report->workload         = 'Team Workload Summary';
+$lang->report->workloadAB       = 'Workload';
+$lang->report->bugOpenedDate    = 'Bug reported from';
+$lang->report->beginAndEnd      = ' From';
+$lang->report->begin            = 'Begin';
+$lang->report->end              = 'End';
+$lang->report->dept             = 'Department';
+$lang->report->deviationChart   = 'Project Deviation Chart';
 
 $lang->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
-$lang->reportList->product   = new stdclass();
-$lang->reportList->test      = new stdclass();
-$lang->reportList->staff     = new stdclass();
+$lang->reportList->project = new stdclass();
+$lang->reportList->product = new stdclass();
+$lang->reportList->test    = new stdclass();
+$lang->reportList->staff   = new stdclass();
 
-$lang->reportList->execution->lists[10] = 'Execution Deviation|report|executiondeviation';
-$lang->reportList->product->lists[10]   = $lang->productCommon . ' Summary|report|productsummary';
-$lang->reportList->test->lists[10]      = 'Bug Reported Summary|report|bugcreate';
-$lang->reportList->test->lists[13]      = 'Bug Assigned Summary|report|bugassign';
-$lang->reportList->staff->lists[10]     = 'Team Workload Summary|report|workload';
+$lang->reportList->project->lists[10] = 'Execution Deviation|report|projectdeviation';
+$lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary';
+$lang->reportList->test->lists[10]    = 'Bug Reported Summary|report|bugcreate';
+$lang->reportList->test->lists[13]    = 'Bug Assigned Summary|report|bugassign';
+$lang->reportList->staff->lists[10]   = 'Team Workload Summary|report|workload';
 
 $lang->report->id            = 'ID';
 $lang->report->execution     = $lang->executionCommon;
diff --git a/module/report/lang/fr.php b/module/report/lang/fr.php
index 276e4101b6..187aa4b7af 100644
--- a/module/report/lang/fr.php
+++ b/module/report/lang/fr.php
@@ -9,16 +9,15 @@
  * @version     $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
  * @link        https://www.zentao.pm
  */
-$lang->report->common          = 'Rapports';
-$lang->report->index           = 'Accueil Rapports';
-$lang->report->list            = 'Rapports';
-$lang->report->item            = 'Item';
-$lang->report->value           = 'Valeur';
-$lang->report->percent         = '%';
-$lang->report->undefined       = 'N/D';
-$lang->report->query           = 'Requête';
-$lang->report->annual          = 'Résumé Annuel';
-$lang->report->executionCommon = 'Execution';
+$lang->report->index     = 'Accueil Rapports';
+$lang->report->list      = 'Rapports';
+$lang->report->item      = 'Item';
+$lang->report->value     = 'Valeur';
+$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->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -38,30 +37,30 @@ $lang->report->assign['assign']   = 'Affecté';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->executionDeviation = 'Dérive Effectué';
-$lang->report->productSummary     = 'Résumé ' . $lang->productCommon;
-$lang->report->bugCreate          = 'Résumé remontée Bugs';
-$lang->report->bugAssign          = 'Résumé affectation Bugs';
-$lang->report->workload           = 'Résumé charge travail';
-$lang->report->workloadAB         = 'Charge Travail';
-$lang->report->bugOpenedDate      = 'Bugs signalés de';
-$lang->report->beginAndEnd        = ' de';
-$lang->report->begin              = 'Begin';
-$lang->report->end                = 'End';
-$lang->report->dept               = 'Compartiment';
-$lang->report->deviationChart     = 'Graphique de Dérive d uEffectué' ;
+$lang->report->projectDeviation = 'Rapport de déviation du projet';
+$lang->report->productSummary   = 'Résumé ' . $lang->productCommon;
+$lang->report->bugCreate        = 'Résumé remontée Bugs';
+$lang->report->bugAssign        = 'Résumé affectation Bugs';
+$lang->report->workload         = 'Résumé charge travail';
+$lang->report->workloadAB       = 'Charge Travail';
+$lang->report->bugOpenedDate    = 'Bugs signalés de';
+$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->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
-$lang->reportList->product   = new stdclass();
-$lang->reportList->test      = new stdclass();
-$lang->reportList->staff     = new stdclass();
+$lang->reportList->project = new stdclass();
+$lang->reportList->product = new stdclass();
+$lang->reportList->test    = new stdclass();
+$lang->reportList->staff   = new stdclass();
 
-$lang->reportList->execution->lists[10] = 'Dériv Effectué|report|executiondeviation';
-$lang->reportList->product->lists[10]   = 'Résumé ' . $lang->productCommon . '|report|productsummary';
-$lang->reportList->test->lists[10]      = 'Résumé remontée Bugs|report|bugcreate';
-$lang->reportList->test->lists[13]      = 'Résumé affectation Bugs|report|bugassign';
-$lang->reportList->staff->lists[10]     = 'Résumé charge travail|report|workload';
+$lang->reportList->project->lists[10] = 'Dériv Effectué|report|projectdeviation';
+$lang->reportList->product->lists[10] = 'Résumé ' . $lang->productCommon . '|report|productsummary';
+$lang->reportList->test->lists[10]    = 'Résumé remontée Bugs|report|bugcreate';
+$lang->reportList->test->lists[13]    = 'Résumé affectation Bugs|report|bugassign';
+$lang->reportList->staff->lists[10]   = 'Résumé charge travail|report|workload';
 
 $lang->report->id            = 'ID';
 $lang->report->execution     = $lang->executionCommon;
diff --git a/module/report/lang/vi.php b/module/report/lang/vi.php
index e66560113a..3a431a8172 100644
--- a/module/report/lang/vi.php
+++ b/module/report/lang/vi.php
@@ -9,16 +9,15 @@
  * @version  $Id: vi.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
  * @link  http://www.zentao.net
  */
-$lang->report->common          = 'Báo cáo';
-$lang->report->index           = 'Trang báo cáo';
-$lang->report->list            = 'Báo cáo';
-$lang->report->item            = 'Hạng mục';
-$lang->report->value           = 'Giá trị';
-$lang->report->percent         = '%';
-$lang->report->undefined       = 'Chưa định nghĩa';
-$lang->report->query           = 'Truy vấn';
-$lang->report->annual          = 'Tóm tắt theo năm';
-$lang->report->executionCommon = 'Execution';
+$lang->report->index      = 'Trang báo cáo';
+$lang->report->list       = 'Báo cáo';
+$lang->report->item       = 'Hạng mục';
+$lang->report->value      = 'Giá trị';
+$lang->report->percent    = '%';
+$lang->report->undefined  = 'Chưa định nghĩa';
+$lang->report->query      = 'Truy vấn';
+$lang->report->annual     = 'Tóm tắt theo năm';
+$lang->report->project    = 'Project';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -38,30 +37,30 @@ $lang->report->assign['assign']   = 'Đã giao';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->executionDeviation = 'Độ lệch thực hiện';
-$lang->report->productSummary     = 'Tóm tắt '.$lang->productCommon;
-$lang->report->bugCreate          = 'Báo cáo Bug';
-$lang->report->bugAssign          = 'Bàn giao Bug';
-$lang->report->workload           = 'Lượng công việc đội nhóm';
-$lang->report->workloadAB         = 'Lượng công việc';
-$lang->report->bugOpenedDate      = 'Bug được báo cáo từ';
-$lang->report->beginAndEnd        = ' từ';
-$lang->report->begin              = 'Begin';
-$lang->report->end                = 'End';
-$lang->report->dept               = 'Phòng/Ban';
-$lang->report->deviationChart     = 'Biểu đồ chênh lệcthực hiệnh';
+$lang->report->projectDeviation = 'Độ lệch thực hiện';
+$lang->report->productSummary   = 'Tóm tắt '.$lang->productCommon;
+$lang->report->bugCreate        = 'Báo cáo Bug';
+$lang->report->bugAssign        = 'Bàn giao Bug';
+$lang->report->workload         = 'Lượng công việc đội nhóm';
+$lang->report->workloadAB       = 'Lượng công việc';
+$lang->report->bugOpenedDate    = 'Bug được báo cáo từ';
+$lang->report->beginAndEnd      = ' từ';
+$lang->report->begin            = 'Begin';
+$lang->report->end              = 'End';
+$lang->report->dept             = 'Phòng/Ban';
+$lang->report->deviationChart   = 'Biểu đồ chênh lệcthực hiệnh';
 
 $lang->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
-$lang->reportList->product   = new stdclass();
-$lang->reportList->test      = new stdclass();
-$lang->reportList->staff     = new stdclass();
+$lang->reportList->project = new stdclass();
+$lang->reportList->product = new stdclass();
+$lang->reportList->test    = new stdclass();
+$lang->reportList->staff   = new stdclass();
 
-$lang->reportList->execution->lists[10] = 'Chênh lệchthực hiện|report|executiondeviation';
-$lang->reportList->product->lists[10]   = 'Tóm tắt '.$lang->productCommon . '|report|productsummary';
-$lang->reportList->test->lists[10]      = 'Báo cáo Bug|report|bugcreate';
-$lang->reportList->test->lists[13]      = 'Bàn giao Bug|report|bugassign';
-$lang->reportList->staff->lists[10]     = 'Lượng công việc đội nhóm|report|workload';
+$lang->reportList->project->lists[10] = 'Chênh lệchthực hiện|reportprojectdeviation';
+$lang->reportList->product->lists[10] = 'Tóm tắt '.$lang->productCommon . '|report|productsummary';
+$lang->reportList->test->lists[10]    = 'Báo cáo Bug|report|bugcreate';
+$lang->reportList->test->lists[13]    = 'Bàn giao Bug|report|bugassign';
+$lang->reportList->staff->lists[10]   = 'Lượng công việc đội nhóm|report|workload';
 
 $lang->report->id            = 'ID';
 $lang->report->execution     = $lang->executionCommon;
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index 601354c496..46ff54dbaa 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -9,16 +9,15 @@
  * @version     $Id: zh-cn.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->report->common          = '统计视图';
-$lang->report->index           = '统计首页';
-$lang->report->list            = '统计报表';
-$lang->report->item            = '条目';
-$lang->report->value           = '值';
-$lang->report->percent         = '百分比';
-$lang->report->undefined       = '未设定';
-$lang->report->query           = '查询';
-$lang->report->annual          = '年度总结';
-$lang->report->executionCommon = '执行';
+$lang->report->index      = '统计首页';
+$lang->report->list       = '统计报表';
+$lang->report->item       = '条目';
+$lang->report->value      = '值';
+$lang->report->percent    = '百分比';
+$lang->report->undefined  = '未设定';
+$lang->report->query      = '查询';
+$lang->report->annual     = '年度总结';
+$lang->report->project    = '项目';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -38,30 +37,30 @@ $lang->report->assign['assign']   = '已指派';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->executionDeviation = '执行偏差报表';
-$lang->report->productSummary     = $lang->productCommon . '汇总表';
-$lang->report->bugCreate          = 'Bug创建表';
-$lang->report->bugAssign          = 'Bug指派表';
-$lang->report->workload           = '员工负载表';
-$lang->report->workloadAB         = '工作负载';
-$lang->report->bugOpenedDate      = 'Bug创建时间';
-$lang->report->beginAndEnd        = '起止时间';
-$lang->report->begin              = '起始时间';
-$lang->report->end                = '结束时间';
-$lang->report->dept               = '部门';
-$lang->report->deviationChart     = '执行偏差曲线';
+$lang->report->projectDeviation = '项目偏差报表';
+$lang->report->productSummary   = $lang->productCommon . '汇总表';
+$lang->report->bugCreate        = 'Bug创建表';
+$lang->report->bugAssign        = 'Bug指派表';
+$lang->report->workload         = '员工负载表';
+$lang->report->workloadAB       = '工作负载';
+$lang->report->bugOpenedDate    = 'Bug创建时间';
+$lang->report->beginAndEnd      = '起止时间';
+$lang->report->begin            = '起始日期';
+$lang->report->end              = '结束日期';
+$lang->report->dept             = '部门';
+$lang->report->deviationChart   = '项目偏差曲线';
 
 $lang->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
-$lang->reportList->product   = new stdclass();
-$lang->reportList->test      = new stdclass();
-$lang->reportList->staff     = new stdclass();
+$lang->reportList->project = new stdclass();
+$lang->reportList->product = new stdclass();
+$lang->reportList->test    = new stdclass();
+$lang->reportList->staff   = new stdclass();
 
-$lang->reportList->execution->lists[10] = '执行偏差报表|report|executiondeviation';
-$lang->reportList->product->lists[10]   = $lang->productCommon . '汇总表|report|productsummary';
-$lang->reportList->test->lists[10]      = 'Bug创建表|report|bugcreate';
-$lang->reportList->test->lists[13]      = 'Bug指派表|report|bugassign';
-$lang->reportList->staff->lists[10]     = '员工负载表|report|workload';
+$lang->reportList->project->lists[10] = '项目偏差报表|report|projectdeviation';
+$lang->reportList->product->lists[10] = $lang->productCommon . '汇总表|report|productsummary';
+$lang->reportList->test->lists[10]    = 'Bug创建表|report|bugcreate';
+$lang->reportList->test->lists[13]    = 'Bug指派表|report|bugassign';
+$lang->reportList->staff->lists[10]   = '员工负载表|report|workload';
 
 $lang->report->id            = '编号';
 $lang->report->execution     = $lang->executionCommon;
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index 102922493c..7b98729edd 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -9,7 +9,6 @@
  * @version     $Id: zh-tw.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->report->common     = '統計視圖';
 $lang->report->index      = '統計首頁';
 $lang->report->list       = '統計報表';
 $lang->report->item       = '條目';
@@ -18,6 +17,7 @@ $lang->report->percent    = '百分比';
 $lang->report->undefined  = '未設定';
 $lang->report->query      = '查詢';
 $lang->report->annual     = '年度總結';
+$lang->report->project    = '項目';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -37,28 +37,30 @@ $lang->report->assign['assign']   = '已指派';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->executionDeviation = $lang->executionCommon . '偏差報表';
-$lang->report->productSummary     = $lang->productCommon . '彙總表';
-$lang->report->bugCreate          = 'Bug創建表';
-$lang->report->bugAssign          = 'Bug指派表';
-$lang->report->workload           = '員工負載表';
-$lang->report->workloadAB         = '工作負載';
-$lang->report->bugOpenedDate      = 'Bug創建時間';
-$lang->report->beginAndEnd        = '起止時間';
-$lang->report->dept               = '部門';
-$lang->report->deviationChart     = $lang->executionCommon . '偏差曲綫';
+$lang->report->projectDeviation = '項目偏差報表';
+$lang->report->productSummary   = $lang->productCommon . '彙總表';
+$lang->report->bugCreate        = 'Bug創建表';
+$lang->report->bugAssign        = 'Bug指派表';
+$lang->report->workload         = '員工負載表';
+$lang->report->workloadAB       = '工作負載';
+$lang->report->bugOpenedDate    = 'Bug創建時間';
+$lang->report->beginAndEnd      = '起止時間';
+$lang->report->begin            = '起始日期';
+$lang->report->end              = '結束日期';
+$lang->report->dept             = '部門';
+$lang->report->deviationChart   = '項目偏差曲綫';
 
 $lang->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
-$lang->reportList->product   = new stdclass();
-$lang->reportList->test      = new stdclass();
-$lang->reportList->staff     = new stdclass();
+$lang->reportList->project = new stdclass();
+$lang->reportList->product = new stdclass();
+$lang->reportList->test    = new stdclass();
+$lang->reportList->staff   = new stdclass();
 
-$lang->reportList->execution->lists[10] = $lang->executionCommon . '偏差報表|report|executiondeviation';
-$lang->reportList->product->lists[10]   = $lang->productCommon . '彙總表|report|productsummary';
-$lang->reportList->test->lists[10]      = 'Bug創建表|report|bugcreate';
-$lang->reportList->test->lists[13]      = 'Bug指派表|report|bugassign';
-$lang->reportList->staff->lists[10]     = '員工負載表|report|workload';
+$lang->reportList->project->lists[10] = '項目偏差報表|report|projectdeviation';
+$lang->reportList->product->lists[10] = $lang->productCommon . '彙總表|report|productsummary';
+$lang->reportList->test->lists[10]    = 'Bug創建表|report|bugcreate';
+$lang->reportList->test->lists[13]    = 'Bug指派表|report|bugassign';
+$lang->reportList->staff->lists[10]   = '員工負載表|report|workload';
 
 $lang->report->id            = '編號';
 $lang->report->execution     = $lang->executionCommon;
@@ -125,7 +127,7 @@ $lang->report->annualData->stories          = "需求數據";
 $lang->report->annualData->tasks            = "任務數據";
 $lang->report->annualData->bugs             = "Bug數據";
 $lang->report->annualData->cases            = "用例數據";
-$lang->report->annualData->statusStat       = "{$lang->storyCommon}/任務/Bug狀態分佈（截止今日）";
+$lang->report->annualData->statusStat       = "{$lang->SRCommon}/任務/Bug狀態分佈（截止今日）";
 
 $lang->report->annualData->companyUsers     = "公司總人數";
 $lang->report->annualData->deptUsers        = "部門人數";
@@ -151,7 +153,7 @@ $lang->report->annualData->bugMonthActions   = "每月Bug操作情況";
 $lang->report->annualData->caseMonthActions  = "每月用例操作情況";
 
 $lang->report->annualData->executionFields['name']  = "{$lang->executionCommon}名稱";
-$lang->report->annualData->executionFields['story'] = "完成{$lang->storyCommon}數";
+$lang->report->annualData->executionFields['story'] = "完成{$lang->SRCommon}數";
 $lang->report->annualData->executionFields['task']  = "完成任務數";
 $lang->report->annualData->executionFields['bug']   = "解決Bug數";
 
@@ -162,7 +164,7 @@ if(!empty($config->URAndSR))
 {
     $lang->report->annualData->productFields['requirement'] = "創建{$lang->URCommon}數";
 }
-$lang->report->annualData->productFields['story']    = "創建{$lang->storyCommon}數";
+$lang->report->annualData->productFields['story']    = "創建{$lang->SRCommon}數";
 $lang->report->annualData->productFields['finished'] = "完成需求數";
 
 $lang->report->annualData->objectTypeList['product']     = $lang->productCommon;
@@ -201,7 +203,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->executionCommon;
 $lang->report->annualData->radarItems['devel']     = "研發";
 $lang->report->annualData->radarItems['qa']        = "測試";
 $lang->report->annualData->radarItems['other']     = "其他";
diff --git a/module/report/model.php b/module/report/model.php
index 9dd3f49f5a..7f8d4294d5 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -91,8 +91,10 @@ class reportModel extends model
     /**
      * Get executions.
      *
+     * @param  string $begin
+     * @param  string $end
      * @access public
-     * @return void
+     * @return array
      */
     public function getExecutions($begin = 0, $end = 0)
     {
@@ -136,12 +138,15 @@ class reportModel extends model
      */
     public function getProducts($conditions, $storyType = 'story')
     {
-        $products = $this->dao->select('id, code, name, PO')->from(TABLE_PRODUCT)
-            ->where('deleted')->eq(0)
-            ->beginIF(strpos($conditions, 'closedProduct') === false)->andWhere('status')->ne('closed')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
+        $products = $this->dao->select('t1.id as id, t1.code, t1.name, t1.PO')->from(TABLE_PRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
+            ->where('t1.deleted')->eq(0)
+            ->beginIF(strpos($conditions, 'closedProduct') === false)->andWhere('t1.status')->ne('closed')->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi()
+            ->orderBy('t2.order_asc, t1.line_desc, t1.order_asc')
             ->fetchAll('id');
-        $plans    = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('deleted')->eq(0)->andWhere('product')->in(array_keys($products))
+
+        $plans = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('deleted')->eq(0)->andWhere('product')->in(array_keys($products))
             ->beginIF(strpos($conditions, 'overduePlan') === false)->andWhere('end')->gt(date('Y-m-d'))->fi()
             ->orderBy('product,parent_desc,begin')
             ->fetchAll('id');
@@ -491,6 +496,7 @@ class reportModel extends model
             ->leftJoin(TABLE_USER)->alias('t2')
             ->on('t1.account = t2.account')
             ->where('t1.cycle')->eq(0)
+            ->andWhere('t1.deleted')->eq(0)
             ->andWhere('t1.status')->in('wait,doing')
             ->query();
 
@@ -611,6 +617,7 @@ class reportModel extends model
     {
         return $this->dao->select("count(*) as count, sum(if((`status` != 'done'), 1, 0)) AS `undone`, sum(if((`status` = 'done'), 1, 0)) AS `done`")->from(TABLE_TODO)
             ->where('LEFT(date, 4)')->eq($year)
+            ->andWhere('deleted')->eq('0')
             ->beginIF($accounts)->andWhere('account')->in($accounts)->fi()
             ->fetch();
     }
@@ -747,6 +754,7 @@ class reportModel extends model
     {
         /* Get changed executions in this year. */
         $executions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('deleted')->eq(0)
+            ->andwhere('type')->eq('sprint')
             ->andWhere('LEFT(begin, 4)', true)->eq($year)
             ->orWhere('LEFT(end, 4)')->eq($year)
             ->markRight(1)
@@ -776,6 +784,7 @@ class reportModel extends model
             $executions += $this->dao->select('id,name')->from(TABLE_EXECUTION)
                 ->where('id')->in($teamExecutions + $taskExecutions)
                 ->andWhere('deleted')->eq(0)
+                ->andWhere('type')->eq('sprint')
                 ->orderBy('`order` desc')
                 ->fetchAll('id');
         }
diff --git a/module/report/view/blockreportlist.html.php b/module/report/view/blockreportlist.html.php
index c9bac0f916..cedd17ef20 100644
--- a/module/report/view/blockreportlist.html.php
+++ b/module/report/view/blockreportlist.html.php
@@ -1,7 +1,7 @@
 <div class="sidebar-toggle">
   <i class="icon icon-angle-left"></i>
 </div>
-<div class="cell w-200px">
+<div class="cell">
   <div class='panel'>
     <div class='panel-heading'>
       <div class='panel-title'><?php echo $lang->report->list;?></div>
@@ -21,9 +21,11 @@
       </div>
     </div>
   </div>
+  <?php if(!isset($config->proVersion) and !isset($config->bizVersion) and !isset($config->maxVersion)):?>
   <div class='panel panel-body' style='padding: 10px 6px'>
     <div class='text proversion'>
       <strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo (!empty($config->isINT)) ? $lang->report->proVersionEn : $lang->report->proVersion;?></span>
     </div>
   </div>
+  <?php endif;?>
 </div>
diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php
index a65207bd39..f46c741884 100644
--- a/module/report/view/bugassign.html.php
+++ b/module/report/view/bugassign.html.php
@@ -1,4 +1,8 @@
 <?php include '../../common/view/header.html.php';?>
+<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
+<style>#mainContent > .side-col.col-lg{width: 235px}</style>
+<style>.hide-sidebar #sidebar{width: 0 !important}</style>
+<?php endif;?>
 <div id='mainContent' class='main-row'>
   <div class='side-col col-lg' id='sidebar'>
     <?php include 'blockreportlist.html.php';?>
diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php
index 01352a80dc..6377bd9a87 100644
--- a/module/report/view/bugcreate.html.php
+++ b/module/report/view/bugcreate.html.php
@@ -1,5 +1,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
+<style>#mainContent > .side-col.col-lg{width: 235px}</style>
+<style>.hide-sidebar #sidebar{width: 0 !important}</style>
+<?php endif;?>
 <div id='mainContent' class='main-row'>
   <div class='side-col col-lg' id='sidebar'>
     <?php include 'blockreportlist.html.php';?>
diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php
index c6a18768e5..3972a1303c 100644
--- a/module/report/view/productsummary.html.php
+++ b/module/report/view/productsummary.html.php
@@ -2,6 +2,10 @@
 <?php if(common::checkNotCN()):?>
 <style>#conditions .col-xs { width: 126px; }</style>
 <?php endif;?>
+<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
+<style>#mainContent > .side-col.col-lg{width: 235px}</style>
+<style>.hide-sidebar #sidebar{width: 0 !important}</style>
+<?php endif;?>
 <div id='mainContent' class='main-row'>
   <div class='side-col col-lg' id='sidebar'>
     <?php include 'blockreportlist.html.php';?>
@@ -97,7 +101,7 @@
               </tr>
               <?php endforeach;?>
             </tbody>
-          </table> 
+          </table>
         </div>
       </div>
     </div>
diff --git a/module/report/view/executiondeviation.html.php b/module/report/view/projectdeviation.html.php
similarity index 94%
rename from module/report/view/executiondeviation.html.php
rename to module/report/view/projectdeviation.html.php
index 6a5b5a660e..cd1084b6a4 100644
--- a/module/report/view/executiondeviation.html.php
+++ b/module/report/view/projectdeviation.html.php
@@ -1,23 +1,27 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/chart.html.php';?>
+<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
+<style>#mainContent > .side-col.col-lg{width: 235px}</style>
+<style>.hide-sidebar #sidebar{width: 0 !important}</style>
+<?php endif;?>
 <?php $chartData = array('labels' => array(), 'data' => array());?>
 <div id='mainContent' class='main-row'>
   <div class='side-col col-lg' id='sidebar'>
     <?php include 'blockreportlist.html.php';?>
   </div>
-  <div class='main-col w-800px'>
+  <div class='main-col'>
     <div class='cell'>
       <div class="row" id='conditions'>
         <div class='w-220px col-md-3 col-sm-6'>
           <div class='input-group'>
-            <span class='input-group-addon'><?php echo $lang->report->executionCommon . $lang->report->begin;?></span>
+            <span class='input-group-addon'><?php echo $lang->report->execution . $lang->report->begin;?></span>
             <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $begin, "class='form-control form-date' onchange='changeDate(this.value, \"$end\")'");?></div>
           </div>
         </div>
         <div class='w-220px col-md-3 col-sm-6'>
           <div class='input-group'>
-            <span class='input-group-addon'><?php echo $lang->report->executionCommon . $lang->report->end;?></span>
+            <span class='input-group-addon'><?php echo $lang->report->execution . $lang->report->end;?></span>
             <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $end, "class='form-control form-date' onchange='changeDate(\"$begin\", this.value)'");?></div>
           </div>
         </div>
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index 99ea165653..e549090273 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -1,5 +1,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
+<style>#mainContent > .side-col.col-lg{width: 210px}</style>
+<style>.hide-sidebar #sidebar{width: 0 !important}</style>
+<?php endif;?>
 <?php js::set('weekend', $config->execution->weekend);?>
 <div id='mainContent' class='main-row'>
   <div class='side-col col-lg' id='sidebar'>
diff --git a/module/search/control.php b/module/search/control.php
index 257c754b99..3ddb7d9098 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -11,6 +11,19 @@
  */
 class search extends control
 {
+    /**
+     * Determine whether to display the effort object.
+     *
+     * @access public
+     * @return void
+     */
+    public function __construct($module = '', $method = '')
+    {
+        parent::__construct($module, $method);
+        if(!isset($this->config->maxVersion))  unset($this->lang->search->modules['effort']);
+        if($this->config->systemMode != 'new') unset($this->lang->search->modules['program'], $this->lang->search->modules['project']);
+    }
+
     /**
      * Build search form.
      *
@@ -157,8 +170,9 @@ class search extends control
             }
         }
 
-        $this->lang->search->menu = $this->lang->admin->menu;
-        $this->lang->menugroup->search = 'system';
+        $this->lang->navGroup->search  = 'admin';
+        $this->lang->search->menu      = $this->lang->admin->menu;
+        $this->lang->search->menuOrder = $this->lang->admin->menuOrder;
 
         $this->view->title = $this->lang->search->buildIndex;
         $this->display();
@@ -187,46 +201,49 @@ class search extends control
         $type = (empty($type) or $type[0] == 'all') ? 'all' : $type;
 
         $this->app->loadClass('pager', $static = true);
-        $pager = new pager($recTotal, $this->config->search->recPerPage, $pageID);
+        $pager  = new pager($recTotal, $this->config->search->recPerPage, $pageID);
+        $begin  = time();
+        $result = $this->search->getList($words, $pager, $type);
 
         /* Set session. */
-        $uri  = inlink('index', "recTotal=$recTotal&pageID=$pageID");
+        $uri  = inlink('index', "recTotal=$pager->recTotal&pageID=$pager->pageID");
         $uri .= strpos($uri, '?') === false ? '?' : '&';
         $uri .= 'words=' . $words;
-        $this->session->set('bugList',         $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('docList',         $uri);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('executionList',   $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('testtaskList',    $uri);
-        $this->session->set('todoList',        $uri);
-        $this->session->set('effortList',      $uri);
-        $this->session->set('reportList',      $uri);
-        $this->session->set('testsuiteList',   $uri);
-        $this->session->set('issueList',       $uri);
-        $this->session->set('riskList',        $uri);
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('docList',         $uri, 'doc');
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('programList',     $uri, 'program');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('todoList',        $uri, 'my');
+        $this->session->set('effortList',      $uri, 'my');
+        $this->session->set('reportList',      $uri, 'qa');
+        $this->session->set('testsuiteList',   $uri, 'qa');
+        $this->session->set('issueList',       $uri, 'project');
+        $this->session->set('riskList',        $uri, 'project');
+        $this->session->set('caselibList',     $uri, 'qa');
         $this->session->set('searchIngWord',   $words);
         $this->session->set('searchIngType',   $type);
 
-        $begin = time();
-        $this->view->results = $this->search->getList($words, $pager, $type);
-
         if(strpos($this->server->http_referer, 'search') === false)
         {
             $this->session->set('referer', $this->server->http_referer);
         }
 
-        $this->view->consumed = time() - $begin;
-        $this->view->title    = $this->lang->search->index;
-        $this->view->type     = $type;
-        $this->view->pager    = $pager;
-        $this->view->words    = $words;
-        $this->view->referer  = $this->session->referer;
+        $this->view->results    = $result;
+        $this->view->consumed   = time() - $begin;
+        $this->view->title      = $this->lang->search->index;
+        $this->view->type       = $type;
+        $this->view->pager      = $pager;
+        $this->view->words      = $words;
+        $this->view->referer    = $this->session->referer;
 
         $this->display();
     }
diff --git a/module/search/lang/de.php b/module/search/lang/de.php
index 7edf04ba22..d37d7d28bc 100644
--- a/module/search/lang/de.php
+++ b/module/search/lang/de.php
@@ -87,7 +87,7 @@ $lang->search->modules['testreport']  = 'Testing Report';
 $lang->search->modules['productplan'] = 'Plan';
 $lang->search->modules['program']     = 'Program';
 $lang->search->modules['project']     = 'Project';
-$lang->search->modules['execution']   = 'Execution';
+$lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = 'Story';
 
 $lang->search->objectTypeList['story']            = $lang->SRCommon;
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index f9d5893f00..b35e74c92b 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -87,7 +87,7 @@ $lang->search->modules['testreport']  = 'Testing Report';
 $lang->search->modules['productplan'] = 'Plan';
 $lang->search->modules['program']     = 'Program';
 $lang->search->modules['project']     = 'Project';
-$lang->search->modules['execution']   = 'Execution';
+$lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = 'Story';
 
 $lang->search->objectTypeList['story']            = $lang->SRCommon;
diff --git a/module/search/lang/fr.php b/module/search/lang/fr.php
index 0940a44cf7..c385e47934 100644
--- a/module/search/lang/fr.php
+++ b/module/search/lang/fr.php
@@ -87,7 +87,7 @@ $lang->search->modules['testreport']  = 'Testing Report';
 $lang->search->modules['productplan'] = 'Plan';
 $lang->search->modules['program']     = 'Program';
 $lang->search->modules['project']     = 'Project';
-$lang->search->modules['execution']   = 'Execution';
+$lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = 'Story';
 
 $lang->search->objectTypeList['story']            = $lang->SRCommon;
diff --git a/module/search/lang/vi.php b/module/search/lang/vi.php
index 26810c39f7..4d8a3132eb 100644
--- a/module/search/lang/vi.php
+++ b/module/search/lang/vi.php
@@ -87,7 +87,7 @@ $lang->search->modules['testreport']  = 'Báo cáo Test';
 $lang->search->modules['productplan'] = 'Kế hoạch';
 $lang->search->modules['program']     = 'Program';
 $lang->search->modules['project']     = 'Project';
-$lang->search->modules['execution']   = 'Execution';
+$lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = 'Story';
 
 $lang->search->objectTypeList['story']            = $lang->SRCommon;
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index b4a236692f..9ec02c18d1 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -76,7 +76,7 @@ $lang->search->modules['bug']         = 'Bug';
 $lang->search->modules['case']        = '用例';
 $lang->search->modules['doc']         = '文档';
 $lang->search->modules['todo']        = '待办';
-$lang->search->modules['build']       = 'Build';
+$lang->search->modules['build']       = '版本';
 $lang->search->modules['effort']      = '日志';
 $lang->search->modules['caselib']     = '测试库';
 $lang->search->modules['product']     = $lang->productCommon;
@@ -87,7 +87,7 @@ $lang->search->modules['testreport']  = '报告';
 $lang->search->modules['productplan'] = '计划';
 $lang->search->modules['program']     = '项目集';
 $lang->search->modules['project']     = '项目';
-$lang->search->modules['execution']   = '执行';
+$lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = '需求';
 
 $lang->search->objectTypeList['story']            = $lang->SRCommon;
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index 3bee72f868..3eb4611e71 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -76,7 +76,7 @@ $lang->search->modules['bug']         = 'Bug';
 $lang->search->modules['case']        = '用例';
 $lang->search->modules['doc']         = '文檔';
 $lang->search->modules['todo']        = '待辦';
-$lang->search->modules['build']       = 'Build';
+$lang->search->modules['build']       = '版本';
 $lang->search->modules['effort']      = '日誌';
 $lang->search->modules['caselib']     = '測試庫';
 $lang->search->modules['product']     = $lang->productCommon;
@@ -89,12 +89,10 @@ $lang->search->modules['program']     = '項目集';
 $lang->search->modules['project']     = '項目';
 $lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = '需求';
-$lang->search->modules['issue']       = '問題';
-$lang->search->modules['risk']        = '風險';
 
 $lang->search->objectTypeList['story']            = $lang->SRCommon;
 $lang->search->objectTypeList['requirement']      = $lang->URCommon;
-$lang->search->objectTypeList['stage']            = $lang->execution->stage;
+$lang->search->objectTypeList['stage']            = '階段';
 $lang->search->objectTypeList['sprint']           = $lang->executionCommon;
 $lang->search->objectTypeList['commonIssue']      = '問題';
 $lang->search->objectTypeList['stakeholderIssue'] = '干係人問題';
diff --git a/module/search/model.php b/module/search/model.php
index 194c103036..19faf9d00f 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -266,8 +266,8 @@ class searchModel extends model
             $users = $this->loadModel('user')->getPairs('realname|noclosed', $appendUsers, $this->config->maxCount);
             $users['$@me'] = $this->lang->search->me;
         }
-        if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->PRJ);
-        if($hasExecution) $executions = array('' => '') + $this->loadModel('execution')->getPairs($this->session->PRJ);
+        if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->project);
+        if($hasExecution) $executions = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project);
 
         foreach($fields as $fieldName)
         {
@@ -543,8 +543,6 @@ class searchModel extends model
                 if(common::hasPriv($module, 'view')) $allowedObject[] = $objectType;
 
                 if($module == 'caselib'    and common::hasPriv('caselib', 'view'))     $allowedObject[] = $objectType;
-                if($module == 'execution'  and common::haspriv('project', 'view'))     $allowedobject[] = $objectType;
-                if($module == 'project'    and common::haspriv('program', 'index'))    $allowedobject[] = $objectType;
                 if($module == 'deploystep' and common::haspriv('deploy',  'viewstep')) $allowedobject[] = $objectType;
             }
         }
@@ -578,31 +576,27 @@ class searchModel extends model
             {
                 if(!isset($this->config->objectTables[$record->objectType])) continue;
                 $table       = $this->config->objectTables[$record->objectType];
-                $executionID = $this->dao->select('execution')->from($table)->where('id')->eq($record->objectID)->fetch('execution');
-                $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, $executionID);
+                $projectID   = $this->dao->select('project')->from($table)->where('id')->eq($record->objectID)->fetch('project');
+                $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, $projectID);
             }
             elseif($module == 'issue')
             {
-                $issue             = $this->dao->select('id,execution,owner')->from(TABLE_ISSUE)->where('id')->eq($record->objectID)->fetch();
-                $record->url       = helper::createLink($module, $method, "id={$record->objectID}", '', false, $issue->execution);
+                $issue             = $this->dao->select('id,project,owner')->from(TABLE_ISSUE)->where('id')->eq($record->objectID)->fetch();
+                $record->url       = helper::createLink($module, $method, "id={$record->objectID}", '', false, $issue->project);
                 $record->extraType = empty($issue->owner) ? 'commonIssue' : 'stakeholderIssue';
             }
+            elseif($module == 'execution')
+            {
+                $execution         = $this->dao->select('id,type,project')->from(TABLE_EXECUTION)->where('id')->eq($record->objectID)->fetch();
+                $record->url       = helper::createLink('execution', $method, "id={$record->objectID}", '', false, $execution->project);
+                $record->extraType = $execution->type;
+            }
             elseif($module == 'story')
             {
                 $story             = $this->dao->select('id,type')->from(TABLE_STORY)->where('id')->eq($record->objectID)->fetch();
                 $record->url       = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
                 $record->extraType = $story->type;
             }
-            elseif($module == 'execution')
-            {
-                $execution         = $this->dao->select('id,type,project')->from(TABLE_PROJECT)->where('id')->eq($record->objectID)->fetch();
-                $record->url       = helper::createLink('execution', $method, "id={$record->objectID}", '', false, $execution->project);
-                $record->extraType = $execution->type;
-            }
-            elseif($module == 'project')
-            {
-                $record->url = helper::createLink('project', 'index', "id={$record->objectID}", '', false, 0, true);
-            }
             else
             {
                 $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
@@ -1021,7 +1015,7 @@ class searchModel extends model
             while(true)
             {
                 $query    = $this->buildIndexQuery($module);
-                $dataList = $query->beginIF($lastID)->andWhere('t1.id')->gt($lastID)->fi()->limit($limit)->fetchAll('id');
+                $dataList = $query->beginIF($lastID)->andWhere('t1.id')->gt($lastID)->fi()->orderBy('t1.id')->limit($limit)->fetchAll('id');
                 if(empty($dataList))
                 {
                     $lastID = 0;
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index add7cdc13b..7c8a1081cb 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -41,6 +41,7 @@ $formId = 'searchForm-' . uniqid('');
 #queryBox .chosen-container-single .chosen-single > span {margin-right:5px;}
 
 #queryBox .form-actions .btn {margin-right: 5px;}
+@media screen and (max-width: 1366px) { #userQueries {width: 130px!important;} }
 #userQueries {border-left: 1px solid #eee; vertical-align: top;}
 #userQueries > h4 {margin: 0 0 6px;}
 #userQueries ul {list-style: none; padding-left: 0; margin: 0; max-height:75px; overflow:auto;}
diff --git a/module/search/view/buildindex.html.php b/module/search/view/buildindex.html.php
index 8427147840..817aad8b34 100644
--- a/module/search/view/buildindex.html.php
+++ b/module/search/view/buildindex.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 common::printAdminSubMenu('system');?></div>
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
diff --git a/module/search/view/index.html.php b/module/search/view/index.html.php
index 9dbc8dd964..724c638fcc 100644
--- a/module/search/view/index.html.php
+++ b/module/search/view/index.html.php
@@ -1,4 +1,22 @@
-<?php include '../../common/view/header.html.php';?>
+<?php //include '../../common/view/header.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
+<header id='header'>
+  <div id='mainHeader' style='height: 0px;'>
+  </div>
+</header>
+<?php
+if(!empty($config->sso->redirect))
+{
+    css::import($defaultTheme . 'bindranzhi.css');
+    js::import($jsRoot . 'bindranzhi.js');
+}
+?>
+<script>
+adjustMenuWidth();
+</script>
+<main id='main' <?php if(!empty($config->sso->redirect)) echo "class='ranzhiFixedTfootAction'";?> >
+  <div class='container'>
+
 <div class='row'>
   <div class='col-md-12'>
     <form method='post' action='<?php echo inlink('index')?>' style='margin-bottom:10px;'>
@@ -17,7 +35,7 @@
         <div class='item'>
           <div class='item-heading'>
             <div class="pull-right">
-              <span><?php echo html::a($object->url . (strpos($object->url, '?') !== false ? '&onlybody=yes' : '?onlybody=yes'), "<i class='icon-eye-open'></i>" . $lang->search->preview, '', "class='iframe' data-width='90%' data-title=\"<a href='$object->url' target='_blank' class='btn'><i class='icon-eye-open'></i>$lang->preview</a>\"")?></span>
+              <span><?php echo html::a($object->url . (strpos($object->url, '?') !== false ? '&onlybody=yes' : '?onlybody=yes'), $lang->search->preview, '', "class='iframe' data-width='90%'")?></span>
             </div>
             <h4>
               <?php
@@ -42,7 +60,7 @@
       </section>
       <footer class='table-footer'>
         <?php echo str_replace($words, urlencode($words), $pager->get('right', 'short'));?>
-        <span class='execute-info text-muted'><?php printf($lang->search->executeInfo, $pager->recTotal, $consumed);?></span> 
+        <span class='execute-info text-muted'><?php printf($lang->search->executeInfo, $pager->recTotal, $consumed);?></span>
       </footer>
     </div>
   </div>
diff --git a/module/setting/model.php b/module/setting/model.php
index 00b9f0a0aa..8fc6d443f3 100644
--- a/module/setting/model.php
+++ b/module/setting/model.php
@@ -14,10 +14,10 @@
 class settingModel extends model
 {
     //-------------------------------- methods for get, set and delete setting items. ----------------------------//
-    
+
     /**
      * Get value of an item.
-     * 
+     *
      * @param  string   $paramString    see parseItemParam();
      * @access public
      * @return misc
@@ -29,7 +29,7 @@ class settingModel extends model
 
     /**
      * Get some items.
-     * 
+     *
      * @param  string   $paramString    see parseItemParam();
      * @access public
      * @return array
@@ -40,10 +40,10 @@ class settingModel extends model
     }
 
     /**
-     * Set value of an item. 
-     * 
-     * @param  string      $path     system.common.global.sn or system.common.sn 
-     * @param  string      $value 
+     * Set value of an item.
+     *
+     * @param  string      $path     system.common.global.sn or system.common.sn
+     * @param  string      $value
      * @access public
      * @return void
      */
@@ -78,12 +78,12 @@ class settingModel extends model
 
     /**
      * Batch set items, the example:
-     * 
+     *
      * $path = 'system.mail';
      * $items->turnon = true;
      * $items->smtp->host = 'localhost';
      *
-     * @param  string         $path   like system.mail 
+     * @param  string         $path   like system.mail
      * @param  array|object   $items  the items array or object, can be mixed by one level or two levels.
      * @access public
      * @return bool
@@ -112,7 +112,7 @@ class settingModel extends model
 
     /**
      * Delete items.
-     * 
+     *
      * @param  string   $paramString    see parseItemParam();
      * @access public
      * @return void
@@ -124,7 +124,7 @@ class settingModel extends model
 
     /**
      * Parse the param string for select or delete items.
-     * 
+     *
      * @param  string    $paramString     owner=xxx&key=sn and so on.
      * @access public
      * @return array
@@ -132,7 +132,7 @@ class settingModel extends model
     public function parseItemParam($paramString)
     {
         /* Parse the param string into array. */
-        parse_str($paramString, $params); 
+        parse_str($paramString, $params);
 
         /* Init fields not set in the param string. */
         $fields = 'owner,module,section,key';
@@ -144,7 +144,7 @@ class settingModel extends model
 
     /**
      * Create a DAO object to select or delete one or more records.
-     * 
+     *
      * @param  array  $params     the params parsed by parseItemParam() method.
      * @param  string $method     select|delete.
      * @access public
@@ -162,7 +162,7 @@ class settingModel extends model
     /**
      * Get config of system and one user.
      *
-     * @param  string $account 
+     * @param  string $account
      * @access public
      * @return array
      */
@@ -179,6 +179,7 @@ class settingModel extends model
         $config = array();
         foreach($records as $record)
         {
+            if(!isset($config[$record->owner])) $config[$record->owner] = new stdclass();
             if(!isset($record->module)) return array();    // If no module field, return directly. Since 3.2 version, there's the module field.
             if(empty($record->module)) continue;
 
@@ -188,10 +189,10 @@ class settingModel extends model
     }
 
     //-------------------------------- methods for version and sn. ----------------------------//
-   
+
     /**
      * Get the version of current zentaopms.
-     * 
+     *
      * Since the version field not saved in db. So if empty, return 0.3 beta.
      *
      * @access public
@@ -205,9 +206,21 @@ class settingModel extends model
     }
 
     /**
-     * Update version 
-     * 
-     * @param  string    $version 
+     * Get URSR.
+     *
+     * @access public
+     * @return int
+     */
+    public function getURSR()
+    {
+        if(isset($this->config->URSR)) return $this->config->URSR;
+        return $this->getItem('owner=system&module=custom&key=URSR');
+    }
+
+    /**
+     * Update version
+     *
+     * @param  string    $version
      * @access public
      * @return void
      */
@@ -218,7 +231,7 @@ class settingModel extends model
 
     /**
      * Set the sn of current zentaopms.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -230,8 +243,8 @@ class settingModel extends model
 
     /**
      * Compute a SN. Use the server ip, and server software string as seed, and an rand number, two micro time
-     * 
-     * Note: this sn just to unique this zentaopms. No any private info. 
+     *
+     * Note: this sn just to unique this zentaopms. No any private info.
      *
      * @access public
      * @return string
@@ -245,8 +258,8 @@ class settingModel extends model
 
     /**
      * Judge a sn needed update or not.
-     * 
-     * @param  string    $sn 
+     *
+     * @param  string    $sn
      * @access public
      * @return bool
      */
diff --git a/module/sso/control.php b/module/sso/control.php
index e36f7ec4af..d72a994fa7 100644
--- a/module/sso/control.php
+++ b/module/sso/control.php
@@ -280,6 +280,7 @@ class sso extends control
         if($_POST)
         {
             $result = $this->sso->createUser();
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $result['id']));
             if($result['status'] != 'success') die($result['data']);
             die('success');
         }
diff --git a/module/sso/model.php b/module/sso/model.php
index 8d902b3107..88389b0853 100644
--- a/module/sso/model.php
+++ b/module/sso/model.php
@@ -3,7 +3,7 @@ class ssoModel extends model
 {
     /**
      * Check Key.
-     * 
+     *
      * @access public
      * @return bool
      */
@@ -16,8 +16,8 @@ class ssoModel extends model
 
     /**
      * Get bind user.
-     * 
-     * @param  string    $user 
+     *
+     * @param  string    $user
      * @access public
      * @return object
      */
@@ -28,7 +28,7 @@ class ssoModel extends model
 
     /**
      * Get bind users with ranzhi.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -38,8 +38,8 @@ class ssoModel extends model
     }
 
     /**
-     * Bind user. 
-     * 
+     * Bind user.
+     *
      * @access public
      * @return object
      */
@@ -83,14 +83,14 @@ class ssoModel extends model
 
     /**
      * Create a user from ranzhi.
-     * 
+     *
      * @access public
      * @return void
      */
     public function createUser()
     {
         $user = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($this->post->account)->fetch();
-        if($user) return array('status' => 'fail', 'data' => $this->lang->sso->bindHasAccount); 
+        if($user) return array('status' => 'fail', 'data' => $this->lang->sso->bindHasAccount);
 
         $user = new stdclass();
         $user->account  = $this->post->account;
@@ -101,7 +101,7 @@ class ssoModel extends model
 
         $this->dao->insert(TABLE_USER)->data($user)->autoCheck()->exec();
 
-        if(dao::isError()) return array('status' => 'fail', 'data' => dao::getError()); 
-        return array('status' => 'success'); 
+        if(dao::isError()) return array('status' => 'fail', 'data' => dao::getError());
+        return array('status' => 'success', 'id' => $this->dao->lastInsertId());
     }
 }
diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php
index ecbca2aee2..f2e9965177 100644
--- a/module/stakeholder/control.php
+++ b/module/stakeholder/control.php
@@ -4,20 +4,23 @@ class stakeholder extends control
     /**
      * Stakeholder list.
      *
+     * @param  int    $projectID
      * @param  string $browseType
-     * @param  string orderBy
-     * @param  int recTotal
-     * @param  int recPerPage
-     * @param  int pageID
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
-    public function browse($browseType = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($projectID, $browseType = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->app->loadClass('pager', true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
-        $stakeholders = $this->stakeholder->getStakeholders($browseType, $orderBy, $pager);
+        $this->loadModel('project')->setMenu($projectID);
+
+        $stakeholders = $this->stakeholder->getStakeholders($projectID, $browseType, $orderBy, $pager);
 
         $this->view->title       = $this->lang->stakeholder->browse;
         $this->view->position[]  = $this->lang->stakeholder->browse;
@@ -26,6 +29,7 @@ class stakeholder extends control
         $this->view->recTotal     = $recTotal;
         $this->view->recPerPage   = $recPerPage;
         $this->view->pageID       = $pageID;
+        $this->view->projectID    = $projectID;
         $this->view->orderBy      = $orderBy;
         $this->view->browseType   = $browseType;
         $this->view->stakeholders = $stakeholders;
@@ -36,15 +40,15 @@ class stakeholder extends control
     /**
      * Create a stakeholder.
      *
-     * @param  int programID
+     * @param  int objectID
      * @access public
      * @return void
      */
-    public function create($programID = 0)
+    public function create($objectID = 0)
     {
         if($_POST)
         {
-            $stakeholderID = $this->stakeholder->create($programID);
+            $stakeholderID = $this->stakeholder->create($objectID);
 
             $response['result']  = 'success';
             $response['message'] = $this->lang->saveSuccess;
@@ -57,34 +61,31 @@ class stakeholder extends control
             }
 
             $actionID = $this->loadModel('action')->create('stakeholder', $stakeholderID, 'added');
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $stakeholderID));
 
-            $moduleName = $programID ? 'program'              : $this->moduleName;
-            $methodName = $programID ? 'stakeholder'          : 'browse';
-            $param      = $programID ? "programID=$programID" : '';
+            $moduleName = $this->app->openApp == 'program' ? 'program'              : $this->moduleName;
+            $methodName = $this->app->openApp == 'program' ? 'stakeholder'          : 'browse';
+            $param      = $this->app->openApp == 'program' ? "programID=$objectID" : "projectID=$objectID";
             $locate     = $this->createLink($moduleName, $methodName, $param);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
-        if($programID)
+        if($this->app->openApp == 'program')
         {
-            $this->loadModel('program');
-            $this->app->rawModule = 'program';
-            $this->app->rawMethod = 'stakeholder';
-            $this->lang->navGroup->program = 'program';
-            $this->lang->program->switcherMenu = $this->program->getSwitcher($programID, true);
-            $this->program->setViewMenu($programID);
-
-            $this->view->members = $this->loadModel('project')->getTeamMemberPairs($programID);
+            $this->loadModel('program')->setMenu($objectID);
+            $this->view->members = $this->loadModel('program')->getTeamMemberPairs($objectID);
         }
         else
         {
-            $this->view->members = $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ);
+            $this->loadModel('project')->setMenu($objectID);
+            $this->view->members = $this->loadModel('user')->getTeamMemberPairs($objectID, 'project');
         }
 
         $this->view->title      = $this->lang->stakeholder->create;
         $this->view->position[] = $this->lang->stakeholder->create;
         $this->view->companys   = $this->loadModel('company')->getOutsideCompanies();
-        $this->view->programID  = $programID;
+        $this->view->programID  = $this->app->openApp == 'program' ? $objectID : 0;
+        $this->view->projectID  = $this->app->openApp == 'project' ? $objectID : 0;
 
         $this->display();
     }
@@ -92,15 +93,28 @@ class stakeholder extends control
     /**
      * Batch create stakeholders.
      *
+     * @param  int    $projectID
+     * @param  string $dept
+     * @param  string $dept
      * @access public
      * @return void
      */
-    public function batchCreate($dept = '', $parentID = 0)
+    public function batchCreate($projectID, $dept = '', $parentID = 0)
     {
         if($_POST)
         {
-            $this->stakeholder->batchCreate();
-            die(js::locate($this->createLink('stakeholder', 'browse'), 'parent'));
+            $stakeholderList = $this->stakeholder->batchCreate();
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $stakeholderList));
+            die(js::locate($this->createLink('stakeholder', 'browse', "projectID=$projectID"), 'parent'));
+        }
+
+        if($this->app->openApp == 'program')
+        {
+            $this->loadModel('program')->setMenu($projectID);
+        }
+        else
+        {
+            $this->loadModel('project')->setMenu($projectID);
         }
 
         $this->loadModel('user');
@@ -111,13 +125,13 @@ class stakeholder extends control
         $this->view->title      = $this->lang->stakeholder->batchCreate;
         $this->view->position[] = $this->lang->stakeholder->batchCreate;
 
-        $this->view->project            = $this->loadModel('project')->getByID($this->session->PRJ);
+        $this->view->project            = $this->loadModel('project')->getByID($this->session->project);
         $this->view->users              = $this->user->getPairs('all|nodeleted|noclosed');
         $this->view->deptUsers          = $deptUsers;
         $this->view->dept               = $dept;
-        $this->view->projectID          = $this->session->PRJ;
+        $this->view->projectID          = $projectID;
         $this->view->depts              = array('' => '') + $this->dept->getOptionMenu();
-        $this->view->stakeholders       = $this->stakeholder->getStakeholders('all', 'id_desc');
+        $this->view->stakeholders       = $this->stakeholder->getStakeholders($projectID, 'all', 'id_desc');
         $this->view->parentStakeholders = $this->loadModel('program')->getStakeholders($parentID, 't1.id_desc');
 
         $this->display();
@@ -133,6 +147,8 @@ class stakeholder extends control
     public function edit($stakeholderID = 0)
     {
         $stakeholder = $this->stakeholder->getByID($stakeholderID);
+        $this->loadModel('project')->setMenu($stakeholder->objectID);
+
         if($_POST)
         {
             $changes = $this->stakeholder->edit($stakeholderID);
@@ -149,16 +165,16 @@ class stakeholder extends control
 
             $actionID = $this->loadModel('action')->create('stakeholder', $stakeholderID, 'Edited');
             $this->action->logHistory($actionID, $changes);
-            $response['locate'] = $this->createLink('stakeholder', 'browse', '');
+            $response['locate'] = $this->createLink('stakeholder', 'browse', "projectID=$stakeholder->objectID");
             $this->send($response);
         }
 
         $users = array('' => '');
-        if($stakeholder->type == 'team') $users = $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ);
-        elseif($stakeholder->type == 'company')
+        if($stakeholder->from == 'team') $users = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project');
+        elseif($stakeholder->from == 'company')
         {
-            $members = $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ);
-            $users   = $this->loadModel('user')->getPairs('noclosed');
+            $members = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project');
+            $users   = $this->user->getPairs('noclosed');
             $users   = array('' => '') + array_diff($users, $members);
         }
 
@@ -176,12 +192,20 @@ class stakeholder extends control
      *
      * @param  string $user
      * @param  int    $programID
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function ajaxGetMembers($user = '', $programID = 0)
+    public function ajaxGetMembers($user = '', $programID = 0, $projectID = 0)
     {
-        $members = $programID == 0 ? $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ) : $this->loadModel('project')->getTeamMemberPairs($programID);
+        if($programID)
+        {
+            $members = $this->loadModel('program')->getTeamMemberPairs($programID);
+        }
+        else
+        {
+            $members = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project');
+        }
         die(html::select('user', $members, $user, "class='form-control chosen'"));
     }
 
@@ -190,13 +214,22 @@ class stakeholder extends control
      *
      * @param  string $user
      * @param  int    $programID
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function ajaxGetCompanyUser($user = '', $programID = 0)
+    public function ajaxGetCompanyUser($user = '', $programID = 0, $projectID = 0)
     {
-        $members = $programID == 0 ? $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ) : $this->loadModel('project')->getTeamMemberPairs($programID);
-        $users   = $this->loadModel('user')->getPairs('noclosed');
+        if($programID)
+        {
+            $members = $this->loadModel('program')->getTeamMemberPairs($programID);
+        }
+        else
+        {
+            $members = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project');
+        }
+
+        $users = $this->loadModel('user')->getPairs('noclosed');
         $companyUsers = array('' => '') + array_diff($users, $members);
 
         die(html::select('user', $companyUsers, $user, "class='form-control chosen'"));
@@ -275,7 +308,7 @@ class stakeholder extends control
         else
         {
             $this->stakeholder->delete(TABLE_STAKEHOLDER, $userID);
-            $this->loadModel('user')->updateUserView($this->session->PRJ, 'project');
+            $this->loadModel('user')->updateUserView($this->session->project, 'project');
             die(js::reload('parent'));
         }
     }
@@ -289,12 +322,15 @@ class stakeholder extends control
     */
     public function view($userID = 0)
     {
+        $user = $this->stakeholder->getByID($userID);
+        $this->loadModel('project')->setMenu($user->objectID);
         $this->commonAction($userID, 'stakeholder');
+
         $this->view->title      = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->view;
         $this->view->position[] = $this->lang->stakeholder->view;
 
-        $this->view->user    = $this->stakeholder->getByID($userID);
-        $this->view->users   = $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ,'nodeleted');
+        $this->view->user    = $user;
+        $this->view->users   = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project', 'nodeleted');
         $this->view->expects = $this->stakeholder->getExpectByUser($userID);
 
         $this->display();
@@ -357,7 +393,7 @@ class stakeholder extends control
         $this->view->title      = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate;
         $this->view->position[] = $this->lang->stakeholder->view;
         $this->view->user       = $this->stakeholder->getByID($userID);
-        $this->view->users      = $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ,'nodeleted');
+        $this->view->users      = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project', 'nodeleted');
         $this->display();
     }
 
@@ -414,6 +450,7 @@ class stakeholder extends control
         $this->view->position[] = $this->lang->stakeholder->view;
 
         $this->view->stakeholder = $stakeholder;
+        $this->view->projectID   = $stakeholder->objectID;
         $this->view->issueList   = $this->stakeholder->getStakeholderIssue($stakeholder->user);
 
         $this->display();
diff --git a/module/stakeholder/css/plan.css b/module/stakeholder/css/plan.css
index bd943d7f4b..cf3c3f0644 100644
--- a/module/stakeholder/css/plan.css
+++ b/module/stakeholder/css/plan.css
@@ -1,2 +1,2 @@
-table td, table th {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
-.table-footer {color: #fff;}
+table td, table th{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.table-footer{color: #fff}
diff --git a/module/stakeholder/js/batchcreate.js b/module/stakeholder/js/batchcreate.js
index d7df1e69c9..b9909d6656 100644
--- a/module/stakeholder/js/batchcreate.js
+++ b/module/stakeholder/js/batchcreate.js
@@ -1,7 +1,7 @@
 function setDeptUsers(obj)
 {
     dept = $(obj).val();//Get dept ID.
-    link = createLink('stakeholder', 'batchCreate', 'dept=' + dept);
+    link = createLink('stakeholder', 'batchCreate', 'projectID=' + projectID + '&dept=' + dept);
     location.href=link;
 }
 
diff --git a/module/stakeholder/js/create.js b/module/stakeholder/js/create.js
index 0ff75739c9..d99a081f7e 100644
--- a/module/stakeholder/js/create.js
+++ b/module/stakeholder/js/create.js
@@ -6,7 +6,7 @@ $(function()
         {
             $('.user-info').addClass('hidden');
             $('#user').closest('tr').find('.input-group-addon').addClass('hidden');
-            var link = createLink('stakeholder', 'ajaxGetMembers', 'user=&programID=' + programID);
+            var link = createLink('stakeholder', 'ajaxGetMembers', 'user=&program=' + programID + '&projectID=' + projectID);
             $.post(link, function(data)
             {
                 $('#user').replaceWith(data);        
@@ -19,7 +19,7 @@ $(function()
         {
             $('.user-info').addClass('hidden');
             $('#user').closest('tr').find('.input-group-addon').addClass('hidden');
-            var link = createLink('stakeholder', 'ajaxGetCompanyUser', 'user=&programID=' + programID);
+            var link = createLink('stakeholder', 'ajaxGetCompanyUser', 'user=&programID=' + programID + '&projectID=' + projectID);
             $.post(link, function(data)
             {
                 $('#user').replaceWith(data);        
diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php
index 020050a311..7824102a67 100644
--- a/module/stakeholder/lang/en.php
+++ b/module/stakeholder/lang/en.php
@@ -26,6 +26,9 @@ $lang->stakeholder->issue        = 'Issue Management';
 $lang->stakeholder->viewIssue    = 'Active Issues';
 $lang->stakeholder->userIssue    = 'Stakeholder Issues';
 
+$lang->stakeholder->viewAction      = 'View Stakeholder';
+$lang->stakeholder->viewIssueAction = 'Issue List';
+
 /* Fields. */
 $lang->stakeholder->id          = 'ID';
 $lang->stakeholder->user        = 'User';
diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php
index 567a5ab5b1..7c2dd53148 100644
--- a/module/stakeholder/lang/zh-cn.php
+++ b/module/stakeholder/lang/zh-cn.php
@@ -26,6 +26,9 @@ $lang->stakeholder->issue        = '问题管理';
 $lang->stakeholder->viewIssue    = '活动问题列表';
 $lang->stakeholder->userIssue    = '干系人问题列表';
 
+$lang->stakeholder->viewAction      = '干系人详情';
+$lang->stakeholder->viewIssueAction = '问题列表';
+
 /* Fields. */
 $lang->stakeholder->id          = '编号';
 $lang->stakeholder->user        = '用户';
diff --git a/module/stakeholder/lang/zh-tw.php b/module/stakeholder/lang/zh-tw.php
index ecdca7ecad..876aa00c6a 100644
--- a/module/stakeholder/lang/zh-tw.php
+++ b/module/stakeholder/lang/zh-tw.php
@@ -26,6 +26,9 @@ $lang->stakeholder->issue        = '問題管理';
 $lang->stakeholder->viewIssue    = '活動問題列表';
 $lang->stakeholder->userIssue    = '干係人問題列表';
 
+$lang->stakeholder->viewAction      = '干係人詳情';
+$lang->stakeholder->viewIssueAction = '問題列表';
+
 /* Fields. */
 $lang->stakeholder->id          = '編號';
 $lang->stakeholder->user        = '用戶';
diff --git a/module/stakeholder/model.php b/module/stakeholder/model.php
index 01d5f758b7..c19b685f08 100644
--- a/module/stakeholder/model.php
+++ b/module/stakeholder/model.php
@@ -4,18 +4,16 @@ class stakeholderModel extends model
     /**
      * Create a stakeholder.
      *
-     * @param  int programID
+     * @param  int objectID
      * @access public
      * @return int|bool
      */
-    public function create($programID = 0)
+    public function create($objectID = 0)
     {
         $stakeholder = new stdclass();
         $data = fixer::input('post')
-            ->setIF($programID == 0, 'objectType', 'project')
-            ->setIF($programID != 0, 'objectType', 'program')
-            ->setIF($programID == 0, 'objectID', $this->session->PRJ)
-            ->setIF($programID != 0, 'objectID', $programID)
+            ->setDefault('objectType', $this->app->openApp)
+            ->setDefault('objectID', $objectID)
             ->setDefault('createdBy', $this->app->user->account)
             ->setDefault('createdDate', helper::today())
             ->stripTags($this->config->stakeholder->editor->create['id'], $this->config->allowedTags)
@@ -106,24 +104,25 @@ class stakeholderModel extends model
      * Batch create stakeholders for a project.
      *
      * @access public
-     * @return void
+     * @return array
      */
     public function batchCreate()
     {
         $this->loadModel('action');
         $data = (array)fixer::input('post')->get();
 
-        $members  = $this->loadModel('execution')->getTeamMemberPairs($this->session->PRJ);
+        $members  = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project');
         $accounts = array_unique($data['accounts']);
-        $oldJoin  = $this->dao->select('`user`, createdDate')->from(TABLE_STAKEHOLDER)->where('objectID')->eq((int)$this->session->PRJ)->andWhere('objectType')->eq('project')->fetchPairs();
-        $this->dao->delete()->from(TABLE_STAKEHOLDER)->where('objectID')->eq((int)$this->session->PRJ)->andWhere('objectType')->eq('project')->exec();
+        $oldJoin  = $this->dao->select('`user`, createdDate')->from(TABLE_STAKEHOLDER)->where('objectID')->eq((int)$this->session->project)->andWhere('objectType')->eq('project')->fetchPairs();
+        $this->dao->delete()->from(TABLE_STAKEHOLDER)->where('objectID')->eq((int)$this->session->project)->andWhere('objectType')->eq('project')->exec();
 
+        $stakeholderList = array();
         foreach($accounts as $key => $account)
         {
             if(empty($account)) continue;
 
             $stakeholder = new stdclass();
-            $stakeholder->objectID    = $this->session->PRJ;
+            $stakeholder->objectID    = $this->session->project;
             $stakeholder->objectType  = 'project';
             $stakeholder->user        = $account;
             $stakeholder->type		  = in_array($account, array_keys($members)) ? 'inside' : 'outside';
@@ -132,7 +131,8 @@ class stakeholderModel extends model
 
             $this->dao->insert(TABLE_STAKEHOLDER)->data($stakeholder)->exec();
 
-            $stakeholderID = $this->dao->lastInsertId();
+            $stakeholderID     = $this->dao->lastInsertId();
+            $stakeholderList[] = $stakeholderID;
             $this->action->create('stakeholder', $stakeholderID, 'added');
         }
 
@@ -142,7 +142,9 @@ class stakeholderModel extends model
         $changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
         $changedAccounts = array_unique($changedAccounts);
 
-        $this->loadModel('user')->updateUserView($this->session->PRJ, 'project', $changedAccounts);
+        $this->loadModel('user')->updateUserView($this->session->project, 'project', $changedAccounts);
+
+        return $stakeholderList;
     }
 
     /**
@@ -193,20 +195,21 @@ class stakeholderModel extends model
     /**
      * Get stakeholder list.
      *
+     * @param  int    $projectID
      * @param  string $browseType
      * @param  string $orderBy
      * @param  object $pager
      * @access public
      * @return array
      */
-    public function getStakeholders($browseType = 'all', $orderBy = 'id_desc', $pager = null)
+    public function getStakeholders($projectID, $browseType = 'all', $orderBy = 'id_desc', $pager = null)
     {
         $stakeholders = $this->dao->select('t1.*, t2.phone, t2.realname as name, t2.email, t2.qq, t2.weixin, t2.nature, t2.analysis, t2.strategy, t3.name as companyName, t4.model as projectModel')->from(TABLE_STAKEHOLDER)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
             ->leftJoin(TABLE_COMPANY)->alias('t3')->on('t2.company=t3.id')
             ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.objectID=t4.id')
             ->where('t1.deleted')->eq('0')
-            ->andWhere('t1.objectID')->eq($this->session->PRJ)
+            ->andWhere('t1.objectID')->eq($projectID)
             ->beginIF($browseType == 'inside')->andWhere('t1.type')->eq('inside')->fi()
             ->beginIF($browseType == 'outside')->andWhere('t1.type')->eq('outside')->fi()
             ->beginIF($browseType == 'key')->andWhere('t1.key')->ne('0')->fi()
@@ -220,17 +223,18 @@ class stakeholderModel extends model
     /**
      * Get stakeholder pairs.
      *
+     * @param  int    $projectID
      * @param  string $browseType
      * @param  string $orderBy
      * @param  object $pager
      * @access public
      * @return array
      */
-    public function getStakeHolderPairs()
+    public function getStakeHolderPairs($projectID)
     {
         $stakeholders = $this->dao->select('id, user')->from(TABLE_STAKEHOLDER)
             ->where('deleted')->eq('0')
-            ->andWhere('objectID')->eq($this->session->PRJ)
+            ->andWhere('objectID')->eq($this->session->project)
             ->orderBy('id_desc')
             ->fetchPairs();
 
@@ -309,7 +313,7 @@ class stakeholderModel extends model
         $stakeholders = $this->dao->select('t2.realname as name, t2.account, t1.type, t2.role')->from(TABLE_STAKEHOLDER)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
             ->where('t1.deleted')->eq('0')
-            ->andWhere('t1.objectID')->eq($this->session->PRJ)
+            ->andWhere('t1.objectID')->eq($this->session->project)
             ->fetchGroup('type');
 
         return $stakeholders;
@@ -329,7 +333,7 @@ class stakeholderModel extends model
             ->leftJoin(TABLE_COMPANY)->alias('t3')->on('t2.company=t3.id')
             ->where('t1.id')->eq($userID)
             ->andWhere('t1.deleted')->eq('0')
-            ->andWhere('t1.objectID')->eq($this->session->PRJ)
+            ->andWhere('t1.objectID')->eq($this->session->project)
             ->fetch();
 
         return $stakeholder;
@@ -344,7 +348,7 @@ class stakeholderModel extends model
     public function getProcessGroup()
     {
         $group = $this->dao->select('process, activity')->from(TABLE_PROGRAMACTIVITY)
-            ->where('project')->eq($this->session->PRJ)
+            ->where('project')->eq($this->session->project)
             ->andWhere('result')->eq('yes')
             ->fetchGroup('process');
 
@@ -374,7 +378,7 @@ class stakeholderModel extends model
     {
         return $this->dao->select('*')->from(TABLE_INTERVENTION)
             ->where('deleted')->eq(0)
-            ->andWhere('project')->eq($this->session->PRJ)
+            ->andWhere('project')->eq($this->session->project)
             ->fetchAll('activity');
     }
 
@@ -389,7 +393,7 @@ class stakeholderModel extends model
         $stakeholders = $this->getStakeHolderPairs();
         return $this->dao->select('*')->from(TABLE_ISSUE)
             ->where('deleted')->eq(0)
-            ->andWhere('project')->eq($this->session->PRJ)
+            ->andWhere('project')->eq($this->session->project)
             ->andWhere('owner')->in(array_values($stakeholders))
             ->orWhere('activity')->ne('')
             ->orderBy('id_desc')
@@ -440,7 +444,7 @@ class stakeholderModel extends model
             ->add('userID', $userID)
             ->add('createdBy', $this->app->user->account)
             ->add('createdDate', date('Y-m-d'))
-            ->add('project', $this->session->PRJ)
+            ->add('project', $this->session->project)
             ->stripTags($this->config->stakeholder->editor->expect['id'], $this->config->allowedTags)
             ->get();
 
@@ -492,7 +496,7 @@ class stakeholderModel extends model
         $expects = $this->dao->select('t1.*,t2.key,t3.realname')->from(TABLE_EXPECT)->alias('t1')
             ->leftJoin(TABLE_STAKEHOLDER)->alias('t2')->on('t1.userID=t2.id')
             ->leftJoin(TABLE_USER)->alias('t3')->on('t2.user=t3.account')
-            ->where('t1.project')->eq($this->session->PRJ)
+            ->where('t1.project')->eq($this->session->project)
             ->beginIF($browseType == 'bysearch')
             ->andWhere($stakeholderQuery)
             ->fi()
@@ -565,7 +569,7 @@ class stakeholderModel extends model
         $users = $this->dao->select("t1.id, CONCAT_WS('/', t3.name,t2.realname) as realname")->from(TABLE_STAKEHOLDER)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
             ->leftJoin(TABLE_COMPANY)->alias('t3')->on('t2.company=t3.id')
-            ->where('t1.objectID')->eq($this->session->PRJ)
+            ->where('t1.objectID')->eq($this->session->project)
             ->andWhere('t1.deleted')->eq('0')
             ->fetchPairs('id', 'realname');
 
@@ -583,7 +587,7 @@ class stakeholderModel extends model
         $users = $this->dao->select("t1.user, CONCAT_WS('/', t3.name,t2.realname) as realname")->from(TABLE_STAKEHOLDER)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
             ->leftJoin(TABLE_COMPANY)->alias('t3')->on('t2.company=t3.id')
-            ->where('t1.objectID')->eq($this->session->PRJ)
+            ->where('t1.objectID')->eq($this->session->project)
             ->andWhere('t1.deleted')->eq('0')
             ->fetchPairs('user', 'realname');
 
@@ -644,7 +648,7 @@ class stakeholderModel extends model
     public function getStakeholderIssue($account)
     {
         $issueList = $this->dao->select('*')->from(TABLE_ISSUE)
-            ->where('project')->eq($this->session->PRJ)
+            ->where('project')->eq($this->session->project)
             ->andWhere('owner')->eq($account)
             ->andWhere('deleted')->eq('0')
             ->orderBy('id_desc')
diff --git a/module/stakeholder/view/batchcreate.html.php b/module/stakeholder/view/batchcreate.html.php
index 03d36c44a0..26b04d6cb6 100644
--- a/module/stakeholder/view/batchcreate.html.php
+++ b/module/stakeholder/view/batchcreate.html.php
@@ -22,7 +22,7 @@
       <?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='setDeptUsers(this)' data-placeholder='{$lang->execution->selectDeptTitle}'");?>
     </div>
     <?php if($project->parent and $config->systemMode == 'new'):?>
-    <?php echo html::a($this->createLink('stakeholder', 'batchcreate', "dept=&parent=$project->parent"), $lang->program->importStakeholder, '', 'class="btn btn-primary"');?>
+    <?php echo html::a($this->createLink('stakeholder', 'batchcreate', "projectID={$projectID}&dept=&parent=$project->parent"), $lang->program->importStakeholder, '', 'class="btn btn-primary"');?>
     <?php endif;?>
   </div>
 </div>
diff --git a/module/stakeholder/view/browse.html.php b/module/stakeholder/view/browse.html.php
index 33f1c2ffc4..07b3f5e308 100644
--- a/module/stakeholder/view/browse.html.php
+++ b/module/stakeholder/view/browse.html.php
@@ -17,8 +17,8 @@
     <?php echo html::a($this->createLink('stakeholder', 'browse', 'browseType=all'), '<span class="text">' . $lang->stakeholder->browse . '</span>', '', 'class="btn btn-link btn-active-text"');?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('stakeholder', 'batchcreate', '', "<i class='icon icon-plus'></i>" . $lang->stakeholder->batchCreate, '', "class='btn btn-primary'");?>
-    <?php common::printLink('stakeholder', 'create', '', "<i class='icon icon-plus'></i>" . $lang->stakeholder->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('stakeholder', 'batchcreate', "projectID=$projectID", "<i class='icon icon-plus'></i>" . $lang->stakeholder->batchCreate, '', "class='btn btn-primary'");?>
+    <?php common::printLink('stakeholder', 'create', "projectID=$projectID", "<i class='icon icon-plus'></i>" . $lang->stakeholder->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id='mainContent' class='main-row fade'>
@@ -28,7 +28,7 @@
       <table class='table has-sort-head' id='userList'>
         <thead>
         <tr>
-          <?php $vars = "browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
+          <?php $vars = "projectID=$projectID&browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
           <th class='c-id'>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
@@ -49,7 +49,7 @@
           </td>
           <?php $stakeholder->name = $stakeholder->companyName ? $stakeholder->companyName . '/' . $stakeholder->name : $stakeholder->name;?>
           <?php $isKey = $stakeholder->key ? " <i class='icon icon-star-empty'></i>" : '';?>
-          <?php $title = $stakeholder->key ? $lang->stakeholder->isKey : '';?>
+          <?php $title = $stakeholder->key ? $stakeholder->name . '(' . $lang->stakeholder->isKey . ')' : $stakeholder->name;?>
           <td><?php common::printLink('stakeholder', 'view', "id=$stakeholder->id", $stakeholder->name . $isKey, '', "title=$title");?></td>
           <td title='<?php echo zget($lang->stakeholder->typeList, $stakeholder->type, '');?>'><?php echo zget($lang->stakeholder->typeList, $stakeholder->type, '');?></td>
           <td title="<?php echo $stakeholder->phone;?>"><?php echo $stakeholder->phone;?></td>
diff --git a/module/stakeholder/view/create.html.php b/module/stakeholder/view/create.html.php
index 6bb6548bed..30fc5378cd 100644
--- a/module/stakeholder/view/create.html.php
+++ b/module/stakeholder/view/create.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::set('projectID', $projectID)?>
 <?php js::set('programID', $programID)?>
 <div id="mainContent" class="main-content fade">
   <div class="center-block">
diff --git a/module/stakeholder/view/userissue.html.php b/module/stakeholder/view/userissue.html.php
index cb6b9c0a32..7564f1f472 100644
--- a/module/stakeholder/view/userissue.html.php
+++ b/module/stakeholder/view/userissue.html.php
@@ -18,7 +18,7 @@
         <span><?php echo $lang->stakeholder->viewIssue;?></span>
       </h2>
       <div class="pull-right">
-        <?php common::printLink('issue', 'create', 'from=stakeholder&owner=' . $stakeholder->user, "<i class='icon icon-plus'></i>" . $lang->issue->create, '', "class='btn btn-primary'");?>
+        <?php common::printLink('issue', 'create', "projectID=$projectID&from=stakeholder&owner=" . $stakeholder->user, "<i class='icon icon-plus'></i>" . $lang->issue->create, '', "class='btn btn-primary'");?>
       </div>
     </div>
   </div>
@@ -45,7 +45,7 @@
               <td><?php echo zget($lang->issue->typeList, $issue->type);?></td>
               <td><?php echo zget($lang->issue->severityList, $issue->severity);?></td>
               <td><?php echo $issue->pri;?></td>
-              <td><?php echo zget($lang->issue->resolveMethods, $issue->status);?></td>
+              <td><?php echo zget($lang->issue->statusList, $issue->status);?></td>
               <td><?php echo $issue->createdDate;?></td>
             </tr>
           <?php endforeach;?>
diff --git a/module/stakeholder/view/view.html.php b/module/stakeholder/view/view.html.php
index aa3649c285..a50000e2bd 100644
--- a/module/stakeholder/view/view.html.php
+++ b/module/stakeholder/view/view.html.php
@@ -13,8 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php
-$browseLink = $this->createLink('stakeholder', 'browse');
-$createLink = $this->createLink('stakeholder', 'create');
+$browseLink = $this->createLink('stakeholder', 'browse', "projectID=$user->objectID");
+$createLink = $this->createLink('stakeholder', 'create', "projectID=$user->objectID");
 ?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
@@ -28,7 +28,7 @@ $createLink = $this->createLink('stakeholder', 'create');
     </div>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php if(common::hasPriv('stakeholder', 'create')) echo html::a($createLink, "<i class='icon icon-plus'></i> {$lang->stakeholder->create}", '', "class='btn btn-primary'");?>
+    <?php if(common::hasPriv('stakeholder', 'create')) echo html::a($createLink, "<i class='icon icon-plus'></i> {$lang->stakeholder->create}", '', "class='btn btn-primary' data-app=$app->openApp");?>
   </div>
 </div>
 <div class="main-row" id="mainContent">
diff --git a/module/story/config.php b/module/story/config.php
index 6641fd9f73..5db4554810 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -16,7 +16,7 @@ $config->story->review = new stdclass();
 $config->story->create->requiredFields = 'title';
 $config->story->change->requiredFields = 'title';
 $config->story->close->requiredFields  = 'closedReason';
-$config->story->review->requiredFields = 'assignedTo,reviewedBy';
+$config->story->review->requiredFields = '';
 
 $config->story->editor = new stdclass();
 $config->story->editor->create   = array('id' => 'spec,verify', 'tools' => 'simpleTools');
@@ -90,24 +90,29 @@ $config->story->datatable->fieldList['sourceNote']['fixed']    = 'no';
 $config->story->datatable->fieldList['sourceNote']['width']    = '90';
 $config->story->datatable->fieldList['sourceNote']['required'] = 'no';
 
+$config->story->datatable->fieldList['category']['title']    = 'category';
+$config->story->datatable->fieldList['category']['fixed']    = 'no';
+$config->story->datatable->fieldList['category']['width']    = '60';
+$config->story->datatable->fieldList['category']['required'] = 'no';
+
 $config->story->datatable->fieldList['status']['title']    = 'statusAB';
 $config->story->datatable->fieldList['status']['fixed']    = 'no';
-$config->story->datatable->fieldList['status']['width']    = '80';
+$config->story->datatable->fieldList['status']['width']    = '60';
 $config->story->datatable->fieldList['status']['required'] = 'no';
 
 $config->story->datatable->fieldList['estimate']['title']    = 'estimateAB';
 $config->story->datatable->fieldList['estimate']['fixed']    = 'no';
-$config->story->datatable->fieldList['estimate']['width']    = '80';
+$config->story->datatable->fieldList['estimate']['width']    = '50';
 $config->story->datatable->fieldList['estimate']['required'] = 'no';
 
 $config->story->datatable->fieldList['stage']['title']    = 'stageAB';
 $config->story->datatable->fieldList['stage']['fixed']    = 'no';
-$config->story->datatable->fieldList['stage']['width']    = '95';
+$config->story->datatable->fieldList['stage']['width']    = '60';
 $config->story->datatable->fieldList['stage']['required'] = 'no';
 
 $config->story->datatable->fieldList['openedBy']['title']    = 'openedByAB';
 $config->story->datatable->fieldList['openedBy']['fixed']    = 'no';
-$config->story->datatable->fieldList['openedBy']['width']    = '70';
+$config->story->datatable->fieldList['openedBy']['width']    = '60';
 $config->story->datatable->fieldList['openedBy']['required'] = 'no';
 
 $config->story->datatable->fieldList['openedDate']['title']    = 'openedDate';
@@ -117,7 +122,7 @@ $config->story->datatable->fieldList['openedDate']['required'] = 'no';
 
 $config->story->datatable->fieldList['assignedTo']['title']    = 'assignedToAB';
 $config->story->datatable->fieldList['assignedTo']['fixed']    = 'no';
-$config->story->datatable->fieldList['assignedTo']['width']    = '100';
+$config->story->datatable->fieldList['assignedTo']['width']    = '86';
 $config->story->datatable->fieldList['assignedTo']['required'] = 'no';
 
 $config->story->datatable->fieldList['assignedDate']['title']    = 'assignedDate';
diff --git a/module/story/control.php b/module/story/control.php
index ea7b929e63..09250d6d3d 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -37,7 +37,7 @@ class story extends control
      * @param  int    $branch
      * @param  int    $moduleID
      * @param  int    $storyID
-     * @param  int    $executionID
+     * @param  int    $objectID  projectID|executionID
      * @param  int    $bugID
      * @param  int    $planID
      * @param  int    $todoID
@@ -46,28 +46,22 @@ class story extends control
      * @access public
      * @return void
      */
-    public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $executionID = 0, $bugID = 0, $planID = 0, $todoID = 0, $extra = '', $type = 'story')
+    public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $objectID = 0, $bugID = 0, $planID = 0, $todoID = 0, $extra = '', $type = 'story')
     {
         $this->story->replaceURLang($type);
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
-        if($executionID)
+        if($this->app->openApp == 'product')
         {
-            $execution = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
-            if($execution->type == 'project')
-            {
-                $this->app->rawModule = 'projectstory';
-                $this->lang->navGroup->projectstory = 'project';
-                $this->lang->product->menu = $this->lang->menu->{$execution->model};
-            }
-            else
-            {
-                $this->app->rawModule = 'execution';
-                $this->lang->navGroup->story = 'execution';
-            }
-            $this->view->execution = $execution;
+            $this->product->setMenu($productID);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $objectID = empty($objectID) ? $this->session->project : $objectID;
+            $this->project->setMenu($objectID);
+        }
+        else if($this->app->openApp == 'execution')
+        {
+            $objectID = empty($objectID) ? $this->session->execution : $objectID;
+            $this->execution->setMenu($objectID);
         }
 
         /* Whether there is a object to transfer story, for example feedback. */
@@ -100,8 +94,8 @@ class story extends control
             $response['result']  = 'success';
             $response['message'] = $this->lang->saveSuccess;
 
-            setcookie('lastStoryModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
-            $storyResult = $this->story->create($executionID, $bugID, $from = isset($fromObjectIDKey) ? $fromObjectIDKey : '');
+            setcookie('lastStoryModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            $storyResult = $this->story->create($objectID, $bugID, $from = isset($fromObjectIDKey) ? $fromObjectIDKey : '');
             if(!$storyResult or dao::isError())
             {
                 $response['result']  = 'fail';
@@ -109,19 +103,20 @@ class story extends control
                 $this->send($response);
             }
 
-            $storyID = $storyResult['id'];
+            $storyID   = $storyResult['id'];
+            $productID = $this->post->product ? $this->post->product : $productID;
             if($storyResult['status'] == 'exists')
             {
                 $response['message'] = sprintf($this->lang->duplicate, $this->lang->story->common);
-                if($executionID == 0)
+                if($objectID == 0)
                 {
                     $response['locate'] = $this->createLink('story', 'view', "storyID={$storyID}");
                 }
                 else
                 {
-                    $execution          = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
+                    $execution          = $this->dao->findById((int)$objectID)->from(TABLE_EXECUTION)->fetch();
                     $moduleName         = $execution->type == 'project' ? 'projectstory' : 'execution';
-                    $param              = $execution->type == 'project' ? "project=$executionID" : "executionID=$executionID";
+                    $param              = $execution->type == 'project' ? "projectID=$objectID&productID=$productID" : "executionID=$objectID";
                     $response['locate'] = $this->createLink($moduleName, 'story', $param);
                 }
                 $this->send($response);
@@ -137,10 +132,10 @@ class story extends control
             }
             $actionID = $this->action->create('story', $storyID, $action, '', $extra);
 
-            if($executionID != 0)
+            if($objectID != 0)
             {
-                if($executionID != $this->session->PRJ) $this->loadModel('action')->create('story', $storyID, 'linked2project', '', $executionID);
-                $this->loadModel('action')->create('story', $storyID, 'linked2project', '', $this->session->PRJ);
+                if($objectID != $this->session->project) $this->loadModel('action')->create('story', $storyID, 'linked2execution', '', $objectID);
+                $this->loadModel('action')->create('story', $storyID, 'linked2project', '', $this->session->project);
             }
 
             if($todoID > 0)
@@ -151,31 +146,32 @@ class story extends control
 
             $this->executeHooks($storyID);
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $storyID));
+
             /* If link from no head then reload. */
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
 
             if($this->post->newStory)
             {
                 $response['message'] = $this->lang->story->successSaved . $this->lang->story->newStory;
-                $response['locate']  = $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID&story=0&executionID=$executionID&bugID=$bugID");
+                $response['locate']  = $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID&story=0&objectID=$objectID&bugID=$bugID");
                 $this->send($response);
             }
 
             $moduleID = $this->post->module ? $this->post->module : 0;
-            if($executionID == 0)
+            if($objectID == 0)
             {
-                setcookie('storyModule', 0, 0, $this->config->webRoot, '', false, false);
-                $productID = $this->post->product ? $this->post->product : $productID;
+                setcookie('storyModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
                 $branchID  = $this->post->branch  ? $this->post->branch  : $branch;
                 $response['locate'] = $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=unclosed&param=0&type=$type&orderBy=id_desc");
-                if($this->session->storyList) $response['locate'] = $this->session->storyList;
+                if($this->session->storyList and $this->app->openApp != 'product') $response['locate'] = $this->session->storyList;
             }
             else
             {
-                setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', false, true);
-                $execution          = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
+                setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
+                $execution          = $this->dao->findById((int)$objectID)->from(TABLE_EXECUTION)->fetch();
                 $moduleName         = $execution->type == 'project' ? 'projectstory' : 'execution';
-                $param              = $execution->type == 'project' ? "productID=$productID" : "executionID=$executionID&orderBy=id_desc&browseType=unclosed";
+                $param              = $execution->type == 'project' ? "projectID=$objectID&productID=$productID" : "executionID=$objectID&orderBy=id_desc&browseType=unclosed";
                 $response['locate'] = $this->createLink($moduleName, 'story', $param);
             }
             if($this->app->getViewType() == 'xhtml') $response['locate'] = $this->createLink('story', 'view', "storyID=$storyID");
@@ -183,9 +179,9 @@ class story extends control
         }
 
         /* Set products, users and module. */
-        if($executionID != 0)
+        if($objectID != 0)
         {
-            $products  = $this->product->getProductPairsByProject($executionID);
+            $products  = $this->product->getProductPairsByProject($objectID);
             $productID = empty($productID) ? key($products) : $productID;
             $product   = $this->product->getById(($productID and array_key_exists($productID, $products)) ? $productID : key($products));
         }
@@ -202,9 +198,6 @@ class story extends control
         $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'story', 0, $branch);
         if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
 
-        /* Set menu. */
-        $this->product->setMenu($products, $product->id, $branch);
-
         /* Init vars. */
         $source     = '';
         $sourceNote = '';
@@ -285,6 +278,18 @@ class story extends control
             }
         }
 
+        /* Get block id of assinge to me. */
+        $blockID = 0;
+        if(isonlybody())
+        {
+            $blockID = $this->dao->select('id')->from(TABLE_BLOCK)
+                ->where('block')->eq('assingtome')
+                ->andWhere('module')->eq('my')
+                ->andWhere('account')->eq($this->app->user->account)
+                ->orderBy('order_desc')
+                ->fetch('id');
+        }
+
         /* Set Custom. */
         foreach(explode(',', $this->config->story->list->customCreateFields) as $field) $customFields[$field] = $this->lang->story->$field;
         $this->view->customFields = $customFields;
@@ -308,15 +313,16 @@ class story extends control
         $this->view->branches         = $product->type != 'normal' ? $this->loadModel('branch')->getPairs($productID) : array();
         $this->view->productID        = $productID;
         $this->view->product          = $product;
-        $this->view->executionID      = $executionID;
+        $this->view->objectID         = $objectID;
         $this->view->estimate         = $estimate;
         $this->view->storyTitle       = $title;
         $this->view->spec             = $spec;
         $this->view->verify           = $verify;
         $this->view->keywords         = $keywords;
         $this->view->mailto           = $mailto;
+        $this->view->blockID          = $blockID;
         $this->view->URS              = $type == 'story' ? $this->story->getRequierements($productID) : '';
-        $this->view->needReview       = ($this->app->user->account == $product->PO || $executionID > 0 || $this->config->story->needReview == 0) ? "checked='checked'" : "";
+        $this->view->needReview       = ($this->app->user->account == $product->PO || $objectID > 0 || $this->config->story->needReview == 0) ? "checked='checked'" : "";
         $this->view->type             = $type;
 
         $this->display();
@@ -337,33 +343,35 @@ class story extends control
      */
     public function batchCreate($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $executionID = 0, $plan = 0, $type = 'story')
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
 
+        /* Set menu. */
         if($executionID)
         {
-            $executions = $this->execution->getPairs();
-            $this->execution->setMenu($executions, $executionID);
-
             $execution = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
             if($execution->type == 'project')
             {
+                $this->project->setMenu($executionID);
                 $this->app->rawModule = 'projectstory';
                 $this->lang->navGroup->story = 'project';
-                $this->lang->product->menu = $this->lang->menu->{$execution->model};
+                $this->lang->product->menu = $this->lang->{$execution->model}->menu;
             }
             else
             {
+                $this->execution->setMenu($executionID);
                 $this->app->rawModule = 'execution';
                 $this->lang->navGroup->story = 'execution';
             }
             $this->view->execution = $execution;
         }
+        else
+        {
+            $this->product->setMenu($productID, $branch);
+        }
 
         /* Clear title when switching products and set the session for the current product. */
         if($productID != $this->cookie->preProductID) unset($_SESSION['storyImagesFile']);
-        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         $this->story->replaceURLang($type);
 
@@ -388,7 +396,7 @@ class story extends control
                 $products = array();
                 foreach($mails as $story) $products[$story->storyID] = $productID;
                 $this->execution->linkStory($executionID, $stories, $products);
-                if($executionID != $this->session->PRJ) $this->execution->linkStory($this->session->PRJ, $stories, $products);
+                if($executionID != $this->session->project) $this->execution->linkStory($this->session->project, $stories, $products);
             }
 
             /* If storyID not equal zero, subdivide this story to child stories and close it. */
@@ -398,6 +406,7 @@ class story extends control
                 if(dao::isError()) die(js::error(dao::getError()));
             }
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $stories));
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
 
             if($storyID)
@@ -406,15 +415,15 @@ class story extends control
             }
             elseif($executionID)
             {
-                setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', false, false);
+                setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
                 $moduleName = $execution->type == 'project' ? 'projectstory' : 'execution';
-                $param      = $execution->type == 'project' ? "productID=$productID" : "executionID=$executionID&orderBy=id_desc&browseType=unclosed";
+                $param      = $execution->type == 'project' ? "projectID=$executionID&productID=$productID" : "executionID=$executionID&orderBy=id_desc&browseType=unclosed";
                 $link       = $this->createLink($moduleName, 'story', $param);
                 die(js::locate($link, 'parent'));
             }
             else
             {
-                setcookie('storyModule', 0, 0, $this->config->webRoot, '', false, false);
+                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&type=$type");
                 die(js::locate($locateLink, 'parent'));
             }
@@ -425,9 +434,6 @@ class story extends control
         $products = $this->product->getPairs();
         $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'story', 0, $branch);
 
-        /* Set menu. */
-        $this->product->setMenu($products, $product->id, $branch);
-
         /* Init vars. */
         $planID   = $plan;
         $pri      = 0;
@@ -487,6 +493,7 @@ class story extends control
         $this->view->moduleID         = $moduleID;
         $this->view->moduleOptionMenu = $moduleOptionMenu;
         $this->view->plans            = $plans;
+        $this->view->users            = $this->user->getPairs('pdfirst|noclosed|nodeleted');
         $this->view->priList          = $priList;
         $this->view->sourceList       = $sourceList;
         $this->view->planID           = $planID;
@@ -520,10 +527,19 @@ class story extends control
         $moduleOptionMenu = $this->tree->getOptionMenu($product->id, $viewType = 'story', 0, $story->branch);
 
         /* Set menu. */
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($product->id);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-        $this->product->setMenu($products, $product->id, $story->branch);
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($product->id);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($this->session->project);
+        }
+        elseif($this->app->openApp == 'product')
+        {
+            $this->product->setMenu($product->id, $story->branch);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($this->session->execution);
+        }
 
         $this->story->replaceURLang($story->type);
 
@@ -572,21 +588,49 @@ class story extends control
 
         $this->commonAction($storyID);
 
+        /* Sort products. */
+        $myProducts     = array();
+        $othersProducts = array();
+        $products       = $this->loadModel('product')->getList();
+
+        foreach($products as $product)
+        {
+            if($product->status == 'normal' and $product->PO == $this->app->user->account) $myProducts[$product->id] = $product->name;
+            if($product->status == 'normal' and !($product->PO == $this->app->user->account)) $othersProducts[$product->id] = $product->name;
+            if($product->status == 'closed') continue;
+        }
+
         /* Assign. */
         $story   = $this->story->getById($storyID, 0, true);
         $product = $this->product->getById($story->product);
         $stories = $this->story->getParentStoryPairs($story->product, $story->parent);
         if(isset($stories[$storyID])) unset($stories[$storyID]);
 
+        /* Get users. */
+        $users = $this->user->getPairs('pofirst|nodeleted|noclosed', "$story->assignedTo,$story->openedBy,$story->closedBy");
+
+        $isShowReviewer = true;
+        $reviewerList   = $this->story->getReviewerPairs($story->id, $story->version);
+        $reviewerList   = array_keys($reviewerList);
+        $reviewedBy     = explode(',', trim($story->reviewedBy, ','));
+        if(!array_diff($reviewerList, $reviewedBy)) $isShowReviewer = false;
+
+        $reviewedReviewer = array();
+        foreach($reviewedBy as $reviewer) $reviewedReviewer[] = zget($users, $reviewer);
+
         $this->story->replaceURLang($story->type);
 
-        $this->view->title      = $this->lang->story->edit . "STORY" . $this->lang->colon . $this->view->story->title;
-        $this->view->position[] = $this->lang->story->edit;
-        $this->view->story      = $story;
-        $this->view->stories    = $stories;
-        $this->view->users      = $this->user->getPairs('pofirst|nodeleted', "$story->assignedTo,$story->openedBy,$story->closedBy");
-        $this->view->product    = $product;
-        $this->view->branches   = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($story->product);
+        $this->view->title            = $this->lang->story->edit . "STORY" . $this->lang->colon . $this->view->story->title;
+        $this->view->position[]       = $this->lang->story->edit;
+        $this->view->story            = $story;
+        $this->view->stories          = $stories;
+        $this->view->users            = $users;
+        $this->view->product          = $product;
+        $this->view->products         = $myProducts + $othersProducts;
+        $this->view->branches         = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($story->product);
+        $this->view->reviewers        = implode(',', $reviewerList);
+        $this->view->reviewedReviewer = $reviewedReviewer;
+        $this->view->isShowReviewer   = $isShowReviewer;
         $this->display();
     }
 
@@ -595,16 +639,40 @@ class story extends control
      *
      * @param  int    $productID
      * @param  int    $executionID
+     * @param  int    $branch
+     * @param  string $storyType
+     * @param  string $from
      * @access public
      * @return void
      */
-    public function batchEdit($productID = 0, $executionID = 0, $branch = 0, $storyType = 'story')
+    public function batchEdit($productID = 0, $executionID = 0, $branch = 0, $storyType = 'story', $from = '')
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
         $this->story->replaceURLang($storyType);
 
+        if($this->app->openApp == 'product')
+        {
+            $this->product->setMenu($productID);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $this->project->setMenu($executionID);
+        }
+        else if($this->app->openApp == 'execution')
+        {
+            $this->execution->setMenu($executionID);
+        }
+        else if($this->app->openApp == 'qa')
+        {
+            $this->loadModel('qa')->setMenu('', $productID);
+        }
+        else if($this->app->openApp == 'my')
+        {
+            $this->loadModel('my')->setMenu();
+            if($from == 'work')       $this->lang->my->menu->work['subModule']       = 'story';
+            if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'story';
+        }
+
         /* Load model. */
         $this->loadModel('productplan');
 
@@ -634,7 +702,6 @@ class story extends control
         /* The stories of a product. */
         if($productID)
         {
-            $this->product->setMenu($this->product->getPairs('nodeleted'), $productID, $branch);
             $product = $this->product->getByID($productID);
             $branchProduct = $product->type == 'normal' ? false : true;
 
@@ -644,7 +711,6 @@ class story extends control
             $productPlans = $this->productplan->getPairs($productID, $branch, '', true);
             $productPlans = array('' => '', 'ditto' => $this->lang->story->ditto) + $productPlans;
 
-
             $this->view->modules      = $modules;
             $this->view->branches     = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($product->id);
             $this->view->productPlans = $productPlans;
@@ -654,15 +720,6 @@ class story extends control
         elseif($executionID)
         {
             /* The stories of a execution. */
-            $this->lang->navGroup->story = 'execution';
-            $moduleIndex = array_search('story', $this->lang->noMenuModule);
-            if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-            $this->lang->story->menu = $this->lang->execution->menu;
-
-            $this->execution->setMenu($this->execution->getPairs($this->session->PRJ, 'all', 'nodeleted'), $executionID);
-            $this->lang->set('menugroup.story', 'execution');
-            $this->lang->story->menuOrder = $this->lang->execution->menuOrder;
-
             $execution = $this->execution->getByID($executionID);
 
             $branchProduct  = false;
@@ -680,14 +737,9 @@ class story extends control
             $this->view->title       = $execution->name . $this->lang->colon . $this->lang->story->batchEdit;
             $this->view->resetActive = true;
         }
-        /* The stories of my. */
         else
         {
-            $this->lang->story->menu = $this->lang->my->menu;
-            $this->lang->set('menugroup.story', 'my');
-            $this->lang->story->menuOrder = $this->lang->my->menuOrder;
-            $this->loadModel('my')->setMenu();
-
+            /* The stories of my. */
             $branchProduct = false;
             $productIdList = array();
             foreach($stories as $story) $productIdList[$story->product] = $story->product;
@@ -706,7 +758,7 @@ class story extends control
         }
 
         /* Set ditto option for users. */
-        $users          = $this->loadModel('user')->getPairs('nodeleted');
+        $users = $this->loadModel('user')->getPairs('nodeleted');
         $users = array('' => '', 'ditto' => $this->lang->story->ditto) + $users;
 
         /* Set Custom*/
@@ -715,7 +767,9 @@ class story extends control
         if($storyType == 'requirement')
         {
             unset($customFields['plan']);
-            $showFields = str_replace('plan', '', $showFields);
+            unset($customFields['stage']);
+            $showFields = str_replace('plan',  '', $showFields);
+            $showFields = str_replace('stage', '', $showFields);
         }
         $this->view->customFields = $customFields;
         $this->view->showFields   = $showFields;
@@ -739,6 +793,7 @@ class story extends control
         $this->view->storyType         = $storyType;
         $this->view->stories           = $stories;
         $this->view->productName       = isset($product) ? $product->name : '';
+        $this->view->executionID       = $executionID;
         $this->display();
     }
 
@@ -746,11 +801,10 @@ class story extends control
      * Change a story.
      *
      * @param  int    $storyID
-     * @param  string $from product|project
      * @access public
      * @return void
      */
-    public function change($storyID, $from = 'product')
+    public function change($storyID)
     {
         if(!empty($_POST))
         {
@@ -770,7 +824,7 @@ class story extends control
 
             $this->executeHooks($storyID);
 
-            $module = $from == 'project' ? 'projectstory' : 'story';
+            $module = $this->app->openApp == 'project' ? 'projectstory' : 'story';
             die(js::locate($this->createLink($module, 'view', "storyID=$storyID"), 'parent'));
         }
 
@@ -781,11 +835,16 @@ class story extends control
         $this->app->loadLang('testcase');
         $this->app->loadLang('execution');
 
+        $story    = $this->story->getById($storyID);
+        $reviewer = $this->story->getReviewerPairs($storyID, $story->version);
+
         /* Assign. */
         $this->view->title      = $this->lang->story->change . "STORY" . $this->lang->colon . $this->view->story->title;
-        $this->view->users      = $this->user->getPairs('pofirst|nodeleted', $this->view->story->assignedTo);
+        $this->view->users      = $this->user->getPairs('pofirst|nodeleted|noclosed', $this->view->story->assignedTo);
         $this->view->position[] = $this->lang->story->change;
         $this->view->needReview = ($this->app->user->account == $this->view->product->PO || $this->config->story->needReview == 0) ? "checked='checked'" : "";
+        $this->view->reviewer   = implode(',', array_keys($reviewer));
+
         $this->display();
     }
 
@@ -839,6 +898,8 @@ class story extends control
         $story   = $this->story->getById($storyID, $version, true);
         if(!$story) die(js::error($this->lang->notFound) . js::locate('back'));
 
+        $story = $this->story->mergeReviewer($story, true);
+
         $this->story->replaceURLang($story->type);
 
         $story->files = $this->loadModel('file')->getByObject('story', $storyID);
@@ -849,32 +910,25 @@ class story extends control
         $cases        = $this->dao->select('id,title')->from(TABLE_CASE)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
         $modulePath   = $this->tree->getParents($story->module);
         $storyModule  = empty($story->module) ? '' : $this->tree->getById($story->module);
-        $users        = $this->user->getPairs('noletter');
+
+        $reviewers    = $this->story->getReviewerPairs($storyID, $story->version);
 
         /* Set the menu. */
         $from = $this->app->openApp;
-        if($from == 'project')
-        {
-            $project = $this->dao->findById((int)$this->session->PRJ)->from(TABLE_PROJECT)->fetch();
-            $this->lang->product->menu = $this->lang->menu->{$project->model};
-            $this->execution->setMenu($this->execution->getPairs($this->session->PRJ, 'all', 'nodeleted'), $project->id);
+        $this->product->setMenu($story->product, $story->branch);
 
-            /* If status is done, can not create task from story. */
-            $execution = $this->execution->getById($param);
-            if($execution->status == 'done') $from = '';
+        if($from == 'execution')
+        {
+            $this->execution->setMenu($param);
         }
-        else
+        elseif($from == 'project')
         {
-            $this->lang->product->menu = $this->lang->product->viewMenu;
-            $this->product->setMenu($this->product->getPairs(), $product->id, $story->branch);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($product->id);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
-            if($this->app->rawModule == 'projectstory')
-            {
-                $project = $this->dao->findById((int)$this->session->PRJ)->from(TABLE_PROJECT)->fetch();
-                $this->lang->product->menu = $this->lang->menu->{$project->model};
-            }
+            $this->loadModel('project')->setMenu($param);
+        }
+        elseif($from == 'qa')
+        {
+            $products = $this->product->getProductPairsByProject(0, 'noclosed');
+            $this->loadModel('qa')->setMenu($products, $story->product);
         }
 
         $this->executeHooks($storyID);
@@ -894,7 +948,8 @@ class story extends control
         $this->view->cases       = $cases;
         $this->view->story       = $story;
         $this->view->track       = $this->story->getTrackByID($story->id);
-        $this->view->users       = $users;
+        $this->view->users       = $this->user->getPairs('noletter');
+        $this->view->reviewers   = array_keys($reviewers);
         $this->view->relations   = $this->story->getStoryRelation($story->id, $story->type);
         $this->view->executions  = $this->execution->getPairs(0, 'all', 'nocode');
         $this->view->execution   = empty($story->execution) ? array() : $this->dao->findById($story->execution)->from(TABLE_EXECUTION)->fetch();
@@ -951,10 +1006,7 @@ class story extends control
      */
     public function review($storyID, $from = 'product')
     {
-        $this->product;
-        $this->lang->product->menu           = $this->lang->product->viewMenu;
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($this->session->product);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($this->session->product);
 
         if(!empty($_POST))
         {
@@ -963,14 +1015,15 @@ class story extends control
 
             if($changes)
             {
-                $result   = $this->post->result;
-                $actionID = $this->action->create('story', $storyID, 'Reviewed', $this->post->comment, ucfirst($result));
-                if($result == 'reject') $actionID = $this->action->create('story', $storyID, 'Closed', '', ucfirst($this->post->closedReason));
+                $story    = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
+                $actionID = $this->story->recordReviewAction($story, $this->post->result, $this->post->closedReason);
                 $this->action->logHistory($actionID, $changes);
             }
 
             $this->executeHooks($storyID);
 
+            if(isonlybody()) die(js::reload('parent.parent'));
+
             $module = $from == 'project' ? 'projectstory' : 'story';
             die(js::locate($this->createLink($module, 'view', "storyID=$storyID"), 'parent'));
         }
@@ -982,19 +1035,29 @@ class story extends control
         $this->story->replaceURLang($story->type);
 
         /* Set menu. */
-        if($from == 'project')
+        if($this->app->openApp == 'project')
         {
             $this->app->rawModule = 'projectstory';
-            $this->lang->navGroup->story = 'project';
+            $this->loadModel('project')->setMenu($this->session->project);
         }
-        else
+        elseif($this->app->openApp == 'product')
         {
-            $this->product->setMenu($this->product->getPairs(), $product->id, $story->branch);
+            $this->product->setMenu($product->id, $story->branch);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($this->session->execution);
         }
 
         /* Set the review result options. */
-        if($story->status == 'draft' and $story->version == 1) unset($this->lang->story->reviewResultList['revert']);
-        if($story->status == 'changed') unset($this->lang->story->reviewResultList['reject']);
+        $reviewers = $this->story->getReviewerPairs($storyID, $story->version);
+        $this->lang->story->resultList = $this->lang->story->reviewResultList;
+
+        if($story->status == 'draft' and $story->version == 1) unset($this->lang->story->resultList['revert']);
+
+        if($story->status == 'changed') unset($this->lang->story->resultList['reject']);
+
+        if(count($reviewers) > 1) unset($this->lang->story->resultList['revert']);
 
         $this->view->title      = $this->lang->story->review . "STORY" . $this->lang->colon . $story->title;
         $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$story->branch"), $product->name);
@@ -1032,7 +1095,7 @@ class story extends control
 
         if(dao::isError()) die(js::error(dao::getError()));
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->session->storyList, 'parent'));
+        die(js::reload('parent'));
     }
 
     /**
@@ -1075,7 +1138,7 @@ class story extends control
         $this->story->replaceURLang($story->type);
 
         /* Set menu. */
-        $this->product->setMenu($this->product->getPairs(), $product->id, $story->branch);
+        $this->product->setMenu($product->id, $story->branch);
 
         /* Set the closed reason options and remove subdivided options. */
         if($story->status == 'draft') unset($this->lang->story->reasonList['cancel']);
@@ -1099,10 +1162,12 @@ class story extends control
      *
      * @param  int    $productID
      * @param  int    $executionID
+     * @param  string $storyType
+     * @param  string $from
      * @access public
      * @return void
      */
-    public function batchClose($productID = 0, $execution = 0)
+    public function batchClose($productID = 0, $executionID = 0, $storyType = 'story', $from = '')
     {
         if($this->post->comments)
         {
@@ -1149,7 +1214,7 @@ class story extends control
         /* The stories of a product. */
         if($productID)
         {
-            $this->product->setMenu($this->product->getPairs('nodeleted'), $productID);
+            $this->product->setMenu($productID);
             $product = $this->product->getByID($productID);
             $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
             $this->view->title      = $product->name . $this->lang->colon . $this->lang->story->batchClose;
@@ -1159,21 +1224,30 @@ class story extends control
         {
             $this->lang->story->menu      = $this->lang->execution->menu;
             $this->lang->story->menuOrder = $this->lang->execution->menuOrder;
-            $this->execution->setMenu($this->execution->getPairs($this->session->PRJ, 'all', 'nodeleted'), $executionID);
-            $this->lang->set('menugroup.story', 'execution');
+            $this->execution->setMenu($executionID);
             $execution = $this->execution->getByID($executionID);
             $this->view->position[] = html::a($this->createLink('execution', 'story', "executionID=$execution->id"), $execution->name);
             $this->view->title      = $execution->name . $this->lang->colon . $this->lang->story->batchClose;
         }
-        /* The stories of my. */
         else
         {
-            $this->lang->story->menu = $this->lang->my->menu;
-            $this->lang->set('menugroup.story', 'my');
-            $this->lang->story->menuOrder = $this->lang->my->menuOrder;
-            $this->loadModel('my')->setMenu();
-            $this->view->position[] = html::a($this->createLink('my', 'story'), $this->lang->my->story);
-            $this->view->title      = $this->lang->story->batchEdit;
+            if($this->app->openApp == 'project')
+            {
+                $this->project->setMenu($this->session->project);
+                $this->view->title = $this->lang->story->batchEdit;
+            }
+            else
+            {
+                $this->lang->story->menu      = $this->lang->my->menu;
+                $this->lang->story->menuOrder = $this->lang->my->menuOrder;
+                $this->loadModel('my')->setMenu();
+
+                if($from == 'work')       $this->lang->my->menu->work['subModule']       = 'story';
+                if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'story';
+
+                $this->view->position[] = html::a($this->createLink('my', 'story'), $this->lang->my->story);
+                $this->view->title      = $this->lang->story->batchEdit;
+            }
         }
 
         /* Judge whether the editedStories is too large and set session. */
@@ -1190,6 +1264,7 @@ class story extends control
         $this->view->productID        = $productID;
         $this->view->stories          = $stories;
         $this->view->storyIdList      = $storyIdList;
+        $this->view->storyType        = $storyType;
         $this->view->reasonList       = $this->lang->story->reasonList;
 
         $this->display();
@@ -1231,7 +1306,7 @@ class story extends control
             $response['result']  = 'success';
             $response['message'] = $this->lang->story->successToTask;
 
-            $this->story->batchToTask($executionID, $this->session->PRJ);
+            $tasks = $this->story->batchToTask($executionID, $this->session->project);
 
             if(dao::isError())
             {
@@ -1240,6 +1315,7 @@ class story extends control
                 $this->send($response);
             }
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $tasks));
             $response['locate'] = $this->createLink('execution', 'task', "executionID=$executionID");
             $this->send($response);
         }
@@ -1345,7 +1421,7 @@ class story extends control
         $products = $this->product->getPairs();
 
         /* Set menu. */
-        $this->product->setMenu($products, $story->product, $story->branch);
+        $this->product->setMenu($story->product, $story->branch);
 
         $this->view->title      = zget($products, $story->product, '') . $this->lang->colon . $this->lang->story->assign;
         $this->view->position[] = $this->lang->story->assign;
@@ -1388,33 +1464,35 @@ class story extends control
      * @access public
      * @return void
      */
-    public function track($productID, $branch = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function track($productID, $branch = 0, $projectID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Set menu. The projectstory module does not execute. */
-        if($this->app->rawModule == 'story')
+        if(!$projectID)
         {
-            $this->lang->product->menu = $this->lang->product->viewMenu;
             $products  = $this->product->getPairs();
             $productID = $this->product->saveState($productID, $products);
-            $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID, '', $branch);
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-            $this->product->setMenu($products, $productID, $branch);
+            $this->product->products = $this->product->saveState($productID, $products);
+            $this->product->setMenu($productID, $branch);
         }
 
         /* Save session. */
-        $this->session->set('storyList',    $this->app->getURI(true));
-        $this->session->set('designList',   $this->app->getURI(true));
-        $this->session->set('bugList',      $this->app->getURI(true));
-        $this->session->set('caseList',     $this->app->getURI(true));
-        $this->session->set('bugList',      $this->app->getURI(true));
-        $this->session->set('revisionList', $this->app->getURI(true));
+        $this->session->set('storyList',    $this->app->getURI(true), 'product');
+        $this->session->set('taskList',     $this->app->getURI(true), 'execution');
+        $this->session->set('designList',   $this->app->getURI(true), 'project');
+        $this->session->set('bugList',      $this->app->getURI(true), 'qa');
+        $this->session->set('caseList',     $this->app->getURI(true), 'qa');
+        $this->session->set('revisionList', $this->app->getURI(true), 'repo');
 
         /* Load pager and get tracks. */
         $this->app->loadClass('pager', $static = true);
         $pager  = new pager($recTotal, $recPerPage, $pageID);
         $tracks = $this->story->getTracks($productID, $branch, $pager);
 
-        if($this->app->rawModule == 'projectstory') $projectProducts = $this->product->getProducts($this->session->PRJ);
+        if($projectID)
+        {
+            $this->loadModel('project')->setMenu($projectID);
+            $projectProducts = $this->product->getProducts($projectID);
+        }
 
         $this->view->title      = $this->lang->story->track;
         $this->view->position[] = $this->lang->story->track;
@@ -1480,34 +1558,36 @@ class story extends control
      * Show zero case story.
      *
      * @param  int    $productID
+     * @param  int    $branchID
      * @param  string $orderBy
-     * @param  string $from      qa|project
      * @access public
      * @return void
      */
-    public function zeroCase($productID, $orderBy = 'id_desc', $from = 'project')
+    public function zeroCase($productID = 0, $branchID = 0, $orderBy = 'id_desc')
     {
-        $this->session->set('productList', $this->app->getURI(true));
-        $products = $this->product->getPairs();
+        $this->session->set('storyList', $this->app->getURI(true) . '#app=' . $this->app->openApp, 'product');
+        $this->session->set('caseList', $this->app->getURI(true), $this->app->openApp);
 
-        $this->lang->set('menugroup.story', 'qa');
-
-        $this->lang->navGroup->story = $from;
-        if($from == 'project')
+        $this->loadModel('testcase');
+        if($this->app->openApp == 'project')
         {
-            $moduleIndex = array_search('story', $this->lang->noMenuModule);
-            if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
+            $this->loadModel('project')->setMenu($this->session->project);
+            $this->app->rawModule = 'qa';
+            $this->lang->project->menu->qa['subMenu']->testcase['subModule'] = 'story';
+            $products  = $this->project->getProducts($this->session->project, false);
+            $productID = $this->product->saveState($productID, $products);
+            $this->lang->modulePageNav = $this->product->select($products, $productID, 'story', 'zeroCase');
         }
         else
         {
-            $this->app->loadConfig('qa');
+            $products  = $this->product->getPairs();
+            $productID = $this->product->saveState($productID, $products);
+            $this->loadModel('qa');
+            $this->app->rawModule = 'testcase';
             foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
+            $this->qa->setMenu($products, $productID, $branchID);
         }
 
-        $this->lang->story->menu      = $this->lang->testcase->menu;
-        $this->lang->story->menuOrder = $this->lang->testcase->menuOrder;
-        $this->loadModel('testcase')->setMenu($products, $productID);
-
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
@@ -1515,9 +1595,10 @@ class story extends control
         $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $products[$productID]);
         $this->view->position[] = $this->lang->story->zeroCase;
 
-        $this->view->stories    = $this->story->getZeroCase($productID, $sort);
+        $this->view->stories    = $this->story->getZeroCase($productID, $branchID, $sort);
         $this->view->users      = $this->user->getPairs('noletter');
         $this->view->productID  = $productID;
+        $this->view->branchID   = $branchID;
         $this->view->orderBy    = $orderBy;
         $this->view->suiteList  = $this->loadModel('testsuite')->getSuites($productID);
         $this->view->browseType = '';
@@ -1592,7 +1673,7 @@ class story extends control
         if($result == 'no')
         {
             $this->dao->update(TABLE_STORY)->set('URChanged')->eq(0)->where('id')->eq($storyID)->exec();
-            die(js::closeModal('parent.parent', 'this'));
+            die(js::reload('parent', 'this'));
         }
 
         $this->view->changedStories = $this->story->getChangedStories($story);
@@ -1769,7 +1850,7 @@ class story extends control
     public function report($productID, $branchID, $storyType = 'story', $browseType = 'unclosed', $moduleID = 0, $chartType = 'pie')
     {
         $this->loadModel('report');
-        $this->view->charts   = array();
+        $this->view->charts = array();
 
         if(!empty($_POST))
         {
@@ -1788,9 +1869,8 @@ class story extends control
 
         $this->story->replaceURLang($storyType);
         $this->products = $this->product->getPairs();
-        $this->lang->product->switcherMenu   = $this->product->getSwitcher($productID, $storyType, $branchID);
-        $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-        $this->product->setMenu($this->products, $productID, $branchID);
+        $this->lang->product->switcherMenu = $this->product->getSwitcher($productID, $storyType, $branchID);
+        $this->product->setMenu($productID, $branchID);
 
         $this->view->title         = $this->products[$productID] . $this->lang->colon . $this->lang->story->reportChart;
         $this->view->position[]    = $this->products[$productID];
@@ -1862,18 +1942,23 @@ class story extends control
                         unset($stories[$story->id]);
                     }
                 }
+
                 if(!empty($children))
                 {
-                    $position = 0;
+                    $reorderStories = array();
                     foreach($stories as $story)
                     {
-                        $position ++;
+                        $reorderStories[$story->id] = $story;
                         if(isset($children[$story->id]))
                         {
-                            array_splice($stories, $position, 0, $children[$story->id]);
-                            $position += count($children[$story->id]);
+                            foreach($children[$story->id] as $childrenID => $childrenStory)
+                            {
+                                $reorderStories[$childrenID] = $childrenStory;
+                            }
                         }
+                        unset($stories[$story->id]);
                     }
+                    $stories = $reorderStories;
                 }
             }
 
@@ -2131,10 +2216,7 @@ class story extends control
         {
             $oldStory = $this->dao->findById((int)$params['storyID'])->from(TABLE_STORY)->fetch();
             $status   = $oldStory->status;
-            if($params['result'] == 'pass' and $oldStory->status == 'draft')   $status = 'active';
-            if($params['result'] == 'pass' and $oldStory->status == 'changed') $status = 'active';
             if($params['result'] == 'revert') $status = 'active';
-            if($params['result'] == 'reject') $status = 'closed';
         }
         die($status);
     }
diff --git a/module/story/css/edit.css b/module/story/css/edit.css
index 7a1fa73c22..325971cb2f 100644
--- a/module/story/css/edit.css
+++ b/module/story/css/edit.css
@@ -1 +1 @@
-#product_chosen .chosen-single {border-right-width: 1px;}
+#product_chosen .chosen-single{border-right-width:1px}
diff --git a/module/story/css/view.css b/module/story/css/view.css
index 10ce93c2a5..a8a0febfde 100644
--- a/module/story/css/view.css
+++ b/module/story/css/view.css
@@ -1,5 +1,4 @@
 .side-col .cell {padding: 0px;}
 .side-col #legendProjectAndTask .list-unstyled {padding: 10px; border-top: 0px; margin: 0px;}
-.col-4 .cell .tab-content .text-top {padding-top: 1px;}
 #legendStories ul li {padding: 10px 0 0 12px; line-height: 20px;}
 .main-actions .btn-toolbar .btn {padding-right: 6px; padding-left: 6px;}
diff --git a/module/story/js/batchedit.js b/module/story/js/batchedit.js
index b4fff1bb6b..bf3a1adbae 100644
--- a/module/story/js/batchedit.js
+++ b/module/story/js/batchedit.js
@@ -1,7 +1,7 @@
 /**
  * Set duplicate field.
- * 
- * @param  string $resolution 
+ *
+ * @param  string $resolution
  * @param  int    $storyID
  * @access public
  * @return void
diff --git a/module/story/js/change.js b/module/story/js/change.js
index b94ee6d026..fcdf2de956 100644
--- a/module/story/js/change.js
+++ b/module/story/js/change.js
@@ -2,7 +2,7 @@ $(function()
 {
     $('#needNotReview').on('change', function()
     {
-        $('#assignedTo').attr('disabled', $(this).is(':checked') ? 'disabled' : null).trigger('chosen:updated');
+        $('#reviewer').attr('disabled', $(this).is(':checked') ? 'disabled' : null).trigger('chosen:updated');
         getStatus('change', "storyID=" + storyID + ",changed=" + changed + ",needNotReview=" + ($(this).prop('checked') ? 1 : 0));
     });
     $('#needNotReview').change();
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 6590164006..8cc11344f3 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -3,11 +3,13 @@ $(function()
     if(typeof(resetActive) != 'undefined') return false;
     if(typeof(storyType) == 'undefined') storyType = '';
     if(typeof(rawModule) == 'undefined') rawModule = 'product';
+    if(typeof(app)       == 'undefined') app       = '';
     if(typeof(execution) != 'undefined') rawModule = 'projectstory';
-    if(['project', 'projectstory'].indexOf(rawModule) === -1)
+    if(['project', 'projectstory'].indexOf(rawModule) === -1 && app != 'qa')
     {
-        $('#navbar .nav li').removeClass('active');
+        if(app != 'my') $('#navbar .nav li').removeClass('active');
         $("#navbar .nav li[data-id=" + storyType + ']').addClass('active');
+        $('#subNavbar li[data-id="' + storyType + '"]').addClass('active');
     }
 })
 
diff --git a/module/story/js/create.js b/module/story/js/create.js
index 22cce69ff6..473c38bd5f 100644
--- a/module/story/js/create.js
+++ b/module/story/js/create.js
@@ -2,7 +2,16 @@ $(function()
 {
     $('#needNotReview').on('change', function()
     {
-        $('#assignedTo').attr('disabled', $(this).is(':checked') ? 'disabled' : null).trigger('chosen:updated');
+        $('#reviewer').attr('disabled', $(this).is(':checked') ? 'disabled' : null).trigger('chosen:updated');
+        if($(this).is(':checked'))
+        {
+            $('#reviewerBox').removeClass('required');
+        }
+        else
+        {
+            $('#reviewerBox').addClass('required');
+        }
+
         getStatus('create', "product=" + $('#product').val() + ",execution=" + executionID + ",needNotReview=" + ($(this).prop('checked') ? 1 : 0));
     });
     $('#needNotReview').change();
@@ -21,3 +30,7 @@ function refreshPlan()
 {
     $('a.refresh').click();
 }
+
+$(window).unload(function(){
+    if(blockID) window.parent.refreshBlock($('#block' + blockID));
+});
diff --git a/module/story/js/edit.js b/module/story/js/edit.js
index 6a9fb4078d..73f5542098 100644
--- a/module/story/js/edit.js
+++ b/module/story/js/edit.js
@@ -1,4 +1,8 @@
 $(function()
 {
     $('.main-side #branch').closest('td').find('#product_chosen .chosen-single').css('width', '153px');
+    $('#reviewer_chosen .search-choice').each(function()
+    {
+        if(reviewedReviewer.indexOf($(this).find('span').text()) != -1) $(this).css('pointer-events', 'none');
+    })
 })
diff --git a/module/story/js/review.js b/module/story/js/review.js
index a609560c51..0ffa50543d 100644
--- a/module/story/js/review.js
+++ b/module/story/js/review.js
@@ -6,8 +6,6 @@ function switchShow(result)
     {
         $('#rejectedReasonBox').show();
         $('#preVersionBox').hide();
-        $('#assignedTo').val('closed');
-        $('#assignedTo').trigger("chosen:updated");
     }
     else if(result == 'revert')
     {
@@ -15,8 +13,6 @@ function switchShow(result)
         $('#rejectedReasonBox').hide();
         $('#duplicateStoryBox').hide();
         $('#childStoriesBox').hide();
-        $('#assignedTo').val(assignedTo);
-        $('#assignedTo').trigger("chosen:updated");
     }
     else
     {
@@ -30,8 +26,6 @@ function switchShow(result)
         $('#duplicateStoryBox').hide();
         $('#childStoriesBox').hide();
         $('#rejectedReasonBox').hide();
-        $('#assignedTo').val(assignedTo);
-        $('#assignedTo').trigger("chosen:updated");
     }
 
     getStatus('review', "storyID=" + storyID + ",result=" + result);
diff --git a/module/story/js/x.view.js b/module/story/js/x.view.js
index 7f5b52bef1..4bc8e30157 100644
--- a/module/story/js/x.view.js
+++ b/module/story/js/x.view.js
@@ -1,7 +1,7 @@
 $(function()
 {
     $('.main-actions-holder').css('height', '0px');
-    var $xuanAction = "<div class='xuancard-actions fixed'>";
+    var xuanAction = "<div class='xuancard-actions fixed'>";
     $('.main-col div.main-actions .btn-toolbar a').each(function(){
         var $that    = $(this);
 
@@ -12,7 +12,7 @@ $(function()
         var btnClass = " class='" + $that.attr('class') + "'";
         var action   = $that.html();
 
-        if(href.indexOf('browse') >= 0 || href.indexOf('batchCreate') >= 0 
+        if(href.indexOf('browse') >= 0 || href.indexOf('batchCreate') >= 0
             || href.indexOf('create') >= 0 || href.indexOf('delete') >= 0) return true;
 
         if($that.hasClass('iframe'))
@@ -26,10 +26,10 @@ $(function()
            target = " target='_blank'";
         }
 
-        $xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
+        xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
     });
 
-    $xuanAction += '</div>';
-    $('#footer').replaceWith($xuanAction);
+    xuanAction += '</div>';
+    $('body').append(xuanAction);
     $('.xuancard-actions a.iframe').modalTrigger();
 })
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index c8ac65045d..751c3af05a 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -31,11 +31,13 @@ $lang->story->reviewAction      = 'Review Story';
 $lang->story->needReview        = 'Need Review';
 $lang->story->batchReview       = 'Mehere prüfen';
 $lang->story->edit              = "Bearbeiten";
+$lang->story->editAB            = "Bearbeiten";
 $lang->story->batchEdit         = "Mehere bearbeiten";
 $lang->story->subdivide         = 'Aufteilen';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->trackAB           = 'Track';
 $lang->story->processStoryChange= 'Process Story Change';
 $lang->story->subdivideAction   = 'Decompose Story';
 $lang->story->splitRequirent    = 'Decompose';
@@ -80,6 +82,7 @@ $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
 $lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->SRCommon} and link {$lang->SRCommon} to the task. The closed {$lang->SRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
+$lang->story->storyRound      = '%s time estimation';
 
 $lang->story->common         = 'Story';
 $lang->story->id             = 'ID';
@@ -93,7 +96,7 @@ $lang->story->source         = 'Von';
 $lang->story->sourceNote     = 'Hinweis';
 $lang->story->fromBug        = 'Von Bug';
 $lang->story->title          = 'Titel';
-$lang->story->type           = 'Type';
+$lang->story->category       = 'Category';
 $lang->story->color          = 'Color';
 $lang->story->toBug          = 'ToBug';
 $lang->story->spec           = 'Beschreibung';
@@ -120,6 +123,7 @@ $lang->story->closedDate     = 'Geschlossen am';
 $lang->story->closedReason   = 'Geschlossen weil';
 $lang->story->rejectedReason = 'Abgelehnt weil';
 $lang->story->reviewedBy     = 'Prüfer';
+$lang->story->reviewers      = 'Reviewers';
 $lang->story->reviewedDate   = 'Geprüft am';
 $lang->story->version        = 'Version';
 $lang->story->plan           = 'Plan';
@@ -152,6 +156,8 @@ $lang->story->noRequirement  = 'No Requirements';
 $lang->story->one            = 'One';
 $lang->story->field          = 'Synchronized fields';
 $lang->story->completeRate   = 'Completion Rate';
+$lang->story->reviewed       = 'Reviewed';
+$lang->story->toBeReviewed   = 'To Be Reviewed';
 
 $lang->story->ditto       = 'Dito';
 $lang->story->dittoNotice = 'Die Story gehört nicht zum Projekt wie die vorherige!';
@@ -247,7 +253,7 @@ $lang->story->lblClose    = 'Close';
 $lang->story->lblTBC      = 'Task/Bug/Case';
 
 $lang->story->checkAffection       = 'Impact';
-$lang->story->affectedProjects     = '' . $lang->executionCommon;
+$lang->story->affectedProjects     = "{$lang->project->common}s/{$lang->execution->common}s";
 $lang->story->affectedBugs         = 'Bug';
 $lang->story->affectedCases        = 'Fall';
 
@@ -257,6 +263,7 @@ $lang->story->successSaved         = "Story wurde gespeichrt!";
 $lang->story->confirmDelete        = "Möchten Sie diese Story löschen?";
 $lang->story->errorEmptyChildStory = '『Unterteilte Story』 darf nicht leer sein.';
 $lang->story->errorNotSubdivide    = "If the status is not active, or the stage is not wait, or a sub story, it cannot be subdivided.";
+$lang->story->errorEmptyReviewedBy = "『ReviewedBy』darf nicht leer sein.";
 $lang->story->mustChooseResult     = 'Ergebnis wählen';
 $lang->story->mustChoosePreVersion = 'Version wählen um es umzukhren.';
 $lang->story->noStory              = 'Keine Storys. ';
@@ -265,6 +272,7 @@ $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Ple
 $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->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->form = new stdclass();
 $lang->story->form->area     = 'Story Bereich';
@@ -274,7 +282,11 @@ $lang->story->form->file     = 'Wenn Dateien zu dieser Story gehören, laden Sie
 
 $lang->story->action = new stdclass();
 $lang->story->action->reviewed              = array('main' => '$date, geprüft von <strong>$actor</strong>. Das Ergebnis ist <strong>$extra</strong>.', 'extra' => 'reviewResultList');
+$lang->story->action->passreviewed          = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Pass</strong>.');
+$lang->story->action->clarifyreviewed       = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Review Failed</strong>. Please re-initiate the review after changing.');
+$lang->story->action->rejectreviewed        = array('main' => '$date, geprüft von <strong>$actor</strong>. Das Ergebnis ist <strong>$extra</strong>, Der Grund ist <strong>$reason</strong>.', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
 $lang->story->action->closed                = array('main' => '$date, geschlossen von <strong>$actor</strong>. Der Grund ist <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
+$lang->story->action->reviewclosed          = array('main' => '$date, closed by <strong>System</strong>. The reasion is <strong>Review Failed</strong>.');
 $lang->story->action->linked2plan           = array('main' => '$date, verknüpft von <strong>$actor</strong> mit Plan <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan      = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> von Plan <strong>$extra</strong>.');
 $lang->story->action->linked2execution      = array('main' => '$date, verknüpft von <strong>$actor</strong> mit ' . $lang->executionCommon . ' <strong>$extra</strong>.');
@@ -384,3 +396,11 @@ $lang->story->convertToTask->fieldList['spec']       = "Description";
 $lang->story->convertToTask->fieldList['pri']        = 'Priority';
 $lang->story->convertToTask->fieldList['mailto']     = 'Mailto';
 $lang->story->convertToTask->fieldList['assignedTo'] = 'AssignTo';
+
+$lang->story->categoryList['feature']     = 'Feature';
+$lang->story->categoryList['interface']   = 'Interface';
+$lang->story->categoryList['performance'] = 'Performance';
+$lang->story->categoryList['safe']        = 'Safe';
+$lang->story->categoryList['experience']  = 'Experience';
+$lang->story->categoryList['improve']     = 'Improve';
+$lang->story->categoryList['other']       = 'Other';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 50c63dc37f..e357062c2f 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -22,12 +22,9 @@ $lang->story->affectedStories   = "Affected {$lang->story->story}";
 
 $lang->story->batchCreate       = "Batch Create";
 $lang->story->change            = "Change";
-$lang->story->changeAction      = "Change Story";
 $lang->story->changed           = 'Change';
 $lang->story->assignTo          = 'Assign';
-$lang->story->assignAction      = 'Assign Story';
 $lang->story->review            = 'Review';
-$lang->story->reviewAction      = 'Review Story';
 $lang->story->needReview        = 'Need Review';
 $lang->story->batchReview       = 'Batch Review';
 $lang->story->edit              = "Edit Story";
@@ -36,16 +33,13 @@ $lang->story->subdivide         = 'Decompose';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->trackAB           = 'Track';
 $lang->story->processStoryChange= 'Process Story Change';
-$lang->story->subdivideAction   = 'Decompose Story';
 $lang->story->splitRequirent    = 'Decompose';
 $lang->story->close             = 'Close';
-$lang->story->closeAction       = 'Close Story';
 $lang->story->batchClose        = 'Batch Close';
 $lang->story->activate          = 'Activate';
-$lang->story->activateAction    = 'Activate Story';
 $lang->story->delete            = "Delete";
-$lang->story->deleteAction      = "Delete Story";
 $lang->story->view              = "Story Detail";
 $lang->story->setting           = "Settings";
 $lang->story->tasks             = "Linked Tasks";
@@ -60,11 +54,9 @@ $lang->story->caseCountAB       = 'C';
 $lang->story->linkStory         = 'Link Story';
 $lang->story->unlinkStory       = 'UnLinked';
 $lang->story->export            = "Export Data";
-$lang->story->exportAction      = "Export Story";
 $lang->story->zeroCase          = "Stories without cases";
 $lang->story->zeroTask          = "Only list stories without tasks";
 $lang->story->reportChart       = "Report";
-$lang->story->reportAction      = "Story Report";
 $lang->story->copyTitle         = "Copy Title";
 $lang->story->batchChangePlan   = "Batch Change Plans";
 $lang->story->batchChangeBranch = "Batch Change Branches";
@@ -76,10 +68,22 @@ $lang->story->toTask            = 'Convert to Task';
 $lang->story->batchToTask       = 'Batch Convert to Task';
 $lang->story->convertRelations  = 'Convert Relations';
 
+$lang->story->editAction      = "Edit {$lang->SRCommon}";
+$lang->story->changeAction    = "Change {$lang->SRCommon}";
+$lang->story->assignAction    = "Assign {$lang->SRCommon}";
+$lang->story->reviewAction    = "Review {$lang->SRCommon}";
+$lang->story->subdivideAction = "Subdivide {$lang->SRCommon}";
+$lang->story->closeAction     = "Close {$lang->SRCommon}";
+$lang->story->activateAction  = "Activate {$lang->SRCommon}";
+$lang->story->deleteAction    = "Delete {$lang->SRCommon}";
+$lang->story->exportAction    = "Export {$lang->SRCommon}";
+$lang->story->reportAction    = "Report";
+
 $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
 $lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->SRCommon} and link {$lang->SRCommon} to the task. The closed {$lang->SRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
+$lang->story->storyRound      = '%s time estimation';
 
 $lang->story->common         = 'Story';
 $lang->story->id             = 'ID';
@@ -93,7 +97,7 @@ $lang->story->source         = 'From';
 $lang->story->sourceNote     = 'Note';
 $lang->story->fromBug        = 'From Bug';
 $lang->story->title          = 'Title';
-$lang->story->type           = 'Type';
+$lang->story->category       = 'Category';
 $lang->story->color          = 'Color';
 $lang->story->toBug          = 'ToBug';
 $lang->story->spec           = 'Description';
@@ -120,6 +124,7 @@ $lang->story->closedDate     = 'ClosedDate';
 $lang->story->closedReason   = 'Reason';
 $lang->story->rejectedReason = 'Reject Reason';
 $lang->story->reviewedBy     = 'ReviewedBy';
+$lang->story->reviewers      = 'Reviewers';
 $lang->story->reviewedDate   = 'ReviewedDate';
 $lang->story->version        = 'Version';
 $lang->story->plan           = 'Linked Plan';
@@ -152,6 +157,8 @@ $lang->story->noRequirement  = 'No Requirements';
 $lang->story->one            = 'One';
 $lang->story->field          = 'Synchronized fields';
 $lang->story->completeRate   = 'Completion Rate';
+$lang->story->reviewed       = 'Reviewed';
+$lang->story->toBeReviewed   = 'To Be Reviewed';
 
 $lang->story->ditto       = 'Ditto';
 $lang->story->dittoNotice = 'This story is not linked to the same product as the last one is!';
@@ -247,7 +254,7 @@ $lang->story->lblClose    = 'Close';
 $lang->story->lblTBC      = 'Task/Bug/Case';
 
 $lang->story->checkAffection       = 'Influence';
-$lang->story->affectedProjects     = '' . $lang->executionCommon . 's';
+$lang->story->affectedProjects     = "{$lang->project->common}s/{$lang->execution->common}s";
 $lang->story->affectedBugs         = 'Bugs';
 $lang->story->affectedCases        = 'Cases';
 
@@ -257,6 +264,7 @@ $lang->story->successSaved         = "Story is saved!";
 $lang->story->confirmDelete        = "Do you want to delete this story?";
 $lang->story->errorEmptyChildStory = '『Decomposed Stories』canot be blank.';
 $lang->story->errorNotSubdivide    = "If the status is not active, or the stage is not wait, or a sub story, it cannot be subdivided.";
+$lang->story->errorEmptyReviewedBy = "『ReviewedBy』canot be blank.";
 $lang->story->mustChooseResult     = 'Select Result';
 $lang->story->mustChoosePreVersion = 'Select a version to revert to.';
 $lang->story->noStory              = 'No stories yet. ';
@@ -265,6 +273,7 @@ $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Ple
 $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->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->form = new stdclass();
 $lang->story->form->area     = 'Scope';
@@ -274,7 +283,11 @@ $lang->story->form->file     = 'If any file that is linked to a story, please cl
 
 $lang->story->action = new stdclass();
 $lang->story->action->reviewed              = array('main' => '$date, recorded by <strong>$actor</strong>. The result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
+$lang->story->action->passreviewed          = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Pass</strong>.');
+$lang->story->action->clarifyreviewed       = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Review Failed</strong>. Please re-initiate the review after changing.');
+$lang->story->action->rejectreviewed        = array('main' => '$date, recorded by <strong>$actor</strong>. The result is <strong>$extra</strong>. The reasion is <strong>$reason</strong>.', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
 $lang->story->action->closed                = array('main' => '$date, closed by <strong>$actor</strong>. The reasion is <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
+$lang->story->action->reviewclosed          = array('main' => '$date, closed by <strong>System</strong>. The reasion is <strong>Review Failed</strong>.');
 $lang->story->action->linked2plan           = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan      = array('main' => '$date, unlinked by <strong>$actor</strong> from Plan <strong>$extra</strong>.');
 $lang->story->action->linked2execution      = array('main' => '$date, linked by <strong>$actor</strong> to ' . $lang->executionCommon . ' <strong>$extra</strong>.');
@@ -384,3 +397,11 @@ $lang->story->convertToTask->fieldList['spec']       = "Description";
 $lang->story->convertToTask->fieldList['pri']        = 'Priority';
 $lang->story->convertToTask->fieldList['mailto']     = 'Mailto';
 $lang->story->convertToTask->fieldList['assignedTo'] = 'AssignTo';
+
+$lang->story->categoryList['feature']     = 'Feature';
+$lang->story->categoryList['interface']   = 'Interface';
+$lang->story->categoryList['performance'] = 'Performance';
+$lang->story->categoryList['safe']        = 'Safe';
+$lang->story->categoryList['experience']  = 'Experience';
+$lang->story->categoryList['improve']     = 'Improve';
+$lang->story->categoryList['other']       = 'Other';
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index 2826ee5aa1..02881e23a9 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -31,11 +31,13 @@ $lang->story->reviewAction      = 'Valider Story';
 $lang->story->needReview        = 'Validation requise';
 $lang->story->batchReview       = 'Validation par lot';
 $lang->story->edit              = "Editer Story";
+$lang->story->editAB            = "Editer Story";
 $lang->story->batchEdit         = "Editer par Lot";
 $lang->story->subdivide         = 'Décomposer';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->trackAB           = 'Track';
 $lang->story->processStoryChange= 'Process Story Change';
 $lang->story->subdivideAction   = 'Décomposer Story';
 $lang->story->splitRequirent    = 'Décompose';
@@ -80,6 +82,7 @@ $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
 $lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->SRCommon} and link {$lang->SRCommon} to the task. The closed {$lang->SRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
+$lang->story->storyRound      = '%s time estimation';
 
 $lang->story->common         = 'Story';
 $lang->story->id             = 'ID';
@@ -93,7 +96,7 @@ $lang->story->source         = 'De';
 $lang->story->sourceNote     = 'Note';
 $lang->story->fromBug        = 'Depuis Bug';
 $lang->story->title          = 'Titre';
-$lang->story->type           = 'Type';
+$lang->story->category       = 'Category';
 $lang->story->color          = 'Couleur';
 $lang->story->toBug          = 'Vers Bug';
 $lang->story->spec           = 'Description';
@@ -120,6 +123,7 @@ $lang->story->closedDate     = 'Date Fermeture';
 $lang->story->closedReason   = 'Raison';
 $lang->story->rejectedReason = 'Raison du Rejet';
 $lang->story->reviewedBy     = 'Validée par';
+$lang->story->reviewers      = 'Reviewers';
 $lang->story->reviewedDate   = 'Date Validation';
 $lang->story->version        = 'Version';
 $lang->story->plan           = 'Intégrée Plans';
@@ -152,6 +156,8 @@ $lang->story->noRequirement  = 'No Requirements';
 $lang->story->one            = 'One';
 $lang->story->field          = 'Synchronized fields';
 $lang->story->completeRate   = 'Completion Rate';
+$lang->story->reviewed       = 'Reviewed';
+$lang->story->toBeReviewed   = 'To Be Reviewed';
 
 $lang->story->ditto       = 'Idem';
 $lang->story->dittoNotice = "La story n'est pas associée au même product que la précédente !";
@@ -247,7 +253,7 @@ $lang->story->lblClose    = 'Fermer';
 $lang->story->lblTBC      = 'Tâche/Bug/CasTest';
 
 $lang->story->checkAffection       = 'Influence';
-$lang->story->affectedProjects     = '' . $lang->executionCommon . 's';
+$lang->story->affectedProjects     = "{$lang->project->common}s/{$lang->execution->common}s";
 $lang->story->affectedBugs         = 'Bugs';
 $lang->story->affectedCases        = 'CasTests';
 
@@ -257,6 +263,7 @@ $lang->story->successSaved         = "Story est sauvegardée !";
 $lang->story->confirmDelete        = "Voulez-vous vraiment supprimer cette story ?";
 $lang->story->errorEmptyChildStory = '『Decomposed Stories』ne peuvent être vides.';
 $lang->story->errorNotSubdivide    = "Si le statut n'est pas actif, ou l'étape n'est pas en attente, ou si c'est une sous-story, elle ne peut pas être subdivisée.";
+$lang->story->errorEmptyReviewedBy = "『ReviewedBy』ne peuvent être vides."
 $lang->story->mustChooseResult     = 'Sélect Résultat';
 $lang->story->mustChoosePreVersion = 'Sélect une version pour revenir en arrière.';
 $lang->story->noStory              = "Aucune story pour l'instant. ";
@@ -265,6 +272,7 @@ $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Ple
 $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->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->form = new stdclass();
 $lang->story->form->area     = 'Périmètre';
@@ -274,7 +282,11 @@ $lang->story->form->file     = 'Si certains fichiers sont associés à la story,
 
 $lang->story->action = new stdclass();
 $lang->story->action->reviewed              = array('main' => '$date, validée par <strong>$actor</strong>. Le résultat est <strong>$extra</strong>.', 'extra' => 'reviewResultList');
+$lang->story->action->passreviewed          = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Pass</strong>.');
+$lang->story->action->clarifyreviewed       = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Review Failed</strong>. Please re-initiate the review after changing.');
+$lang->story->action->rejectreviewed        = array('main' => '$date, validée par <strong>$actor</strong>. Le résultat est <strong>$extra</strong>. La raison est <strong>$reason</strong>.', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
 $lang->story->action->closed                = array('main' => '$date, Fermée par <strong>$actor</strong>. La raison est <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
+$lang->story->action->reviewclosed          = array('main' => '$date, closed by <strong>System</strong>. The reasion is <strong>Review Failed</strong>.');
 $lang->story->action->linked2plan           = array('main' => '$date, planifiée par <strong>$actor</strong> au Plan <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan      = array('main' => '$date, déplanifiée par <strong>$actor</strong> du Plan <strong>$extra</strong>.');
 $lang->story->action->linked2execution      = array('main' => '$date, associée au ' . $lang->executionCommon . ' <strong>$extra</strong> par <strong>$actor</strong>.');
@@ -384,3 +396,11 @@ $lang->story->convertToTask->fieldList['spec']       = "Description";
 $lang->story->convertToTask->fieldList['pri']        = 'Priority';
 $lang->story->convertToTask->fieldList['mailto']     = 'Mailto';
 $lang->story->convertToTask->fieldList['assignedTo'] = 'AssignTo';
+
+$lang->story->categoryList['feature']     = 'Feature';
+$lang->story->categoryList['interface']   = 'Interface';
+$lang->story->categoryList['performance'] = 'Performance';
+$lang->story->categoryList['safe']        = 'Safe';
+$lang->story->categoryList['experience']  = 'Experience';
+$lang->story->categoryList['improve']     = 'Improve';
+$lang->story->categoryList['other']       = 'Other';
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index 3a2fe7901c..84ff7ead1e 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -31,11 +31,13 @@ $lang->story->reviewAction      = 'Duyệt câu chuyện';
 $lang->story->needReview        = 'Duyệt nhu cầu';
 $lang->story->batchReview       = 'Duyệt hàng loạt';
 $lang->story->edit              = "Sửa câu chuyện";
+$lang->story->editAB            = "Sửa câu chuyện";
 $lang->story->batchEdit         = "Sửa hàng loạt";
 $lang->story->subdivide         = 'Phân rã';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->trackAB           = 'Track';
 $lang->story->processStoryChange= 'Process Story Change';
 $lang->story->subdivideAction   = 'Phân rã câu chuyện';
 $lang->story->splitRequirent    = 'Phân rã';
@@ -80,6 +82,7 @@ $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
 $lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->SRCommon} and link {$lang->SRCommon} to the task. The closed {$lang->SRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
+$lang->story->storyRound      = '%s time estimation';
 
 $lang->story->common         = 'Câu chuyện';
 $lang->story->id             = 'ID';
@@ -93,7 +96,7 @@ $lang->story->source         = 'Từ';
 $lang->story->sourceNote     = 'Ghi chú';
 $lang->story->fromBug        = 'Từ Bug';
 $lang->story->title          = 'Tiêu đề';
-$lang->story->type           = 'Loại';
+$lang->story->category       = 'Category';
 $lang->story->color          = 'Màu';
 $lang->story->toBug          = 'Tới Bug';
 $lang->story->spec           = 'Mô tả';
@@ -120,6 +123,7 @@ $lang->story->closedDate     = 'Ngày đóng';
 $lang->story->closedReason   = 'Lý do';
 $lang->story->rejectedReason = 'Lý do từ chối';
 $lang->story->reviewedBy     = 'Người duyệt';
+$lang->story->reviewers      = 'Reviewers';
 $lang->story->reviewedDate   = 'Ngày duyệt';
 $lang->story->version        = 'Phiên bản';
 $lang->story->plan           = 'Kế hoạch liên kết';
@@ -152,6 +156,8 @@ $lang->story->noRequirement  = 'No Requirements';
 $lang->story->one            = 'One';
 $lang->story->field          = 'Synchronized fields';
 $lang->story->completeRate   = 'Completion Rate';
+$lang->story->reviewed       = 'Reviewed';
+$lang->story->toBeReviewed   = 'To Be Reviewed';
 
 $lang->story->ditto       = 'Như trên';
 $lang->story->dittoNotice = 'Câu chuyện này chưa liên kết tới cùng sản phẩm bởi bởi vì nó là cuối cùng!';
@@ -247,7 +253,7 @@ $lang->story->lblClose    = 'Đóng';
 $lang->story->lblTBC      = 'Nhiệm vụ/Bug/Tình huống';
 
 $lang->story->checkAffection   = 'Ảnh hưởng';
-$lang->story->affectedProjects = ' ' . $lang->executionCommon;
+$lang->story->affectedProjects = "{$lang->project->common}s/{$lang->execution->common}s";
 $lang->story->affectedBugs     = 'Bugs';
 $lang->story->affectedCases    = 'Tình huống';
 
@@ -257,6 +263,7 @@ $lang->story->successSaved         = "Câu chuyện đã lưu lại!";
 $lang->story->confirmDelete        = "Bạn có muốn xóa câu chuyện này?";
 $lang->story->errorEmptyChildStory = '『Câu chuyện đã phân rã』 không thể để trống.';
 $lang->story->errorNotSubdivide    = "Nếu tình trạng này là chưa kích hoạt, hoặc giai đoạn này chưa đợi, hoặc một câu chuyện con, nó không thể bị chia nhỏ.";
+$lang->story->errorEmptyReviewedBy = "『ReviewedBy』 không thể để trống.";
 $lang->story->mustChooseResult     = 'Chọn kết quả';
 $lang->story->mustChoosePreVersion = 'Chọn một phiên bản để chuyển thành.';
 $lang->story->noStory              = 'Không có câu chuyện nào';
@@ -265,6 +272,7 @@ $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Ple
 $lang->story->cannotDeleteParent   = "Không thể xóa {$lang->SRCommon} mẹ";
 $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->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->form = new stdclass();
 $lang->story->form->area     = 'Phạm vi';
@@ -274,7 +282,11 @@ $lang->story->form->file     = 'Nếu bất kỳ tập tin mà liên kết tới
 
 $lang->story->action = new stdclass();
 $lang->story->action->reviewed              = array('main' => '$date, ghi nhận bởi <strong>$actor</strong>. Kết quả là <strong>$extra</strong>.', 'extra' => 'reviewResultList');
-$lang->story->action->closed                = array('main' => '$date, được đóng bởi <strong>$actor</strong>.Lý do là <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
+$lang->story->action->passreviewed          = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Pass</strong>.');
+$lang->story->action->clarifyreviewed       = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Review Failed</strong>. Please re-initiate the review after changing.');
+$lang->story->action->rejectreviewed        = array('main' => '$date, ghi nhận bởi <strong>$actor</strong>. Kết quả là <strong>$extra</strong>. Lý do là <strong>$reason</strong>', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
+$lang->story->action->closed                = array('main' => '$date, được đóng bởi <strong>$actor</strong>. Lý do là <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
+$lang->story->action->reviewclosed          = array('main' => '$date, closed by <strong>System</strong>. The reasion is <strong>Review Failed</strong>.');
 $lang->story->action->linked2plan           = array('main' => '$date, liên kết bởi <strong>$actor</strong> tới kế hoạch <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan      = array('main' => '$date, bị hủy bởi <strong>$actor</strong> từ kế hoạch <strong>$extra</strong>.');
 $lang->story->action->linked2execution      = array('main' => '$date, liên kết bởi <strong>$actor</strong> tới ' . $lang->executionCommon . ' <strong>$extra</strong>.');
@@ -384,3 +396,11 @@ $lang->story->convertToTask->fieldList['spec']       = "Description";
 $lang->story->convertToTask->fieldList['pri']        = 'Priority';
 $lang->story->convertToTask->fieldList['mailto']     = 'Mailto';
 $lang->story->convertToTask->fieldList['assignedTo'] = 'AssignTo';
+
+$lang->story->categoryList['feature']     = 'Feature';
+$lang->story->categoryList['interface']   = 'Interface';
+$lang->story->categoryList['performance'] = 'Performance';
+$lang->story->categoryList['safe']        = 'Safe';
+$lang->story->categoryList['experience']  = 'Experience';
+$lang->story->categoryList['improve']     = 'Improve';
+$lang->story->categoryList['other']       = 'Other';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 547ba377bf..c32023f07a 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -22,12 +22,9 @@ $lang->story->affectedStories   = "影响的{$lang->story->story}";
 
 $lang->story->batchCreate        = "批量创建";
 $lang->story->change             = "变更";
-$lang->story->changeAction       = "变更{$lang->SRCommon}";
 $lang->story->changed            = "{$lang->SRCommon}变更";
 $lang->story->assignTo           = '指派';
-$lang->story->assignAction       = "指派{$lang->SRCommon}";
 $lang->story->review             = '评审';
-$lang->story->reviewAction       = "评审{$lang->SRCommon}";
 $lang->story->needReview         = '需要评审';
 $lang->story->batchReview        = '批量评审';
 $lang->story->edit               = "编辑";
@@ -36,16 +33,13 @@ $lang->story->subdivide          = '细分';
 $lang->story->link               = '关联';
 $lang->story->unlink             = '移除';
 $lang->story->track              = '跟踪矩阵';
+$lang->story->trackAB            = '矩阵';
 $lang->story->processStoryChange = '处理需求变更';
-$lang->story->subdivideAction    = "细分{$lang->SRCommon}";
 $lang->story->splitRequirent     = '拆分';
 $lang->story->close              = '关闭';
-$lang->story->closeAction        = "关闭{$lang->SRCommon}";
 $lang->story->batchClose         = '批量关闭';
 $lang->story->activate           = '激活';
-$lang->story->activateAction     = "激活{$lang->SRCommon}";
 $lang->story->delete             = "删除";
-$lang->story->deleteAction       = "删除{$lang->SRCommon}";
 $lang->story->view               = "{$lang->SRCommon}详情";
 $lang->story->setting            = "设置";
 $lang->story->tasks              = "相关任务";
@@ -60,11 +54,9 @@ $lang->story->caseCountAB        = 'C';
 $lang->story->linkStory          = "关联{$lang->SRCommon}";
 $lang->story->unlinkStory        = "移除相关{$lang->SRCommon}";
 $lang->story->export             = "导出数据";
-$lang->story->exportAction       = "导出{$lang->SRCommon}";
 $lang->story->zeroCase           = "零用例{$lang->SRCommon}";
 $lang->story->zeroTask           = "只列零任务{$lang->SRCommon}";
 $lang->story->reportChart        = "统计报表";
-$lang->story->reportAction       = "统计报表";
 $lang->story->copyTitle          = "同{$lang->SRCommon}名称";
 $lang->story->batchChangePlan    = "批量修改计划";
 $lang->story->batchChangeBranch  = "批量修改分支";
@@ -76,10 +68,22 @@ $lang->story->toTask             = '转任务';
 $lang->story->batchToTask        = '批量转任务';
 $lang->story->convertRelations   = '换算关系';
 
+$lang->story->editAction      = "编辑{$lang->SRCommon}";
+$lang->story->changeAction    = "变更{$lang->SRCommon}";
+$lang->story->assignAction    = "指派{$lang->SRCommon}";
+$lang->story->reviewAction    = "评审{$lang->SRCommon}";
+$lang->story->subdivideAction = "细分{$lang->SRCommon}";
+$lang->story->closeAction     = "关闭{$lang->SRCommon}";
+$lang->story->activateAction  = "激活{$lang->SRCommon}";
+$lang->story->deleteAction    = "删除{$lang->SRCommon}";
+$lang->story->exportAction    = "导出{$lang->SRCommon}";
+$lang->story->reportAction    = "统计报表";
+
 $lang->story->skipStory       = '需求：%s 为父需求，将不会被关闭。';
 $lang->story->closedStory     = '需求：%s 已关闭，将不会被关闭。';
 $lang->story->batchToTaskTips = "此操作会创建与所选{$lang->SRCommon}同名的任务，并将{$lang->SRCommon}关联到任务中，已关闭的需求不会转为任务。";
 $lang->story->successToTask   = '批量转任务成功';
+$lang->story->storyRound      = '第 %s 轮估算';
 
 $lang->story->common         = $lang->SRCommon;
 $lang->story->id             = '编号';
@@ -93,7 +97,7 @@ $lang->story->source         = "来源";
 $lang->story->sourceNote     = '来源备注';
 $lang->story->fromBug        = '来源Bug';
 $lang->story->title          = "{$lang->SRCommon}名称";
-$lang->story->type           = "类型";
+$lang->story->category       = "类型";
 $lang->story->color          = '标题颜色';
 $lang->story->toBug          = '转Bug';
 $lang->story->spec           = "描述";
@@ -120,6 +124,7 @@ $lang->story->closedDate     = '关闭日期';
 $lang->story->closedReason   = '关闭原因';
 $lang->story->rejectedReason = '拒绝原因';
 $lang->story->reviewedBy     = '由谁评审';
+$lang->story->reviewers      = '评审人员';
 $lang->story->reviewedDate   = '评审时间';
 $lang->story->version        = '版本号';
 $lang->story->plan           = "所属计划";
@@ -152,6 +157,8 @@ $lang->story->noRequirement  = '无需求';
 $lang->story->one            = '一个';
 $lang->story->field          = '同步的字段';
 $lang->story->completeRate   = '完成率';
+$lang->story->reviewed       = '已评审';
+$lang->story->toBeReviewed   = '待评审';
 
 $lang->story->ditto       = '同上';
 $lang->story->dittoNotice = "该{$lang->SRCommon}与上一{$lang->SRCommon}不属于同一产品！";
@@ -247,7 +254,7 @@ $lang->story->lblClose             = "关闭{$lang->SRCommon}";
 $lang->story->lblTBC               = '任务Bug用例';
 
 $lang->story->checkAffection       = '影响范围';
-$lang->story->affectedProjects     = '影响的' . $lang->executionCommon;
+$lang->story->affectedProjects     = "影响的{$lang->project->common}或{$lang->execution->common}";
 $lang->story->affectedBugs         = '影响的Bug';
 $lang->story->affectedCases        = '影响的用例';
 
@@ -257,6 +264,7 @@ $lang->story->successSaved          = "{$lang->SRCommon}成功添加，";
 $lang->story->confirmDelete         = "您确认删除该{$lang->SRCommon}吗?";
 $lang->story->errorEmptyChildStory  = "『细分{$lang->SRCommon}』不能为空。";
 $lang->story->errorNotSubdivide     = "状态不是激活，或者阶段不是未开始的{$lang->SRCommon}，或者是子需求，则不能细分。";
+$lang->story->errorEmptyReviewedBy  = "『由谁评审』不能为空。";
 $lang->story->mustChooseResult      = '必须选择评审结果';
 $lang->story->mustChoosePreVersion  = '必须选择回溯的版本';
 $lang->story->noStory               = "暂时没有{$lang->SRCommon}。";
@@ -265,6 +273,7 @@ $lang->story->ignoreChangeStage     = "{$lang->SRCommon} %s 为草稿状态或
 $lang->story->cannotDeleteParent    = "不能删除父{$lang->SRCommon}";
 $lang->story->moveChildrenTips      = "修改父{$lang->SRCommon}的所属产品会将其下的子{$lang->SRCommon}也移动到所选产品下。";
 $lang->story->changeTips            = '该软件需求关联的用户需求有变更，点击“不变更”忽略此条变更，点击“变更”来进行该软件需求的变更。';
+$lang->story->estimateMustBeNumber  = '估算值必须是数字';
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = "该{$lang->SRCommon}所属范围";
@@ -274,7 +283,11 @@ $lang->story->form->file      = "附件，如果该{$lang->SRCommon}有相关文
 
 $lang->story->action = new stdclass();
 $lang->story->action->reviewed              = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
+$lang->story->action->passreviewed          = array('main' => '$date, 由 <strong>系统</strong> 判定，结果为 <strong>确认通过</strong>。');
+$lang->story->action->clarifyreviewed       = array('main' => '$date, 由 <strong>系统</strong> 判定，结果为 <strong>评审不通过</strong>，请变更后重新发起评审。');
+$lang->story->action->rejectreviewed        = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>，原因为 <strong>$reason</strong>。', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
 $lang->story->action->closed                = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
+$lang->story->action->reviewclosed          = array('main' => '$date, 由 <strong>系统</strong> 关闭，原因为 <strong>评审失败</strong>。');
 $lang->story->action->linked2plan           = array('main' => '$date, 由 <strong>$actor</strong> 关联到计划 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfromplan      = array('main' => '$date, 由 <strong>$actor</strong> 从计划 <strong>$extra</strong> 移除。');
 $lang->story->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
@@ -384,3 +397,11 @@ $lang->story->convertToTask->fieldList['spec']       = "{$lang->SRCommon}描述"
 $lang->story->convertToTask->fieldList['pri']        = '优先级';
 $lang->story->convertToTask->fieldList['mailto']     = '抄送给';
 $lang->story->convertToTask->fieldList['assignedTo'] = '指派给';
+
+$lang->story->categoryList['feature']     = '功能';
+$lang->story->categoryList['interface']   = '接口';
+$lang->story->categoryList['performance'] = '性能';
+$lang->story->categoryList['safe']        = '安全';
+$lang->story->categoryList['experience']  = '体验';
+$lang->story->categoryList['improve']     = '改进';
+$lang->story->categoryList['other']       = '其他';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index f6d891015b..9adabeb2c2 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -22,12 +22,9 @@ $lang->story->affectedStories   = "影響的{$lang->story->story}";
 
 $lang->story->batchCreate        = "批量創建";
 $lang->story->change             = "變更";
-$lang->story->changeAction       = "變更{$lang->SRCommon}";
 $lang->story->changed            = "{$lang->SRCommon}變更";
 $lang->story->assignTo           = '指派';
-$lang->story->assignAction       = "指派{$lang->SRCommon}";
 $lang->story->review             = '評審';
-$lang->story->reviewAction       = "評審{$lang->SRCommon}";
 $lang->story->needReview         = '需要評審';
 $lang->story->batchReview        = '批量評審';
 $lang->story->edit               = "編輯";
@@ -36,16 +33,13 @@ $lang->story->subdivide          = '細分';
 $lang->story->link               = '關聯';
 $lang->story->unlink             = '移除';
 $lang->story->track              = '跟蹤矩陣';
+$lang->story->trackAB            = '矩陣';
 $lang->story->processStoryChange = '處理需求變更';
-$lang->story->subdivideAction    = "細分{$lang->SRCommon}";
 $lang->story->splitRequirent     = '拆分';
 $lang->story->close              = '關閉';
-$lang->story->closeAction        = "關閉{$lang->SRCommon}";
 $lang->story->batchClose         = '批量關閉';
 $lang->story->activate           = '激活';
-$lang->story->activateAction     = "激活{$lang->SRCommon}";
 $lang->story->delete             = "刪除";
-$lang->story->deleteAction       = "刪除{$lang->SRCommon}";
 $lang->story->view               = "{$lang->SRCommon}詳情";
 $lang->story->setting            = "設置";
 $lang->story->tasks              = "相關任務";
@@ -60,11 +54,9 @@ $lang->story->caseCountAB        = 'C';
 $lang->story->linkStory          = "關聯{$lang->SRCommon}";
 $lang->story->unlinkStory        = "移除相關{$lang->SRCommon}";
 $lang->story->export             = "導出數據";
-$lang->story->exportAction       = "導出{$lang->SRCommon}";
 $lang->story->zeroCase           = "零用例{$lang->SRCommon}";
 $lang->story->zeroTask           = "只列零任務{$lang->SRCommon}";
 $lang->story->reportChart        = "統計報表";
-$lang->story->reportAction       = "統計報表";
 $lang->story->copyTitle          = "同{$lang->SRCommon}名稱";
 $lang->story->batchChangePlan    = "批量修改計劃";
 $lang->story->batchChangeBranch  = "批量修改分支";
@@ -76,10 +68,22 @@ $lang->story->toTask             = '轉任務';
 $lang->story->batchToTask        = '批量轉任務';
 $lang->story->convertRelations   = '換算關係';
 
+$lang->story->editAction      = "編輯{$lang->SRCommon}";
+$lang->story->changeAction    = "變更{$lang->SRCommon}";
+$lang->story->assignAction    = "指派{$lang->SRCommon}";
+$lang->story->reviewAction    = "評審{$lang->SRCommon}";
+$lang->story->subdivideAction = "細分{$lang->SRCommon}";
+$lang->story->closeAction     = "關閉{$lang->SRCommon}";
+$lang->story->activateAction  = "激活{$lang->SRCommon}";
+$lang->story->deleteAction    = "刪除{$lang->SRCommon}";
+$lang->story->exportAction    = "導出{$lang->SRCommon}";
+$lang->story->reportAction    = "統計報表";
+
 $lang->story->skipStory       = '需求：%s 為父需求，將不會被關閉。';
 $lang->story->closedStory     = '需求：%s 已關閉，將不會被關閉。';
 $lang->story->batchToTaskTips = "此操作會創建與所選{$lang->SRCommon}同名的任務，並將{$lang->SRCommon}關聯到任務中，已關閉的需求不會轉為任務。";
 $lang->story->successToTask   = '批量轉任務成功';
+$lang->story->storyRound      = '第 %s 輪估算';
 
 $lang->story->common         = $lang->SRCommon;
 $lang->story->id             = '編號';
@@ -93,7 +97,7 @@ $lang->story->source         = "來源";
 $lang->story->sourceNote     = '來源備註';
 $lang->story->fromBug        = '來源Bug';
 $lang->story->title          = "{$lang->SRCommon}名稱";
-$lang->story->type           = "類型";
+$lang->story->category       = "類型";
 $lang->story->color          = '標題顏色';
 $lang->story->toBug          = '轉Bug';
 $lang->story->spec           = "描述";
@@ -120,6 +124,7 @@ $lang->story->closedDate     = '關閉日期';
 $lang->story->closedReason   = '關閉原因';
 $lang->story->rejectedReason = '拒絶原因';
 $lang->story->reviewedBy     = '由誰評審';
+$lang->story->reviewers      = '評審人員';
 $lang->story->reviewedDate   = '評審時間';
 $lang->story->version        = '版本號';
 $lang->story->plan           = "所屬計劃";
@@ -152,6 +157,8 @@ $lang->story->noRequirement  = '無需求';
 $lang->story->one            = '一個';
 $lang->story->field          = '同步的欄位';
 $lang->story->completeRate   = '完成率';
+$lang->story->reviewed       = '已評審';
+$lang->story->toBeReviewed   = '待評審';
 
 $lang->story->ditto       = '同上';
 $lang->story->dittoNotice = "該{$lang->SRCommon}與上一{$lang->SRCommon}不屬於同一產品！";
@@ -247,7 +254,7 @@ $lang->story->lblClose             = "關閉{$lang->SRCommon}";
 $lang->story->lblTBC               = '任務Bug用例';
 
 $lang->story->checkAffection       = '影響範圍';
-$lang->story->affectedProjects     = '影響的' . $lang->executionCommon;
+$lang->story->affectedProjects     = "影響的{$lang->project->common}或{$lang->execution->common}";
 $lang->story->affectedBugs         = '影響的Bug';
 $lang->story->affectedCases        = '影響的用例';
 
@@ -257,6 +264,7 @@ $lang->story->successSaved          = "{$lang->SRCommon}成功添加，";
 $lang->story->confirmDelete         = "您確認刪除該{$lang->SRCommon}嗎?";
 $lang->story->errorEmptyChildStory  = "『細分{$lang->SRCommon}』不能為空。";
 $lang->story->errorNotSubdivide     = "狀態不是激活，或者階段不是未開始的{$lang->SRCommon}，或者是子需求，則不能細分。";
+$lang->story->errorEmptyReviewedBy  = "『由誰評審』不能為空。";
 $lang->story->mustChooseResult      = '必須選擇評審結果';
 $lang->story->mustChoosePreVersion  = '必須選擇回溯的版本';
 $lang->story->noStory               = "暫時沒有{$lang->SRCommon}。";
@@ -265,6 +273,7 @@ $lang->story->ignoreChangeStage     = "{$lang->SRCommon} %s 為草稿狀態或
 $lang->story->cannotDeleteParent    = "不能刪除父{$lang->SRCommon}";
 $lang->story->moveChildrenTips      = "修改父{$lang->SRCommon}的所屬產品會將其下的子{$lang->SRCommon}也移動到所選產品下。";
 $lang->story->changeTips            = '該軟件需求關聯的用戶需求有變更，點擊“不變更”忽略此條變更，點擊“變更”來進行該軟件需求的變更。';
+$lang->story->estimateMustBeNumber  = '估算值必須是數字';
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = "該{$lang->SRCommon}所屬範圍";
@@ -273,22 +282,26 @@ $lang->story->form->resource  = '資源分配，有誰完成？需要多少時
 $lang->story->form->file      = "附件，如果該{$lang->SRCommon}有相關檔案，請點此上傳。";
 
 $lang->story->action = new stdclass();
-$lang->story->action->reviewed            = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
-$lang->story->action->closed              = array('main' => '$date, 由 <strong>$actor</strong> 關閉，原因為 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
-$lang->story->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 關聯到計劃 <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 從計劃 <strong>$extra</strong> 移除。');
-$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到' . $lang->executionCommon . ' <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 從' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
-$lang->story->action->linked2prj          = array('main' => '$date, 由 <strong>$actor</strong> 關聯到項目 <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromprj     = array('main' => '$date, 由 <strong>$actor</strong> 從項目 <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>。');
-$lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 <strong>$actor</strong> 從發佈 <strong>$extra</strong> 移除。');
-$lang->story->action->linkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 關聯相關{$lang->SRCommon} <strong>\$extra</strong>。");
-$lang->story->action->subdividestory      = array('main' => "\$date, 由 <strong>\$actor</strong> 細分為{$lang->SRCommon}   <strong>\$extra</strong>。");
-$lang->story->action->unlinkrelatedstory  = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相關{$lang->SRCommon} <strong>\$extra</strong>。");
-$lang->story->action->unlinkchildstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除細分{$lang->SRCommon} <strong>\$extra</strong>。");
+$lang->story->action->reviewed              = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
+$lang->story->action->passreviewed          = array('main' => '$date, 由 <strong>系統</strong> 判定，結果為 <strong>確認通過</strong>。');
+$lang->story->action->clarifyreviewed       = array('main' => '$date, 由 <strong>系統</strong> 判定，結果為 <strong>評審不通過</strong>，請變更後重新發起評審。');
+$lang->story->action->rejectreviewed        = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>，原因為 <strong>$reason</strong>。', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
+$lang->story->action->closed                = array('main' => '$date, 由 <strong>$actor</strong> 關閉，原因為 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
+$lang->story->action->reviewclosed          = array('main' => '$date, 由 <strong>系統</strong> 關閉，原因為 <strong>評審失敗</strong>。');
+$lang->story->action->linked2plan           = array('main' => '$date, 由 <strong>$actor</strong> 關聯到計劃 <strong>$extra</strong>。');
+$lang->story->action->unlinkedfromplan      = array('main' => '$date, 由 <strong>$actor</strong> 從計劃 <strong>$extra</strong> 移除。');
+$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->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->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>。');
+$lang->story->action->unlinkedfromrelease   = array('main' => '$date, 由 <strong>$actor</strong> 從發佈 <strong>$extra</strong> 移除。');
+$lang->story->action->linkrelatedstory      = array('main' => "\$date, 由 <strong>\$actor</strong> 關聯相關{$lang->SRCommon} <strong>\$extra</strong>。");
+$lang->story->action->subdividestory        = array('main' => "\$date, 由 <strong>\$actor</strong> 細分為{$lang->SRCommon}   <strong>\$extra</strong>。");
+$lang->story->action->unlinkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相關{$lang->SRCommon} <strong>\$extra</strong>。");
+$lang->story->action->unlinkchildstory      = array('main' => "\$date, 由 <strong>\$actor</strong> 移除細分{$lang->SRCommon} <strong>\$extra</strong>。");
 
 /* 統計報表。*/
 $lang->story->report = new stdclass();
@@ -384,3 +397,11 @@ $lang->story->convertToTask->fieldList['spec']       = "{$lang->SRCommon}描述"
 $lang->story->convertToTask->fieldList['pri']        = '優先順序';
 $lang->story->convertToTask->fieldList['mailto']     = '抄送給';
 $lang->story->convertToTask->fieldList['assignedTo'] = '指派給';
+
+$lang->story->categoryList['feature']     = '功能';
+$lang->story->categoryList['interface']   = '介面';
+$lang->story->categoryList['performance'] = '性能';
+$lang->story->categoryList['safe']        = '安全';
+$lang->story->categoryList['experience']  = '體驗';
+$lang->story->categoryList['improve']     = '改進';
+$lang->story->categoryList['other']       = '其他';
diff --git a/module/story/model.php b/module/story/model.php
index ece2ee9f33..085e5a6bd1 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -186,6 +186,13 @@ class storyModel extends model
      */
     public function create($executionID = 0, $bugID = 0, $from = '')
     {
+        if(isset($_POST['reviewer'])) $_POST['reviewer'] = array_filter($_POST['reviewer']);
+        if(!$this->post->needNotReview and empty($_POST['reviewer']))
+        {
+            dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
+            return false;
+        }
+
         $now   = helper::now();
         $story = fixer::input('post')
             ->cleanInt('product,module,pri,plan')
@@ -204,7 +211,7 @@ class storyModel extends model
             ->setIF($bugID > 0, 'fromBug', $bugID)
             ->join('mailto', ',')
             ->stripTags($this->config->story->editor->create['id'], $this->config->allowedTags)
-            ->remove('files,labels,needNotReview,newStory,uid,contactListMenu,URS')
+            ->remove('files,labels,reviewer,needNotReview,newStory,uid,contactListMenu,URS')
             ->get();
 
         /* Check repeat story. */
@@ -243,11 +250,24 @@ class storyModel extends model
             $data->verify  = $story->verify;
             $this->dao->insert(TABLE_STORYSPEC)->data($data)->exec();
 
+            /* Save the story reviewer to storyreview table. */
+            if(isset($_POST['reviewer']))
+            {
+                foreach($this->post->reviewer as $reviewer)
+                {
+                    $reviewData = new stdclass();
+                    $reviewData->story    = $storyID;
+                    $reviewData->version  = 1;
+                    $reviewData->reviewer = $reviewer;
+                    $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
+                }
+            }
+
             /* Project or execution linked story. */
             if($executionID != 0 and $story->status != 'draft')
             {
                 $this->linkStory($executionID, $this->post->product, $storyID);
-                if($executionID != $this->session->PRJ) $this->linkStory($this->session->PRJ, $this->post->product, $storyID);
+                if($executionID != $this->session->project) $this->linkStory($this->session->project, $this->post->product, $storyID);
             }
 
             if(is_array($this->post->URS))
@@ -333,6 +353,16 @@ class storyModel extends model
      */
     public function batchCreate($productID = 0, $branch = 0, $type = 'story')
     {
+        foreach($_POST['needReview'] as $index => $value)
+        {
+            if($_POST['title'][$index] and isset($_POST['reviewer'][$index])) $_POST['reviewer'][$index] = array_filter($_POST['reviewer'][$index]);
+            if($_POST['title'][$index] and $value and empty($_POST['reviewer'][$index]))
+            {
+                dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
+                return false;
+            }
+        }
+
         $this->loadModel('action');
         $branch    = (int)$branch;
         $productID = (int)$productID;
@@ -376,9 +406,11 @@ class storyModel extends model
             $story->color      = $stories->color[$i];
             $story->title      = $stories->title[$i];
             $story->source     = $stories->source[$i];
+            $story->category   = $stories->category[$i];
             $story->pri        = $stories->pri[$i];
             $story->estimate   = $stories->estimate[$i];
-            $story->status     = ($stories->needReview[$i] == 0 and !$forceReview) ? 'active' : 'draft';
+            $story->status     = ($this->app->openApp == project or $this->app->openApp == execution or ($stories->needReview[$i] == 0 and !$forceReview)) ? 'active' : 'draft';
+            $story->stage      = ($this->app->openApp == project or $this->app->openApp == execution) ? 'projected' : 'wait';
             $story->keywords   = $stories->keywords[$i];
             $story->sourceNote = $stories->sourceNote[$i];
             $story->product    = $productID;
@@ -468,6 +500,19 @@ class storyModel extends model
 
             $this->dao->insert(TABLE_STORYSPEC)->data($specData)->exec();
 
+            /* Save the story reviewer to storyreview table. */
+            if(isset($_POST['reviewer'][$i]))
+            {
+                foreach($_POST['reviewer'][$i] as $reviewer)
+                {
+                    $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', '');
@@ -477,7 +522,6 @@ class storyModel extends model
             $mails[$i]->actionID = $actionID;
         }
 
-
         /* Remove upload image file and session. */
         if(!empty($stories->uploadImage) and $this->session->storyImagesFile)
         {
@@ -519,6 +563,13 @@ class storyModel extends model
             return false;
         }
 
+        if(isset($_POST['reviewer'])) $_POST['reviewer'] = array_filter($_POST['reviewer']);
+        if(!$this->post->needNotReview and empty($_POST['reviewer']))
+        {
+            dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
+            return false;
+        }
+
         $story = fixer::input('post')->stripTags($this->config->story->editor->change['id'], $this->config->allowedTags)->get();
         if($story->spec != $oldStory->spec or $story->verify != $oldStory->verify or $story->title != $oldStory->title or $this->loadModel('file')->getCount()) $specChanged = true;
 
@@ -526,9 +577,7 @@ class storyModel extends model
         $story = fixer::input('post')
             ->callFunc('title', 'trim')
             ->setDefault('lastEditedBy', $this->app->user->account)
-            ->setDefault('lastEditedDate', $now)
-            ->setIF($this->post->assignedTo == '', 'assignedTo', $oldStory->assignedTo)
-            ->setIF($this->post->assignedTo != '' and $this->post->assignedTo != $oldStory->assignedTo, 'assignedDate', $now)
+            ->add('lastEditedDate', $now)
             ->setIF($specChanged, 'version', $oldStory->version + 1)
             ->setIF($specChanged and $oldStory->status == 'active' and $this->post->needNotReview == false, 'status',  'changed')
             ->setIF($specChanged and $oldStory->status == 'draft'  and $this->post->needNotReview, 'status', 'active')
@@ -538,7 +587,7 @@ class storyModel extends model
             ->setIF($specChanged and $oldStory->reviewedBy, 'reviewedDate',  '0000-00-00')
             ->setIF($specChanged and $oldStory->closedBy,   'closedDate',   '0000-00-00')
             ->stripTags($this->config->story->editor->change['id'], $this->config->allowedTags)
-            ->remove('files,labels,comment,needNotReview,uid')
+            ->remove('files,labels,reviewer,comment,needNotReview,uid')
             ->get();
         if($specChanged and $story->status == 'active' and $this->checkForceReview()) $story->status = 'changed';
         $story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->change['id'], $this->post->uid);
@@ -546,6 +595,7 @@ class storyModel extends model
             ->autoCheck()
             ->batchCheck($this->config->story->change->requiredFields, 'notempty')
             ->where('id')->eq((int)$storyID)->exec();
+
         if(!dao::isError())
         {
             if($specChanged)
@@ -582,7 +632,23 @@ class storyModel extends model
             {
                 unset($story->spec);
                 unset($oldStory->spec);
+
+                if(isset($_POST['reviewer'])) $this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->notin(implode(',', $_POST['reviewer']))->exec();
             }
+
+            /* Update the reviewer. */
+            $oldReviewerList = $this->getReviewerPairs($storyID, $oldStory->version);
+            foreach($_POST['reviewer'] as $reviewer)
+            {
+                if(!$specChanged and in_array($reviewer, array_keys($oldReviewerList))) continue;
+
+                $reviewData = new stdclass();
+                $reviewData->story    = $storyID;
+                $reviewData->version  = $specChanged ? $story->version : $oldStory->version;
+                $reviewData->reviewer = $reviewer;
+                $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
+            }
+
             $this->file->updateObjectID($this->post->uid, $storyID, 'story');
             return common::createChanges($oldStory, $story);
         }
@@ -627,7 +693,7 @@ class storyModel extends model
             ->join('mailto', ',')
             ->join('linkStories', ',')
             ->join('childStories', ',')
-            ->remove('files,labels,comment,contactListMenu,stages')
+            ->remove('files,labels,comment,contactListMenu,stages,reviewer')
             ->get();
 
         if(isset($story->plan) and is_array($story->plan)) $story->plan = trim(join(',', $story->plan), ',');
@@ -742,6 +808,24 @@ class storyModel extends model
                 if(empty($oldStory->plan) or empty($story->plan)) $this->setStage($storyID); // Set new stage for this story.
             }
 
+            $_POST['reviewer']   = array_filter($_POST['reviewer']);
+            $oldReviewer         = $this->getReviewerPairs($storyID, $oldStory->version);
+            $oldStory->reviewers = implode(',', array_keys($oldReviewer));
+            $story->reviewers    = implode(',', $_POST['reviewer']);
+
+            /* Update story reviewer. */
+            $this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->notin(implode(',', $_POST['reviewer']))->exec();
+            foreach($_POST['reviewer'] as $reviewer)
+            {
+                if(in_array($reviewer, array_keys($oldReviewer))) continue;
+
+                $reviewData = new stdclass();
+                $reviewData->story    = $storyID;
+                $reviewData->version  = $oldStory->version;
+                $reviewData->reviewer = $reviewer;
+                $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
+            }
+
             unset($oldStory->parent);
             unset($story->parent);
             return common::createChanges($oldStory, $story);
@@ -1008,12 +1092,13 @@ class storyModel extends model
                 $story->color          = $data->colors[$storyID];
                 $story->title          = $data->titles[$storyID];
                 $story->estimate       = $data->estimates[$storyID];
+                $story->category       = $data->category[$storyID];
                 $story->pri            = $data->pris[$storyID];
                 $story->assignedTo     = $data->assignedTo[$storyID];
                 $story->assignedDate   = $oldStory == $data->assignedTo[$storyID] ? $oldStory->assignedDate : $now;
                 $story->branch         = isset($data->branches[$storyID]) ? $data->branches[$storyID] : 0;
                 $story->module         = $data->modules[$storyID];
-                $story->plan           = $data->plans[$storyID];
+                $story->plan           = $oldStories[$storyID]->parent < 0 ? '' : $data->plans[$storyID];
                 $story->source         = $data->sources[$storyID];
                 $story->keywords       = $data->keywords[$storyID];
                 $story->stage          = isset($data->stages[$storyID])             ? $data->stages[$storyID]             : $oldStory->stage;
@@ -1068,7 +1153,7 @@ class storyModel extends model
                     if($oldStory->plan != $story->plan) $this->updateStoryOrderOfPlan($storyID, $story->plan, $oldStory->plan);
 
                     $this->executeHooks($storyID);
-                    $this->batchChangeStage(array($storyID), $story->stage);
+                    if($story->type == 'story') $this->batchChangeStage(array($storyID), $story->stage);
                     if($story->closedReason == 'done') $this->loadModel('score')->create('story', 'close');
                     $allChanges[$storyID] = common::createChanges($oldStory, $story);
                 }
@@ -1103,32 +1188,44 @@ class storyModel extends model
         $oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
         $now      = helper::now();
         $date     = helper::today();
-        $story = fixer::input('post')
-            ->setDefault('reviewedDate', $date)
+        $story    = fixer::input('post')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
-            ->setDefault('reviewedBy', '')
-            ->setIF($this->post->result == 'pass' and $oldStory->status == 'draft',   'status', 'active')
-            ->setIF($this->post->result == 'pass' and $oldStory->status == 'changed', 'status', 'active')
-            ->setIF($this->post->result == 'reject', 'closedBy',   $this->app->user->account)
-            ->setIF($this->post->result == 'reject', 'closedDate', $now)
-            ->setIF($this->post->result == 'reject', 'assignedTo', 'closed')
-            ->setIF($this->post->result == 'reject', 'status', 'closed')
-            ->setIF($this->post->result == 'reject', 'stage', 'closed')
+            ->setDefault('status', $oldStory->status)
             ->setIF($this->post->result == 'revert', 'version', $this->post->preVersion)
             ->setIF($this->post->result == 'revert', 'status',  'active')
-            ->setIF($this->post->closedReason == 'done', 'stage', 'released')
             ->removeIF($this->post->result != 'reject', 'closedReason, duplicateStory, childStories')
             ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'duplicate', 'duplicateStory')
             ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'subdivided', 'childStories')
-            ->join('reviewedBy', ',')
+            ->add('reviewedDate', $now)
+            ->add('reviewedBy', $oldStory->reviewedBy . ',' . $this->app->user->account)
             ->remove('result,preVersion,comment')
             ->get();
 
-        /* fix bug #671. */
+        /* Fix bug #671. */
         $this->lang->story->closedReason = $this->lang->story->rejectedReason;
 
-        $this->dao->update(TABLE_STORY)->data($story)
+        $this->dao->update(TABLE_STORYREVIEW)->set('result')->eq($this->post->result)->set('reviewDate')->eq($now)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->eq($this->app->user->account)->exec();
+
+        /* Update the story status by review rules. */
+        $reviewerList = $this->getReviewerPairs($storyID, $oldStory->version);
+        $reviewedBy   = explode(',', trim($story->reviewedBy, ','));
+        if(!array_diff(array_keys($reviewerList), $reviewedBy))
+        {
+            $status        = $this->setStatusByReviewRules($reviewerList);
+            $story->status = $status ? $status : $oldStory->status;
+            if($story->status == 'closed')
+            {
+                $story->closedBy     = $this->app->user->account;
+                $story->closedDate   = $now;
+                $story->assignedTo   = 'closed';
+                $story->assignedDate = $now;
+                $story->stage        = 'closed';
+                if($this->post->closedReason == 'done') $story->stage = 'released';
+            }
+        }
+
+        $this->dao->update(TABLE_STORY)->data($story, 'closedReason')
             ->autoCheck()
             ->batchCheck($this->config->story->review->requiredFields, 'notempty')
             ->checkIF($this->post->result == 'reject', 'closedReason', 'notempty')
@@ -1148,6 +1245,7 @@ class storyModel extends model
         }
         if($this->post->result != 'reject') $this->setStage($storyID);
 
+        if(isset($story->closedReason)) unset($story->closedReason);
         return common::createChanges($oldStory, $story);
     }
 
@@ -1161,37 +1259,54 @@ class storyModel extends model
     function batchReview($storyIdList, $result, $reason)
     {
         $now     = helper::now();
-        $date    = helper::today();
         $actions = array();
         $this->loadModel('action');
 
-        $oldStories = $this->getByList($storyIdList);
+        $oldStories   = $this->getByList($storyIdList);
+        $hasResult    = $this->dao->select('story,version,result')->from(TABLE_STORYREVIEW)->where('story')->in($storyIdList)->andWhere('reviewer')->eq($this->app->user->account)->andWhere('result')->ne('')->orderBy('version')->fetchAll('story');
+        $reviewerList = $this->dao->select('story,reviewer,result,version')->from(TABLE_STORYREVIEW)->where('story')->in($storyIdList)->orderBy('version')->fetchGroup('story', 'reviewer');
         foreach($storyIdList as $storyID)
         {
             $oldStory = $oldStories[$storyID];
             if($oldStory->status != 'draft' and $oldStory->status != 'changed') continue;
+            if(isset($hasResult[$storyID])) continue;
 
             $story = new stdClass();
-            $story->reviewedDate   = $date;
+            $story->reviewedDate   = $now;
             $story->lastEditedBy   = $this->app->user->account;
             $story->lastEditedDate = $now;
-            $story->reviewedBy     = $this->app->user->account;
-            if($result == 'pass') $story->status = 'active';
-            if($reason == 'done') $story->stage = 'released';
-            if($result == 'reject')
+            $story->reviewedBy     = $oldStory->reviewedBy . ',' . $this->app->user->account;
+            $story->status         = $oldStory->status;
+
+            $this->dao->update(TABLE_STORYREVIEW)->set('result')->eq($result)->set('reviewDate')->eq($now)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->eq($this->app->user->account)->exec();
+
+            /* Update the story status by review rules. */
+            $reviewedBy = explode(',', trim($story->reviewedBy, ','));
+            if(!array_diff(array_keys($reviewerList[$storyID]), $reviewedBy))
             {
-                $story->status     = 'closed';
-                $story->closedBy   = $this->app->user->account;
-                $story->closedDate = $now;
-                $story->assignedTo = closed;
-                $this->action->create('story', $storyID, 'Closed', '', ucfirst($reason));
+                $reviewerPairs = array();
+                foreach($reviewerList[$storyID] as $reviewer => $reviewInfo) $reviewerPairs[$reviewer] = $reviewInfo->result;
+                $reviewerPairs[$this->app->user->account] = $result;
+
+                $status = $this->setStatusByReviewRules($reviewerPairs);
+                $story->status = $status ? $status : $oldStory->status;
+
+                if($story->status == 'closed')
+                {
+                    $story->closedBy   = $this->app->user->account;
+                    $story->closedDate = $now;
+                    $story->assignedTo = 'closed';
+                    $story->stage      = 'closed';
+                    if($reason == 'done') $story->stage = 'released';
+                }
             }
 
             $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq($storyID)->exec();
             $this->setStage($storyID);
 
-            if($reason and strpos('done,postponed', $reason) !== false) $result = 'pass';
-            $actions[$storyID] = $this->action->create('story', $storyID, 'Reviewed', '', ucfirst($result));
+            $story->id         = $storyID;
+            $story->version    = $oldStory->version;
+            $actions[$storyID] = $this->recordReviewAction($story, $result, $reason);
         }
 
         return $actions;
@@ -1238,7 +1353,10 @@ class storyModel extends model
             }
 
             if(dao::isError()) die(js::error(dao::getError()));
-            die(js::locate(helper::createLink('product', 'browse', "productID=$oldStory->product&branch=0&browseType=unclosed&queryID=0&type=story"), 'parent.parent'));
+
+            $isonlybody = isonlybody();
+            unset($_GET['onlybody']);
+            die(js::locate(helper::createLink('product', 'browse', "productID=$oldStory->product&branch=0&browseType=unclosed&queryID=0&type=story"), $isonlybody ? 'parent.parent' : 'parent'));
         }
         else
         {
@@ -1549,7 +1667,7 @@ class storyModel extends model
      * @param  int    $executionID
      * @param  int    $projectID
      * @access public
-     * @return bool
+     * @return bool|array
      */
     public function batchToTask($executionID, $projectID = 0)
     {
@@ -1575,6 +1693,7 @@ class storyModel extends model
         if(dao::isError()) return false;
 
         /* Create tasks. */
+        $tasks   = array();
         $stories = $this->getByList($data->storyIdList);
         foreach($stories as $story)
         {
@@ -1612,9 +1731,11 @@ class storyModel extends model
                 ->exec();
 
             if(dao::isError()) return false;
-            $taskID = $this->dao->lastInsertID();
+            $taskID  = $this->dao->lastInsertID();
+            $tasks[] = $taskID;
             $this->action->create('task', $taskID, 'Opened', '');
         }
+        return $tasks;
     }
 
     /**
@@ -1785,7 +1906,7 @@ class storyModel extends model
             ->andWhere('deleted')->eq(0)
             ->fetchGroup('type');
 
-        /* No tasks, then the stage is executioned. */
+        /* No tasks, then the stage is projected. */
         if(!$tasks and $executions)
         {
             foreach($stages as $branch => $stage)
@@ -2189,21 +2310,21 @@ class storyModel extends model
      */
     public function getBySearch($productID, $branch = 0, $queryID, $orderBy, $executionID = '', $type = 'story', $excludeStories = '', $pager = null)
     {
-        if($executionID != '')
+        if(!empty($executionID))
         {
-            $products = $this->loadModel('execution')->getProducts($executionID);
+            $products = $this->loadModel('project')->getProducts($executionID);
         }
         else
         {
-            $products = $this->loadModel('product')->getPairs();
+            $products = $this->loadModel('product')->getProducts();
         }
         $query = $queryID ? $this->loadModel('search')->getQuery($queryID) : '';
 
         /* Get the sql and form status from the query. */
         if($query)
         {
-            $this->session->set('storyQuery', $query->sql);
-            $this->session->set('storyForm', $query->form);
+            $this->session->set('storyQuery', $query->sql, $this->app->openApp);
+            $this->session->set('storyForm', $query->form, $this->app->openApp);
         }
         if($this->session->storyQuery == false) $this->session->set('storyQuery', ' 1 = 1');
 
@@ -2359,11 +2480,6 @@ class storyModel extends model
 
             $unclosedStatus = $this->lang->story->statusList;
             unset($unclosedStatus['closed']);
-            if($execution->type == 'project')
-            {
-                $statusFeatureList = $this->lang->projectstory->featureBarList['status'];
-                $otherFeatureList  = $this->lang->projectstory->featureBarList['other'];
-            }
 
             $stories = $this->dao->select('distinct t1.*, t2.*,t3.branch as productBranch,t4.type as productType,t2.version as version')->from(TABLE_PROJECTSTORY)->alias('t1')
                 ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
@@ -2375,15 +2491,14 @@ class storyModel extends model
                 ->beginIF($execution->type == 'project')
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)
                 ->beginIF($type == 'bybranch')->andWhere('t2.branch')->eq($branch)->fi()
-                ->beginIF(isset($statusFeatureList) and in_array($type, array_keys($statusFeatureList)))->andWhere('t2.status')->eq(substr($type, 0, -5))->fi()
-                ->beginIF(isset($otherFeatureList) and in_array($type, array_keys($otherFeatureList)))->andWhere('t2.' . substr($type, 0, -2))->eq($this->app->user->account)->fi()
+                ->beginIF(strpos('changed|closed', $type) !== false)->andWhere('t2.status')->eq($type)->fi()
                 ->beginIF($type == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
-                ->beginIF($type == 'willclose')->andWhere('t2.stage')->in('developed,released')->andWhere('t2.status')->ne('closed')->fi()
                 ->fi()
                 ->beginIF($execution->type != 'project')
                 ->beginIF(!empty($productParam))->andWhere('t1.product')->eq($productParam)->fi()
-                ->beginIF($this->session->executionStoryBrowseType == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
+                ->beginIF(strpos('changed|closed', $this->session->executionStoryBrowseType) !== false)->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
                 ->fi()
+                ->beginIF(strpos('changed|closed', $this->session->storyBrowseType) !== false)->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
                 ->beginIF(!empty($branchParam))->andWhere('t2.branch')->eq($branchParam)->fi()
                 ->beginIF($modules)->andWhere('t2.module')->in($modules)->fi()
                 ->andWhere('t2.deleted')->eq(0)
@@ -2517,13 +2632,16 @@ class storyModel extends model
      */
     public function getUserStories($account, $type = 'assignedTo', $orderBy = 'id_desc', $pager = null, $storyType = 'story')
     {
-        $stories = $this->dao->select('t1.*, t2.name as productTitle')->from(TABLE_STORY)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
-            ->where('t1.deleted')->eq(0)
+        $sql = $this->dao->select('t1.*, t2.name as productTitle')->from(TABLE_STORY)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id');
+        if($type == 'reviewBy') $sql = $sql->leftJoin(TABLE_STORYREVIEW)->alias('t3')->on('t1.id = t3.story and t1.version = t3.version');
+
+        $stories = $sql->where('t1.deleted')->eq(0)
             ->andWhere('t1.type')->eq($storyType)
             ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi()
             ->beginIF($type != 'all')
             ->beginIF($type == 'assignedTo')->andWhere('assignedTo')->eq($account)->fi()
+            ->beginIF($type == 'reviewBy')->andWhere('t3.reviewer')->eq($account)->andWhere('t3.result')->eq('')->fi()
             ->beginIF($type == 'openedBy')->andWhere('openedBy')->eq($account)->fi()
             ->beginIF($type == 'reviewedBy')->andWhere("CONCAT(',', reviewedBy, ',')")->like("%,$account,%")->fi()
             ->beginIF($type == 'closedBy')->andWhere('closedBy')->eq($account)->fi()
@@ -2607,13 +2725,15 @@ class storyModel extends model
     /**
      * Get zero case.
      *
-     * @param  int    $productID
+     * @param  int     $productID
+     * @param  int     $branchID
+     * @param  string  $orderBy
      * @access public
      * @return array
      */
-    public function getZeroCase($productID, $orderBy = 'id_desc')
+    public function getZeroCase($productID, $branchID = 0, $orderBy = 'id_desc')
     {
-        $allStories   = $this->getProductStories($productID, 0, 0, 'all', 'story', $orderBy, $hasParent = false, '', null);
+        $allStories   = $this->getProductStories($productID, $branchID, 0, 'all', 'story', $orderBy, $hasParent = false, '', null);
         $casedStories = $this->dao->select('DISTINCT story')->from(TABLE_CASE)->where('product')->eq($productID)->andWhere('story')->ne(0)->andWhere('deleted')->eq(0)->fetchAll('story');
 
         foreach($allStories as $key => $story)
@@ -2745,7 +2865,7 @@ class storyModel extends model
             }
             elseif($type == 'full')
             {
-                $property = '(' . $this->lang->story->pri . ':' . (!empty($this->lang->story->priList[$story->pri]) ? $this->lang->story->priList[$story->pri] : 0) . ',' . $this->lang->story->estimate . ':' . $this->lang->hourCommon . ')';
+                $property = '(' . $this->lang->story->pri . ':' . (!empty($this->lang->story->priList[$story->pri]) ? $this->lang->story->priList[$story->pri] : 0) . ',' . $this->lang->story->estimate . ':' . $story->estimate . ')';
             }
             else
             {
@@ -3155,14 +3275,19 @@ class storyModel extends model
 
         if($story->parent < 0 and $action != 'edit' and $action != 'batchcreate') return false;
 
-        if($action == 'change')     return $story->status != 'closed';
-        if($action == 'review')     return $story->status == 'draft' or $story->status == 'changed';
+        global $app;
+
+        $story->reviewer  = isset($story->reviewer)  ? $story->reviewer  : array();
+        $story->notReview = isset($story->notReview) ? $story->notReview : array();
+
+        if($action == 'change')     return (count($story->reviewer) == 0 || count($story->notReview) == 0) and $story->status != 'closed';
+        if($action == 'review')     return in_array($app->user->account, $story->notReview) and ($story->status == 'draft' or $story->status == 'changed');
         if($action == 'close')      return $story->status != 'closed';
         if($action == 'activate')   return $story->status == 'closed';
         if($action == 'assignto')   return $story->status != 'closed';
         if($action == 'createcase') return $story->type != 'requirement';
         if($action == 'batchcreate' and $story->parent > 0) return false;
-        if($action == 'batchcreate' and $story->type == 'requirement') return $story->status != 'draft';
+        if($action == 'batchcreate' and $story->type == 'requirement' and $story->status != 'closed') return $story->status != 'draft';
         if($action == 'batchcreate' and ($story->status != 'active' or $story->stage != 'wait')) return false;
 
         return true;
@@ -3247,6 +3372,39 @@ class storyModel extends model
         return $stories;
     }
 
+    /**
+     * Merge story reviewers.
+     *
+     * @param  array|object  $stories
+     * @param  bool          $isObject
+     * @access public
+     * @return array|object
+     */
+    public function mergeReviewer($stories, $isObject = false)
+    {
+        if($isObject)
+        {
+            $story = $stories;
+            $stories = (array)$stories;
+            $stories[$story->id] = $story;
+        }
+
+        $allReviewers = $this->dao->select('story,reviewer,result')->from(TABLE_STORYREVIEW)->where('story')->in(array_keys($stories))->orderBy('version')->fetchGroup('story', 'reviewer');
+
+        foreach($allReviewers as $storyID => $reviewerList)
+        {
+            $stories[$storyID]->reviewer  = array_keys($reviewerList);
+            $stories[$storyID]->notReview = array();
+            foreach($reviewerList as $reviewer => $reviewInfo)
+            {
+                if($reviewInfo->result == '') $stories[$storyID]->notReview[] = $reviewer;
+            }
+        }
+
+        if($isObject) return $stories[$story->id];
+        return $stories;
+    }
+
     /**
      * Print cell data
      *
@@ -3315,6 +3473,10 @@ class storyModel extends model
                 $title  = $story->sourceNote;
                 $class .= ' text-ellipsis';
             }
+            else if($id == 'category')
+            {
+                $title  = zget($this->lang->story->categoryList, $story->category);
+            }
             else if($id == 'estimate')
             {
                 $title = $story->estimate . ' ' . $this->lang->hourCommon;
@@ -3339,6 +3501,10 @@ class storyModel extends model
                     }
                 }
             }
+            else if($id == 'actions')
+            {
+                $class .= ' text-center';
+            }
 
             echo "<td class='" . $class . "' title='$title' style='$style'>";
             if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('story', $story, $id);
@@ -3383,6 +3549,9 @@ class storyModel extends model
             case 'sourceNote':
                 echo $story->sourceNote;
                 break;
+            case 'category':
+                echo zget($this->lang->story->categoryList, $story->category);
+                break;
             case 'status':
                 if($story->URChanged)
                 {
@@ -3394,7 +3563,7 @@ class storyModel extends model
                 echo '</span>';
                 break;
             case 'estimate':
-                echo $story->estimate . ' ' . $this->config->hourUnit;
+                echo $story->estimate . $this->config->hourUnit;
                 break;
             case 'stage':
                 if(isset($storyStages[$story->id]) and !empty($branches))
@@ -3483,12 +3652,12 @@ class storyModel extends model
                     }
 
                     common::printIcon('story', 'change',     $vars . "&from=$story->from", $story, 'list', 'alter', '', '', false, "data-group=$story->from");
-                    common::printIcon('story', 'review',     $vars . "&from=$story->from", $story, 'list', 'glasses', '', '', false, "data-group=$story->from");
+                    common::printIcon('story', 'review',     $vars . "&from=$story->from", $story, 'list', 'search', '', '', false, "data-group=$story->from");
                     common::printIcon('story', 'close',      $vars, $story, 'list', '', '', 'iframe', true);
                     common::printIcon('story', 'edit',       $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from");
-                    common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
+                    if($story->type != 'requirement') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
                     common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide);
-                    if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->PRJ}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
+                    if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
                 }
                 else
                 {
@@ -3910,6 +4079,90 @@ class storyModel extends model
         return $relations;
     }
 
+    /**
+     * Get estimate info
+     *
+     * @param  int    $storyID
+     * @param  int    $round
+     * @access public
+     * @return bool|array
+     */
+    public function getEstimateInfo($storyID, $round = 0)
+    {
+        $estimateInfo = $this->dao->select('*')->from(TABLE_STORYESTIMATE)
+            ->where('story')->eq($storyID)
+            ->beginIf($round)->andWhere('round')->eq($round)->fi()
+            ->orderBy('round_desc')
+            ->fetch();
+
+        if(!empty($estimateInfo)) $estimateInfo->estimate = json_decode($estimateInfo->estimate);
+        return $estimateInfo;
+    }
+
+    /**
+     * Get estimate rounds.
+     *
+     * @param  int    $storyID
+     * @access public
+     * @return array
+     */
+    public function getEstimateRounds($storyID)
+    {
+        $lastRound = $this->dao->select('round')->from(TABLE_STORYESTIMATE)
+            ->where('story')->eq($storyID)
+            ->orderBy('round_desc')
+            ->fetch('round');
+        if(!$lastRound) return array();
+
+        $rounds = array();
+        for($i = 1; $i <= $lastRound; $i++)
+        {
+            $rounds[$i] = sprintf($this->lang->story->storyRound, $i);
+        }
+
+        return $rounds;
+    }
+
+    /**
+     * Save estimate information.
+     *
+     * @param  int    $storyID
+     * @access public
+     * @return void
+     */
+    public function saveEstimateInfo($storyID)
+    {
+        $data = fixer::input('post')->get();
+
+        $lastRound = $this->dao->select('round')->from(TABLE_STORYESTIMATE)
+            ->where('story')->eq($storyID)
+            ->orderBy('round_desc')
+            ->fetch('round');
+
+        $estimates = array();
+        foreach($data->account as $key => $account)
+        {
+            $estimates[$account]['account']  = $account;
+            if(!empty($data->estimate[$key]) and !is_numeric($data->estimate[$key]))
+            {
+                dao::$errors[] = $this->lang->story->estimateMustBeNumber;
+                return false;
+            }
+            $estimates[$account]['estimate'] = $data->estimate[$key];
+        }
+
+
+        $storyEstimate = new stdclass();
+        $storyEstimate->story      = $storyID;
+        $storyEstimate->round      = empty($lastRound) ? 1 : $lastRound + 1;
+        $storyEstimate->estimate   = json_encode($estimates);
+        $storyEstimate->average    = $data->average;
+        $storyEstimate->openedBy   = $this->app->user->account;
+        $storyEstimate->openedDate = helper::now();
+
+        $this->dao->insert(TABLE_STORYESTIMATE)->data($storyEstimate)->exec();
+    }
+
     /**
      * Update the story order according to the plan.
      *
@@ -3982,7 +4235,6 @@ class storyModel extends model
             $storyLang->copyTitle          = str_replace($SRCommon, $URCommon, $storyLang->copyTitle);
             $storyLang->common             = str_replace($SRCommon, $URCommon, $storyLang->common);
             $storyLang->title              = str_replace($SRCommon, $URCommon, $storyLang->title);
-            $storyLang->type               = str_replace($SRCommon, $URCommon, $storyLang->type);
             $storyLang->spec               = str_replace($SRCommon, $URCommon, $storyLang->spec);
             $storyLang->children           = str_replace($SRCommon, $URCommon, $storyLang->children);
             $storyLang->linkStories        = str_replace($SRCommon, $URCommon, $storyLang->linkStories);
@@ -4003,4 +4255,77 @@ class storyModel extends model
             $storyLang->report->charts['storysPerSource']  = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storysPerSource']);
         }
     }
+
+    /**
+     * Get story reviewer pairs.
+     *
+     * @param  int  $storyID
+     * @param  int  version
+     * @access public
+     * @return array
+     */
+    public function getReviewerPairs($storyID, $version)
+    {
+        return $this->dao->select('reviewer,result')->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->andWhere('version')->eq($version)->fetchPairs('reviewer', 'result');
+    }
+
+    /**
+     * Set story status by review rules.
+     *
+     * @param  array  $reviewerList
+     * @access public
+     * @return string
+     */
+    public function setStatusByReviewRules($reviewerList)
+    {
+        $status      = '';
+        $passCount   = 0;
+        $rejectCount = 0;
+        $reviewRule  = $this->config->story->reviewRules;
+        foreach($reviewerList as $reviewer => $reviewResult)
+        {
+            $passCount   = $reviewResult == 'pass'   ? $passCount   + 1 : $passCount;
+            $rejectCount = $reviewResult == 'reject' ? $rejectCount + 1 : $rejectCount;
+        }
+
+        if($reviewRule == 'allpass')
+        {
+            if($passCount   == count($reviewerList)) $status = 'active';
+            if($rejectCount == count($reviewerList)) $status = 'closed';
+        }
+
+        if($reviewRule == 'halfpass')
+        {
+            if($passCount   >= floor(count($reviewerList) / 2) + 1) $status = 'active';
+            if($rejectCount >= floor(count($reviewerList) / 2) + 1) $status = 'closed';
+        }
+
+        return $status;
+    }
+
+    /**
+     * Record story review actions.
+     *
+     * @param  object $story
+     * @param  string $result
+     * @param  string $reason
+     * @access public
+     * @return int
+     */
+    public function recordReviewAction($story, $result, $reason)
+    {
+        $reasonParam = $result == 'reject' ? ',' . $reason : '';
+        $reviewers   = $this->getReviewerPairs($story->id, $story->version);
+        $reviewedBy  = explode(',', trim($story->reviewedBy, ','));
+
+        $comment  = isset($_POST['comment']) ? $this->post->comment : '';
+        $actionID = $this->loadModel('action')->create('story', $story->id, 'Reviewed', $comment, ucfirst($result) . $reasonParam);
+
+        if($story->status == 'closed') $this->action->create('story', $story->id, 'ReviewClosed');
+        if($story->status == 'active') $this->action->create('story', $story->id, 'PassReviewed');
+        if(!array_diff(array_keys($reviewers), $reviewedBy) and ($story->status == 'draft' || $story->status == 'changed')) $this->action->create('story', $story->id, 'ClarifyReviewed');
+
+        return $actionID;
+    }
+
 }
diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php
index c946a90973..6d4b3f5933 100644
--- a/module/story/view/activate.html.php
+++ b/module/story/view/activate.html.php
@@ -45,8 +45,8 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php 
-            echo html::submitButton($lang->story->activate, '', 'btn btn-wide btn-success');
+            <?php
+            echo html::submitButton($lang->story->activate, '', 'btn btn-wide btn-primary');
             echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');
             ?>
           </td>
diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php
index 8d54dbc0f0..fe46a632cc 100755
--- a/module/story/view/batchclose.html.php
+++ b/module/story/view/batchclose.html.php
@@ -11,6 +11,8 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php js::set('storyType', $storyType);?>
+<?php js::set('app', $app->openApp);?>
 <div class='main-content' id='mainContent'>
   <div class='main-header'>
     <h2><?php echo $lang->story->common . $lang->colon . $lang->story->batchClose;?></h2>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index a83af37f6c..2c452cea59 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -15,7 +15,7 @@
   <div class="main-header">
     <h2><?php echo $storyID ? $storyTitle . ' - ' . $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
-      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
+      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID&executionID=&plan=&type=$type")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
@@ -53,9 +53,11 @@
             <th class='w-100px<?php      echo zget($visibleFields, 'source',   ' hidden') . zget($requiredFields, 'source',   '', ' required');?>'><?php echo $lang->story->source;?></th>
             <th class='w-100px<?php echo zget($visibleFields, 'source', ' hidden') . zget($requiredFields, 'sourceNote', '', ' required');?>'><?php echo $lang->story->sourceNote;?></th>
             <th class='w-150px<?php        echo zget($visibleFields, 'verify',   ' hidden') . zget($requiredFields, 'verify',   '', ' required');?>'><?php echo $lang->story->verify;?></th>
+            <th class='w-90px'><?php echo $lang->story->category;?></th>
             <th class='col-pri<?php      echo zget($visibleFields, 'pri',      ' hidden') . zget($requiredFields, 'pri',      '', ' required');?>'><?php echo $lang->story->pri;?></th>
             <th class='col-estimate<?php echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', '', ' required');?>'><?php echo $lang->story->estimate;?></th>
             <th class='col-review<?php   echo zget($visibleFields, 'review',   ' hidden') . zget($requiredFields, 'review',   '', ' required');?>'><?php echo $lang->story->needReview;?></th>
+            <th class='<?php echo zget($visibleFields, 'review',   ' hidden');?>' style="width: 200px !important"><?php echo $lang->story->reviewedBy;?></th>
             <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->story->keywords;?></th>
             <?php
             $extendFields = $this->story->getFlowExtendFields();
@@ -90,9 +92,12 @@
             <td class='text-left<?php echo zget($visibleFields, 'source', ' hidden')?>'><?php echo html::select('source[$id]', $sourceList, '', "class='form-control'");?></td>
             <td class='<?php echo zget($visibleFields, 'source', 'hidden')?>'><?php echo html::input('sourceNote[$id]', '', "class='form-control'");?></td>
             <td class='<?php echo zget($visibleFields, 'verify', 'hidden')?>'><textarea name="verify[$id]" id="verify$id" rows="1" class="form-control autosize"></textarea></td>
+            <td class='text-left' style='overflow:visible'><?php echo html::select('category[$id]', $lang->story->categoryList, 'feature', "class='form-control chosen'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'pri', ' hidden')?>' style='overflow:visible'><?php echo html::select('pri[$id]', $priList, $pri, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'estimate', 'hidden')?>'><?php echo html::input('estimate[$id]', $estimate, "class='form-control'");?></td>
             <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select('needReview[$id]', $lang->story->reviewList, $needReview, "class='form-control'");?></td>
+            <?php $isDisabled = $needReview ? '' : 'disabled';?>
+            <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select('reviewer[$id][]', $users, '', "class='form-control chosen' multiple $isDisabled");?></td>
             <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input('keywords[$id]', '', "class='form-control'");?></td>
             <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . '[$id]') . "</td>";?>
           </tr>
@@ -120,9 +125,10 @@ $(function()
         idEnd: <?php echo max((empty($titles) ? 0 : count($titles)), 9)?>,
         rowCreator: function($row, index)
         {
-            $row.find('select.chosen').each(function()
+            $row.find('select.chosen,select.picker-select').each(function()
             {
                 var $select = $(this);
+                if($select.hasClass('picker-select')) $select.parent().find('.picker').remove();
                 if(index == 0) $select.find("option[value='ditto']").remove();
                 if(index > 0) $select.val('ditto');
                 if($select.attr('id').indexOf('branch') >= 0) $select.val('<?php echo $branch;?>')
@@ -139,6 +145,14 @@ $(function()
               }
         }
     });
+
+    $(document).on('change', "#mainContent select[name^=needReview]", function()
+    {
+        select = $(this).parent('td').next('td').children("select[name^=reviewer]");
+        $(select).removeAttr('disabled');
+        if($(this).val() == 0) $(select).attr('disabled', 'disabled');
+        $(select).trigger("chosen:updated");
+    })
 });
 </script>
 <?php if(isset($execution)) js::set('execution', $execution);?>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 9d003aad3a..5f16b51bbe 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('dittoNotice', $this->lang->story->dittoNotice);?>
 <?php js::set('storyType', $storyType);?>
+<?php js::set('app', $this->app->openApp);?>
 <?php if(isset($resetActive)) js::set('resetActive', true);?>
 <div class='main-content' id='mainContent'>
 <div class='main-header'>
@@ -31,15 +32,15 @@
 $visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$visibleFields[$field] = '';
+    if($field and ($storyType == 'story' or $field != 'stage'))$visibleFields[$field] = '';
 }
 ?>
-<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "from=storyBatchEdit")?>" id="batchEditForm">
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "productID=$productID&executionID=$executionID")?>" id="batchEditForm">
   <div class="table-responsive">
     <table class='table table-form'>
       <thead>
         <tr>
-          <th class='w-40px'> <?php echo $lang->idAB;?></th> 
+          <th class='w-40px'> <?php echo $lang->idAB;?></th>
           <?php if($branchProduct):?>
           <th class='w-120px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->story->branch;?></th>
           <?php endif;?>
@@ -47,6 +48,7 @@ foreach(explode(',', $showFields) as $field)
           <th class='w-150px<?php echo zget($visibleFields, 'plan', ' hidden')?> col-plan'><?php echo $lang->story->planAB;?></th>
           <th class='w-150px required'><?php echo $lang->story->title;?></th>
           <th class='w-50px<?php   echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
+          <th class='w-90px'><?php echo $lang->story->category;?></th>
           <th class='w-70px<?php   echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
           <th class='w-100px<?php  echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
           <th class='w-100px<?php  echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
@@ -107,7 +109,7 @@ foreach(explode(',', $showFields) as $field)
           <td title='<?php echo $story->title?>'>
             <div class="input-group">
               <div class="input-control has-icon-right">
-                <?php echo html::input("titles[$storyID]", $story->title, "class='form-control input-story-title'"); ?>
+                <?php echo html::input("titles[$storyID]", $story->title, "class='form-control input-story-title' disabled"); ?>
 
                 <div class="colorpicker">
                   <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
@@ -120,8 +122,9 @@ foreach(explode(',', $showFields) as $field)
               </div>
             </div>
           </td>
-          
+
           <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimates[$storyID]", $story->estimate, "class='form-control'"); ?></td>
+          <td><?php echo html::select("category[$storyID]", $lang->story->categoryList, $story->category, 'class=form-control chosen');?></td>
           <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$storyID]",     $priList, $story->pri, 'class=form-control');?></td>
           <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo html::select("assignedTo[$storyID]",     $users, $story->assignedTo, "class='form-control chosen'");?></td>
           <td <?php echo zget($visibleFields, 'source', "class='hidden'")?>><?php echo html::select("sources[$storyID]",  $sourceList, $story->source, 'class=form-control');?></td>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index b6b09d2098..add9531f91 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -24,9 +24,9 @@
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
-          <td class='w-p35-f'>
+          <td colspan="2">
             <div class="input-group">
-              <?php echo html::select('assignedTo', $users, $story->reviewedBy, 'class="form-control chosen"');?>
+              <?php echo html::select('reviewer[]', $users, $reviewer, 'class="form-control chosen" multiple');?>
               <?php if(!$this->story->checkForceReview()):?>
               <span class="input-group-addon">
               <?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview' {$needReview}");?>
@@ -34,7 +34,6 @@
               <?php endif;?>
             </div>
           </td>
-          <td></td>
         </tr>
         <tr class='hide'>
           <th><?php echo $lang->story->status;?></th>
@@ -71,7 +70,7 @@
             <?php
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
             echo html::submitButton();
-            echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');
+            if(!isonlybody()) echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');
             ?>
           </td>
         </tr>
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index 3b1f8395ed..38f3a33302 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -48,7 +48,7 @@
         <tr>
           <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton();?>
-            <?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?>
+            <?php if(!isonlybody()) echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');?>
           </td>
         </tr>
       </table>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 9ee2c8b719..147187c88c 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -11,7 +11,12 @@
  */
 ?>
 <?php include './header.html.php';?>
+<style>
+#product_chosen {border-right:1px solid #dcdcdc;}
+#branch_chosen>a {border-left:0px;}
+</style>
 <?php js::set('holders', $lang->story->placeholder); ?>
+<?php js::set('blockID', $blockID); ?>
 <?php if(common::checkNotCN()):?>
 <style> .sourceTd > .input-group > .input-group > .input-group-addon:first-child{padding: 5px 18px} </style>
 <?php endif;?>
@@ -36,15 +41,11 @@
           <tr>
             <th><?php echo $lang->story->product;?></th>
             <td colspan="2">
-              <?php if($product->type != 'normal'):?>
               <div class='input-group'>
-              <?php endif;?>
               <?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
-              <?php if($product->type != 'normal'):?>
               <span class='input-group-addon fix-border fix-padding'></span>
-              <?php echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>
+              <?php if($branches) echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>
               </div>
-              <?php endif;?>
             </td>
             <td colspan="2">
               <div class='input-group' id='moduleIdBox'>
@@ -86,10 +87,11 @@
             <td colspan="2" class='sourceTd'>
               <div class="input-group">
                 <div class="input-group">
-                  <div class="input-group-addon"><?php echo $lang->story->source;?></div>
+                  <div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>
                   <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
                   <span class='input-group-addon'><?php echo $lang->story->sourceNote;?></span>
-                  <?php echo html::input('sourceNote', $sourceNote, "class='form-control' style='width:140px;'");?>
+                  <?php $sourceNoteWidth = isonlybody() ? "style='width: 70px;'" : "style='width: 140px;'"?>
+                  <?php echo html::input('sourceNote', $sourceNote, "class='form-control' $sourceNoteWidth");?>
                 </div>
               </div>
             </td>
@@ -98,21 +100,30 @@
           <?php endif;?>
           <tr>
             <th><?php echo $lang->story->reviewedBy;?></th>
-            <td><?php echo html::select('assignedTo', $users, empty($needReview) ? $product->PO : '', "class='form-control chosen'");?></td>
-            <?php if(!$this->story->checkForceReview()):?>
-            <td>
-              <div class='checkbox-primary'>
-                <input id='needNotReview' name='needNotReview' value='1' type='checkbox' class='no-margin' <?php echo $needReview;?>/>
-                <label for='needNotReview'><?php echo $lang->story->needNotReview;?></label>
+            <?php $colspan = $type == 'story' ? "colspan='4'" : "colspan='2'";?>
+            <td <?php echo $colspan;?> id='reviewerBox'>
+              <div class="table-row">
+                <div class="table-col">
+                  <?php echo html::select('reviewer[]', $users, empty($needReview) ? $product->PO : '', "class='form-control chosen' multiple");?>
+                </div>
+                <?php if(!$this->story->checkForceReview()):?>
+                <div class="table-col w-130px">
+                  <span class="input-group-addon" style="border: 1px solid #dcdcdc; border-left-width: 0px;">
+                    <div class='checkbox-primary'>
+                      <input id='needNotReview' name='needNotReview' value='1' type='checkbox' class='no-margin' <?php echo $needReview;?>/>
+                      <label for='needNotReview'><?php echo $lang->story->needNotReview;?></label>
+                    </div>
+                  </span>
+                </div>
+                <?php endif;?>
               </div>
             </td>
-            <?php endif;?>
             <?php if($type == 'requirement'):?>
               <?php if(strpos(",$showFields,", ',source,') !== false):?>
               <td colspan="2" class='sourceTd'>
                 <div class="input-group">
                   <div class="input-group">
-                    <div class="input-group-addon"><?php echo $lang->story->source;?></div>
+                    <div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>
                     <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
                     <span class='input-group-addon'><?php echo $lang->story->sourceNote;?></span>
                     <?php echo html::input('sourceNote', $sourceNote, "class='form-control' style='width:140px;'");?>
@@ -125,7 +136,7 @@
           <?php if($type == 'story' and $this->config->URAndSR):?>
           <tr>
             <th><?php echo $lang->story->requirement;?></th>
-            <td colspan=2><?php echo html::select('URS[]', $URS, '', "class='form-control chosen' multiple");?></td>
+            <td colspan="4"><?php echo html::select('URS[]', $URS, '', "class='form-control chosen' multiple");?></td>
           </tr>
           <?php endif;?>
           <tr>
@@ -145,6 +156,12 @@
                   </div>
                 </div>
                 <?php if(strpos(",$showFields,", ',pri,') !== false): // begin print pri selector?>
+                <div class='table-col w-150px'>
+                  <div class="input-group">
+                    <span class="input-group-addon fix-border br-0"><?php echo $lang->story->category;?></span>
+                    <?php echo html::select('category', $lang->story->categoryList, 'feature', "class='form-control chosen'");?>
+                  </div>
+                </div>
                 <div class='table-col w-120px'>
                   <div class="input-group">
                     <span class="input-group-addon fix-border br-0"><?php echo $lang->story->pri;?></span>
@@ -247,8 +264,7 @@
     </form>
   </div>
 </div>
-<?php if(isset($execution)) js::set('execution', $execution);?>
-<?php js::set('executionID', $executionID);?>
+<?php js::set('executionID', $objectID);?>
 <?php js::set('storyModule', $lang->story->module);?>
 <?php js::set('storyType', $type);?>
 <script>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 89e1d33721..44e1a58b79 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -15,6 +15,7 @@
 <?php js::set('parentStory', !empty($story->children));?>
 <?php js::set('moveChildrenTips', $lang->story->moveChildrenTips);?>
 <?php js::set('rawModule', $this->app->rawModule);?>
+<?php js::set('reviewedReviewer', $reviewedReviewer);?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>
@@ -55,10 +56,10 @@
             </div>
           </div>
           <div class='actions form-actions text-center'>
-            <?php 
+            <?php
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
             echo html::submitButton($lang->save);
-            echo html::backButton();
+            if(!isonlybody()) echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');
             ?>
           </div>
           <hr class='small' />
@@ -118,7 +119,7 @@
                   <div class='input-group' id='planIdBox'>
                   <?php $multiple = ($this->session->currentProductType != 'normal' and empty($story->branch)) ? true : false;?>
                   <?php echo html::select($multiple ? 'plan[]' : 'plan', $plans, $story->plan, "class='form-control chosen'" . ($multiple ? ' multiple' : ''));
-                  if(count($plans) == 1) 
+                  if(count($plans) == 1)
                   {
                       echo "<span class='input-group-addon'>";
                       echo html::a($this->createLink('productplan', 'create', "productID=$story->product&branch=$story->branch", '', true), $lang->productplan->create, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
@@ -146,7 +147,7 @@
                   <?php echo html::hidden('status', $story->status);?>
                 </td>
               </tr>
-              <?php if($story->status != 'draft'):?>
+              <?php if($story->status != 'draft' and $story->type == 'story'):?>
               <tr>
                 <th><?php echo $lang->story->stage;?></th>
                 <td>
@@ -166,6 +167,10 @@
                 </td>
               </tr>
               <?php endif;?>
+              <tr>
+                <th><?php echo $lang->story->category;?></th>
+                <td><?php echo html::select('category', $lang->story->categoryList, $story->category, "class='form-control chosen'");?></td>
+              </tr>
               <tr>
                 <th><?php echo $lang->story->pri;?></th>
                 <td><?php echo html::select('pri', $lang->story->priList, $story->pri, "class='form-control chosen'");?></td>
@@ -200,10 +205,10 @@
                 <th><?php echo $lang->story->assignedTo;?></th>
                 <td><?php echo html::select('assignedTo', $users, $story->assignedTo, 'class="form-control chosen"');?></td>
               </tr>
-              <?php if($story->reviewedBy):?>
+              <?php if($isShowReviewer):?>
               <tr>
-                <th><?php echo $lang->story->reviewedBy;?></th>
-                <td><?php echo html::select('reviewedBy[]', $users, str_replace(' ', '', $story->reviewedBy), 'class="form-control chosen" multiple');?></td>
+                <th><?php echo $lang->story->reviewers;?></th>
+                <td><?php echo html::select('reviewer[]', $users, $reviewers, 'class="form-control chosen" multiple')?></td>
               </tr>
               <?php endif;?>
               <?php if($story->status == 'closed'):?>
@@ -218,7 +223,7 @@
               <?php endif;?>
             </table>
           </div>
-    
+
           <?php $this->printExtendFields($story, 'div', 'position=right');?>
 
           <div class='detail'>
diff --git a/module/story/view/report.html.php b/module/story/view/report.html.php
index 61fce8c252..a3758a2b75 100644
--- a/module/story/view/report.html.php
+++ b/module/story/view/report.html.php
@@ -13,7 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php echo html::a($this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=$browseType&moduleID=$moduleID"), "<i class='icon icon-back icon-sm'> </i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <?php $browseLink = $this->session->storyList ? $this->session->storyList : $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=$browseType&moduleID=$moduleID&storyType=$storyType")?>
+    <?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'> </i>" . $lang->goback, '', "class='btn btn-link'");?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='text'><?php echo $lang->story->report->common;?></span>
@@ -29,6 +30,7 @@
       <div class='panel-body'>
         <form method='post' id='chartTypesForm'>
           <div class='checkboxes'>
+            <?php if($storyType == 'requirement') unset($lang->story->report->charts['storysPerPlan']);?>
             <?php echo html::checkBox('charts', $lang->story->report->charts, $checkedCharts, '', 'block');?>
           </div>
           <div class='btn-toolbar'>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index 391925b932..a88d826455 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -12,9 +12,6 @@
 ?>
 <?php include './header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<script>
-var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : print($story->openedBy);?>';
-</script>
 <div class='main-content' id='mainContent'>
   <div class='center-block'>
     <div class='main-header'>
@@ -32,7 +29,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
         </tr>
         <tr>
           <th><?php echo $lang->story->reviewResult;?></th>
-          <td class = 'required'><?php echo html::select('result', $lang->story->reviewResultList, '', 'class=form-control onchange="switchShow(this.value)"');?></td><td></td>
+          <td class = 'required'><?php echo html::select('result', $lang->story->resultList, '', 'class=form-control onchange="switchShow(this.value)"');?></td><td></td>
         </tr>
         <tr id='rejectedReasonBox' class='hide'>
           <th><?php echo $lang->story->rejectedReason;?></th>
@@ -60,19 +57,11 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
           <td colspan='2'><?php echo html::radio('preVersion', array_combine(range($story->version - 1, 1), range($story->version - 1, 1)), $story->version - 1);?></td>
         </tr>
         <?php endif;?>
-        <tr>
-          <th><?php echo $lang->story->assignedTo;?></th>
-          <td><?php echo html::select('assignedTo', $users, $story->lastEditedBy ? $story->lastEditedBy : $story->openedBy, "class='form-control chosen'");?></td><td></td>
-        </tr>
         <tr class='hide'>
           <th><?php echo $lang->story->status;?></th>
           <td><?php echo html::hidden('status', $story->status);?></td>
         </tr>
         <?php $this->printExtendFields($story, 'table');?>
-        <tr>
-          <th><?php echo $lang->story->reviewedBy;?></th>
-          <td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control chosen' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?></td>
-        </tr>
         <tr>
           <th><?php echo $lang->story->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
@@ -84,7 +73,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
         <tr>
           <td colspan='3' class='text-center form-actions'>
           <?php echo html::submitButton();?>
-          <?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?>
+          <?php if(!isonlybody()) echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');?>
           </td>
         </tr>
       </table>
diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
index 02b8f3b4a3..29e9ca847a 100644
--- a/module/story/view/track.html.php
+++ b/module/story/view/track.html.php
@@ -17,9 +17,9 @@
       </p>
     </div>
     <?php else:?>
-    <?php $style     = $this->app->rawModule == 'projectstory' ? "style='overflow: unset; text-align: left'" : '';?>
-    <?php $openApp   = $this->app->rawModule == 'projectstory' ? 'project' : 'product';?>
-    <?php $module    = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story';?>
+    <?php $style   = $this->app->rawModule == 'projectstory' ? "style='overflow: unset; text-align: left'" : '';?>
+    <?php $openApp = $this->app->rawModule == 'projectstory' ? 'project' : 'product';?>
+    <?php $module  = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story';?>
     <div class='main-table' data-ride="table">
       <table class='table table-bordered' id="trackList">
         <thead>
@@ -31,7 +31,7 @@
                 <?php echo html::a('javascript:;', "<i class='icon icon-product'></i>". $projectProducts[$productID]->name . '<span class="caret"></span>', '', 'class="dropdown-toggle" data-toggle="dropdown"');?>
                 <ul class="dropdown-menu">
                   <?php foreach($projectProducts as $product): ?>
-                  <li><?php echo html::a($this->createLink('projectstory', 'track', "productID=$product->id"), $product->name);?></li>
+                  <li><?php echo html::a($this->createLink('projectstory', 'track', "projectID={$this->session->project}&productID=$product->id"), $product->name);?></li>
                   <?php endforeach;?>
                 </ul>
               </div>
@@ -91,7 +91,7 @@
               <td>
                 <?php foreach($story->revisions as $revision => $repoID):?>
                 <?php
-                echo html::a($this->createLink('design', 'revision', "repoID=$revision"), '#'. $revision) . '<br/>';
+                echo html::a($this->createLink('design', 'revision', "repoID=$revision"), '#'. $revision, '', "data-app='devops'") . '<br/>';
                 ?>
                 <?php endforeach;?>
               </td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 638b236e07..2f38ee0ae5 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php $browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
+<?php $browseLink = $app->session->storyList ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
@@ -49,15 +49,15 @@
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('product', $product)): ?>
     <?php
-    $otherParam = '';
+    $otherParam = 'storyID=&projectID=';
     $openApp    = 'product';
     if($this->app->rawModule == 'projectstory')
     {
-        $otherParam = "storyID=&projectID={$this->session->PRJ}";
+        $otherParam = "storyID=&projectID={$this->session->project}";
         $openGroup  = 'project';
     }
     ?>
-    <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam", "<i class='icon icon-plus'></i>" . $lang->story->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
+    <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam&bugID=0&planID=0&todoID=0&extra=&type=$story->type", "<i class='icon icon-plus'></i>" . $lang->story->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
     <?php endif;?>
   </div>
   <?php endif;?>
@@ -159,12 +159,12 @@
                 </td>
                 <td class='text-left' title='<?php echo $child->title;?>'><a class="iframe" data-width="90%" href="<?php echo $this->createLink('story', 'view', "storyID=$child->id", '', true); ?>"><?php echo $child->title;?></a></td>
                 <td><?php echo zget($users, $child->assignedTo);?></td>
-                <td title="<?php echo $child->estimate . ' ' . $lang->hourCommon;?>"><?php echo $child->estimate . ' ' . $config->hourUnit;?></td>
+                <td title="<?php echo $child->estimate . ' ' . $lang->hourCommon;?>"><?php echo $child->estimate . $config->hourUnit;?></td>
                 <td><?php echo $this->processStatus('story', $child);?></td>
                 <td class='c-actions'>
                   <?php
                   common::printIcon('story', 'change', "storyID=$child->id", $child, 'list', 'alter');
-                  common::printIcon('story', 'review', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
+                  common::printIcon('story', 'review', "storyID=$child->id", $child, 'list', 'search', '', 'iframe showinonlybody', true);
                   common::printIcon('story', 'assignTo', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
                   common::printIcon('story', 'close',  "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
                   common::printIcon('story', 'activate', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
@@ -189,7 +189,7 @@
         <?php if(!$story->deleted):?>
         <?php
         common::printIcon('story', 'change', "storyID=$story->id", $story, 'button', 'alter', '', 'showinonlybody');
-        common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody');
+        common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', 'search', '', 'showinonlybody');
         if($story->status == 'active' and $story->stage == 'wait' and $story->parent <= 0 and !isonlybody())
         {
             $divideLang = $lang->story->subdivide;
@@ -221,7 +221,7 @@
             echo "</div>";
         }
 
-        if($from == 'project') common::printIcon('task', 'create', "execution=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
+        if($from == 'execution') common::printIcon('task', 'create', "execution=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
 
         echo $this->buildOperateMenu($story, 'view');
 
@@ -276,7 +276,7 @@
                       foreach($modulePath as $key => $module)
                       {
                           $moduleTitle .= $module->name;
-                          if(!common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                          if(!common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch&browseType=byModule&param=$module->id", $module->name, '', "data-app='product'")) echo $module->name;
                           if(isset($modulePath[$key + 1]))
                           {
                               $moduleTitle .= '/';
@@ -289,6 +289,7 @@
                   ?>
                   <td title='<?php echo $moduleTitle?>'><?php echo $printModule?></td>
                 </tr>
+                <?php if($story->type != 'requirement'):?>
                 <tr class='plan-line'>
                   <th><?php echo $lang->story->plan;?></th>
                   <td>
@@ -304,6 +305,7 @@
                   ?>
                   </td>
                 </tr>
+                <?php endif;?>
                 <tr>
                   <th><?php echo $lang->story->source;?></th>
                   <td id='source'><?php echo $lang->story->sourceList[$story->source];?></td>
@@ -316,6 +318,7 @@
                   <th><?php echo $lang->story->status;?></th>
                   <td><span class='status-story status-<?php echo $story->status?>'><span class="label label-dot"></span> <?php echo $this->processStatus('story', $story);?></span></td>
                 </tr>
+                <?php if($story->type != 'requirement'):?>
                 <tr class='stage-line'>
                   <th><?php echo $lang->story->stage;?></th>
                   <td>
@@ -331,13 +334,18 @@
                   ?>
                   </td>
                 </tr>
+                <?php endif;?>
+                <tr>
+                  <th><?php echo $lang->story->category;?></th>
+                  <td><?php echo $lang->story->categoryList[$story->category];?></td>
+                </tr>
                 <tr>
                   <th><?php echo $lang->story->pri;?></th>
                   <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->estimate;?></th>
-                  <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                  <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->keywords;?></th>
@@ -362,8 +370,16 @@
                   <td><?php if($story->assignedTo) echo zget($users, $story->assignedTo) . $lang->at . $story->assignedDate;?></td>
                 </tr>
                 <tr>
-                  <th><?php echo $lang->story->reviewedBy;?></th>
-                  <td><?php $reviewedBy = explode(',', $story->reviewedBy); foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); ?></td>
+                  <th><?php echo $lang->story->reviewers;?></th>
+                  <td>
+                    <?php
+                    $reviewedBy = explode(',', trim($story->reviewedBy, ','));
+                    foreach($reviewers as $reviewer)
+                    {
+                        echo in_array($reviewer, $reviewedBy) ? '<span style="color: #cbd0db" title="' . $lang->story->reviewed . '"> ' . zget($users, $reviewer) . '</span>' : '<span title="' . $lang->story->toBeReviewed .'"> ' . zget($users, $reviewer) . '</span>';
+                    }
+                    ?>
+                  </td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->reviewedDate;?></th>
@@ -456,7 +472,7 @@
             <table class="table table-data">
               <tbody>
                 <?php if(!empty($fromBug)):?>
-                <tr class='text-top'>
+                <tr>
                   <th class='thWidth'><?php echo $lang->story->legendFromBug;?></th>
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
@@ -466,7 +482,7 @@
                 </tr>
                 <?php endif;?>
                 <tr>
-                  <th class='text-top thWidth'><?php echo $lang->story->legendBugs;?></th>
+                  <th class='thWidth'><?php echo $lang->story->legendBugs;?></th>
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
                     <?php
@@ -479,20 +495,20 @@
                   </td>
                 </tr>
                 <tr>
-                  <th class='text-top'><?php echo $lang->story->legendCases;?></th>
+                  <th><?php echo $lang->story->legendCases;?></th>
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
                     <?php
                     foreach($cases as $case)
                     {
-                        echo "<li title='[C]$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id", '', true), "[C] #$case->id $case->title", '', "class='iframe' data-width='80%'") . '</li>';
+                        echo "<li title='[C]$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id", '', true), "[C] #$case->id $case->title", '',"data-toggle='modal'") . '</li>';
                     }
                     ?>
                     </ul>
                   </td>
                 </tr>
                 <tr>
-                  <th class='text-top thWidth'><?php echo $lang->story->legendLinkStories;?></th>
+                  <th class='thWidth'><?php echo $lang->story->legendLinkStories;?></th>
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
                       <?php
@@ -506,7 +522,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <th class='text-top'><?php echo $lang->story->legendChildStories;?></th>
+                  <th><?php echo $lang->story->legendChildStories;?></th>
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
                       <?php
diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php
index 495a32ab82..77d9aca830 100644
--- a/module/story/view/zerocase.html.php
+++ b/module/story/view/zerocase.html.php
@@ -23,7 +23,10 @@
     <table class='table has-sort-head table-fixed' id='storyList'>
       <thead>
       <tr>
-        <?php $vars = "productID=$productID&orderBy=%s";?>
+        <?php
+        $this->app->rawModule = 'story';
+        $vars = "productID=$productID&branchID=$branchID&orderBy=%s";
+        ?>
         <th class='c-id'>
           <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
             <label></label>
@@ -45,7 +48,10 @@
       <tbody>
       <?php foreach($stories as $key => $story):?>
       <?php
-      $viewLink = $this->createLink('story', 'view', "storyID=$story->id");
+      $param = 0;
+      if($this->app->openApp == 'project')   $param = $this->session->project;
+      if($this->app->openApp == 'execution') $param = $this->session->execution;
+      $viewLink = $this->createLink('story', 'view', "storyID=$story->id&version=0&param=$param");
       $canView  = common::hasPriv('story', 'view');
       ?>
       <tr>
@@ -57,7 +63,7 @@
           <?php printf('%03d', $story->id);?>
         </td>
         <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
-        <td class='text-left' title="<?php echo $story->title?>"><nobr><?php echo html::a($viewLink, $story->title);?></nobr></td>
+        <td class='text-left' title="<?php echo $story->title?>"><nobr><?php echo html::a($viewLink, $story->title, '', "data-app='product'");?></nobr></td>
         <td title="<?php echo $story->planTitle?>"><?php echo $story->planTitle;?></td>
         <td><?php echo $lang->story->sourceList[$story->source];?></td>
         <td><?php echo zget($users, $story->openedBy);?></td>
@@ -68,10 +74,12 @@
         <td class='c-actions'>
           <?php
           $vars = "storyID={$story->id}";
-          common::printIcon('story', 'change',     $vars, $story, 'list', 'fork');
-          common::printIcon('story', 'review',     $vars, $story, 'list', 'glasses');
-          common::printIcon('story', 'close',      $vars, $story, 'list', 'off');
-          common::printIcon('story', 'edit',       $vars, $story, 'list', 'pencil');
+          $this->app->openApp = 'product';
+          common::printIcon('story', 'change', $vars, $story, 'list', 'fork');
+          common::printIcon('story', 'review', $vars, $story, 'list', 'glasses');
+          common::printIcon('story', 'close',  $vars, $story, 'list', 'off', '', 'iframe', 'yes');
+          common::printIcon('story', 'edit',   $vars, $story, 'list');
+          $this->app->openApp = 'qa';
           common::printIcon('story', 'createCase', "productID=$story->product&branch=0&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
           ?>
         </td>
@@ -85,7 +93,7 @@
         <?php
         $canBatchEdit  = common::hasPriv('story', 'batchEdit');
         $disabled   = $canBatchEdit ? '' : "disabled='disabled'";
-        $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&executionID=0&branch=$branch");
+        $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=$projectID&branch=$branch");
         ?>
         <?php echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");?>
         <?php
diff --git a/module/svn/model.php b/module/svn/model.php
index 74fa8ddd36..0c23411b7c 100644
--- a/module/svn/model.php
+++ b/module/svn/model.php
@@ -15,39 +15,39 @@ class svnModel extends model
 {
     /**
      * The svn binary client.
-     * 
-     * @var int   
+     *
+     * @var int
      * @access public
      */
     public $client;
 
     /**
      * Repos.
-     * 
-     * @var array 
+     *
+     * @var array
      * @access public
      */
-    public $repos = array(); 
+    public $repos = array();
 
     /**
      * The root path of a repo
-     * 
+     *
      * @var string
      * @access public
      */
     public $repoRoot = '';
 
     /**
-     * Users 
-     * 
-     * @var array 
+     * Users
+     *
+     * @var array
      * @access public
      */
     public $users = array();
 
     /**
      * Construct function.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -59,8 +59,8 @@ class svnModel extends model
     }
 
     /**
-     * Run. 
-     * 
+     * Run.
+     *
      * @access public
      * @return void
      */
@@ -134,7 +134,7 @@ class svnModel extends model
             return false;
         }
 
-        $version = $lastInDB->commit;
+        $version = (int)$lastInDB->commit + 1;
         $logs    = $this->repo->getUnsyncCommits($repo);
 
         /* Update code commit history. */
@@ -184,7 +184,7 @@ class svnModel extends model
 
     /**
      * Set the repos.
-     * 
+     *
      * @access public
      * @return bool
      */
@@ -212,7 +212,7 @@ class svnModel extends model
 
     /**
      * Get repos.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -227,8 +227,8 @@ class svnModel extends model
 
     /**
      * Set repo.
-     * 
-     * @param  object    $repo 
+     *
+     * @param  object    $repo
      * @access public
      * @return bool
      */
@@ -243,8 +243,8 @@ class svnModel extends model
 
     /**
      * Set the svn binary client of a repo.
-     * 
-     * @param  object    $repo 
+     *
+     * @param  object    $repo
      * @access public
      * @return bool
      */
@@ -257,7 +257,7 @@ class svnModel extends model
             $version = `$cmd`;
             if(version_compare($version, '1.6.0', '>'))
             {
-                $this->client .= ' --trust-server-cert'; 
+                $this->client .= ' --trust-server-cert';
             }
         }
         if(isset($repo->account)) $this->client .= " --username $repo->account --password $repo->password --no-auth-cache";
@@ -266,10 +266,10 @@ class svnModel extends model
 
     /**
      * set the root path of a repo.
-     * 
-     * @param  object    $repo 
+     *
+     * @param  object    $repo
      * @access public
-     * @return void 
+     * @return void
      */
     public function setRepoRoot($repo)
     {
@@ -295,9 +295,9 @@ class svnModel extends model
 
     /**
      * Get repo logs.
-     * 
-     * @param  object  $repo 
-     * @param  int     $fromRevision 
+     *
+     * @param  object  $repo
+     * @param  int     $fromRevision
      * @access public
      * @return array
      */
@@ -325,9 +325,9 @@ class svnModel extends model
 
     /**
      * Diff a url.
-     * 
-     * @param  string $url 
-     * @param  int    $revision 
+     *
+     * @param  string $url
+     * @param  int    $revision
      * @access public
      * @return string|bool
      */
@@ -356,9 +356,9 @@ class svnModel extends model
 
     /**
      * Cat a url.
-     * 
-     * @param  string $url 
-     * @param  int    $revision 
+     *
+     * @param  string $url
+     * @param  int    $revision
      * @access public
      * @return string|bool
      */
@@ -386,8 +386,8 @@ class svnModel extends model
 
     /**
      * Get repo by url.
-     * 
-     * @param  string    $url 
+     *
+     * @param  string    $url
      * @access public
      * @return object|bool
      */
@@ -403,8 +403,8 @@ class svnModel extends model
 
     /**
      * Pring log.
-     * 
-     * @param  sting    $log 
+     *
+     * @param  sting    $log
      * @access public
      * @return void
      */
diff --git a/module/task/config.php b/module/task/config.php
index 409ec89fdb..5db5eb88ae 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -44,7 +44,7 @@ $config->task->customBatchEditFields   = 'module,assignedTo,status,pri,estimate,
 $config->task->custom = new stdclass();
 $config->task->custom->createFields      = $config->task->customCreateFields;
 $config->task->custom->batchCreateFields = 'module,story,assignedTo,estimate,desc,pri';
-$config->task->custom->batchEditFields   = 'module,assignedTo,status,pri,estimate,record,left,finishedBy,closedBy,closedReason';
+$config->task->custom->batchEditFields   = 'module,assignedTo,status,pri,estimate,record,left';
 
 $config->task->datatable = new stdclass();
 $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'assignedTo', 'finishedBy', 'estimate', 'consumed', 'left', 'progress', 'deadline', 'actions');
@@ -72,7 +72,7 @@ $config->task->datatable->fieldList['type']['required'] = 'no';
 
 $config->task->datatable->fieldList['status']['title']    = 'statusAB';
 $config->task->datatable->fieldList['status']['fixed']    = 'no';
-$config->task->datatable->fieldList['status']['width']    = '80';
+$config->task->datatable->fieldList['status']['width']    = '60';
 $config->task->datatable->fieldList['status']['required'] = 'no';
 
 $config->task->datatable->fieldList['estimate']['title']    = 'estimateAB';
@@ -99,7 +99,7 @@ $config->task->datatable->fieldList['progress']['name']     = $lang->task->progr
 
 $config->task->datatable->fieldList['deadline']['title']    = 'deadlineAB';
 $config->task->datatable->fieldList['deadline']['fixed']    = 'no';
-$config->task->datatable->fieldList['deadline']['width']    = '100';
+$config->task->datatable->fieldList['deadline']['width']    = '60';
 $config->task->datatable->fieldList['deadline']['required'] = 'no';
 
 $config->task->datatable->fieldList['openedBy']['title']    = 'openedByAB';
diff --git a/module/task/control.php b/module/task/control.php
index b445f9320f..c86f3c476d 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -39,8 +39,9 @@ class task extends control
      */
     public function create($executionID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0)
     {
-        $executions  = $this->execution->getPairs($this->session->PRJ);
+        $executions  = $this->execution->getPairs();
         $executionID = $this->execution->saveState($executionID, $executions);
+        $this->execution->setMenu($executionID);
 
         $this->execution->getLimitedExecution();
         $limitedExecutions = !empty($_SESSION['limitedExecutions']) ? $_SESSION['limitedExecutions'] : '';
@@ -82,14 +83,14 @@ class task extends control
         $storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('execution', 'story', "executionID=$executionID");
 
         /* Set menu. */
-        $this->execution->setMenu($executions, $execution->id);
+        $this->execution->setMenu($execution->id);
 
         if(!empty($_POST))
         {
             $response['result']  = 'success';
             $response['message'] = $this->lang->saveSuccess;
 
-            setcookie('lastTaskModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
+            setcookie('lastTaskModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
             if($this->post->execution) $executionID = (int)$this->post->execution;
             $tasksID = $this->task->create($executionID);
             if(dao::isError())
@@ -130,6 +131,9 @@ class task extends control
 
             $this->executeHooks($taskID);
 
+            /* Return task id when call the API. */
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $taskID));
+
             /* If link from no head then reload. */
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
 
@@ -149,7 +153,7 @@ class task extends control
             }
             elseif($this->post->after == 'toTaskList')
             {
-                setcookie('moduleBrowseParam',  0, 0, $this->config->webRoot, '', false, false);
+                setcookie('moduleBrowseParam',  0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
                 $taskLink  = $this->createLink('execution', 'task', "executionID=$executionID&status=unclosed&param=0&orderBy=id_desc");
                 $response['locate'] = $taskLink;
                 $this->send($response);
@@ -167,7 +171,7 @@ class task extends control
         }
 
         $users            = $this->loadModel('user')->getPairs('noclosed|nodeleted');
-        $members          = $this->execution->getTeamMemberPairs($executionID, 'nodeleted');
+        $members          = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted');
         $showAllModule    = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
         $moduleOptionMenu = $this->tree->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
 
@@ -190,6 +194,18 @@ class task extends control
         }
         $stories = $this->story->getExecutionStoryPairs($executionID, 0, 0, $moduleIdList, 'full', 'unclosed');
 
+        /* Get block id of assinge to me. */
+        $blockID = 0;
+        if(isonlybody())
+        {
+            $blockID = $this->dao->select('id')->from(TABLE_BLOCK)
+                ->where('block')->eq('assingtome')
+                ->andWhere('module')->eq('my')
+                ->andWhere('account')->eq($this->app->user->account)
+                ->orderBy('order_desc')
+                ->fetch('id');
+        }
+
         $title      = $execution->name . $this->lang->colon . $this->lang->task->create;
         $position[] = html::a($taskLink, $execution->name);
         $position[] = $this->lang->task->common;
@@ -206,12 +222,13 @@ class task extends control
         $this->view->title            = $title;
         $this->view->position         = $position;
         $this->view->execution        = $execution;
-        $this->view->executions       = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($this->session->PRJ, 'all', 0, true);
+        $this->view->executions       = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject(0, 'all', 0, true);
         $this->view->task             = $task;
         $this->view->users            = $users;
         $this->view->stories          = $stories;
         $this->view->testStoryIdList  = $this->loadModel('story')->getTestStories(array_keys($stories), $execution->id);
         $this->view->members          = $members;
+        $this->view->blockID          = $blockID;
         $this->view->moduleOptionMenu = $moduleOptionMenu;
         $this->display();
     }
@@ -237,18 +254,25 @@ class task extends control
             die(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
         }
 
+        $execution = $this->execution->getById($executionID);
         if($this->config->systemMode == 'new')
         {
-            $project = $this->project->getByID($this->session->PRJ);
+            $project = $this->project->getByID($execution->project);
             if($project->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
         }
 
-        $execution = $this->execution->getById($executionID);
-        $taskLink  = $this->createLink('execution', 'browse', "executionID=$executionID&tab=task");
+        if($this->app->openApp == 'my')
+        {
+            $taskLink = $this->createLink('my', 'work', 'mode=task');
+        }
+        else
+        {
+            $taskLink  = $this->createLink('execution', 'browse', "executionID=$executionID");
+        }
         $storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('execution', 'story', "executionID=$executionID");
 
         /* Set menu. */
-        $this->execution->setMenu($this->execution->getPairs($this->session->PRJ), $execution->id);
+        $this->execution->setMenu($execution->id);
 
         /* When common task are child tasks, query whether common task are consumed. */
         $taskConsumed = 0;
@@ -263,9 +287,15 @@ class task extends control
             $mails = $this->task->batchCreate($executionID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
+            $taskIDList = array();
+            foreach($mails as $mail) $taskIDList[] = $mail->taskID;
+
+            /* Return task id list when call the API. */
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $taskIDList));
+
             /* Locate the browser. */
             if(!empty($iframe)) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $storyLink));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $taskLink));
         }
 
         /* Set Custom*/
@@ -275,7 +305,7 @@ class task extends control
 
 
         $stories = $this->story->getExecutionStoryPairs($executionID, 0, 0, 0, 'short');
-        $members = $this->execution->getTeamMemberPairs($executionID, 'nodeleted');
+        $members = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted');
 
         $showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
         $modules       = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
@@ -313,11 +343,11 @@ class task extends control
     {
         $this->view->task      = $this->loadModel('task')->getByID($taskID);
         $this->view->execution = $this->execution->getById($this->view->task->execution);
-        $this->view->members   = $this->execution->getTeamMemberPairs($this->view->execution->id ,'nodeleted');
+        $this->view->members   = $this->loadModel('user')->getTeamMemberPairs($this->view->execution->id, 'execution','nodeleted');
         $this->view->actions   = $this->loadModel('action')->getList('task', $taskID);
 
         /* Set menu. */
-        $this->execution->setMenu($this->execution->getPairs($this->session->PRJ), $this->view->execution->id);
+        $this->execution->setMenu($this->execution->getPairs(), $this->view->execution->id);
         $this->view->position[] = html::a($this->createLink('execution', 'browse', "execution={$this->view->task->execution}"), $this->view->execution->name);
     }
 
@@ -392,7 +422,7 @@ class task extends control
         $this->view->users         = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}");
         $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
         $this->view->modules       = $this->tree->getTaskOptionMenu($this->view->task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : '');
-        $this->view->executions    = $this->config->systemMode == 'classic' ? $this->execution->getPairs() : $this->execution->getByProject($this->session->PRJ, 'all', 0, true);
+        $this->view->executions    = $this->config->systemMode == 'classic' ? $this->execution->getPairs() : $this->execution->getByProject(0, 'all', 0, true);
         $this->display();
     }
 
@@ -445,7 +475,7 @@ class task extends control
         if($executionID)
         {
             $execution = $this->execution->getById($executionID);
-            $this->execution->setMenu($this->execution->getPairs($this->session->PRJ), $execution->id);
+            $this->execution->setMenu($this->execution->getPairs(), $execution->id);
 
             /* Set modules and members. */
             $showAllModule = isset($this->config->task->allModule) ? $this->config->task->allModule : '';
@@ -460,10 +490,10 @@ class task extends control
         /* The tasks of my. */
         else
         {
-            $this->lang->task->menu = $this->lang->my->menu;
-            $this->lang->set('menugroup.task', 'my');
-            $this->lang->task->menuOrder = $this->lang->my->menuOrder;
+            /* Set my menu. */
             $this->loadModel('my')->setMenu();
+            $this->lang->my->menu->work['subModule'] = 'task';
+
             $this->view->position[] = html::a($this->createLink('my', 'task'), $this->lang->my->task);
             $this->view->title      = $this->lang->task->batchEdit;
             $this->view->users      = $this->loadModel('user')->getPairs('noletter');
@@ -476,7 +506,7 @@ class task extends control
         /* Get execution teams. */
         $executionIDList = array();
         foreach($tasks as $task) if(!in_array($task->execution, $executionIDList)) $executionIDList[] = $task->execution;
-        $executionTeams = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->in($executionIDList)->andWhere('type')->in('sprint,stage')->fetchGroup('root', 'account');
+        $executionTeams = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->in($executionIDList)->andWhere('type')->eq('execution')->fetchGroup('root', 'account');
 
         /* Judge whether the editedTasks is too large and set session. */
         $countInputVars  = count($tasks) * (count(explode(',', $this->config->task->custom->batchEditFields)) + 3);
@@ -533,7 +563,7 @@ class task extends control
 
         $task = $this->task->getByID($taskID);
 
-        $members = $this->execution->getTeamMemberPairs($executionID, 'nodeleted');
+        $members = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted');
 
         /* Compute next assignedTo. */
         if(!empty($task->team))
@@ -625,9 +655,10 @@ class task extends control
      */
     public function view($taskID)
     {
-        $task = $this->task->getById($taskID, true);
+        $taskID = (int)$taskID;
+        $task   = $this->task->getById($taskID, true);
         if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
-        $this->session->PRJ = $task->project;
+        $this->session->project = $task->project;
 
         if($task->fromBug != 0)
         {
@@ -655,7 +686,7 @@ class task extends control
 
         /* Set menu. */
         $execution = $this->execution->getById($task->execution);
-        $this->execution->setMenu($this->execution->getPairs($this->session->PRJ), $execution->id);
+        if($this->app->openApp == 'execution') $this->execution->setMenu($execution->id);
 
         $this->executeHooks($taskID);
 
@@ -745,7 +776,7 @@ class task extends control
         $this->view->position[] = $this->lang->task->start;
 
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->members    = $this->execution->getTeamMemberPairs($task->execution, 'nodeleted');
+        $this->view->members    = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
         $this->view->assignedTo = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo;
         $this->display();
     }
@@ -786,8 +817,8 @@ class task extends control
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
         }
 
-        $this->session->set('estimateList', $this->app->getURI(true));
-        if(isonlybody() && $this->config->requestType != 'GET') $this->session->set('estimateList', $this->app->getURI(true) . '?onlybody=yes');
+        $this->session->set('estimateList', $this->app->getURI(true), 'execution');
+        if(isonlybody() && $this->config->requestType != 'GET') $this->session->set('estimateList', $this->app->getURI(true) . '?onlybody=yes', 'execution');
 
         $this->view->task      = $this->task->getById($taskID);
         $this->view->estimates = $this->task->getTaskEstimate($taskID);
@@ -904,7 +935,7 @@ class task extends control
         }
 
         $task         = $this->view->task;
-        $members      = $this->execution->getTeamMemberPairs($task->execution, 'nodeleted');
+        $members      = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
         $task->nextBy = $task->openedBy;
 
         $this->view->users = $members;
@@ -1005,7 +1036,7 @@ class task extends control
         $this->view->position[] = $this->lang->task->restart;
 
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->members    = $this->execution->getTeamMemberPairs($task->execution, 'nodeleted');
+        $this->view->members    = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
         $this->view->assignedTo = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo;
         $this->display();
     }
@@ -1206,6 +1237,13 @@ class task extends control
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
         }
 
+        if(!empty($this->view->task->team))
+        {
+            $members = array();
+            foreach($this->view->task->team as $account => $member) $members[$account] = zget($this->view->members, $account);
+            $this->view->members = $members;
+        }
+
         if(!isset($this->view->members[$this->view->task->finishedBy])) $this->view->members[$this->view->task->finishedBy] = $this->view->task->finishedBy;
         $this->view->title      = $this->view->execution->name . $this->lang->colon . $this->lang->task->activate;
         $this->view->position[] = $this->lang->task->activate;
@@ -1323,9 +1361,9 @@ class task extends control
             }
         }
 
-        $executions = $this->execution->getPairs($this->session->PRJ);
+        $executions = $this->execution->getPairs();
 
-        $this->execution->setMenu($executions, $executionID);
+        $this->execution->setMenu($executionID);
         $this->executions          = $executions;
         $this->view->title         = $this->executions[$executionID] . $this->lang->colon . $this->lang->task->report->common;
         $this->view->position[]    = $this->executions[$executionID];
@@ -1401,7 +1439,7 @@ class task extends control
 
             /* Get users and executions. */
             $users      = $this->loadModel('user')->getPairs('noletter');
-            $executions = $this->execution->getPairs($this->session->execution, 'all', 'all|nocode');
+            $executions = $this->execution->getPairs($execution->project, 'all', 'all|nocode');
 
             /* Get related objects id lists. */
             $relatedStoryIdList  = array();
@@ -1538,6 +1576,18 @@ class task extends control
                 if(isset($users[$task->closedBy]))     $task->closedBy     = $users[$task->closedBy];
                 if(isset($users[$task->lastEditedBy])) $task->lastEditedBy = $users[$task->lastEditedBy];
 
+                /* Convert username to real name. */
+                if(!empty($task->mailto))
+                {
+                    $mailtoList = explode(',', $task->mailto);
+
+                    $task->mailto = '';
+                    foreach($mailtoList as $mailto)
+                    {
+                        if(!empty($mailto)) $task->mailto .= ',' . zget($users, $mailto);
+                    }
+                }
+
                 if($task->parent > 0 && strpos($task->name, htmlentities('>')) !== 0) $task->name = '>' . $task->name;
                 if(!empty($task->team))   $task->name = '[' . $taskLang->multipleAB . '] ' . $task->name;
 
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 445a66d20e..8df0054d67 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -1,8 +1,8 @@
-#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /* Adjust for task #4151; */
+#copyButton {width: 80px; background-color: #f1f1f1; opacity: 1;} /* Adjust for task #4151; */
 
 .title-group.required:after {display: none;}
 .title-group.required > .required:after {display: block; right: 29px; top: 5px;}
-#copyStory-input:after {display: block; right: 85px; top: 5px;}
+#copyStory-input:after {display: block; right: 110px; top: 5px;}
 #pri + .chosen-container > .chosen-single {border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important;}
 
 .pri-selector > .btn {padding: 5px 8px !important; width: 100%;}
diff --git a/module/task/css/edit.zh-cn.css b/module/task/css/edit.zh-cn.css
index 9672ee2c84..d0b9f1d97a 100644
--- a/module/task/css/edit.zh-cn.css
+++ b/module/task/css/edit.zh-cn.css
@@ -1,2 +1,2 @@
-.thWidth {width: 80px !important;}
+.thWidth {width: 93px !important;}
 .lifeThWidth {width: 80px !important;}
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index dd2ff4963f..bc3669ef4b 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -194,7 +194,15 @@ $(document).on('mousedown', 'select', function()
 $(function()
 {
     /* Adjust width for ie chosen width. */
-    var chosenWidth = $('#module1_chosen').width();
+    if(!hiddenStory)
+    {
+        var chosenWidth = $('#module1_chosen').width();
+    }
+    else
+    {
+        var chosenWidth = 170;
+    }
+
     $('.chosen-container[id^=module]').width(chosenWidth);
     $('.chosen-container[id^=module]').css('max-width', chosenWidth);
 
diff --git a/module/task/js/batchedit.js b/module/task/js/batchedit.js
index e7fad9c273..32dd170945 100644
--- a/module/task/js/batchedit.js
+++ b/module/task/js/batchedit.js
@@ -46,3 +46,7 @@ $(document).on('change', 'select', function()
     }
 });
 
+$(function()
+{
+    $('#subNavbar li[data-id="task"]').addClass('active');
+});
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 84453be652..71bb2b8f52 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -21,6 +21,8 @@ function loadAll(executionID)
  */
 function loadExecutionMembers(executionID)
 {
+    $("#multipleBox").removeAttr("checked");
+    $('.team-group').addClass('hidden');
     $.get(createLink('execution', 'ajaxGetMembers', 'executionID=' + executionID + '&assignedTo=' + $('#assignedTo').val()), function(data)
     {
         $('#assignedTo_chosen').remove();
@@ -35,6 +37,13 @@ function loadExecutionMembers(executionID)
             $(this).find('#team').replaceWith(data);
             $(this).find('#assignedTo').attr('id', 'team').attr('name', 'team[]').chosen();
         });
+
+        $('#testStoryBox table tbody tr').each(function(i)
+        {
+            $td = $(this).find('#testAssignedTo').closest('td');
+            $td.html(data);
+            $td.find('#assignedTo').val('').attr('id', 'testAssignedTo').attr('name', 'testAssignedTo[]').chosen();
+        });
     });
 }
 
@@ -53,6 +62,29 @@ function loadExecutionStories(executionID)
         $('#story').next('.picker').remove();
         $('#story').replaceWith(data);
         $('#story').addClass('filled').chosen();
+
+        if($('#testStoryBox table tbody tr').length == 0)
+        {
+            var trHtml  = $('#testStoryTemplate tr').prop("outerHTML");
+            $('#testStoryBox table tbody').append(trHtml);
+
+            $td = $('#testStoryBox table tbody tr:first').find('#testStory').closest('td');
+            $td.html(data);
+            $td.find('#story').val($td.find('#story option').eq(i).val()).attr('id', 'testStory').attr('name', 'testStory[]').addClass('filled').chosen();
+
+            $td = $('#testStoryBox table tbody tr:first').find('#testPri_chosen').closest('td');
+            $td.find('#testPri_chosen').remove();
+            $td.find('#testPri').chosen();
+        }
+        else
+        {
+            $('#testStoryBox table tbody tr').each(function(i)
+            {
+                $td = $(this).find('#testStory').closest('td');
+                $td.html(data);
+                $td.find('#story').val($td.find('#story option').eq(i).val()).attr('id', 'testStory').attr('name', 'testStory[]').addClass('filled').chosen();
+            });
+        }
     });
 }
 
@@ -156,12 +188,15 @@ function setPreview()
     {
         storyLink  = createLink('story', 'view', "storyID=" + $('#story').val());
         var concat = config.requestType != 'GET' ? '?'  : '&';
-        storyLink  = storyLink + concat + 'onlybody=yes';
+
+        if(storyLink.indexOf("onlybody=yes") < 0) storyLink = storyLink + concat + 'onlybody=yes';
+
         $('#preview').removeClass('hidden');
         $('#preview a').attr('href', storyLink);
         $('#copyButton').removeClass('hidden');
         $('.title-group.required > div').attr('id', 'copyStory-input').removeClass('.required');
-        $('div.colorpicker').css('right', '57px');//Adjust for task #4151;
+        $('div.colorpicker').css('right', '80px');//Adjust for task #4151;
+        $('#copyButton').css('width', '80px');
     }
 
     setAfter();
@@ -304,7 +339,6 @@ function markTestStory()
             var $tr = $(this);
             storiesHasTest[$tr.find('select[name^="testStory"]').val()] = true;
         });
-        console.log(storiesHasTest);
         return storiesHasTest;
     };
 
@@ -474,3 +508,7 @@ $('#modalTeam .btn').click(function()
         $('#estimate').val(time);
     })
 });
+
+$(window).unload(function(){
+    if(blockID) window.parent.refreshBlock($('#block' + blockID));
+});
diff --git a/module/task/js/x.view.js b/module/task/js/x.view.js
index 8ffbdb54e8..52c944d43c 100644
--- a/module/task/js/x.view.js
+++ b/module/task/js/x.view.js
@@ -1,7 +1,7 @@
 $(function()
 {
     $('.main-actions-holder').css('height', '0px');
-    var $xuanAction = "<div class='xuancard-actions fixed'>";
+    var xuanAction = "<div class='xuancard-actions fixed'>";
     $('.main-col div.main-actions .btn-toolbar a').each(function(){
         var $that    = $(this);
 
@@ -14,7 +14,7 @@ $(function()
 
         if(href.indexOf('create') >= 0 || href.indexOf('batchCreate') >= 0 || href.indexOf('delete') >= 0) return true;
 
-        if($that.hasClass('iframe')) 
+        if($that.hasClass('iframe'))
         {
             url = href;
             target = '';
@@ -25,10 +25,10 @@ $(function()
            target = " target='_blank'";
         }
 
-        $xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
+        xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
     });
 
-    $xuanAction += '</div>';
-    $('#footer').replaceWith($xuanAction);
+    xuanAction += '</div>';
+    $('body').append(xuanAction);
     $('.xuancard-actions a.iframe').modalTrigger();
 })
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 35878f839d..d354605c26 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -131,6 +131,8 @@ $lang->task->lblPri            = 'P';
 $lang->task->lblHour           = '(h)';
 $lang->task->lblTestStory      = 'Story Tested';
 
+$lang->task->recordEstimateAction = 'Record Estimate';
+
 $lang->task->ditto             = 'Ditto';
 $lang->task->dittoNotice       = "This Task is not linked to the %s as the previous one is!";
 $lang->task->selectTestStory   = 'Select Story Testd';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index ceecb0892e..ba81bcb2e5 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = '所有模块';
 $lang->task->common           = '任务';
 $lang->task->id               = '编号';
 $lang->task->project          = '所属项目';
-$lang->task->execution        = '所属' . $lang->executionCommon;
+$lang->task->execution        = '所属' . $lang->execution->common;
 $lang->task->module           = '所属模块';
 $lang->task->moduleAB         = '模块';
 $lang->task->story            = "相关{$lang->SRCommon}";
@@ -131,9 +131,11 @@ $lang->task->lblPri           = 'P';
 $lang->task->lblHour          = '(h)';
 $lang->task->lblTestStory     = "测试{$lang->SRCommon}";
 
+$lang->task->recordEstimateAction = '添加工时';
+
 $lang->task->ditto             = '同上';
 $lang->task->dittoNotice       = "该任务与上一任务不属于同一%s！";
-$lang->task->selectTestStory   = "选择测试{$lang->SRCommon}";
+$lang->task->selectTestStory   = "选择测试需求";
 $lang->task->selectAllUser     = '全部';
 $lang->task->noStory           = "无{$lang->SRCommon}";
 $lang->task->noAssigned        = '未指派';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 5bb7be0ba1..5f24670fb2 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = '所有模組';
 $lang->task->common           = '任務';
 $lang->task->id               = '編號';
 $lang->task->project          = '所屬項目';
-$lang->task->execution        = '所屬' . $lang->executionCommon;
+$lang->task->execution        = '所屬' . $lang->execution->common;
 $lang->task->module           = '所屬模組';
 $lang->task->moduleAB         = '模組';
 $lang->task->story            = "相關{$lang->SRCommon}";
@@ -131,6 +131,8 @@ $lang->task->lblPri           = 'P';
 $lang->task->lblHour          = '(h)';
 $lang->task->lblTestStory     = "測試{$lang->SRCommon}";
 
+$lang->task->recordEstimateAction = '添加工時';
+
 $lang->task->ditto             = '同上';
 $lang->task->dittoNotice       = "該任務與上一任務不屬於同一%s！";
 $lang->task->selectTestStory   = "選擇測試{$lang->SRCommon}";
@@ -180,26 +182,26 @@ $lang->task->legendEffort = '工時信息';
 $lang->task->legendLife   = '任務的一生';
 $lang->task->legendDesc   = '任務描述';
 
-$lang->task->confirmDelete         = "您確定要刪除這個任務嗎？";
-$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎？";
-$lang->task->copyStoryTitle        = "同{$lang->SRCommon}";
-$lang->task->afterSubmit           = "添加之後";
-$lang->task->successSaved          = "成功添加，";
-$lang->task->delayWarning          = " <strong class='text-danger'> 延期%s天 </strong>";
-$lang->task->remindBug             = "該任務為Bug轉化得到，是否更新Bug:%s ?";
-$lang->task->confirmChangeProject  = "修改{$lang->executionCommon}會導致相應的所屬模組、相關{$lang->SRCommon}和指派人發生變化，確定嗎？";
-$lang->task->confirmFinish         = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
-$lang->task->confirmRecord         = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
-$lang->task->confirmTransfer       = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
-$lang->task->noticeTaskStart       = '"總計消耗"和"預計剩餘"不能同時為0';
-$lang->task->noticeLinkStory       = "沒有可關聯的相關{$lang->SRCommon}，您可以為當前項目%s，然後%s";
-$lang->task->noticeSaveRecord      = '您有尚未保存的工時記錄，請先將其保存。';
-$lang->task->commentActions        = '%s. %s, 由 <strong>%s</strong> 添加備註。';
-$lang->task->deniedNotice          = '當前任務只有%s才可以%s。';
-$lang->task->noTask                = '暫時沒有任務。';
-$lang->task->createDenied          = '你不能在該項目添加任務';
-$lang->task->cannotDeleteParent    = '不能刪除父任務。';
-$lang->task->addChildTask          = '因該任務已經產生消耗，為保證數據一致性，我們會幫您創建一條同名子任務記錄該消耗。';
+$lang->task->confirmDelete          = "您確定要刪除這個任務嗎？";
+$lang->task->confirmDeleteEstimate  = "您確定要刪除這個記錄嗎？";
+$lang->task->copyStoryTitle         = "同{$lang->SRCommon}";
+$lang->task->afterSubmit            = "添加之後";
+$lang->task->successSaved           = "成功添加，";
+$lang->task->delayWarning           = " <strong class='text-danger'> 延期%s天 </strong>";
+$lang->task->remindBug              = "該任務為Bug轉化得到，是否更新Bug:%s ?";
+$lang->task->confirmChangeExecution = "修改{$lang->executionCommon}會導致相應的所屬模組、相關{$lang->SRCommon}和指派人發生變化，確定嗎？";
+$lang->task->confirmFinish          = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
+$lang->task->confirmRecord          = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
+$lang->task->confirmTransfer        = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
+$lang->task->noticeTaskStart        = '"總計消耗"和"預計剩餘"不能同時為0';
+$lang->task->noticeLinkStory        = "沒有可關聯的相關{$lang->SRCommon}，您可以為當前項目%s，然後%s";
+$lang->task->noticeSaveRecord       = '您有尚未保存的工時記錄，請先將其保存。';
+$lang->task->commentActions         = '%s. %s, 由 <strong>%s</strong> 添加備註。';
+$lang->task->deniedNotice           = '當前任務只有%s才可以%s。';
+$lang->task->noTask                 = '暫時沒有任務。';
+$lang->task->createDenied           = '你不能在該項目添加任務';
+$lang->task->cannotDeleteParent     = '不能刪除父任務。';
+$lang->task->addChildTask           = '因該任務已經產生消耗，為保證數據一致性，我們會幫您創建一條同名子任務記錄該消耗。';
 
 $lang->task->error                    = new stdclass();
 $lang->task->error->totalNumber       = '"總計消耗"必須為數字';
@@ -229,7 +231,7 @@ $lang->task->report->select = '請選擇報表類型';
 $lang->task->report->create = '生成報表';
 $lang->task->report->value  = '任務數';
 
-$lang->task->report->charts['tasksPerProject']      = '按' . $lang->executionCommon . '任務數統計';
+$lang->task->report->charts['tasksPerExecution']    = '按' . $lang->executionCommon . '任務數統計';
 $lang->task->report->charts['tasksPerModule']       = '按模組任務數統計';
 $lang->task->report->charts['tasksPerAssignedTo']   = '按指派給統計';
 $lang->task->report->charts['tasksPerType']         = '按任務類型統計';
@@ -249,7 +251,7 @@ $lang->task->report->options->type   = 'pie';
 $lang->task->report->options->width  = 500;
 $lang->task->report->options->height = 140;
 
-$lang->task->report->tasksPerProject      = new stdclass();
+$lang->task->report->tasksPerExecution    = new stdclass();
 $lang->task->report->tasksPerModule       = new stdclass();
 $lang->task->report->tasksPerAssignedTo   = new stdclass();
 $lang->task->report->tasksPerType         = new stdclass();
@@ -263,7 +265,7 @@ $lang->task->report->tasksPerFinishedBy   = new stdclass();
 $lang->task->report->tasksPerClosedReason = new stdclass();
 $lang->task->report->finishedTasksPerDay  = new stdclass();
 
-$lang->task->report->tasksPerProject->item      = $lang->executionCommon;
+$lang->task->report->tasksPerExecution->item    = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = '模組';
 $lang->task->report->tasksPerAssignedTo->item   = '用戶';
 $lang->task->report->tasksPerType->item         = '類型';
@@ -277,7 +279,7 @@ $lang->task->report->tasksPerFinishedBy->item   = '用戶';
 $lang->task->report->tasksPerClosedReason->item = '原因';
 $lang->task->report->finishedTasksPerDay->item  = '日期';
 
-$lang->task->report->tasksPerProject->graph      = new stdclass();
+$lang->task->report->tasksPerExecution->graph    = new stdclass();
 $lang->task->report->tasksPerModule->graph       = new stdclass();
 $lang->task->report->tasksPerAssignedTo->graph   = new stdclass();
 $lang->task->report->tasksPerType->graph         = new stdclass();
@@ -291,7 +293,7 @@ $lang->task->report->tasksPerFinishedBy->graph   = new stdclass();
 $lang->task->report->tasksPerClosedReason->graph = new stdclass();
 $lang->task->report->finishedTasksPerDay->graph  = new stdclass();
 
-$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->executionCommon;
+$lang->task->report->tasksPerExecution->graph->xAxisName    = $lang->executionCommon;
 $lang->task->report->tasksPerModule->graph->xAxisName       = '模組';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = '用戶';
 $lang->task->report->tasksPerType->graph->xAxisName         = '類型';
diff --git a/module/task/model.php b/module/task/model.php
index 2f2053e347..1c52542220 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -28,7 +28,6 @@ class taskModel extends model
             return false;
         }
 
-        $this->getExtraRequiredFields();
         $executionID    = (int)$executionID;
         $taskIdList     = array();
         $taskFiles      = array();
@@ -47,7 +46,7 @@ class taskModel extends model
             ->setDefault('execution', $executionID)
             ->setDefault('estimate,left,story', 0)
             ->setDefault('status', 'wait')
-            ->setIF($this->config->systemMode == 'new', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new', 'project', $this->getProjectID($executionID))
             ->setIF($this->post->estimate != false, 'left', $this->post->estimate)
             ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
             ->setDefault('estStarted', '0000-00-00')
@@ -80,7 +79,7 @@ class taskModel extends model
             if($assignedTo) $task->assignedDate = helper::now();
 
             /* Check duplicate task. */
-            if($task->type != 'affair')
+            if($task->type != 'affair' and $task->name)
             {
                 $result = $this->loadModel('common')->removeDuplicate('task', $task, "execution={$executionID} and story=" . (int)$task->story);
                 if($result['stop'])
@@ -280,8 +279,8 @@ class taskModel extends model
         $assignedTo = '';
 
         /* Get task data. */
-        $this->getExtraRequiredFields();
         $extendFields = $this->getFlowExtendFields();
+        $projectID    = $this->getProjectID($executionID);
         $data         = array();
         foreach($tasks->name as $i => $name)
         {
@@ -303,7 +302,7 @@ class taskModel extends model
             $data[$i]->pri        = $tasks->pri[$i];
             $data[$i]->estimate   = $tasks->estimate[$i];
             $data[$i]->left       = $tasks->estimate[$i];
-            $data[$i]->project    = $this->config->systemMode == 'new' ? $this->session->PRJ : 0;
+            $data[$i]->project    = $this->config->systemMode == 'new' ? $projectID : 0;
             $data[$i]->execution  = $executionID;
             $data[$i]->estStarted = empty($tasks->estStarted[$i]) ? '0000-00-00' : $tasks->estStarted[$i];
             $data[$i]->deadline   = empty($tasks->deadline[$i]) ? '0000-00-00' : $tasks->deadline[$i];
@@ -779,8 +778,6 @@ class taskModel extends model
      */
     public function update($taskID)
     {
-        $this->getExtraRequiredFields();
-
         $oldTask = $this->getByID($taskID);
         if($this->post->estimate < 0 or $this->post->left < 0 or $this->post->consumed < 0)
         {
@@ -839,7 +836,7 @@ class taskModel extends model
             ->setIF($oldTask->parent < 0, 'estimate', $oldTask->estimate)
             ->setIF($oldTask->parent < 0, 'left', $oldTask->left)
 
-            ->setIF($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline, 'version', $oldTask->version + 1)
+            ->setIF($oldTask->name != $this->post->name || $oldTask->estStarted != $this->post->estStarted || $oldTask->deadline != $this->post->deadline, 'version', $oldTask->version + 1)
 
             ->setDefault('lastEditedBy',   $this->app->user->account)
             ->add('lastEditedDate', $now)
@@ -862,7 +859,7 @@ class taskModel extends model
         $teams = array();
         if($this->post->multiple)
         {
-            if(strpos(',done,closed,cancel,', ",{$task->status},") === false && !in_array($this->post->assignedTo, $this->post->team))
+            if(strpos(',done,closed,cancel,', ",{$task->status},") === false && $this->post->assignedTo && !in_array($this->post->assignedTo, $this->post->team))
             {
                 dao::$errors[] = $this->lang->task->error->assignedTo;
                 return false;
@@ -937,7 +934,6 @@ class taskModel extends model
             ->checkIF($task->status == 'done' and $task->closedReason, 'closedReason', 'equal', 'done')
             ->batchCheckIF($task->status == 'done', 'canceledBy, canceledDate', 'empty')
 
-            ->checkIF($task->status == 'closed', 'closedReason', 'notempty')
             ->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
             ->where('id')->eq((int)$taskID)->exec();
 
@@ -951,7 +947,7 @@ class taskModel extends model
             }
 
             /* Record task version. */
-            if($task->version > $oldTask->version)
+            if(isset($task->version) and $task->version > $oldTask->version)
             {
                 $taskSpec = new stdClass();
                 $taskSpec->task       = $taskID;
@@ -1361,7 +1357,7 @@ class taskModel extends model
 
         if($this->post->left == 0)
         {
-            if($task->consumed == 0)
+            if(isset($task->consumed) and $task->consumed == 0)
             {
                 dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->task->consumed);
                 return false;
@@ -1494,6 +1490,7 @@ class taskModel extends model
         $data->status         = $task->status;
         $data->lastEditedBy   = $this->app->user->account;
         $data->lastEditedDate = $now;
+        if(helper::isZeroDate($task->realStarted)) $data->realStarted = $now;
 
         if($left == 0)
         {
@@ -1872,6 +1869,11 @@ class taskModel extends model
         return $this->processTask($task);
     }
 
+    public function getProjectID($executionID = 0)
+    {
+        return $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
+    }
+
     /**
      * Get task list.
      *
@@ -2534,7 +2536,7 @@ class taskModel extends model
 
         $datas = $this->processData4Report($tasks, '', 'execution');
 
-        $executions = $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'all');
+        $executions = $this->loadModel('execution')->getPairs(0, 'all', 'all');
         foreach($datas as $executionID => $data)
         {
             $data->name  = isset($executions[$executionID]) ? $executions[$executionID] : $this->lang->report->undefined;
@@ -2970,13 +2972,13 @@ class taskModel extends model
                 $storyChanged ? print("<span class='status-story status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");
                 break;
             case 'estimate':
-                echo round($task->estimate, 1) . ' ' . $this->lang->execution->workHourUnit;
+                echo round($task->estimate, 1) . $this->lang->execution->workHourUnit;
                 break;
             case 'consumed':
-                echo round($task->consumed, 1) . ' ' . $this->lang->execution->workHourUnit;
+                echo round($task->consumed, 1) . $this->lang->execution->workHourUnit;
                 break;
             case 'left':
-                echo round($task->left, 1)     . ' ' . $this->lang->execution->workHourUnit;
+                echo round($task->left, 1)     . $this->lang->execution->workHourUnit;
                 break;
             case 'progress':
                 echo round($task->progress, 2) . '%';
@@ -3028,7 +3030,7 @@ class taskModel extends model
                 {
                     if(common::hasPriv('story', 'view'))
                     {
-                        echo html::a(helper::createLink('story', 'view', "storyid=$task->storyID", 'html', true), "<i class='icon icon-{$this->lang->icons['story']}'></i>", '', "class='iframe' title='{$task->storyTitle}'");
+                        echo html::a(helper::createLink('story', 'view', "storyid=$task->storyID", 'html', true), "<i class='icon icon-{$this->lang->icons['story']}'></i>", '', "class='iframe' data-width='1050' title='{$task->storyTitle}'");
                     }
                     else
                     {
@@ -3242,7 +3244,7 @@ class taskModel extends model
      */
     public function getMemberPairs($task)
     {
-        $users   = $this->loadModel('execution')->getTeamMemberPairs($task->execution, 'nodeleted');
+        $users   = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
         $members = array('');
         foreach($task->team as $member)
         {
@@ -3250,21 +3252,4 @@ class taskModel extends model
         }
         return $members;
     }
-
-    /**
-     * Get additional required fields.
-     *
-     * @access public
-     * @return void
-     */
-    public function getExtraRequiredFields()
-    {
-        /* Add required fields to waterfall execution. */
-        $execution = $this->loadModel('project')->getByID($this->session->PRJ);
-        if(!empty($execution) && $execution->model == 'waterfall')
-        {
-            $this->config->task->create->requiredFields .= ',estStarted,deadline';
-            $this->config->task->edit->requiredFields   .= ',estStarted,deadline';
-        }
-    }
 }
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 0c0b3a886c..c762761c8b 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -200,5 +200,6 @@
 <?php js::set('mainField', 'name');?>
 <?php js::set('ditto', $lang->task->ditto);?>
 <?php js::set('storyID', $storyID);?>
+<?php js::set('hiddenStory', $hiddenStory);?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 52fd386645..21de933490 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -21,7 +21,7 @@ js::set('dittoNotice', $dittoNotice);
     <h2>
       <?php echo $lang->task->common . $lang->colon . $lang->task->batchEdit;?>
       <?php if($executionName):?>
-      <small class='text-muted'><?php echo html::icon($lang->icons[$executionType]) . ' ' . $lang->task->execution . $lang->colon . ' ' . $executionName;?></small>
+      <small class='text-muted'><?php echo $lang->task->execution . $lang->colon . ' ' . $executionName;?></small>
       <?php endif;?>
     </h2>
     <div class='pull-right btn-toolbar'>
@@ -91,7 +91,7 @@ js::set('dittoNotice', $dittoNotice);
             <?php $disableHour = (isset($teams[$taskID]) or $tasks[$taskID]->parent < 0) ? "disabled='disabled'" : '';?>
             <?php
             $members      = array('' => '', 'ditto' => $this->lang->task->ditto);
-            $teamAccounts = array_keys($executionTeams[$tasks[$taskID]->execution]);
+            $teamAccounts = !empty($executionTeams[$tasks[$taskID]->execution]) ? array_keys($executionTeams[$tasks[$taskID]->execution]) : array();
             foreach($teamAccounts as $teamAccount) $members[$teamAccount] = $users[$teamAccount];
             $members['closed'] = 'Closed';
 
@@ -105,6 +105,11 @@ js::set('dittoNotice', $dittoNotice);
             {
                 $taskMembers = $members;
             }
+
+            if($tasks[$taskID]->assignedTo and !isset($taskMembers[$tasks[$taskID]->assignedTo]))
+            {
+                $taskMembers[$tasks[$taskID]->assignedTo] = $users[$tasks[$taskID]->assignedTo];
+            }
             ?>
             <td><?php echo $taskID . html::hidden("taskIDList[$taskID]", $taskID);?></td>
             <td style='overflow:visible' title='<?php echo $tasks[$taskID]->name?>'>
@@ -119,7 +124,7 @@ js::set('dittoNotice', $dittoNotice);
                 </div>
               </div>
             </td>
-            <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$taskID]",     $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
+            <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$taskID]", $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
             <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$taskID]", $taskMembers, $tasks[$taskID]->assignedTo, "class='form-control chosen' {$disableAssignedTo}");?></td>
             <td><?php echo html::select("types[$taskID]",    $typeList, $tasks[$taskID]->type, "class='form-control'");?></td>
             <td <?php echo zget($visibleFields, 'status',     "class='hidden'")?>><?php echo html::select("statuses[$taskID]", $statusList, $tasks[$taskID]->status, "class='form-control'");?></td>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 90ed3392ba..508f3f7087 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/sortable.html.php';?>
 <?php js::set('toTaskList', !empty($task->id));?>
+<?php js::set('blockID', $blockID);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -292,6 +293,27 @@
     </form>
   </div>
 </div>
+<table class='hidden' id='testStoryTemplate'>
+  <tr>
+    <td><?php echo html::select("testStory[]", array(0 => ''), 0, "class='form-control chosen'");?></td>
+    <td><?php echo html::select("testPri[]", $lang->task->priList, '', "class='form-control chosen'");?></td>
+    <td>
+      <div class='input-group'>
+        <?php echo html::input("testEstStarted[]", '', "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?>
+        <span class='input-group-addon fix-border'>~</span>
+        <?php echo html::input("testDeadline[]", '', "class='form-control form-date' placeholder='{$lang->task->deadline}'");?>
+      </div>
+    </td>
+    <td><?php echo html::select("testAssignedTo[]", array('' => ''), '', "class='form-control chosen'");?></td>
+    <td><?php echo html::input("testEstimate[]", '', "class='form-control'");?></td>
+    <td class='text-center'>
+      <div class="btn-group">
+        <button type="button" class="btn btn-sm" tabindex="-1" onclick='addItem(this)'><i class="icon icon-plus"></i></button>
+        <button type="button" class="btn btn-sm" tabindex="-1" onclick='removeItem(this)'><i class="icon icon-close"></i></button>
+      </div>
+    </td>
+  </tr>
+</table>
 <?php js::set('stories', $stories);?>
 <?php js::set('storyPinYin', (empty($config->isINT) and class_exists('common')) ? common::convert2Pinyin($stories) : array());?>
 <?php js::set('testStoryIdList', $testStoryIdList);?>
diff --git a/module/testcase/config.php b/module/testcase/config.php
index 2d9eaccca0..7d0d752ec8 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -160,7 +160,7 @@ $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['status']['title']    = 'statusAB';
 $config->testcase->datatable->fieldList['status']['fixed']    = 'no';
-$config->testcase->datatable->fieldList['status']['width']    = '90';
+$config->testcase->datatable->fieldList['status']['width']    = '70';
 $config->testcase->datatable->fieldList['status']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['lastEditedBy']['title']    = 'lastEditedBy';
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 1c94cd15d3..a6bacfea31 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -39,23 +39,28 @@ class testcase extends control
         $this->loadModel('product');
         $this->loadModel('tree');
         $this->loadModel('user');
+        $this->loadModel('qa');
 
-        /* Set test case menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID)
+        /* Get product data. */
+        $objectID = 0;
+        if($this->app->openApp == 'project')
         {
-            $this->app->loadConfig('qa');
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-            //$this->lang->noMenuModule[] = $this->app->rawModule;
+            $objectID = $this->session->project;
+            $products  = $this->loadModel('project')->getProducts($objectID, false);
         }
-        else 
-        {    
-            $this->lang->testcase->menu    = $this->lang->projectQa->menu;
-            $this->lang->testcase->subMenu = $this->lang->projectQa->subMenu;
+        elseif($this->app->openApp == 'execution')
+        {
+            $objectID = $this->session->execution;
+            $products = $this->loadModel('execution')->getProducts($objectID, false);
+        }
+        else
+        {
+            $products = $this->product->getPairs();
         }
 
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->projectID);
-        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testcase")));
+        $this->view->products = $this->products = $products;
+        $openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
+        if(empty($this->products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=testcase&objectID=$objectID")));
     }
 
     /**
@@ -79,10 +84,11 @@ class testcase extends control
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = '', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $branch = '', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
     {
         $this->loadModel('datatable');
 
@@ -90,18 +96,18 @@ class testcase extends control
         $browseType = strtolower($browseType);
 
         /* Set browseType, productID, moduleID and queryID. */
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->app->openApp != 'project' ? $this->product->saveState($productID, $this->products) : $productID;
         $branch    = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
-        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch)
         {
             $_COOKIE['caseModule'] = 0;
-            setcookie('caseModule', 0, 0, $this->config->webRoot, '', false, false);
+            setcookie('caseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
         }
-        if($browseType == 'bymodule') setcookie('caseModule', (int)$param, 0, $this->config->webRoot, '', false, false);
-        if($browseType == 'bysuite')  setcookie('caseSuite', (int)$param, 0, $this->config->webRoot, '', false, true);
+        if($browseType == 'bymodule') setcookie('caseModule', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+        if($browseType == 'bysuite')  setcookie('caseSuite', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
         if($browseType != 'bymodule') $this->session->set('caseBrowseType', $browseType);
 
         $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->caseModule ? $this->cookie->caseModule : 0));
@@ -109,8 +115,17 @@ class testcase extends control
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu, save session. */
-        $this->testcase->setMenu($this->products, $productID, $branch, $moduleID, $suiteID, $orderBy);
-        $this->session->set('caseList', $this->app->getURI(true));
+        if($this->app->openApp == 'project')
+        {
+            $this->products = array('0' => $this->lang->product->all) + $this->loadModel('project')->getProducts($this->session->project, false);
+            $this->loadModel('project')->setMenu($projectID);
+        }
+        else
+        {
+            $this->qa->setMenu($this->products, $productID, $branch);
+        }
+
+        $this->session->set('caseList', $this->app->getURI(true), $this->app->openApp);
         $this->session->set('productID', $productID);
         $this->session->set('moduleID', $moduleID);
         $this->session->set('browseType', $browseType);
@@ -140,7 +155,10 @@ class testcase extends control
         $cases = $this->testcase->appendData($cases);
 
         /* Build the search form. */
-        $actionURL = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID");
+        $currentModule = $this->app->openApp == 'project' ? 'project'  : 'testcase';
+        $currentMethod = $this->app->openApp == 'project' ? 'testcase' : 'browse';
+        $projectParam  = $this->app->openApp == 'project' ? "projectID={$this->session->project}&" : '';
+        $actionURL = $this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID");
         $this->config->testcase->search['onMenuBar'] = 'yes';
 
         $this->testcase->buildSearchForm($productID, $this->products, $queryID, $actionURL);
@@ -148,6 +166,16 @@ class testcase extends control
         $showModule = !empty($this->config->datatable->testcaseBrowse->showModule) ? $this->config->datatable->testcaseBrowse->showModule : '';
         $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'case', $showModule) : array();
 
+        /* Get module tree.*/
+        if($projectID and empty($productID))
+        {
+            $moduleTree = $this->tree->getCaseTreeMenu($projectID, $productID, 0, array('treeModel', 'createCaseLink'));
+        }
+        else
+        {
+            $moduleTree = $this->tree->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createCaseLink'), '', $branch);
+        }
+
         /* Assign. */
         $tree = $moduleID ? $this->tree->getByID($moduleID) : '';
         $this->view->title         = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common;
@@ -157,9 +185,10 @@ class testcase extends control
         $this->view->product       = $this->product->getById($productID);
         $this->view->productName   = $this->products[$productID];
         $this->view->modules       = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch);
-        $this->view->moduleTree    = $this->tree->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createCaseLink'), '', $branch);
+        $this->view->moduleTree    = $moduleTree;
         $this->view->moduleName    = $moduleID ? $tree->name : $this->lang->tree->all;
         $this->view->moduleID      = $moduleID;
+        $this->view->projectType   = !empty($projectID) ? $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('model') : '';
         $this->view->summary       = $this->testcase->summary($cases);
         $this->view->pager         = $pager;
         $this->view->users         = $this->user->getPairs('noletter');
@@ -192,8 +221,14 @@ class testcase extends control
 
         $this->app->loadLang('testtask');
 
-        $this->testcase->setMenu($this->products, $productID, $branch);
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
+        if($this->app->openApp == 'project')
+        {
+            $products = array('0' => $this->lang->product->all) + $this->project->getProducts($this->session->project, false);
+            $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'groupCase', '', $branch);
+        }
+
+        $this->session->set('caseList', $this->app->getURI(true), $this->app->openApp);
 
         $cases = $this->testcase->getModuleCases($productID, $branch, 0, $groupBy);
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
@@ -247,7 +282,16 @@ class testcase extends control
      */
     public function create($productID, $branch = '', $moduleID = 0, $from = '', $param = 0, $storyID = 0, $extras = '')
     {
-        $testcaseID = $from == 'testcase' ? $param : 0;
+        if($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($this->session->execution);
+        }
+        else
+        {
+            $this->qa->setMenu($this->products, $productID, $branch);
+        }
+
+        $testcaseID = ($from and strpos('testcase|work|contribute', $from) !== false) ? $param : 0;
         $bugID      = $from == 'bug' ? $param : 0;
 
         $this->loadModel('story');
@@ -256,7 +300,7 @@ class testcase extends control
             $response['result']  = 'success';
             $response['message'] = $this->lang->saveSuccess;
 
-            setcookie('lastCaseModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
+            setcookie('lastCaseModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $caseResult = $this->testcase->create($bugID);
             if(!$caseResult or dao::isError())
             {
@@ -275,14 +319,17 @@ class testcase extends control
 
             $this->loadModel('action');
             $this->action->create('case', $caseID, 'Opened');
+            if($this->app->openApp == 'project') $this->action->create('case', $caseID, 'linked2project', '', $this->session->project);
+            if($this->app->openApp == 'execution') $this->action->create('case', $caseID, 'linked2execution', '', $this->session->execution);
 
             $this->executeHooks($caseID);
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $caseID));
             /* If link from no head then reload. */
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
 
-            setcookie('caseModule', 0, 0, $this->config->webRoot, '', false, false);
-            $response['locate'] = $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all&param=0&orderBy=id_desc");
+            setcookie('caseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            $response['locate'] = ($this->session->caseList and strpos($this->session->caseList, 'dynamic') === false) ? $this->session->caseList : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all&param=0&orderBy=id_desc");
             $this->send($response);
         }
         if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
@@ -292,7 +339,18 @@ class testcase extends control
         if($branch === '') $branch = (int)$this->cookie->preBranch;
 
         /* Set menu. */
-        $this->testcase->setMenu($this->products, $productID, $branch);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($this->session->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($this->session->execution);
+        }
+        else
+        {
+            $this->qa->setMenu($this->products, $productID, $branch);
+        }
 
         /* Init vars. */
         $type         = 'feature';
@@ -366,6 +424,11 @@ class testcase extends control
             $modules = $this->tree->getAllChildID($modules);
         }
         $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false);
+        if($this->app->openApp != 'qa')
+        {
+            $projectID = $this->app->openApp == 'project' ? $this->session->project : $this->session->execution;
+            $stories   = $this->story->getExecutionStoryPairs($projectID, $productID, $branch);
+        }
         if($storyID and !isset($stories[$storyID])) $stories = $this->story->formatStories(array($storyID => $story)) + $stories;//Fix bug #2406.
 
         /* Set custom. */
@@ -411,12 +474,17 @@ class testcase extends control
         $this->loadModel('story');
         if(!empty($_POST))
         {
-            $caseID = $this->testcase->batchCreate($productID, $branch, $storyID);
+            $caseIDList = $this->testcase->batchCreate($productID, $branch, $storyID);
             if(dao::isError()) die(js::error(dao::getError()));
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
 
-            setcookie('caseModule', 0, 0, $this->config->webRoot, '', false, false);
-            die(js::locate($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=all&param=0&orderBy=id_desc"), 'parent'));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $caseIDList));
+
+            setcookie('caseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+            $currentModule = $this->app->openApp == 'project' ? 'project'  : 'testcase';
+            $currentMethod = $this->app->openApp == 'project' ? 'testcase' : 'browse';
+            $projectParam  = $this->app->openApp == 'project' ? "projectID={$this->session->project}&" : '';
+            die(js::locate($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=all&param=0&orderBy=id_desc"), 'parent'));
         }
         if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
 
@@ -431,7 +499,7 @@ class testcase extends control
         $currentModuleID = (int)$moduleID;
 
         /* Set menu. */
-        $this->testcase->setMenu($this->products, $productID, $branch);
+        $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
 
         /* Set story list. */
         $story     = $storyID ? $this->story->getByID($storyID) : '';
@@ -523,7 +591,8 @@ class testcase extends control
      */
     public function view($caseID, $version = 0, $from = 'testcase', $taskID = 0)
     {
-        $case = $this->testcase->getById($caseID, $version);
+        $caseID = (int)$caseID;
+        $case   = $this->testcase->getById($caseID, $version);
         if(!$case) die(js::error($this->lang->notFound) . js::locate('back'));
         if($case->auto == 'unit')
         {
@@ -551,13 +620,11 @@ class testcase extends control
             }
         }
 
-        $branches  = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($case->product);
         $isLibCase = ($case->lib and empty($case->product));
         if($isLibCase)
         {
             $libraries = $this->loadModel('caselib')->getLibraries();
-            $this->caselib->setLibMenu($libraries, $case->lib);
-            $this->lang->testcase->menu = $this->lang->caselib->menu;
+            $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->caselib->setLibMenu($libraries, $case->lib);
 
             $this->view->title      = "CASE #$case->id $case->title - " . $libraries[$case->lib];
             $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$case->lib"), $libraries[$case->lib]);
@@ -567,13 +634,20 @@ class testcase extends control
         else
         {
             $productID = $case->product;
-            $this->testcase->setMenu($this->products, $productID, $case->branch);
+            $product   = $this->product->getByID($productID);
+            $branches  = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID);
+
+            if($this->app->openApp == 'project')   $this->loadModel('project')->setMenu($this->session->project);
+            if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($this->session->execution);
+            if($this->app->openApp == 'qa')        $this->testcase->setMenu($this->products, $productID, $case->branch);
 
             $this->view->title      = "CASE #$case->id $case->title - " . $this->products[$productID];
             $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
 
+            $this->view->product     = $product;
+            $this->view->branches    = $branches;
             $this->view->productName = $this->products[$productID];
-            $this->view->branchName  = $this->session->currentProductType == 'normal' ? '' : zget($branches, $case->branch, '');
+            $this->view->branchName  = $product->type == 'normal' ? '' : zget($branches, $case->branch, '');
         }
 
         $caseFails = $this->dao->select('COUNT(*) AS count')->from(TABLE_TESTRESULT)
@@ -600,7 +674,6 @@ class testcase extends control
         $this->view->runID      = $from == 'testcase' ? 0 : $run->id;
         $this->view->isLibCase  = $isLibCase;
         $this->view->caseFails  = $caseFails;
-        $this->view->branches   = $branches;
 
         $this->display();
     }
@@ -663,8 +736,7 @@ class testcase extends control
         if($isLibCase)
         {
             $libraries = $this->loadModel('caselib')->getLibraries();
-            $this->caselib->setLibMenu($libraries, $case->lib);
-            $this->lang->testcase->menu = $this->lang->caselib->menu;
+            $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->caselib->setLibMenu($libraries, $case->lib);
 
             $title      = "CASE #$case->id $case->title - " . $libraries[$case->lib];
             $position[] = html::a($this->createLink('caselib', 'browse', "libID=$case->lib"), $libraries[$case->lib]);
@@ -681,7 +753,9 @@ class testcase extends control
             $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
 
             /* Set menu. */
-            $this->testcase->setMenu($this->products, $productID, $case->branch);
+            if($this->app->openApp == 'project')   $this->loadModel('project')->setMenu($this->session->project);
+            if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($this->session->execution);
+            if($this->app->openApp == 'qa')        $this->testcase->setMenu($this->products, $productID, $case->branch);
 
             $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $case->branch);
             if($case->lib and $case->fromCaseID)
@@ -746,20 +820,22 @@ class testcase extends control
 
         $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList));
         $caseIDList = array_unique($caseIDList);
-
-        /* Get the edited cases. */
-        $cases = $this->testcase->getByList($caseIDList);
         $branchProduct = false;
 
+        if($this->app->openApp == 'project')   $this->loadModel('project')->setMenu($this->session->project);
+        if($this->app->openApp == 'qa')        $this->testcase->setMenu($this->products, $productID, $branch);
+        if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($this->session->execution);
+
         /* The cases of a product. */
         if($productID)
         {
+            /* Get the edited cases. */
+            $cases = $this->testcase->getByList($caseIDList);
+
             if($type == 'lib')
             {
                 $libID     = $productID;
                 $libraries = $this->loadModel('caselib')->getLibraries();
-                $this->caselib->setLibMenu($libraries, $libID);
-                $this->lang->testcase->menu = $this->lang->caselib->menu;
 
                 /* Set modules. */
                 $modules = $this->tree->getOptionMenu($libID, $viewType = 'caselib', $startModuleID = 0, $branch);
@@ -772,7 +848,6 @@ class testcase extends control
             else
             {
                 $product = $this->product->getByID($productID);
-                $this->testcase->setMenu($this->products, $productID, $branch);
 
                 if($product->type != 'normal') $branchProduct = true;
 
@@ -786,13 +861,21 @@ class testcase extends control
                 $this->view->title      = $product->name . $this->lang->colon . $this->lang->testcase->batchEdit;
             }
         }
-        /* The cases of my. */
         else
         {
-            $this->lang->testcase->menu = $this->lang->my->menu;
-            $this->lang->set('menugroup.testcase', 'my');
-            $this->lang->testcase->menuOrder = $this->lang->my->menuOrder;
+            /* Get the edited cases. */
+            $cases = $this->dao->select('t1.*,t2.id as runID')->from(TABLE_CASE)->alias('t1')
+                ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.id = t2.case')
+                ->where('t1.deleted')->eq(0)
+                ->beginIF($this->app->openApp == 'my')->andWhere('t2.id')->in($caseIDList)->fi()
+                ->beginIF($this->app->openApp != 'my')->andWhere('t1.id')->in($caseIDList)->fi()
+                ->fetchAll('id');
+            $caseIDList = array_keys($cases);
+
+            /* The cases of my. */
             $this->loadModel('my')->setMenu();
+            $this->lang->testcase->menu = $this->lang->my->menu->work;
+            $this->lang->my->menu->work['subModule'] = 'testcase';
 
             $this->view->position[] = html::a($this->server->http_referer, $this->lang->my->testCase);
             $this->view->title      = $this->lang->testcase->batchEdit;
@@ -815,12 +898,11 @@ class testcase extends control
         // if(!$this->testcase->forceNotReview()) unset($this->lang->testcase->statusList['wait']); /* Bug#1343 */
 
         /* Judge whether the editedCases is too large and set session. */
-        $countInputVars = count($cases) * (count(explode(',', $this->config->testcase->custom->batchEditFields)) + 3);
+        $countInputVars  = count($cases) * (count(explode(',', $this->config->testcase->custom->batchEditFields)) + 3);
         $showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
         if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
 
-        $this->loadModel('story');
-        $stories = $this->story->getProductStoryPairs($productID, $branch);
+        $stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch);
         $this->view->stories = array('' => '', 'ditto' => $this->lang->testcase->ditto) + $stories;
 
         /* Set custom. */
@@ -1520,13 +1602,13 @@ class testcase extends control
             die(js::reload('parent'));
         }
 
-        $this->testcase->setMenu($this->products, $productID, $branch);
+        $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
 
         $libraries = $this->loadModel('caselib')->getLibraries();
         if(empty($libraries))
         {
             echo js::alert($this->lang->testcase->noLibrary);
-            die(js::locate(inlink('browse')));
+            die(js::locate($this->session->caseList));
         }
         if(empty($libID) or !isset($libraries[$libID])) $libID = key($libraries);
 
@@ -1590,7 +1672,15 @@ class testcase extends control
             if($this->post->isEndPage)
             {
                 unlink($tmpFile);
-                die(js::locate(inlink('browse', "productID=$productID"), 'parent'));
+
+                if($this->app->openApp == 'project')
+                {
+                    die(js::locate($this->createLink('project', 'testcase', "projectID={$this->session->project}&productID=$productID"), 'parent'));
+                }
+                else
+                {
+                    die(js::locate(inlink('browse', "productID=$productID"), 'parent'));
+                }
             }
             else
             {
@@ -1598,7 +1688,14 @@ class testcase extends control
             }
         }
 
-        $this->testcase->setMenu($this->products, $productID, $branch);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($this->session->project);
+        }
+        else
+        {
+            $this->testcase->setMenu($this->products, $productID, $branch);
+        }
 
         $caseLang   = $this->lang->testcase;
         $caseConfig = $this->config->testcase;
diff --git a/module/testcase/css/edit.css b/module/testcase/css/edit.css
index 62f96ee1f6..1c5e8bcfc1 100644
--- a/module/testcase/css/edit.css
+++ b/module/testcase/css/edit.css
@@ -2,3 +2,4 @@
 .col-side .chosen-container {width: 218px !important;}
 .table-form > tbody > tr > td .btn.addbutton {display: block; margin: 1px 0px; width: 40px; padding: 1px 6px;}
 .table-form > tbody > tr > td .btn.delbutton {display: block; margin: 1px 0px; width: 40px; padding: 1px 6px;}
+ #branch {width: 95px!important;}
diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js
index e9747337f4..618c579d39 100644
--- a/module/testcase/js/batchedit.js
+++ b/module/testcase/js/batchedit.js
@@ -37,6 +37,7 @@ function loadBranches(product, branch, caseID)
 $(function()
 {
     removeDitto();  //Remove 'ditto' in first row.
+    $('#subNavbar li[data-id="testcase"]').addClass('active');
 });
 
 $(document).on('click', '.chosen-with-drop', function(){oldValue = $(this).prev('select').val();})//Save old value.
diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index cc09050347..ab596a743e 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -55,7 +55,7 @@ function loadProductBranches(productID)
         if(data)
         {
             $('#product').closest('.input-group').append(data);
-            $('#branch').css('width', config.currentMethod == 'create' ? '120px' : '65px');
+            $('#branch').css('width', config.currentMethod == 'create' ? '120px' : '95px');
         }
     })
 }
diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js
index 8c34ef936d..be6f5d6183 100644
--- a/module/testcase/js/create.js
+++ b/module/testcase/js/create.js
@@ -149,4 +149,6 @@ $(function()
     {
         $('#status').val(status).change();
     });
+
+    $('#subNavbar li[data-id="testcase"]').addClass('active');
 });
diff --git a/module/testcase/js/x.view.js b/module/testcase/js/x.view.js
index 567665ea92..9be6953419 100644
--- a/module/testcase/js/x.view.js
+++ b/module/testcase/js/x.view.js
@@ -1,7 +1,7 @@
 $(function()
 {
     $('.main-actions-holder').css('height', '0px');
-    var $xuanAction = "<div class='xuancard-actions fixed'>";
+    var xuanAction = "<div class='xuancard-actions fixed'>";
     $('.main-col div.main-actions .btn-toolbar a').each(function(){
         var $that    = $(this);
 
@@ -16,7 +16,7 @@ $(function()
 
         if(href.indexOf('create') >= 0 || href.indexOf('delete') >= 0) return true;
 
-        if($that.hasClass('iframe')) 
+        if($that.hasClass('iframe'))
         {
             url = href;
             target = '';
@@ -27,10 +27,10 @@ $(function()
            target = " target='_blank'";
         }
 
-        $xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
+        xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
     });
 
-    $xuanAction += '</div>';
-    $('#footer').replaceWith($xuanAction);
+    xuanAction += '</div>';
+    $('body').append(xuanAction);
     $('.xuancard-actions a.iframe').modalTrigger();
 })
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 77483d3ab8..61b20df5c8 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore           = '忽略';
 $lang->testcase->fromTesttask     = '來自測試單用例';
 $lang->testcase->fromCaselib      = '來自用例庫用例';
 $lang->testcase->deleted          = '是否刪除';
+$lang->testcase->browseUnits      = '單元測試';
+
 $lang->case = $lang->testcase;  // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
 
 $lang->testcase->stepID      = '編號';
@@ -213,8 +215,12 @@ $lang->testcase->searchStories = "鍵入來搜索{$lang->SRCommon}";
 $lang->testcase->selectLib     = '請選擇庫';
 
 $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->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->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->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = '待評審';
@@ -222,4 +228,5 @@ $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConf
 $lang->testcase->featureBar['browse']['group']       = '分組查看';
 $lang->testcase->featureBar['browse']['suite']       = '套件';
 $lang->testcase->featureBar['browse']['zerocase']    = "零用例{$lang->SRCommon}";
+$lang->testcase->featureBar['browse']['browseunits'] = '單元測試';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 29431acd0c..f60252da2a 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -27,40 +27,7 @@ class testcaseModel extends model
      */
     public function setMenu($products, $productID, $branch = 0, $moduleID = 0, $suiteID = 0, $orderBy = 'id_desc')
     {
-        $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'case');
-        $selectHtml = $this->product->select($products, $productID, 'testcase', 'browse', '', $branch, $moduleID, 'case');
-
-        $pageNav     = '';
-        $pageActions = '';
-        $isMobile    = $this->app->viewType == 'mhtml';
-        if($isMobile)
-        {
-            $this->app->loadLang('qa');
-            $pageNav  = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
-        }
-        $pageNav .= $selectHtml;
-
-        $this->lang->modulePageNav = $pageNav;
-        $this->lang->TRActions     = $pageActions;
-        foreach($this->lang->testcase->menu as $key => $menu)
-        {
-            if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testcase', $key, $productID);
-
-            $replace = $productID;
-            if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->testcase->menu, $key, $replace);
-        }
-
-        if($this->lang->navGroup->testcase == 'qa')
-        {
-            foreach($this->lang->qa->subMenu->testcase as $key => $menu)
-            {
-                common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $productID);
-            }
-            $this->lang->qa->menu         = $this->lang->testcase->menu;
-            $this->lang->testcase->menu   = $this->lang->qa->subMenu->testcase;
-            $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
-        }
+        $this->loadModel('qa')->setMenu($products, $productID, $branch, $moduleID, 'case');
     }
 
     /**
@@ -80,7 +47,7 @@ class testcaseModel extends model
             ->add('fromBug', $bugID)
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', $now)
-            ->setIF($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new' && $this->app->openApp == 'project', 'project', $this->session->project)
             ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story))
             ->remove('steps,expects,files,labels,stepType,forceNotReview')
             ->setDefault('story', 0)
@@ -130,9 +97,10 @@ class testcaseModel extends model
      * Batch create cases.
      *
      * @param  int    $productID
+     * @param  int    $branch
      * @param  int    $storyID
      * @access public
-     * @return void
+     * @return array
      */
     function batchCreate($productID, $branch, $storyID)
     {
@@ -176,7 +144,7 @@ class testcaseModel extends model
 
             $data[$i] = new stdclass();
             $data[$i]->product      = $productID;
-            if($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa') $data[$i]->project = $this->session->PRJ;
+            if($this->config->systemMode == 'new' && $this->app->openApp == 'project') $data[$i]->project = $this->session->project;
             $data[$i]->branch       = $cases->branch[$i];
             $data[$i]->module       = $cases->module[$i];
             $data[$i]->type         = $cases->type[$i];
@@ -214,6 +182,7 @@ class testcaseModel extends model
             }
         }
 
+        $caseIDList = array();
         foreach($data as $i => $case)
         {
             $this->dao->insert(TABLE_CASE)->data($case)
@@ -227,7 +196,8 @@ class testcaseModel extends model
                 die(js::reload('parent'));
             }
 
-            $caseID = $this->dao->lastInsertID();
+            $caseID       = $this->dao->lastInsertID();
+            $caseIDList[] = $caseID;
 
             /* If the story is linked project, make the case link the project. */
             $this->syncCase2Project($case, $caseID);
@@ -235,8 +205,11 @@ class testcaseModel extends model
 
             $this->loadModel('score')->create('testcase', 'create', $caseID);
             $actionID = $this->loadModel('action')->create('case', $caseID, 'Opened');
+            if($this->app->openApp == 'project') $this->action->create('case', $caseID, 'linked2project', '', $this->session->project);
+            if($this->app->openApp == 'execution') $this->action->create('case', $caseID, 'linked2execution', '', $this->session->execution);
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchCreate');
+        return $caseIDList;
     }
 
     /**
@@ -255,7 +228,7 @@ class testcaseModel extends model
         return $this->dao->select('t1.*, t2.title as storyTitle')->from(TABLE_CASE)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
             ->where('t1.product')->eq((int)$productID)
-            ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->app->openApp == 'project')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
             ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi()
             ->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi()
@@ -284,8 +257,9 @@ class testcaseModel extends model
             ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id')
             ->leftJoin(TABLE_PROJECTSTORY)->alias('t3')->on('t3.story=t2.story')
             ->leftJoin(TABLE_STORY)->alias('t4')->on('t3.story=t4.id')
-            ->where('t2.product')->eq((int)$productID)
-            ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+            ->where('1=1')
+            ->beginIF(!empty($productID))->andWhere('t2.product')->eq((int)$productID)->fi()
+            ->beginIF($this->app->openApp == 'project')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->beginIF($branch)->andWhere('t2.branch')->eq($branch)->fi()
             ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi()
             ->beginIF($browseType == 'wait')->andWhere('t2.status')->eq($browseType)->fi()
@@ -297,6 +271,28 @@ class testcaseModel extends model
             ->fetchAll('id');
     }
 
+    /**
+     * Get project cases.
+     *
+     * @param  int    $projectID
+     * @param  string $orderBy
+     * @param  object $pager
+     * @param  string $browseType
+     * @access public
+     * @return array
+     */
+    public function getProjectCases($projectID, $orderBy = 'id_desc', $pager = null, $browseType = '')
+    {
+        return $this->dao->select('distinct t1.*, t2.*')->from(TABLE_PROJECTCASE)->alias('t1')
+            ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id')
+            ->where('t1.project')->eq((int)$projectID)
+            ->beginIF($browseType != 'all')->andWhere('t2.status')->eq($browseType)->fi()
+            ->andWhere('t2.deleted')->eq('0')
+            ->orderBy($orderBy)
+            ->page($pager)
+            ->fetchAll('id');
+    }
+
     /**
      * Get execution cases.
      *
@@ -338,7 +334,7 @@ class testcaseModel extends model
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
             ->leftJoin(TABLE_SUITECASE)->alias('t3')->on('t1.id=t3.case')
             ->where('t1.product')->eq((int)$productID)
-            ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->app->openApp == 'project')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->andWhere('t3.suite')->eq((int)$suiteID)
             ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
             ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi()
@@ -422,7 +418,7 @@ class testcaseModel extends model
         $cases = array();
         if($browseType == 'bymodule' or $browseType == 'all' or $browseType == 'wait')
         {
-            if($group == 'project')
+            if($this->app->openApp == 'project')
             {
                 $cases = $this->getModuleProjectCases($productID, $branch, $modules, $sort, $pager, $browseType, $auto);
             }
@@ -434,12 +430,14 @@ class testcaseModel extends model
         /* Cases need confirmed. */
         elseif($browseType == 'needconfirm')
         {
-            $cases = $this->dao->select('t1.*, t2.title AS storyTitle')->from(TABLE_CASE)->alias('t1')->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
+            $cases = $this->dao->select('t1.*, t2.title AS storyTitle')->from(TABLE_CASE)->alias('t1')
+                ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
+                ->leftJoin(TABLE_PROJECTCASE)->alias('t3')->on('t1.id = t3.case')
                 ->where("t2.status = 'active'")
                 ->andWhere('t1.deleted')->eq(0)
                 ->andWhere('t2.version > t1.storyVersion')
-                ->andWhere('t1.product')->eq($productID)
-                ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+                ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
+                ->beginIF($this->app->openApp == 'project')->andWhere('t3.project')->eq($this->session->project)->fi()
                 ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
                 ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
                 ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
@@ -507,12 +505,23 @@ class testcaseModel extends model
         if($branch and strpos($caseQuery, '`branch` =') === false) $caseQuery .= " AND `branch` in('0','$branch')";
         if(strpos($caseQuery, $allBranch) !== false) $caseQuery = str_replace($allBranch, '1', $caseQuery);
         $caseQuery .= ')';
+        $caseQuery  = str_replace('`version`', 't1.`version`', $caseQuery);
 
-        $cases = $this->dao->select('*')->from(TABLE_CASE)->where($caseQuery)
-            ->beginIF($queryProductID != 'all')->andWhere('product')->eq($productID)->fi()
-            ->beginIF($auto != 'unit')->andWhere('auto')->ne('unit')->fi()
-            ->beginIF($auto == 'unit')->andWhere('auto')->eq('unit')->fi()
-            ->andWhere('deleted')->eq(0)
+        if($this->app->openApp == 'project') $caseQuery = str_replace('`product`', 't2.`product`', $caseQuery);
+
+        /* Search criteria under compatible project. */
+        $sql = $this->dao->select('*')->from(TABLE_CASE)->alias('t1');
+        if($this->app->openApp == 'project') $sql->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id=t2.case');
+        $cases = $sql
+            ->where($caseQuery)
+            ->beginIF($this->app->openApp == 'project')->andWhere('t2.project')->eq($this->session->project)->fi()
+            ->beginIF(!empty($productID) and $queryProductID != 'all')
+            ->beginIF($this->app->openApp == 'project' and !empty($productID))->andWhere('t2.product')->eq($productID)->fi()
+            ->beginIF($this->app->openApp != 'project')->andWhere('t1.product')->eq($productID)->fi()
+            ->fi()
+            ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
+            ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
+            ->andWhere('t1.deleted')->eq(0)
             ->orderBy($orderBy)->page($pager)->fetchAll('id');
 
         return $cases;
@@ -530,7 +539,7 @@ class testcaseModel extends model
      */
     public function getByAssignedTo($account, $orderBy = 'id_desc', $pager = null, $auto = 'no')
     {
-        return $this->dao->select('t1.*,t2.project,t2.pri,t2.title,t2.type,t2.openedBy,t2.color,t2.product,t2.branch,t2.module,t2.status')->from(TABLE_TESTRUN)->alias('t1')
+        return $this->dao->select('t1.*,t2.project,t2.pri,t2.title,t2.type,t2.openedBy,t2.color,t2.product,t2.branch,t2.module,t2.status,t3.name as taskName')->from(TABLE_TESTRUN)->alias('t1')
             ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
             ->leftJoin(TABLE_TESTTASK)->alias('t3')->on('t1.task = t3.id')
             ->where('t1.assignedTo')->eq($account)
@@ -538,7 +547,7 @@ class testcaseModel extends model
             ->andWhere('t2.deleted')->eq(0)
             ->beginIF($auto != 'skip' and $auto != 'unit')->andWhere('t2.auto')->ne('unit')->fi()
             ->beginIF($auto == 'unit')->andWhere('t2.auto')->eq('unit')->fi()
-            ->orderBy($orderBy)->page($pager)->fetchAll();
+            ->orderBy($orderBy)->page($pager)->fetchAll('id');
     }
 
     /**
@@ -630,7 +639,7 @@ class testcaseModel extends model
             ->get();
 
         $requiredFields = $this->config->testcase->edit->requiredFields;
-        if($case->lib != 0)
+        if($oldCase->lib != 0)
         {
             /* Remove the require field named story when the case is a lib case.*/
             $requiredFieldsArr = explode(',', $requiredFields);
@@ -645,38 +654,7 @@ class testcaseModel extends model
             $titleChanged = ($case->title != $oldCase->title);
             if($isLibCase and $titleChanged) $this->dao->update(TABLE_CASE)->set('`title`')->eq($case->title)->where('`fromCaseID`')->eq($caseID)->exec();
 
-            /* The case is linked the project. */
-            if($oldCase->project != 0)
-            {
-                $productChanged = ($oldCase->product != $case->product);
-                $storyChanged   = ($oldCase->story != $case->story);
-
-                if($productChanged)
-                {
-                    $this->dao->update(TABLE_PROJECTCASE)
-                        ->set('product')->eq($case->product)
-                        ->set('version')->eq($case->version)
-                        ->where('project')->eq($oldCase->project)
-                        ->andWhere('`case`')->eq($oldCase->id)
-                        ->exec();
-                }
-
-                /* If the related story is changed and the new related story isn't linked the project, unlink the case. */
-                if($storyChanged)
-                {
-                    $projectStory = $this->dao->select('*')->from(TABLE_PROJECTSTORY)
-                        ->where('project')->eq($oldCase->project)
-                        ->andWhere('story')->eq($case->story)
-                        ->fetchAll();
-                    if(!$projectStory)
-                    {
-                        $this->dao->delete()->from(TABLE_PROJECTCASE)
-                            ->where('project')->eq($oldCase->project)
-                            ->andWhere('`case`')->eq($oldCase->id)
-                            ->exec();
-                    }
-                }
-            }
+            $this->updateCase2Project($oldCase, $case, $caseID);
 
             if($stepChanged)
             {
@@ -901,6 +879,8 @@ class testcaseModel extends model
                 $titleChanged = ($case->title != $oldCase->title);
                 if($isLibCase and $titleChanged) $this->dao->update(TABLE_CASE)->set('`title`')->eq($case->title)->where('`fromCaseID`')->eq($caseID)->exec();
 
+                $this->updateCase2Project($oldCase, $case, $caseID);
+
                 $this->executeHooks($caseID);
 
                 unset($oldCase->steps);
@@ -1227,13 +1207,16 @@ class testcaseModel extends model
                     $oldCase->steps  = $this->joinStep($oldStep);
                     $caseData->steps = $this->joinStep($steps);
                     $changes  = common::createChanges($oldCase, $caseData);
+
+                    $this->updateCase2Project($oldCase, $caseData, $caseID);
+
                     $actionID = $this->action->create('case', $caseID, 'Edited');
                     $this->action->logHistory($actionID, $changes);
                 }
             }
             else
             {
-                if($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa') $caseData->project = $this->session->PRJ;
+                if($this->config->systemMode == 'new' && $this->app->openApp == 'project') $caseData->project = $this->session->project;
                 $caseData->version    = 1;
                 $caseData->openedBy   = $this->app->user->account;
                 $caseData->openedDate = $now;
@@ -1264,6 +1247,9 @@ class testcaseModel extends model
                             if($stepData->type == 'step')  $parentStepID = 0;
                         }
                     }
+
+                    $this->syncCase2Project($caseData, $caseID);
+
                     $this->action->create('case', $caseID, 'Opened');
                 }
             }
@@ -1346,12 +1332,12 @@ class testcaseModel extends model
                 }
 
                 /* If under the project module, the cases is imported need linking to the project. */
-                if($this->lang->navGroup->testcase != 'qa')
+                if($this->app->openApp == 'project')
                 {
-                    $lastOrder = (int)$this->dao->select('*')->from(TABLE_PROJECTCASE)->where('project')->eq($this->session->PRJ)->orderBy('order_desc')->limit(1)->fetch('order');
+                    $lastOrder = (int)$this->dao->select('*')->from(TABLE_PROJECTCASE)->where('project')->eq($this->session->project)->orderBy('order_desc')->limit(1)->fetch('order');
 
                     $this->dao->insert(TABLE_PROJECTCASE)
-                        ->set('project')->eq($case->project)
+                        ->set('project')->eq($this->session->project)
                         ->set('product')->eq($case->product)
                         ->set('case')->eq($caseID)
                         ->set('version')->eq($case->version)
@@ -1387,9 +1373,18 @@ class testcaseModel extends model
      */
     public function buildSearchForm($productID, $products, $queryID, $actionURL)
     {
-        $this->config->testcase->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->testcase->allProduct);
-        $this->config->testcase->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
-        $this->config->testcase->search['params']['lib']['values']     = $this->loadModel('caselib')->getLibraries();
+        $product = ($this->app->openApp == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]) + array('all' => $this->lang->testcase->allProduct);
+        $this->config->testcase->search['params']['product']['values'] = $product;
+
+        $module = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0);
+        if(!$productID)
+        {
+            $module = array();
+            foreach($products as $id => $product) $module += $this->loadModel('tree')->getOptionMenu($id, 'case', 0);
+        }
+        $this->config->testcase->search['params']['module']['values'] = $module;
+
+        $this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries();
 
         if($this->session->currentProductType == 'normal')
         {
@@ -1463,7 +1458,7 @@ class testcaseModel extends model
                 if($canBatchAction)
                 {
                     $disabled = $canBeChanged ? '' : 'disabled';
-                    echo html::checkbox('caseIDList', array($case->id => ''), '', $disabled) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id"), sprintf('%03d', $case->id));
+                    echo html::checkbox('caseIDList', array($case->id => ''), '', $disabled) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id"), sprintf('%03d', $case->id), '', "data-app='{$this->app->openApp}'");
                 }
                 else
                 {
@@ -1478,7 +1473,7 @@ class testcaseModel extends model
             case 'title':
                 if($case->branch) echo "<span class='label label-info label-outline'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
-                echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]") : html::a($caseLink, $case->title, null, "style='color: $case->color'")) : "<span style='color: $case->color'>$case->title</span>";
+                echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->openApp}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]", '', "data-app='{$this->app->openApp}'") : html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->openApp}'")) : "<span style='color: $case->color'>$case->title</span>";
                 break;
             case 'branch':
                 echo $branches[$case->branch];
@@ -1568,7 +1563,7 @@ class testcaseModel extends model
                     }
 
                     common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'iframe', true, "data-width='95%'");
-                    common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'run', '', 'runCase iframe', false, "data-width='95%'");
+                    common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");
                     common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
                     if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review',  "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe');
                     common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
@@ -1684,12 +1679,15 @@ class testcaseModel extends model
     {
         if(!empty($case->story))
         {
-            $projects = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($case->story)->fetchAll('project');
-            $projects = array_keys($projects);
+            $projects = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($case->story)->fetchPairs();
         }
-        elseif($this->lang->navGroup->testcase == 'project' and empty($case->story))
+        elseif($this->app->openApp == 'project' and empty($case->story))
         {
-            $projects = array($this->session->PRJ);
+            $projects = array($this->session->project);
+        }
+        elseif($this->app->openApp == 'execution' and empty($case->story))
+        {
+            $projects = array($this->session->execution);
         }
 
         if(!empty($projects))
@@ -1708,6 +1706,64 @@ class testcaseModel extends model
         }
     }
 
+    /**
+     * Deal with the relationship between the case and project when edit the case.
+     *
+     * @param  object  $oldCase
+     * @param  object  $case
+     * @param  int     $caseID
+     * @access public
+     * @return void
+     */
+    public function updateCase2Project($oldCase, $case, $caseID)
+    {
+        $productChanged = ($oldCase->product != $case->product);
+        $storyChanged   = ($oldCase->story   != $case->story);
+
+        if($productChanged)
+        {
+            $this->dao->update(TABLE_PROJECTCASE)
+                ->set('product')->eq($case->product)
+                ->set('version')->eq($case->version)
+                ->where('`case`')->eq($oldCase->id)
+                ->exec();
+        }
+
+        /* The related story is changed. */
+        if($storyChanged)
+        {
+            /* If the new related story isn't linked the project, unlink the case. */
+            $projects = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($oldCase->story)->fetchAll('project');
+
+            $projectIdList = array_keys($projects);
+            $this->dao->delete()->from(TABLE_PROJECTCASE)
+                ->where('project')->in()
+                ->andWhere('`case`')->eq($oldCase->id)
+                ->exec();
+
+            /* If the new related story is not null, make the case link the project which link the new related story. */
+            if(!empty($case->story))
+            {
+                $projects = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('story')->eq($case->story)->fetchAll('project');
+                if($projects)
+                {
+                    $projects = array_keys($projects);
+                    foreach($projects as $projectID)
+                    {
+                        $lastOrder = (int)$this->dao->select('*')->from(TABLE_PROJECTCASE)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order');
+                        $data = new stdclass();
+                        $data->project = $projectID;
+                        $data->product = $case->product;
+                        $data->case    = $caseID;
+                        $data->version = $oldCase->version;
+                        $data->order   = ++ $lastOrder;
+                        $this->dao->replace(TABLE_PROJECTCASE)->data($data)->exec();
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Get status for different method.
      *
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 81831c1302..08c74c303a 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -67,10 +67,9 @@
           <?php foreach($caseIDList as $caseID):?>
           <?php
           if(!isset($cases[$caseID])) continue;
-          if(!$productID and $branchProduct)
+          if(!$productID and !$cases[$caseID]->lib)
           {
-              $product = $this->product->getByID($cases[$caseID]->product);
-
+              $product  = $this->product->getByID($cases[$caseID]->product);
               $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id);
               if($product->type != 'normal')
               {
@@ -79,7 +78,6 @@
               }
 
               $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch);
-              $modules = array('ditto' => $this->lang->story->ditto) + $modules;
           }
           ?>
           <tr class='text-center'>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 0369d3f3a5..c9678db455 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -24,6 +24,13 @@ js::set('productID',      $productID);
 js::set('branch',         $branch);
 js::set('suiteID',        $suiteID);
 ?>
+<?php if($this->app->openApp == 'project'):?>
+<style>
+#subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;}
+#subHeader #dropMenu .col-left {padding-bottom: 0px;}
+</style>
+<?php endif;?>
+
 <div id="mainContent" class="main-row fade">
   <div class='side-col' id='sidebar'>
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
@@ -35,7 +42,7 @@ js::set('suiteID',        $suiteID);
       <?php endif;?>
       <?php echo $moduleTree;?>
       <div class='text-center'>
-        <?php common::printLink('tree', 'browse', "productID=$productID&view=case&currentModuleID=0&branch=0&from={$this->lang->navGroup->testcase}", $lang->tree->manage, '', "class='btn btn-info btn-wide'");?>
+        <?php if(!empty($productID)) common::printLink('tree', 'browse', "productID=$productID&view=case&currentModuleID=0&branch=0&from={$this->lang->navGroup->testcase}", $lang->tree->manage, '', "class='btn btn-info btn-wide'");?>
         <hr class="space-sm" />
       </div>
     </div>
@@ -47,9 +54,13 @@ js::set('suiteID',        $suiteID);
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
-        <?php if(common::canModify('product', $product) and common::hasPriv('testcase', 'create')):?>
+        <?php if((empty($productID) or common::canModify('product', $product)) and common::hasPriv('testcase', 'create') and $browseType != 'bysuite'):?>
         <?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
-        <?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
+        <?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info' data-app='{$this->app->openApp}'");?>
+        <?php endif;?>
+
+        <?php if(common::hasPriv('testsuite', 'linkCase') and $browseType == 'bysuite'):?>
+        <?php echo html::a($this->createLink('testsuite', 'linkCase', "suiteID=$param"), "<i class='icon icon-plus'></i> " . $lang->testsuite->linkCase, '', "class='btn btn-info' data-app='{$this->app->openApp}'");?>
         <?php endif;?>
       </p>
     </div>
@@ -63,7 +74,7 @@ js::set('suiteID',        $suiteID);
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <?php
-      $vars = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+      $vars = $projectParam . "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
 
       if($useDatatable)  include '../../common/view/datatable.html.php';
       else               include '../../common/view/tablesorter.html.php';
@@ -79,7 +90,6 @@ js::set('suiteID',        $suiteID);
       $canBatchCaseTypeChange     = common::hasPriv('testcase', 'batchCaseTypeChange');
       $canBatchConfirmStoryChange = common::hasPriv('testcase', 'batchConfirmStoryChange');
       $canBatchChangeModule       = common::hasPriv('testcase', 'batchChangeModule');
-
       $canBatchAction             = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchCaseTypeChange or $canBatchConfirmStoryChange or $canBatchChangeModule);
       ?>
       <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
@@ -197,7 +207,7 @@ js::set('suiteID',        $suiteID);
             </div>
           </div>
           <?php endif;?>
-          <?php if($canBatchChangeModule):?>
+          <?php if($canBatchChangeModule and !empty($productID)):?>
           <div class="btn-group dropup">
             <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->moduleAB;?> <span class="caret"></span></button>
             <?php $withSearch = count($modules) > 10;?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 68008aabad..129f5c3d94 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -1,6 +1,16 @@
 <?php js::set('flow', $config->global->flow);?>
+<?php $isProjectApp  = $this->app->openApp == 'project'?>
+<?php $currentModule = $isProjectApp ? 'project'  : 'testcase';?>
+<?php $currentMethod = $isProjectApp ? 'testcase' : 'browse';?>
+<?php $projectParam  = $isProjectApp ? "projectID={$this->session->project}&" : '';?>
 <?php if(!isset($branch)) $branch = 0;?>
 <?php if($config->global->flow == 'full'):?>
+<style>
+.btn-group a i.icon-plus {font-size: 16px;}
+.btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
+.btn-group button.dropdown-toggle.btn-primary {padding:6px;}
+.body-modal #mainMenu>.btn-toolbar {width: auto;}
+</style>
 <div id='mainMenu' class='clearfix'>
   <div id="sidebarHeader">
     <div class="title">
@@ -14,8 +24,8 @@
           echo !empty($moduleID) ? $moduleName : $this->lang->tree->all;
           if(!empty($moduleID))
           {
-              $removeLink = $browseType == 'bymodule' ? $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
-              echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
+              $removeLink = $browseType == 'bymodule' ? $this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
+              echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted' data-app='{$this->app->openApp}'");
           }
       }
       ?>
@@ -23,7 +33,7 @@
   </div>
   <div class='btn-toolbar pull-left'>
     <?php
-    $hasBrowsePriv = common::hasPriv('testcase', 'browse');
+    $hasBrowsePriv = $isProjectApp ? common::hasPriv('project', 'testcase') : common::hasPriv('testcase', 'browse');
     $hasGroupPriv  = common::hasPriv('testcase', 'groupcase');
     $hasZeroPriv   = common::hasPriv('story', 'zerocase');
     $hasUnitPriv   = common::hasPriv('testtask', 'browseunits');
@@ -35,23 +45,23 @@
     if(!$config->testcase->needReview and empty($config->testcase->forceReview) and $menuType == 'wait') continue;
     if($hasBrowsePriv and $menuType == 'QUERY')
     {
-        $searchBrowseLink = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySearch&param=%s");
+        $searchBrowseLink = $this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=bySearch&param=%s");
         $isBySearch       = $browseType == 'bysearch';
         include '../../common/view/querymenu.html.php';
     }
     elseif($hasBrowsePriv and ($menuType == 'all' or $menuType == 'needconfirm' or $menuType == 'wait'))
     {
-        echo html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$menuType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab'");
+        echo html::a($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$menuType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab' data-app='{$this->app->openApp}'");
     }
-    elseif($hasBrowsePriv and $menuType == 'suite' and $lang->navGroup->testcase == 'qa')
+    elseif($hasBrowsePriv and $menuType == 'suite' and $this->app->openApp == 'qa')
     {
         $currentSuiteID = isset($suiteID) ? (int)$suiteID : 0;
         $currentSuite   = zget($suiteList, $currentSuiteID, '');
         $currentLable   = empty($currentSuite) ? $lang->testsuite->common : $currentSuite->name;
 
         echo "<div id='bysuiteTab' class='btn-group'>";
-        echo html::a('javascript:;', $currentLable . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
-        if(common::canModify('product', $product))
+        echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
+        if(empty($productID) or common::canModify('product', $product))
         {
             echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
 
@@ -75,20 +85,21 @@
     }
     elseif($hasGroupPriv and $menuType == 'group')
     {
-        $groupBy  = isset($groupBy)  ? $groupBy : '';
-        $active   = !empty($groupBy) ? 'btn-active-text' : '';
+        $groupBy = isset($groupBy)  ? $groupBy : '';
+        $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"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active'");
+        echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active' data-app='{$this->app->openApp}'");
         echo '</div>';
     }
     elseif($hasZeroPriv and $menuType == 'zerocase')
     {
-        echo html::a($this->createLink('story', 'zeroCase', "productID=$productID&orderBy=id_desc&from={$this->lang->navGroup->testcase}"), "<span class='text'>{$lang->story->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab'");
+        $projectID = $isProjectApp ? $this->session->project : 0;
+        echo html::a($this->createLink('story', 'zeroCase', "productID=$productID&branch=$branch&orderBy=id_desc&projectID=$projectID"), "<span class='text'>{$lang->story->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->openApp}'");
     }
     elseif($hasUnitPriv and $menuType == 'browseunits')
     {
-        echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), "<span class='text'>{$lang->testcase->browseUnits}</span>", '', "class='btn btn-link' id='browseunitsTab'");
+        echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), "<span class='text'>{$lang->testcase->browseUnits}</span>", '', "class='btn btn-link' id='browseunitsTab' data-app='{$this->app->openApp}'");
     }
     ?>
     <?php endforeach;?>
@@ -96,74 +107,95 @@
     if($this->methodName == 'browse') echo "<a id='bysearchTab' class='btn btn-link querybox-toggle'><i class='icon-search icon'></i> {$lang->testcase->bySearch}</a>";
     ?>
   </div>
+  <?php if(!isonlybody()):?>
   <div class='btn-toolbar pull-right'>
+    <?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> <?php echo $lang->export ?>
         <span class='caret'></span>
       </button>
-      <ul class='dropdown-menu' id='exportActionMenu'>
+      <ul class='dropdown-menu pull-right' id='exportActionMenu'>
       <?php
       $class = common::hasPriv('testcase', 'export') ? '' : "class=disabled";
       $misc  = common::hasPriv('testcase', 'export') ? "class='export'" : "class=disabled";
       $link  = common::hasPriv('testcase', 'export') ?  $this->createLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=0&browseType=$browseType") : '#';
-      echo "<li $class>" . html::a($link, $lang->testcase->export, '', $misc) . "</li>";
+      echo "<li $class>" . html::a($link, $lang->testcase->export, '', $misc . "data-app={$this->app->openApp}") . "</li>";
 
       $class = common::hasPriv('testcase', 'exportTemplet') ? '' : "class=disabled";
       $misc  = common::hasPriv('testcase', 'exportTemplet') ? "class='export'" : "class=disabled";
       $link  = common::hasPriv('testcase', 'exportTemplet') ?  $this->createLink('testcase', 'exportTemplet', "productID=$productID") : '#';
-      echo "<li $class>" . html::a($link, $lang->testcase->exportTemplet, '', $misc) . "</li>";
+      echo "<li $class>" . html::a($link, $lang->testcase->exportTemplet, '', $misc . "data-app={$this->app->openApp} data-width='50%'") . "</li>";
       ?>
       </ul>
     </div>
-    <?php if(common::canModify('product', $product)):?>
+    <?php endif;?>
+    <?php if(empty($productID) or common::canModify('product', $product)):?>
+    <?php if(!empty($productID)): ?>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></button>
-      <ul class='dropdown-menu' id='importActionMenu'>
+      <ul class='dropdown-menu pull-right' id='importActionMenu'>
       <?php
       $class = common::hasPriv('testcase', 'import') ? '' : "class=disabled";
       $misc  = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled";
       $link  = common::hasPriv('testcase', 'import') ?  $this->createLink('testcase', 'import', "productID=$productID&branch=$branch") : '#';
-      echo "<li $class>" . html::a($link, $lang->testcase->fileImport, '', $misc) . "</li>";
+      echo "<li $class>" . html::a($link, $lang->testcase->fileImport, '', $misc . "data-app={$this->app->openApp}") . "</li>";
 
       $class = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
-      $misc  = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
+      $misc  = common::hasPriv('testcase', 'importFromLib') ? "data-app='{$this->app->openApp}'" : "class=disabled";
       $link  = common::hasPriv('testcase', 'importFromLib') ?  $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch") : '#';
-      echo "<li $class>" . html::a($link, $lang->testcase->importFromLib, '', $misc) . "</li>";
+      echo "<li $class>" . html::a($link, $lang->testcase->importFromLib, '', $misc . "data-app={$this->app->openApp}") . "</li>";
       ?>
       </ul>
     </div>
+    <?php endif;?>
     <?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
     <?php if(!common::checkNotCN()):?>
-    <?php
-    if(common::hasPriv('testcase', 'batchCreate'))
-    {
-        $link = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
-        echo html::a($link, "<i class='icon-plus'></i> " . $lang->testcase->batchCreate, '', "class='btn btn-secondary'");
-    }
+    <div class='btn-group dropdown'>
+      <?php
+      $createTestcaseLink = $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule");
+      $batchCreateLink    = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
 
-    if(common::hasPriv('testcase', 'create'))
-    {
-        $link = $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule");
-        echo html::a($link, "<i class='icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary'");
-    }
-    ?>
-    <?php if($this->app->rawMethod == 'browseunits' and common::canModify('product', $product)):?>
-      <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary'");?>
+      $buttonLink  = '';
+      $buttonTitle = '';
+      if(common::hasPriv('testcase', 'batchCreate'))
+      {
+          $buttonLink  = !empty($productID) ? $batchCreateLink : '';
+          $buttonTitle = $lang->testcase->batchCreate;
+      }
+      if(common::hasPriv('testcase', 'create'))
+      {
+          $buttonLink  = $createTestcaseLink;
+          $buttonTitle = $lang->testcase->create;
+      }
+
+      $hidden = empty($buttonLink) ? 'hidden' : '';
+      echo html::a($buttonLink, "<i class='icon-plus'></i> " . $buttonTitle, '', "class='btn btn-primary $hidden' data-app='{$this->app->openApp}'");
+      ?>
+      <?php if(!empty($productID) and common::hasPriv('testcase', 'batchCreate') and common::hasPriv('testcase', 'create')):?>
+      <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+      <ul class='dropdown-menu'>
+        <li><?php echo html::a($createTestcaseLink, $lang->testcase->create);?></li>
+        <li><?php echo html::a($batchCreateLink, $lang->testcase->batchCreate, '', "data-app='{$this->app->openApp}'");?></li>
+      </ul>
+      <?php endif;?>
+    </div>
+    <?php if($this->app->rawMethod == 'browseunits' and (empty($productID) or common::canModify('product', $product))):?>
+      <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary' data-app='{$this->app->openApp}'");?>
     <?php endif;?>
     <?php else:?>
     <div class='btn-group dropdown-hover'>
       <?php
       $link = common::hasPriv('testcase', 'create') ? $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '###';
       $disabled = common::hasPriv('testcase', 'create') ? '' : "disabled";
-      echo html::a($link, "<i class='icon icon-plus'></i> {$lang->testcase->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
+      echo html::a($link, "<i class='icon icon-plus'></i> {$lang->testcase->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled' data-app='project'");
       ?>
       <ul class='dropdown-menu'>
         <?php $disabled = common::hasPriv('testcase', 'batchCreate') ? '' : "class='disabled'";?>
         <li <?php echo $disabled?>>
         <?php
         $batchLink = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
-        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->testcase->batchCreate) . "</li>";
+        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->testcase->batchCreate, '', "data-app='{$this->app->openApp}'") . "</li>";
         ?>
         </li>
       </ul>
@@ -171,6 +203,7 @@
     <?php endif;?>
     <?php endif;?>
   </div>
+  <?php endif;?>
 </div>
 <?php endif;?>
 
diff --git a/module/testcase/view/createbug.html.php b/module/testcase/view/createbug.html.php
index e4f6557599..2cbbcf46f3 100644
--- a/module/testcase/view/createbug.html.php
+++ b/module/testcase/view/createbug.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
+<?php js::set('openApp', $app->openApp);?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2><?php echo $lang->testcase->createBug;?></h2>
@@ -30,7 +31,15 @@ function createBug(obj)
 
     var onlybody    = config.onlybody;
     config.onlybody = 'no';
-    window.open(createLink('bug', 'create', params + ',stepIdList=' + stepIdList), '_parent');
+    var link        = createLink('bug', 'create', params + ',stepIdList=' + stepIdList);
+    if(openApp == 'my')
+    {
+        window.parent.$.apps.open(link, 'qa');
+    }
+    else
+    {
+        window.open(link, '_parent');
+    }
     config.onlybody = onlybody;
 }
 
diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php
index 100cd5d41c..88a1f876b6 100644
--- a/module/testcase/view/groupcase.html.php
+++ b/module/testcase/view/groupcase.html.php
@@ -92,7 +92,7 @@
         <td><?php echo $case->stepNumber;?></td>
         <td class='c-actions'>
           <?php common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list');?>
-          <?php common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'list', '', 'hiddenwin');?>
+          <?php common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'list', 'trash', 'hiddenwin');?>
         </td>
       </tr>
       <?php $i++;?>
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 83203b06b7..3b02661ad4 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -44,7 +44,6 @@
         </tr>
       </thead>
       <tbody>
-        <?php $modules['ditto'] = $lang->testcase->ditto;?>
         <?php $i = 0;?>
         <?php foreach($cases as $case):?>
         <tr>
@@ -63,6 +62,7 @@
           <?php $libModule = zget($libModules, $case->module, '');?>
           <td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></td>
           <td class='text-left' data-module='<?php echo $case->module?>' style='overflow:visible'>
+            <?php if($i > 0) $modules['ditto'] = $lang->testcase->ditto;?>
             <?php echo html::select("module[{$case->id}]", $modules, $i == 0 ? 0 : 'ditto', "class='form-control chosen'");?>
           </td>
           <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 403b69843c..0f80787c47 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -87,7 +87,7 @@ $(function()
           <?php $storyID = isset($case->story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : '');?>
           <?php echo html::select("story[$key]", array($storyID => zget($stories, $storyID, '')), $storyID, "class='form-control chosen storyChange'")?></td>
           <td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->pri : ''), "class='form-control chosen'")?></td>
-          <td><?php echo html::select("type[$key]", $lang->testcase->typeList, $case->type, "class='form-control chosen'")?></td>
+          <td><?php echo html::select("type[$key]", $lang->testcase->typeList, isset($case->type) ? $case->type : '', "class='form-control chosen'")?></td>
           <td style='overflow:visible'><?php echo html::select("stage[$key][]", $lang->testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?></td>
           <td><?php echo html::textarea("precondition[$key]", isset($case->precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?></td>
           <?php if(!empty($appendFields)):?>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 8fa4c993b8..35a40d8326 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -12,12 +12,12 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php $browseLink  = $app->session->caseList != false ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");?>
+<?php $browseLink  = $app->session->caseList ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary' data-app={$this->app->openApp}");?>
     <div class="divider"></div>
     <?php endif;?>
     <div class="page-title">
@@ -117,7 +117,7 @@
         if(!$isLibCase)
         {
             if(!isonlybody()) echo "<div class='divider'></div>";
-            common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'");
+            common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody iframe', false, "data-width='95%'");
             common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'");
 
             if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'");
@@ -128,7 +128,7 @@
         <?php echo $this->buildOperateMenu($case, 'view');?>
 
         <?php
-        common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody');
+        if(!isonlybody()) common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody');
         if(!$isLibCase and $case->auto != 'unit') common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
         if($isLibCase and common::hasPriv('caselib', 'createCase')) echo html::a($this->createLink('caselib', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
         common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin', '');
@@ -146,17 +146,17 @@
             <?php if($isLibCase):?>
             <tr>
               <th class='thWidth'><?php echo $lang->testcase->lib;?></th>
-              <td><?php if(!common::printLink('caselib', 'browse', "libID=$case->lib", $libName)) echo $libName;?></td>
+              <td><?php echo common::hasPriv('caselib', 'browse') ? html::a($this->createLink('caselib', 'browse', "libID=$case->lib"), $libName) : $libName;?></td>
             </tr>
             <?php else:?>
             <tr>
               <th class='thWidth'><?php echo $lang->testcase->product;?></th>
-              <td><?php if(!common::printLink('product', 'browse', "productID=$case->product", $productName)) echo $productName;?></td>
+              <td><?php echo common::hasPriv('product', 'browse') ? html::a($this->createLink('product', 'browse', "productID=$case->product"), $productName) : $productName;?></td>
             </tr>
-            <?php if($this->session->currentProductType != 'normal'):?>
+            <?php if($product->type != 'normal'):?>
             <tr>
-              <th><?php echo $lang->product->branch;?></th>
-              <td><?php if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$case->branch", $branchName)) echo $branchName;?></td>
+              <th><?php echo sprintf($lang->product->branch, $lang->product->branchName[$product->type]);?></th>
+              <td><?php echo common::hasPriv('testcase', 'browse') ? html::a($this->createLink('testcase', 'browse', "productID=$case->product&branch=$case->branch"), $branchName) : $branchName;?></td>
             </tr>
             <?php endif;?>
             <?php endif;?>
@@ -177,7 +177,19 @@
 
                     foreach($modulePath as $key => $module)
                     {
-                        if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                        if($this->app->openApp == 'qa' || $this->app->openApp == 'ops')
+                        {
+                            if($isLibCase)
+                            {
+                                if(!common::printLink('caselib', 'browse', "libID=$case->lib&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                            }
+                            else
+                            {
+                                if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                            }
+                        }
+                        if($this->app->openApp == 'project' and !common::printLink('project', 'testcase', "projectID={$this->session->project}&productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                        if($this->app->openApp == 'execution') echo $module->name;
                         if(isset($modulePath[$key + 1])) echo $lang->arrow;
                     }
                 }
@@ -190,7 +202,8 @@
               <td>
                 <?php
                 $class = isonlybody() ? 'showinonlybody' : 'iframe';
-                if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story", '', true), "#$case->story:$case->storyTitle", '', "class=$class data-width='80%'");
+                $param = $this->app->openApp == 'project' ? "&version=0&projectID={$this->session->project}" : '';
+                if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story" . $param, '', true), "#$case->story:$case->storyTitle", '', "class=$class data-width='80%'");
                 if($case->story and $case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
                 {
                     echo "(<span class='warning'>{$lang->story->changed}</span> ";
@@ -230,7 +243,7 @@
               <th><?php echo $lang->testcase->status;?></th>
               <td>
                 <?php
-                echo $this->processStatus($from != 'testtask' ? 'testcase' : 'testtask', $case);
+                echo $this->processStatus('testcase', $case);
                 if($case->version > $case->currentVersion and $from == 'testtask')
                 {
                     echo "(<span class='warning' title={$lang->testcase->fromTesttask}>{$lang->testcase->changed}</span> ";
diff --git a/module/testreport/control.php b/module/testreport/control.php
index 37c0f63310..4b5af5bc96 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -13,6 +13,14 @@ class testreport extends control
 {
     public $projectID = 0;
 
+    /**
+     * All products.
+     *
+     * @var    array
+     * @access public
+     */
+    public $products = array();
+
     /**
      * Construct
      *
@@ -36,18 +44,26 @@ class testreport extends control
         $this->loadModel('user');
         $this->app->loadLang('report');
 
-        /* Set testreport menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID)
+        /* Get product data. */
+        $objectID = 0;
+        if($this->app->openApp == 'project')
         {
-            $this->app->loadConfig('qa');
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
+            $objectID = $this->session->project;
+            $products  = $this->loadModel('project')->getProducts($objectID, false);
         }
-        else 
-        {    
-            $this->lang->testreport->menu    = $this->lang->projectQa->menu;
-            $this->lang->testreport->subMenu = $this->lang->projectQa->subMenu;
+        elseif($this->app->openApp == 'execution')
+        {
+            $objectID = $this->session->execution;
+            $products = $this->loadModel('execution')->getProducts($objectID, false);
         }
+        else
+        {
+            $products = $this->product->getPairs();
+        }
+
+        $this->view->products = $this->products = $products;
+        $openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
+        if(empty($this->products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=testreport&objectID=$objectID")));
     }
 
     /**
@@ -65,8 +81,8 @@ class testreport extends control
      */
     public function browse($objectID = 0, $objectType = 'product', $extra = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        if($objectType != 'product' and $objectType != 'project') die('Type Error!');
-        $this->session->set('reportList', $this->app->getURI(true));
+        if(strpos('product|execution|project', $objectType) === false) die('Type Error!');
+        $this->session->set('reportList', $this->app->getURI(true), $this->app->openApp);
 
         $objectID = $this->commonAction($objectID, $objectType);
         $object   = $this->$objectType->getById($objectID);
@@ -81,9 +97,9 @@ class testreport extends control
 
         $reports = $this->testreport->getList($objectID, $objectType, $extra, $orderBy, $pager);
 
-        if($objectType == 'project' and isset($_POST['taskIdList']))
+        if(strpos('project|execution', $objectType) !== false and ($extra or isset($_POST['taskIdList'])))
         {
-            $taskIdList = $_POST['taskIdList'];
+            $taskIdList = isset($_POST['taskIdList']) ? $_POST['taskIdList'] : array($extra);
             foreach($reports as $reportID => $report)
             {
                 $tasks = explode(',', $report->tasks);
@@ -96,10 +112,10 @@ class testreport extends control
         {
             $param = '';
             if($objectType == 'product' and $extra) $param = "objectID=$extra&objectType=testtask";
-            if($objectType == 'project')
+            if(($objectType == 'project' or $objectType == 'execution') and ($extra or !empty($_POST['taskIdList'])))
             {
-                $param = "objectID=$objectID&objectType=project";
-                if(isset($_POST['taskIdList'])) $param .= '&extra=' . join(',', $_POST['taskIdList']);
+                $param  = "objectID=$objectID&objectType=$objectType";
+                $param .= isset($_POST['taskIdList']) ? '&extra=' . join(',', $_POST['taskIdList']) : '&extra=' . $extra;
             }
             if($param) $this->locate($this->createLink('testreport', 'create', $param));
         }
@@ -149,6 +165,7 @@ class testreport extends control
             $reportID = $this->testreport->create();
             if(dao::isError()) die(js::error(dao::getError()));
             $this->loadModel('action')->create('testreport', $reportID, 'Opened');
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $reportID));
             die(js::locate(inlink('view', "reportID=$reportID"), 'parent'));
         }
 
@@ -179,6 +196,9 @@ class testreport extends control
                 $productID = $this->commonAction($task->product, 'product');
             }
             $this->view->taskPairs = $taskPairs;
+
+            if($this->app->openApp == 'execution') $this->execution->setMenu($task->execution);
+            if($this->app->openApp == 'project') $this->project->setMenu($task->project);
         }
 
         if(empty($objectID)) die(js::alert($this->lang->testreport->noObjectID) . js::locate('back'));
@@ -215,14 +235,14 @@ class testreport extends control
             $this->view->position[]  = $this->lang->testreport->create;
             $this->view->reportTitle = date('Y-m-d') . " TESTTASK#{$task->id} {$task->name} {$this->lang->testreport->common}";
         }
-        elseif($objectType == 'project')
+        elseif($objectType == 'execution')
         {
-            $executionID = $this->commonAction($objectID, 'execution');
+            $executionID = $this->commonAction($objectID, $objectType);
             if($executionID != $objectID) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
-            $execution = $this->execution->getById($executionID);
-            $tasks     = $this->testtask->getExecutionTasks($executionID);
-            $owners    = array();
+            $execution     = $this->execution->getById($executionID);
+            $tasks         = $this->testtask->getExecutionTasks($executionID);
+            $owners        = array();
             $buildIdList   = array();
             $productIdList = array();
             foreach($tasks as $i => $task)
@@ -244,6 +264,18 @@ class testreport extends control
                 die(js::locate('back'));
             }
 
+            if($this->app->openApp == 'qa')
+            {
+                $productID = $this->product->saveState(key($productIdList), $this->products);
+                $this->loadModel('qa')->setMenu($this->products, $productID);
+            }
+            elseif($this->app->openApp == 'project')
+            {
+                $projects  = $this->project->getPairsByProgram();
+                $projectID = $this->project->saveState($execution->project, $projects);
+                $this->project->setMenu($projectID);
+            }
+
             $builds  = $this->build->getByList($buildIdList);
             $stories = !empty($builds) ? $this->testreport->getStories4Test($builds) : $this->story->getExecutionStories($execution->id);;
 
@@ -255,9 +287,9 @@ class testreport extends control
             $this->view->title       = $execution->name . $this->lang->testreport->create;
             $this->view->position[]  = html::a(inlink('browse', "objectID=$executionID&objectType=execution"), $execution->name);
             $this->view->position[]  = $this->lang->testreport->create;
-            $this->view->reportTitle = date('Y-m-d') . " PROJECT#{$execution->id} {$execution->name} {$this->lang->testreport->common}";
-
+            $this->view->reportTitle = date('Y-m-d') . " EXECUTION#{$execution->id} {$execution->name} {$this->lang->testreport->common}";
         }
+
         $cases   = $this->testreport->getTaskCases($tasks, $begin, $end);
         $bugInfo = $this->testreport->getBugInfo($tasks, $productIdList, $begin, $end, $builds);
         $this->view->begin   = $begin;
@@ -278,8 +310,13 @@ class testreport extends control
         $this->view->cases       = $cases;
         $this->view->caseSummary = $this->testreport->getResultSummary($tasks, $cases, $begin, $end);
 
-        $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $cases, $begin, $end);
-        $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $cases, $begin, $end);
+        $caseList = array();
+        foreach($cases as $taskID => $casesList)
+        {
+            foreach($casesList as $caseID => $case) $caseList[$caseID] = $case;
+        }
+        $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, array_keys($caseList), $begin, $end);
+        $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, array_keys($caseList), $begin, $end);
         $this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult);
         $this->view->datas['testTaskPerRunner']    = $this->report->computePercent($perCaseRunner);
 
@@ -296,12 +333,13 @@ class testreport extends control
     /**
      * Edit report
      *
-     * @param  int    $reportID
-     * @param  string $from
+     * @param  int       $reportID
+     * @param  string    $begin
+     * @param  string    $end
      * @access public
      * @return void
      */
-    public function edit($reportID, $from = 'product', $begin = '', $end ='')
+    public function edit($reportID, $begin = '', $end ='')
     {
         if($_POST)
         {
@@ -313,14 +351,15 @@ class testreport extends control
             $actionID   = $this->loadModel('action')->create('testreport', $reportID, 'Edited', $fileAction);
             if(!empty($changes)) $this->action->logHistory($actionID, $changes);
 
-            die(js::locate(inlink('view', "reportID=$reportID&from=$from"), 'parent'));
+            die(js::locate(inlink('view', "reportID=$reportID"), 'parent'));
         }
 
         $report    = $this->testreport->getById($reportID);
         $execution = $this->execution->getById($report->execution);
         $begin     = !empty($begin) ? date("Y-m-d", strtotime($begin)) : $report->begin;
         $end       = !empty($end) ? date("Y-m-d", strtotime($end)) : $report->end;
-        if($from == 'product' and is_numeric($report->product))
+
+        if($this->app->openApp == 'qa' and !empty($report->product))
         {
             $product   = $this->product->getById($report->product);
             $productID = $this->commonAction($report->product, 'product');
@@ -330,12 +369,20 @@ class testreport extends control
             $this->view->position[] = html::a($browseLink, $product->name);
             $this->view->position[] = $this->lang->testreport->edit;
         }
-        else
+        elseif($this->app->openApp == 'execution' or $this->app->openApp == 'project')
         {
-            $executionID = $this->commonAction($report->execution, 'execution');
-            if($executionID != $report->objectID) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            if($this->app->openApp == 'execution')
+            {
+                $objectID = $this->commonAction($report->execution, 'execution');
+                if($objectID != $report->execution) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            }
+            else
+            {
+                $objectID = $this->commonAction($report->project, 'project');
+                if($objectID != $report->project) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            }
 
-            $browseLink = inlink('browse', "objectID=$executionID&objectType=project");
+            $browseLink = inlink('browse', "objectID=$objectID&objectType=execution");
             $this->view->position[] = html::a($browseLink, $execution->name);
             $this->view->position[] = $this->lang->testreport->edit;
         }
@@ -364,7 +411,7 @@ class testreport extends control
 
             $this->setChartDatas($report->objectID);
         }
-        else
+        elseif($report->objectType == 'execution')
         {
             $tasks = $this->testtask->getByList($report->tasks);
             $productIdList[$report->product] = $report->product;
@@ -382,7 +429,6 @@ class testreport extends control
         $this->view->title = $report->title . $this->lang->testreport->edit;
 
         $this->view->report        = $report;
-        $this->view->from          = $from;
         $this->view->begin         = $begin;
         $this->view->end           = $end;
         $this->view->stories       = $stories;
@@ -392,14 +438,14 @@ class testreport extends control
         $this->view->tasks         = join(',', array_keys($tasks));
         $this->view->storySummary  = $this->product->summary($stories);
 
-        $this->view->builds  = $builds;
-        $this->view->users   = $this->user->getPairs('noletter|noclosed|nodeleted');
+        $this->view->builds = $builds;
+        $this->view->users  = $this->user->getPairs('noletter|noclosed|nodeleted');
 
         $this->view->cases       = $cases;
         $this->view->caseSummary = $this->testreport->getResultSummary($tasks, $cases, $begin, $end);
 
-        $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $cases, $begin, $end);
-        $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $cases, $begin, $end);
+        $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $report->cases, $begin, $end);
+        $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $report->cases, $begin, $end);
         $this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult);
         $this->view->datas['testTaskPerRunner']    = $this->report->computePercent($perCaseRunner);
 
@@ -414,7 +460,6 @@ class testreport extends control
      * View report.
      *
      * @param  int    $reportID
-     * @param  string $from
      * @param  string $tab
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -422,14 +467,15 @@ class testreport extends control
      * @access public
      * @return void
      */
-    public function view($reportID, $from = 'product', $tab = 'basic', $recTotal = 0, $recPerPage = 100, $pageID = 1)
+    public function view($reportID, $tab = 'basic', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $report  = $this->testreport->getById($reportID);
+        $reportID = (int)$reportID;
+        $report   = $this->testreport->getById($reportID);
         if(!$report) die(js::error($this->lang->notFound) . js::locate('back'));
-        $this->session->PRJ = $report->project;
+        $this->session->project = $report->project;
 
         $execution = $this->execution->getById($report->execution);
-        if($from == 'product' and is_numeric($report->product))
+        if($this->app->openApp == 'qa' and !empty($report->product))
         {
             $product   = $this->product->getById($report->product);
             $productID = $this->commonAction($report->product, 'product');
@@ -438,12 +484,20 @@ class testreport extends control
             $browseLink = inlink('browse', "objectID=$productID&objectType=product");
             $this->view->position[] = html::a($browseLink, $product->name);
         }
-        else
+        elseif($this->app->openApp == 'execution' or $this->app->openApp == 'project')
         {
-            $executionID = $this->commonAction($report->execution, 'execution');
-            if($executionID != $report->objectID) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            if($this->app->openApp == 'execution')
+            {
+                $objectID = $this->commonAction($report->execution, 'execution');
+                if($objectID != $report->execution) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            }
+            else
+            {
+                $objectID = $this->commonAction($report->project, 'project');
+                if($objectID != $report->project) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            }
 
-            $browseLink = inlink('browse', "objectID=$executionID&objectType=project");
+            $browseLink = inlink('browse', "objectID=$objectID&objectType=execution");
             $this->view->position[] = html::a($browseLink, $execution->name);
         }
 
@@ -462,11 +516,10 @@ class testreport extends control
         if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
-        $tasks      = $report->tasks ? $this->testtask->getByList($report->tasks) : array();;
-        $builds     = $report->builds ? $this->build->getByList($report->builds) : array();
-        $cases      = $this->testreport->getTaskCases($tasks, $report->begin, $report->end, $report->cases, $pager);
-        $caseIdList = $this->testreport->getCaseIdList($reportID);
-        $bugInfo    = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds);
+        $tasks   = $report->tasks ? $this->testtask->getByList($report->tasks) : array();;
+        $builds  = $report->builds ? $this->build->getByList($report->builds) : array();
+        $cases   = $this->testreport->getTaskCases($tasks, $report->begin, $report->end);
+        $bugInfo = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds);
 
         if($report->objectType == 'testtask')
         {
@@ -488,15 +541,15 @@ class testreport extends control
         $this->view->stories   = $stories;
         $this->view->bugs      = $report->bugs ? $this->bug->getByList($report->bugs) : array();
         $this->view->builds    = $builds;
-        $this->view->cases     = $cases;
+        $this->view->cases     = $this->testreport->getTaskCases($tasks, $report->begin, $report->end, $report->cases, $pager);
         $this->view->users     = $this->user->getPairs('noletter|noclosed|nodeleted');
         $this->view->actions   = $this->loadModel('action')->getList('testreport', $reportID);
 
         $this->view->storySummary = $this->product->summary($stories);
-        $this->view->caseSummary  = $this->testreport->getResultSummary($tasks, $caseIdList, $report->begin, $report->end);
+        $this->view->caseSummary  = $this->testreport->getResultSummary($tasks, $cases, $report->begin, $report->end);
 
-        $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $caseIdList, $report->begin, $report->end);
-        $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $caseIdList, $report->begin, $report->end);
+        $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $report->cases, $report->begin, $report->end);
+        $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $report->cases, $report->begin, $report->end);
         $this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult);
         $this->view->datas['testTaskPerRunner']    = $this->report->computePercent($perCaseRunner);
 
@@ -539,21 +592,23 @@ class testreport extends control
     {
         if($objectType == 'product')
         {
-            $projectID      = $this->lang->navGroup->testreport == 'qa' ? 0 : $this->session->PRJ;
-            $this->products = $this->product->getProductPairsByProject($projectID);
-            if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=testreport&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=report')));
-            $productID      = $this->product->saveState($objectID, $this->products);
-            $this->testreport->setMenu($this->products, $productID);
+            $productID = $this->product->saveState($objectID, $this->products);
+            $this->loadModel('qa')->setMenu($this->products, $productID);
             return $productID;
         }
+        elseif($objectType == 'execution')
+        {
+            $executions  = $this->execution->getPairs();
+            $executionID = $this->execution->saveState($objectID, $executions);
+            $this->execution->setMenu($executionID);
+            return $executionID;
+        }
         elseif($objectType == 'project')
         {
-            $this->executions = $this->execution->getPairs($this->session->PRJ, 'all', 'nocode');
-            $executionID      = $this->execution->saveState($objectID, $this->executions);
-            $this->execution->setMenu($this->executions, $executionID);
-            $this->lang->testreport->menu = $this->lang->execution->menu;
-            $this->lang->menugroup->testreport = 'execution';
-            return $executionID;
+            $projects  = $this->project->getPairsByProgram();
+            $projectID = $this->project->saveState($objectID, $projects);
+            $this->project->setMenu($projectID);
+            return $projectID;
         }
     }
 
diff --git a/module/testreport/js/common.js b/module/testreport/js/common.js
index 652fbf4d5f..de161ecc93 100644
--- a/module/testreport/js/common.js
+++ b/module/testreport/js/common.js
@@ -52,6 +52,6 @@ function refreshPage()
     }
     else if(method == 'edit')
     {
-        location.href = createLink('testreport', 'edit', "reportID=" + reportID + "&from=" + from + "&begin=" + begin + "&end=" + end);
+        location.href = createLink('testreport', 'edit', "reportID=" + reportID + "&begin=" + begin + "&end=" + end);
     }
 }
diff --git a/module/testreport/js/create.js b/module/testreport/js/create.js
index eff1a62f38..6485cca0dc 100644
--- a/module/testreport/js/create.js
+++ b/module/testreport/js/create.js
@@ -1,6 +1,5 @@
 $(function()
 {
-    if(objectType == 'project' $('#subNavbar ul li[data-id=qa]').addClass('active');
     $('#mainContent .main-header h2 #selectTask').change(function()
     {
         var taskID = $(this).val();
diff --git a/module/testreport/lang/de.php b/module/testreport/lang/de.php
index 64af9319f2..62ccfcc2e9 100644
--- a/module/testreport/lang/de.php
+++ b/module/testreport/lang/de.php
@@ -14,6 +14,7 @@ $lang->testreport->product     = $lang->productCommon;
 $lang->testreport->bugTitle    = 'Bug Titel';
 $lang->testreport->storyTitle  = 'Story Titel';
 $lang->testreport->project     = 'Projekt';
+$lang->testreport->execution   = 'Execution';
 $lang->testreport->testtask    = 'Test Build';
 $lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = 'Start&Ende';
@@ -48,6 +49,7 @@ $lang->testreport->legendLegacyBugs  = 'Legacy Bugs';
 $lang->testreport->legendReport      = 'Bericht';
 $lang->testreport->legendComment     = 'Summe';
 $lang->testreport->legendMore        = 'Mehr';
+$lang->testreport->date              = 'Date';
 
 $lang->testreport->bugSeverityGroups   = 'Nach Dringlichkeit';
 $lang->testreport->bugTypeGroups       = 'Nach Typ';
@@ -56,10 +58,17 @@ $lang->testreport->bugOpenedByGroups   = 'Nach Ersteller';
 $lang->testreport->bugResolvedByGroups = 'Nach Löser';
 $lang->testreport->bugResolutionGroups = 'Nach Lösung';
 $lang->testreport->bugModuleGroups     = 'Nach Modul';
+$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Legacy Bugs';
 $lang->testreport->bugConfirmedRate    = 'Bestätigte Bugs Rate (Lösung ist gelöst oder verschoben / Status ist gelöst oder Geschlossen)';
 $lang->testreport->bugCreateByCaseRate = 'Bug in Fall Rate (Bugs erstellt in Fall / Neu hinzugefügte Bugs)';
 
+$lang->testreport->bugStageList = array();
+$lang->testreport->bugStageList['generated'] = 'Generated Bugs';
+$lang->testreport->bugStageList['legacy']    = 'Legacy Bugs';
+$lang->testreport->bugStageList['resolved']  = 'Resolved Bugs';
+
 $lang->testreport->caseSummary    = ' <strong>%s</strong> Fälle in Summe : <strong>%s</strong> ausgeführt, <strong>%s</strong> Ergebnisse, <strong>%s</strong> fehlgeschlagen.';
 $lang->testreport->buildSummary   = 'Getsetetes <strong>%s</strong> Build.';
 $lang->testreport->confirmDelete  = 'Möchten Sie diesen Bericht löschen?';
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index cac730ac61..b2168ca7e7 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -14,6 +14,7 @@ $lang->testreport->product     = $lang->productCommon;
 $lang->testreport->bugTitle    = 'Bug';
 $lang->testreport->storyTitle  = 'Story';
 $lang->testreport->project     = 'Project';
+$lang->testreport->execution   = 'Execution';
 $lang->testreport->testtask    = 'Test Build';
 $lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = 'Begin&End';
@@ -48,6 +49,7 @@ $lang->testreport->legendLegacyBugs  = 'Left Bugs';
 $lang->testreport->legendReport      = 'Report';
 $lang->testreport->legendComment     = 'Summary';
 $lang->testreport->legendMore        = 'More';
+$lang->testreport->date              = 'Date';
 
 $lang->testreport->bugSeverityGroups   = 'Bug Severity Distribution';
 $lang->testreport->bugTypeGroups       = 'Bug Type Distribution';
@@ -56,10 +58,17 @@ $lang->testreport->bugOpenedByGroups   = 'Bug ReportedBy Distribution';
 $lang->testreport->bugResolvedByGroups = 'Bug ResolvedBy Distribution';
 $lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
 $lang->testreport->bugModuleGroups     = 'Bug Module Distribution';
+$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Left Bugs';
 $lang->testreport->bugConfirmedRate    = 'Confirmed-Bug Rate (Resolution is fixed or postponed / status is resolved or closed)';
 $lang->testreport->bugCreateByCaseRate = 'Bug-Reported-in-Case Rate (Bugs reported in cases / New added bugs)';
 
+$lang->testreport->bugStageList = array();
+$lang->testreport->bugStageList['generated'] = 'Generated Bugs';
+$lang->testreport->bugStageList['legacy']    = 'Legacy Bugs';
+$lang->testreport->bugStageList['resolved']  = 'Resolved Bugs';
+
 $lang->testreport->caseSummary    = 'Total <strong>%s</strong> cases. <strong>%s</strong> cases run. <strong>%s</strong> results generated. <strong>%s</strong> cases failed.';
 $lang->testreport->buildSummary   = 'Tested <strong>%s</strong> builds.';
 $lang->testreport->confirmDelete  = 'Do you want to delete this report?';
diff --git a/module/testreport/lang/fr.php b/module/testreport/lang/fr.php
index ee65a122b1..088f77044f 100644
--- a/module/testreport/lang/fr.php
+++ b/module/testreport/lang/fr.php
@@ -14,6 +14,7 @@ $lang->testreport->product     = $lang->productCommon;
 $lang->testreport->bugTitle    = 'Bug';
 $lang->testreport->storyTitle  = 'Story';
 $lang->testreport->project     = 'Projet';
+$lang->testreport->execution   = 'Execution';
 $lang->testreport->testtask    = 'Campagne';
 $lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = 'Début&Fin';
@@ -48,6 +49,7 @@ $lang->testreport->legendLegacyBugs  = 'Bugs Restants';
 $lang->testreport->legendReport      = 'Rapport';
 $lang->testreport->legendComment     = 'Résumé';
 $lang->testreport->legendMore        = 'Plus...';
+$lang->testreport->date              = 'Date';
 
 $lang->testreport->bugSeverityGroups   = 'Distribution Sévérité de Bug';
 $lang->testreport->bugTypeGroups       = 'Distribution Type de Bug';
@@ -56,10 +58,17 @@ $lang->testreport->bugOpenedByGroups   = 'Distribution Bug Signalé par';
 $lang->testreport->bugResolvedByGroups = 'Distribution Bug Résolu par';
 $lang->testreport->bugResolutionGroups = 'Distribution Bug Résolution';
 $lang->testreport->bugModuleGroups     = 'Distribution Bug Module';
+$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Bugs Restants';
 $lang->testreport->bugConfirmedRate    = 'Taux de Bugs confirmés (Résolution est corrigée ou reportée / statut est résolu ou fermé)';
 $lang->testreport->bugCreateByCaseRate = 'Taux Bug Signalés par CasTest (Bugs signalés dans les CasTests / Nouveaux bugs)';
 
+$lang->testreport->bugStageList = array();
+$lang->testreport->bugStageList['generated'] = 'Generated Bugs';
+$lang->testreport->bugStageList['legacy']    = 'Legacy Bugs';
+$lang->testreport->bugStageList['resolved']  = 'Resolved Bugs';
+
 $lang->testreport->caseSummary    = 'Total <strong>%s</strong> casTests. <strong>%s</strong> casTests joués. <strong>%s</strong> résultats générés. <strong>%s</strong> casTests ont échoué.';
 $lang->testreport->buildSummary   = 'Testé <strong>%s</strong> builds.';
 $lang->testreport->confirmDelete  = 'Voulez-vous supprimer ce rapport ?';
diff --git a/module/testreport/lang/vi.php b/module/testreport/lang/vi.php
index e63e83a6e3..f5f273558e 100644
--- a/module/testreport/lang/vi.php
+++ b/module/testreport/lang/vi.php
@@ -14,6 +14,7 @@ $lang->testreport->product     = $lang->productCommon;
 $lang->testreport->bugTitle    = 'Bug';
 $lang->testreport->storyTitle  = 'Câu chuyện';
 $lang->testreport->project     = 'Dự án';
+$lang->testreport->execution   = 'Execution';
 $lang->testreport->testtask    = 'Test bản dựng';
 $lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = 'Bắt đầu & Kết thúc';
@@ -48,6 +49,7 @@ $lang->testreport->legendLegacyBugs  = 'Bug còn lại';
 $lang->testreport->legendReport      = 'Báo cáo';
 $lang->testreport->legendComment     = 'Tóm tắt';
 $lang->testreport->legendMore        = 'Thêm';
+$lang->testreport->date              = 'Date';
 
 $lang->testreport->bugSeverityGroups   = 'Phân chia mức độ Bug';
 $lang->testreport->bugTypeGroups       = 'Phân chia loại Bug';
@@ -56,10 +58,17 @@ $lang->testreport->bugOpenedByGroups   = 'Phân chia người báo cáo Bug';
 $lang->testreport->bugResolvedByGroups = 'Phân chia người giải quyết Bug';
 $lang->testreport->bugResolutionGroups = 'Phân chia giải pháp Bug';
 $lang->testreport->bugModuleGroups     = 'Phân chia Module Bug';
+$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Bug còn lại';
 $lang->testreport->bugConfirmedRate    = 'Đánh giá Bug đã xác nhận (Nghị quyết đã ban hành hoặc tạm hoãn / tình trạng được giải quyết hoặc đóng)';
 $lang->testreport->bugCreateByCaseRate = 'Đánh giá Bug được báo cáo trong Tình huống (Bug được báo cáo trong tình huống /Thêm mới Bugs)';
 
+$lang->testreport->bugStageList = array();
+$lang->testreport->bugStageList['generated'] = 'Generated Bugs';
+$lang->testreport->bugStageList['legacy']    = 'Legacy Bugs';
+$lang->testreport->bugStageList['resolved']  = 'Resolved Bugs';
+
 $lang->testreport->caseSummary    = 'Tổng <strong>%s</strong> tình huống. <strong>%s</strong> tình huống đang chạy. <strong>%s</strong> kết quả được tạo. <strong>%s</strong> cases thất bại';
 $lang->testreport->buildSummary   = 'Đã test <strong>%s</strong> bản dựng.';
 $lang->testreport->confirmDelete  = 'Bạn có muốn xóa báo cáo này?';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 7723cb1673..9f2cfad8ea 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -14,6 +14,7 @@ $lang->testreport->product     = "所属{$lang->productCommon}";
 $lang->testreport->bugTitle    = 'Bug 标题';
 $lang->testreport->storyTitle  = "{$lang->SRCommon}标题";
 $lang->testreport->project     = '所属项目';
+$lang->testreport->execution   = '所属执行';
 $lang->testreport->testtask    = '测试版本';
 $lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = '起止时间';
@@ -48,6 +49,7 @@ $lang->testreport->legendLegacyBugs  = '遗留的Bug';
 $lang->testreport->legendReport      = '报表';
 $lang->testreport->legendComment     = '总结';
 $lang->testreport->legendMore        = '更多功能';
+$lang->testreport->date              = '日期';
 
 $lang->testreport->bugSeverityGroups   = 'Bug严重级别分布';
 $lang->testreport->bugTypeGroups       = 'Bug类型分布';
@@ -56,16 +58,23 @@ $lang->testreport->bugOpenedByGroups   = 'Bug创建者分布';
 $lang->testreport->bugResolvedByGroups = 'Bug解决者分布';
 $lang->testreport->bugResolutionGroups = 'Bug解决方案分布';
 $lang->testreport->bugModuleGroups     = 'Bug模块分布';
+$lang->testreport->bugStageGroups      = 'Bug重要程度阶段分布';
+$lang->testreport->bugHandleGroups     = 'Bug每日处理情况分布';
 $lang->testreport->legacyBugs          = '遗留的Bug';
 $lang->testreport->bugConfirmedRate    = '有效Bug率 (方案为已解决或延期 / 状态为已解决或已关闭)';
 $lang->testreport->bugCreateByCaseRate = '用例发现Bug率 (用例创建的Bug / 时间区间中新增的Bug)';
 
+$lang->testreport->bugStageList = array();
+$lang->testreport->bugStageList['generated'] = '产生的Bug';
+$lang->testreport->bugStageList['legacy']    = '遗留的Bug';
+$lang->testreport->bugStageList['resolved']  = '解决的Bug';
+
 $lang->testreport->caseSummary    = '共有<strong>%s</strong>个用例，共执行<strong>%s</strong>个用例，产生了<strong>%s</strong>个结果，失败的用例有<strong>%s</strong>个。';
 $lang->testreport->buildSummary   = '共测试了<strong>%s</strong>个版本。';
 $lang->testreport->confirmDelete  = '是否删除该报告？';
 $lang->testreport->moreNotice     = '更多功能可以参考禅道扩展机制进行扩展，也可以联系我们进行定制。';
 $lang->testreport->exportNotice   = "由<a href='https://www.zentao.net' target='_blank' style='color:grey'>禅道项目管理软件</a>导出";
-$lang->testreport->noReport       = "报表还没有生成。";
+$lang->testreport->noReport       = "暂无报告，请选择测试单生成测试报告。";
 $lang->testreport->foundBugTip    = "影响版本在测试轮次内，并且创建时间在测试时间范围内产生的Bug数。";
 $lang->testreport->legacyBugTip   = "Bug状态是激活，或Bug的解决时间在测试结束时间之后。";
 $lang->testreport->fromCaseBugTip = "测试时间范围内，用例执行失败后创建的Bug。";
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index cc58a001f8..71dec71b65 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -14,6 +14,7 @@ $lang->testreport->product     = "所屬{$lang->productCommon}";
 $lang->testreport->bugTitle    = 'Bug 標題';
 $lang->testreport->storyTitle  = "{$lang->SRCommon}標題";
 $lang->testreport->project     = '所屬項目';
+$lang->testreport->execution   = '所屬執行';
 $lang->testreport->testtask    = '測試版本';
 $lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = '起止時間';
@@ -65,7 +66,7 @@ $lang->testreport->buildSummary   = '共測試了<strong>%s</strong>個版本。
 $lang->testreport->confirmDelete  = '是否刪除該報告？';
 $lang->testreport->moreNotice     = '更多功能可以參考禪道擴展機制進行擴展，也可以聯繫我們進行定製。';
 $lang->testreport->exportNotice   = "由<a href='https://www.zentao.net' target='_blank' style='color:grey'>禪道項目管理軟件</a>導出";
-$lang->testreport->noReport       = "報表還沒有生成。";
+$lang->testreport->noReport       = "暫無報告，請選擇測試單生成測試報告。";
 $lang->testreport->foundBugTip    = "影響版本在測試輪次內，並且創建時間在測試時間範圍內產生的Bug數。";
 $lang->testreport->legacyBugTip   = "Bug狀態是激活，或Bug的解決時間在測試結束時間之後。";
 $lang->testreport->fromCaseBugTip = "測試時間範圍內，用例執行失敗後創建的Bug。";
diff --git a/module/testreport/model.php b/module/testreport/model.php
index c056675f9f..7dcf955db5 100644
--- a/module/testreport/model.php
+++ b/module/testreport/model.php
@@ -11,48 +11,6 @@
  */
 class testreportModel extends model
 {
-    /**
-     * Set menu.
-     *
-     * @param  array  $products
-     * @param  int    $productID
-     * @param  int    $branch
-     * @access public
-     * @return void
-     */
-    public function setMenu($products, $productID, $branch = 0)
-    {
-        $this->loadModel('product')->setMenu($products, $productID, $branch);
-        $selectHtml = $this->product->select($products, $productID, 'testreport', 'browse', $this->session->PRJ, $branch);
-
-        /* Remove branch. */
-        if(strpos($selectHtml, 'currentBranch') !== false) $selectHtml = substr($selectHtml, 0, strrpos($selectHtml, "<div class='btn-group'>")) . '</div>';
-
-        $pageNav     = $selectHtml;
-        $pageActions = '';
-
-        $this->lang->modulePageNav = $pageNav;
-        $this->lang->TRActions     = $pageActions;
-        foreach($this->lang->testtask->menu as $key => $value)
-        {
-            if($this->lang->navGroup->testreport != 'qa') $this->loadModel('qa')->setSubMenu('testreport', $key, $productID);
-            $replace = $productID;
-            if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->testreport->menu, $key, $replace);
-        }
-
-        if($this->lang->navGroup->testreport == 'qa')
-        {
-            foreach($this->lang->qa->subMenu->testtask as $key => $menu)
-            {
-                common::setMenuVars($this->lang->qa->subMenu->testtask, $key, $productID);
-            }
-            $this->lang->qa->menu         = $this->lang->testreport->menu;
-            $this->lang->testreport->menu = $this->lang->qa->subMenu->testtask;
-            $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
-        }
-    }
-
     /**
      * Create report.
      *
@@ -61,9 +19,10 @@ class testreportModel extends model
      */
     public function create()
     {
+        $execution = $this->loadModel('execution')->getByID($this->post->execution);
         $data = fixer::input('post')
             ->stripTags($this->config->testreport->editor->create['id'], $this->config->allowedTags)
-            ->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->testreport != 'qa', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new', 'project', $execution->project)
             ->add('createdBy', $this->app->user->account)
             ->add('createdDate', helper::now())
             ->join('stories', ',')
@@ -154,9 +113,10 @@ class testreportModel extends model
     public function getList($objectID, $objectType, $extra = '', $orderBy = 'id_desc', $pager = null)
     {
         $objectID = (int)$objectID;
-        return $this->dao->select('*')->from(TABLE_TESTREPORT)->where('deleted')->eq(0)
-            ->beginIF($this->lang->navGroup->testreport != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
-            ->beginIF($objectType == 'project')->andWhere('objectID')->eq($objectID)->andWhere('objectType')->eq('project')->fi()
+        return $this->dao->select('*')->from(TABLE_TESTREPORT)
+            ->where('deleted')->eq(0)
+            ->beginIF($objectType == 'execution')->andWhere('execution')->eq($objectID)->fi()
+            ->beginIF($objectType == 'project')->andWhere('project')->eq($objectID)->fi()
             ->beginIF($objectType == 'product' and $extra)->andWhere('objectID')->eq((int)$extra)->andWhere('objectType')->eq('testtask')->fi()
             ->beginIF($objectType == 'product' and empty($extra))->andWhere('product')->eq($objectID)->fi()
             ->orderBy($orderBy)
@@ -178,23 +138,83 @@ class testreportModel extends model
     public function getBugInfo($tasks, $productIdList, $begin, $end, $builds)
     {
         $generatedBugs = $this->dao->select('*')->from(TABLE_BUG)->where('product')->in($productIdList)->andWhere('openedDate')->ge($begin)->andWhere('openedDate')->le("$end 23:59:59")->andWhere('deleted')->eq(0)->fetchAll();
+        $resolvedBugs  = $this->dao->select('*')->from(TABLE_BUG)->where('product')->in($productIdList)->andWhere('resolvedDate')->ge($begin)->andWhere('resolvedDate')->le("$end 23:59:59")->andWhere('deleted')->eq(0)->fetchAll();
         $foundBugs     = array();
         $legacyBugs    = array();
         $byCaseNum     = 0;
         $buildIdList   = array_keys($builds);
         $taskIdList    = array_keys($tasks);
 
+        $severityGroups = $statusGroups = $openedByGroups = $resolvedByGroups = $resolutionGroups = $moduleGroups = $typeGroups = $stageGoups = $handleGroups = array();
+
+        /* Init stageGroups. */
+        $isEmptyStage = true;
+        foreach($this->lang->bug->priList as $priKey => $priValue)
+        {
+            $stageGroups[$priKey]['generated'] = 0;
+            $stageGroups[$priKey]['legacy']    = 0;
+            $stageGroups[$priKey]['resolved']  = 0;
+        }
+
+        /* Init handleGroups. */
+        $isEmptyHandle  = true;
+        $beginTimeStamp = strtotime($begin);
+        $endTimeStamp   = strtotime($end);
+        for($i = $beginTimeStamp; $i <= $endTimeStamp; $i += 86400)
+        {
+            $date = date('m-d', $i);
+            $handleGroups['generated'][$date] = 0;
+            $handleGroups['legacy'][$date]    = 0;
+            $handleGroups['resolved'][$date]  = 0;
+        }
+
+        /* Get the resolved bug data. */
+        foreach($resolvedBugs as $bug)
+        {
+            if(array_intersect(explode(',', $bug->openedBuild), $buildIdList))
+            {
+                $resolvedDate = date('m-d', strtotime($bug->resolvedDate));
+                $stageGroups[$bug->pri]['resolved']      += 1;
+                $handleGroups['resolved'][$resolvedDate] += 1;
+                $isEmptyStage  = false;
+                $isEmptyHandle = false;
+            }
+        }
+
+        /* Get the generated and leagcy bug data. */
         foreach($generatedBugs as $bug)
         {
             if(array_intersect(explode(',', $bug->openedBuild), $buildIdList))
             {
+                $openedDate = date('m-d', strtotime($bug->openedDate));
+
                 $foundBugs[$bug->id] = $bug;
-                if($bug->status == 'active' or $bug->resolvedDate > "$end 23:59:59") $legacyBugs[$bug->id] = $bug;
+                $stageGroups[$bug->pri]['generated']    += 1;
+                $handleGroups['generated'][$openedDate] += 1;
+                $isEmptyStage  = false;
+                $isEmptyHandle = false;
+
+                if($bug->status == 'active' or $bug->resolvedDate > "$end 23:59:59")
+                {
+                    $legacyBugs[$bug->id] = $bug;
+                    $stageGroups[$bug->pri]['legacy'] += 1;
+
+                    $beginTimeStamp = strtotime($begin);
+                    $endTimeStamp   = strtotime($end);
+                    for($i = $beginTimeStamp; $i <= $endTimeStamp; $i += 86400)
+                    {
+                        $dateTime = date('Y-m-d 23:59:59', $i);
+                        if($bug->openedDate <= $dateTime and (helper::isZeroDate($bug->resolvedDate) or $bug->resolvedDate > $dateTime))
+                        {
+                            $date = date('m-d', $i);
+                            $handleGroups['legacy'][$date] += 1;
+                        }
+                    }
+                }
                 if($bug->case and !empty($bug->testtask) and in_array($bug->testtask, $taskIdList)) $byCaseNum ++;
             }
         }
 
-        $severityGroups = $statusGroups = $openedByGroups = $resolvedByGroups = $resolutionGroups = $moduleGroups = $typeGroups = array();
         $resolvedBugs   = 0;
         foreach($foundBugs as $bug)
         {
@@ -214,6 +234,8 @@ class testreportModel extends model
         $bugInfo['countBugByTask']      = $byCaseNum;
         $bugInfo['bugConfirmedRate']    = empty($resolvedBugs) ? 0 : round((zget($resolutionGroups, 'fixed', 0) + zget($resolutionGroups, 'postponed', 0)) / $resolvedBugs * 100, 2);
         $bugInfo['bugCreateByCaseRate'] = empty($byCaseNum) ? 0 : round($byCaseNum / count($foundBugs) * 100, 2);
+        $bugInfo['bugStageGroups']      = $isEmptyStage ? array() : $stageGroups;
+        $bugInfo['bugHandleGroups']     = $isEmptyHandle ? array() : $handleGroups;
 
         $this->app->loadLang('bug');
         $users = $this->loadModel('user')->getPairs('noclosed|noletter|nodeleted');
@@ -306,30 +328,33 @@ class testreportModel extends model
             ->beginIF($idList)->andWhere('t2.id')->in($idList)->fi()
             ->andWhere('t2.deleted')->eq(0)
             ->page($pager)
-            ->fetchAll('id');
+            ->fetchGroup('task','id');
 
-        $results = $this->dao->select('t1.*')->from(TABLE_TESTRESULT)->alias('t1')
-            ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.run=t2.id')
-            ->where('t2.task')->in(array_keys($tasks))
-            ->andWhere('t1.`case`')->in(array_keys($cases))
-            ->andWhere('t1.date')->ge($begin)
-            ->andWhere('t1.date')->le($end . " 23:59:59")
-            ->orderBy('date')
-            ->fetchAll('case');
-
-        foreach($cases as $caseID => $case)
+        foreach($cases as $taskID => $caseList)
         {
-            $case->lastRunner    = '';
-            $case->lastRunDate   = '';
-            $case->lastRunResult = '';
-            $case->status        = 'wait';
-            if(isset($results[$caseID]))
+            $results = $this->dao->select('t1.*')->from(TABLE_TESTRESULT)->alias('t1')
+                ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.run=t2.id')
+                ->where('t2.task')->eq($taskID)
+                ->andWhere('t1.`case`')->in(array_keys($caseList))
+                ->andWhere('t1.date')->ge($begin)
+                ->andWhere('t1.date')->le($end . " 23:59:59")
+                ->orderBy('date')
+                ->fetchAll('case');
+
+            foreach($caseList as $caseID => $case)
             {
-                $result = $results[$caseID];
-                $case->lastRunner    = $result->lastRunner;
-                $case->lastRunDate   = $result->date;
-                $case->lastRunResult = $result->caseResult;
-                $case->status        = $result->caseResult == 'blocked' ? 'blocked' : 'done';
+                $case->lastRunner    = '';
+                $case->lastRunDate   = '';
+                $case->lastRunResult = '';
+                $case->status        = 'normal';
+                if(isset($results[$caseID]))
+                {
+                    $result = $results[$caseID];
+                    $case->lastRunner    = $result->lastRunner;
+                    $case->lastRunDate   = $result->date;
+                    $case->lastRunResult = $result->caseResult;
+                    $case->status        = $result->caseResult == 'blocked' ? 'blocked' : 'normal';
+                }
             }
         }
 
@@ -368,23 +393,32 @@ class testreportModel extends model
      */
     public function getResultSummary($tasks, $cases, $begin, $end)
     {
+        $caseCount = 0;
+        $casesList = array();
+        foreach($cases as $taskID => $caseList)
+        {
+            foreach($caseList as $caseID => $case)
+            {
+                $casesList[$caseID] = $case;
+                $caseCount++;
+            }
+        }
+
         $results = $this->dao->select('t1.*')->from(TABLE_TESTRESULT)->alias('t1')
             ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.run=t2.id')
             ->where('t2.task')->in(array_keys($tasks))
-            ->andWhere('t1.`case`')->in(array_keys($cases))
+            ->andWhere('t1.`case`')->in(array_keys($casesList))
             ->andWhere('t1.date')->ge($begin)
             ->andWhere('t1.date')->le($end . " 23:59:59")
             ->orderBy('date')
             ->fetchAll('id');
 
-        $failResults = array();
+        $failResults = 0;
         $runCasesNum = array();
-        foreach($results as $result)
-        {
-            $runCasesNum[$result->case] = $result->case;
-            if($result->caseResult == 'fail') $failResults[$result->case] = $result->case;
-        }
-        return sprintf($this->lang->testreport->caseSummary, count($cases), count($runCasesNum), count($results), count($failResults));
+        foreach($results as $result) $runCasesNum[$result->run] = $result->caseResult;
+        foreach($runCasesNum as $lastResult) if($lastResult == 'fail') $failResults++;
+
+        return sprintf($this->lang->testreport->caseSummary, $caseCount, count($runCasesNum), count($results), $failResults);
     }
 
     /**
@@ -404,7 +438,7 @@ class testreportModel extends model
             ->on('t1.run= t2.id')
             ->where('t2.task')->in(array_keys($tasks))
             ->andwhere('t1.date = t2.lastRunDate')
-            ->andWhere('t1.`case`')->in(array_keys($cases))
+            ->andWhere('t1.`case`')->in($cases)
             ->andWhere('t1.date')->ge($begin)
             ->andWhere('t1.date')->le($end . " 23:59:59")
             ->groupBy('name')
@@ -436,7 +470,7 @@ class testreportModel extends model
             ->on('t1.run= t2.id')
             ->where('t2.task')->in(array_keys($tasks))
             ->andwhere('t1.date = t2.lastRunDate')
-            ->andWhere('t1.`case`')->in(array_keys($cases))
+            ->andWhere('t1.`case`')->in($cases)
             ->andWhere('t1.date')->ge($begin)
             ->andWhere('t1.date')->le($end . " 23:59:59")
             ->groupBy('name')
@@ -475,6 +509,7 @@ class testreportModel extends model
             ->beginIF(is_array($builds) and $type == 'build')->andWhere('id')->in(trim($bugIdList, ','))->fi()
             ->beginIF(!is_array($builds) and $type == 'build')->andWhere("(resolvedBuild = 'trunk' and resolvedDate >= '$begin' and resolvedDate <= '$end 23:59:59')")->fi()
             ->beginIF($type == 'project')->andWhere("(id " . helper::dbIN(trim($bugIdList, ',')) . " OR (resolvedBuild = 'trunk' and resolvedDate >= '$begin' and resolvedDate <= '$end 23:59:59'))")
+            ->beginIF($type == 'execution')->andWhere("(id " . helper::dbIN(trim($bugIdList, ',')) . " OR (resolvedBuild = 'trunk' and resolvedDate >= '$begin' and resolvedDate <= '$end 23:59:59'))")
             ->fetchAll('id');
     }
 
diff --git a/module/testreport/view/blockbugreport.html.php b/module/testreport/view/blockbugreport.html.php
index 437f7dbe43..74dfa1fbbd 100644
--- a/module/testreport/view/blockbugreport.html.php
+++ b/module/testreport/view/blockbugreport.html.php
@@ -48,7 +48,7 @@
   <?php foreach($bugInfo as $infoKey => $infoValue):?>
   <tr>
     <td class='text-top'>
-      <table class='table table-condensed table-report' id='bugSeverityGroups'>
+      <table class='table table-condensed table-report' id='bugStageGroups'>
         <?php if(empty($infoValue)):?>
         <tr>
           <td class='none-data'>
@@ -56,6 +56,85 @@
             <?php echo $lang->testreport->none;?>
           </td>
         </tr>
+        <?php elseif($infoKey == 'bugStageGroups'):?>
+        <tr class='text-top'>
+          <td class='w-p70'>
+            <div class='chart-wrapper text-center'>
+              <h5><?php echo $lang->testreport->$infoKey?></h5>
+              <div class='chart-canvas'>
+                <?php if(isset($_POST["chart-{$infoKey}"])):?>
+                <img src='<?php echo strip_tags($_POST["chart-{$infoKey}"])?>' />
+                <?php else:?>
+                <canvas id='chart-<?php echo $infoKey?>' width='90' height='20' data-responsive='true'></canvas>
+                <?php endif;?>
+              </div>
+            </div>
+          </td>
+          <td class='text-top'>
+            <div class='table-wrapper' style='overflow:auto'>
+              <table class='table table-condensed table-hover table-striped table-bordered' data-chart='bar' data-target='#chart-<?php echo $infoKey?>' data-animation='false'>
+                <thead>
+                  <tr>
+                    <th class='w-60px'><?php echo $lang->bug->pri;?></th>
+                    <th class='w-80px'><?php echo $lang->testreport->bugStageList['generated'];?></th>
+                    <th class='w-80px'><?php echo $lang->testreport->bugStageList['legacy'];?></th>
+                    <th class='w-80px'><?php echo $lang->testreport->bugStageList['resolved'];?></th>
+                  </tr>
+                </thead>
+                <?php foreach($lang->bug->priList as $key => $value):?>
+                <tr class='text-center'>
+                <td class='chart-color w-20px'><i class="chart-color-dot pri-<?php echo $key;?>"></i> <?php echo $key == 0 ? $lang->null : $value;?></td>
+                  <td class='chart-value'><?php echo $infoValue[$key]['generated'];?></td>
+                  <td class='chart-value'><?php echo $infoValue[$key]['legacy'];?></td>
+                  <td class='chart-value'><?php echo $infoValue[$key]['resolved'];?></td>
+                </tr>
+                <?php endforeach?>
+              </table>
+            </div>
+          </td>
+        </tr>
+        <?php elseif($infoKey == 'bugHandleGroups'):?>
+        <tr class='text-top'>
+          <td class='w-p70'>
+            <div class='chart-wrapper text-center'>
+              <h5><?php echo $lang->testreport->$infoKey?></h5>
+              <div class='chart-canvas'>
+                <?php if(isset($_POST["chart-{$infoKey}"])):?>
+                <img src='<?php echo strip_tags($_POST["chart-{$infoKey}"])?>' />
+                <?php else:?>
+                <canvas id='chart-<?php echo $infoKey?>' width='90' height='20' data-responsive='true'></canvas>
+                <?php endif;?>
+              </div>
+            </div>
+          </td>
+          <td class='text-top'>
+            <div class='table-wrapper' style='overflow:auto'>
+              <table class='table table-condensed table-hover table-striped table-bordered' data-chart='line' data-target='#chart-<?php echo $infoKey?>' data-animation='false'>
+                <thead>
+                  <tr>
+                    <th class='w-40px'><?php echo $lang->testreport->date;?></th>
+                    <th class='w-80px'><i class='chart-color-dot generated'></i> <?php echo $lang->testreport->bugStageList['generated'];?></th>
+                    <th class='w-80px'><i class='chart-color-dot legacy'></i> <?php echo $lang->testreport->bugStageList['legacy'];?></th>
+                    <th class='w-80px'><i class='chart-color-dot resolved'></i> <?php echo $lang->testreport->bugStageList['resolved'];?></th>
+                  </tr>
+                </thead>
+                <?php
+                $beginTime = isset($report->begin) ? strtotime($report->begin) : strtotime($begin);
+                $endTime   = isset($report->end) ? strtotime($report->end) : strtotime($end);
+                ?>
+                <?php for($time = $beginTime; $time <= $endTime; $time += 86400):?>
+                <?php $date = date('m-d', $time);?>
+                <tr class='text-center'>
+                  <td class='chart-value'><?php echo $date?></td>
+                  <td class='chart-value'><?php echo $infoValue['generated'][$date];?></td>
+                  <td class='chart-value'><?php echo $infoValue['legacy'][$date];?></td>
+                  <td class='chart-value'><?php echo $infoValue['resolved'][$date];?></td>
+                </tr>
+                <?php endfor?>
+              </table>
+            </div>
+          </td>
+        </tr>
         <?php else:?>
         <?php $sum = 0; foreach($infoValue as $value) $sum += $value->value;?>
         <tr class='text-top'>
@@ -115,3 +194,54 @@
   </tr>
   <?php endforeach;?>
 </table>
+<?php js::set('bugStageList', $lang->testreport->bugStageList);?>
+<?php js::set('bugStageValueList', array_values($lang->testreport->bugStageList));?>
+<?php js::set('bugPriList', $lang->bug->priList);?>
+<?php js::set('zeroPri', $lang->null);?>
+<?php js::set('bugStageGroups', $bugInfo['bugStageGroups']);?>
+<?php js::set('bugHandleGroups', $bugInfo['bugHandleGroups']);?>
+<?php js::set('dateGroups', !empty($bugInfo['bugHandleGroups']) ? array_keys($bugInfo['bugHandleGroups']['generated']) : '');?>
+<script>
+var priList   = [];
+var stageList = [];
+var colorList = ['#d5d9df', '#d50000', '#ff9800', '#2098ee', '#009688'];
+var colorKey  = 0;
+for(var key in bugPriList)
+{
+    $('.pri-' + key).css('background', colorList[colorKey]);
+    var priName  = key == 0 ? zeroPri : bugPriList[key];
+    var pri = {
+        label: priName,
+        color: colorList[colorKey],
+        data:  [bugStageGroups[key]['generated'], bugStageGroups[key]['legacy'], bugStageGroups[key]['resolved']]
+    }
+    priList.push(pri);
+    colorKey++;
+    if(colorKey >= 5) colorKey -= 5;
+}
+var data = {
+    labels: bugStageValueList,
+    datasets: priList,
+};
+var options = {responsive: true};
+var bugStageGroups = $('#chart-bugStageGroups').barChart(data, options);
+
+colorKey = 2;
+for(var key in bugHandleGroups)
+{
+    $('.' + key).css('background', colorList[colorKey]);
+    var stageName  = bugStageList[key];
+    var stage = {
+        label: stageName,
+        color: colorList[colorKey],
+        data:  bugHandleGroups[key]
+    }
+    stageList.push(stage);
+    colorKey++;
+}
+var data = {
+    labels: dateGroups,
+    datasets: stageList,
+};
+var bugHandleGroups = $('#chart-bugHandleGroups').lineChart(data, options);
+</script>
diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php
index 2c44ea8056..934f5958df 100644
--- a/module/testreport/view/blockcases.html.php
+++ b/module/testreport/view/blockcases.html.php
@@ -16,7 +16,8 @@
   <?php if($cases):?>
   <tbody>
     <?php $i = 0;?>
-    <?php foreach($cases as $case):?>
+    <?php foreach($cases as $taskID => $caseList):?>
+    <?php foreach($caseList as $case):?>
     <?php if(!isset($pager) and $i > 50):?>
     <?php echo html::hidden('cases[]', $case->id);?>
     <?php else:?>
@@ -29,7 +30,7 @@
       <td><?php echo zget($users, $case->lastRunner);?></td>
       <td><?php echo substr($case->lastRunDate, 2);?></td>
       <td><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
-      <?php $status = $this->processStatus('testtask', $case);?>
+      <?php $status = $this->processStatus('testcase', $case);?>
       <td title='<?php echo $status;?>'>
         <span class="status-case status-<?php echo $case->status?>"><?php echo $status;?></span>
       </td>
@@ -37,9 +38,10 @@
     <?php endif;?>
     <?php $i++;?>
     <?php endforeach;?>
+    <?php endforeach;?>
     <?php if(!isset($pager) and $i > 50):?>
     <tr>
-      <td colspan='9'><?php echo sprintf($lang->testreport->hiddenCase, count($cases) - 50);?></td>
+      <td colspan='9'><?php echo sprintf($lang->testreport->hiddenCase, $i - 50);?></td>
     </tr>
     <?php endif;?>
   </tbody>
diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php
index 236475333a..d16be9f28c 100644
--- a/module/testreport/view/browse.html.php
+++ b/module/testreport/view/browse.html.php
@@ -24,6 +24,7 @@
   </div>
 </div>
 <?php endif;?>
+
 <div id='mainContent' class='main-table'>
   <?php if(empty($reports)):?>
   <div class="table-empty-tip">
@@ -38,17 +39,17 @@
         <th class='text-left'><?php common::printOrderLink('title',     $orderBy, $vars, $lang->testreport->title);?></th>
         <th class='w-90px'> <?php common::printOrderLink('createdBy',   $orderBy, $vars, $lang->openedByAB);?></th>
         <th class='w-150px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->testreport->createdDate);?></th>
-        <th class='w-250px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->project);?></th>
+        <th class='w-250px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->execution);?></th>
         <th class='w-250px text-left'><?php echo $lang->testreport->testtask;?></th>
         <th class='c-actions-2'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
-    <?php if($reports):?>
     <tbody class='text-center'>
       <?php foreach($reports as $report):?>
       <tr>
-        <td><?php echo html::a(helper::createLink('testreport', 'view', "reportID=$report->id"), sprintf('%03d', $report->id));?></td>
-        <td class='text-left' title='<?php $report->title?>'><?php echo html::a(inlink('view', "reportID=$report->id&from=$objectType"), $report->title)?></td>
+        <?php $viewLink = helper::createLink('testreport', 'view', "reportID=$report->id");?>
+        <td><?php echo html::a($viewLink, sprintf('%03d', $report->id), '', "data-app='{$this->app->openApp}'");?></td>
+        <td class='text-left' title='<?php $report->title?>'><?php echo html::a($viewLink, $report->title, '', "data-app='{$this->app->openApp}'")?></td>
         <td><?php echo zget($users, $report->createdBy);?></td>
         <td><?php echo substr($report->createdDate, 2);?></td>
         <?php $executionName = $report->execution ? '#' . $report->execution . $executions[$report->execution] : '';?>
@@ -70,9 +71,6 @@
       </tr>
       <?php endforeach;?>
     </tbody>
-    <?php else:?>
-    <tbody><tr><td colspan='7'><?php echo $lang->testreport->noReport;?></td></tr></tbody>
-    <?php endif;?>
   </table>
   <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
   <?php endif;?>
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index a91c6ec0e2..e0773bf1d0 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -97,7 +97,9 @@
             <tr>
               <td class='text-center form-actions' colspan='4'>
                 <?php echo html::submitButton();?>
-                <?php echo html::backButton();?>
+                <?php $browseLink = 'javascript:history.go(-1);';?>
+                <?php if($objectType == 'testtask' and $this->session->reportList) $browseLink = $this->session->reportList;?>
+                <?php echo html::a($browseLink, $lang->goback, '', 'class="btn btn-back btn-wide"');?>
               </td>
             </tr>
           </table>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index a8636b8264..d235b2721f 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -114,9 +114,6 @@
     </form>
   </div>
 </div>
-<script>
-var reportID = <?php echo $report->id;?>;
-var from     = '<?php echo $from;?>';
-var method   = 'edit';
-</script>
+<?php js::set('reportID', $report->id);?>
+<?php js::set('method', 'edit');?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php
index 141cc950bd..adbfcdaf47 100644
--- a/module/testreport/view/view.html.php
+++ b/module/testreport/view/view.html.php
@@ -15,8 +15,8 @@
 <?php include '../../common/view/chart.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
+    <?php $browseLink = $this->session->reportList ? $app->session->reportList : $browseLink;?>
     <?php if(!isonlybody()):?>
-    <?php $browseLink  = $this->session->reportList != false ? $app->session->reportList : $browseLink;?>
     <?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-primary'");?>
     <div class='divider'></div>
     <?php endif;?>
@@ -116,7 +116,8 @@
     <?php
     if(common::canBeChanged('report', $report))
     {
-        if(common::hasPriv('testreport', 'create')) echo html::a(inLink('create', "objectID=$report->objectID&objectType=$report->objectType&extra=$report->id"),  "<i class='icon-refresh'></i>", '', "class='btn' title='{$lang->testreport->recreate}'");
+        $extra = $report->objectType == 'execution' ? "&extra=$report->tasks" : '';
+        if(common::hasPriv('testreport', 'create')) echo html::a(inLink('create', "objectID=$report->objectID&objectType=$report->objectType" . $extra),  "<i class='icon-refresh'></i>", '', "class='btn' title='{$lang->testreport->recreate}' data-app='{$this->app->openApp}'");
         common::printIcon('testreport', 'edit', "reportID=$report->id", '', 'button');
         common::printIcon('testreport', 'delete', "reportID=$report->id", '', 'button', 'trash', 'hiddenwin');
     }
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 062a4cea3a..be08277c8a 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -29,15 +29,10 @@ class testsuite extends control
      */
     public function __construct($moduleName = '', $methodName = '')
     {
-       parent::__construct($moduleName, $methodName);
+        parent::__construct($moduleName, $methodName);
 
-       /* Set testtask menu group. */
-       $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-       if(!$this->projectID)
-       {
-           $this->app->loadConfig('qa');
-           foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-       }
+        $this->view->products = $this->products = $this->loadModel('product')->getPairs();
+        if(empty($this->products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=qa&activeMenu=testsuite")));
     }
 
     /**
@@ -65,14 +60,11 @@ class testsuite extends control
     public function browse($productID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
-        $this->session->set('testsuiteList', $this->app->getURI(true));
+        $this->session->set('testsuiteList', $this->app->getURI(true), 'qa');
 
         /* Set menu. */
-        $projectID            = $this->lang->navGroup->testreport == 'qa' ? 0 : $this->session->PRJ;
-        $this->view->products = $this->products = $this->loadModel('product')->getProductPairsByProject($projectID);
-        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=testsuite&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=testsuite')));
         $productID = $this->product->saveState($productID, $this->products);
-        $this->testsuite->setMenu($this->products, $productID);
+        $this->loadModel('qa')->setMenu($this->products, $productID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -130,14 +122,15 @@ class testsuite extends control
 
             $this->executeHooks($suiteID);
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $suiteID));
+
             $response['locate']  = $this->createLink('testsuite', 'browse', "productID=$productID");
             $this->send($response);
         }
 
         /* Set menu. */
-        $this->view->products = $this->products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
         $productID  = $this->product->saveState($productID, $this->products);
-        $this->testsuite->setMenu($this->products, $productID);
+        $this->loadModel('qa')->setMenu($this->products, $productID);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->testsuite->create;
         $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -162,17 +155,18 @@ class testsuite extends control
     public function view($suiteID, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->app->loadLang('testtask');
+
         /* Get test suite, and set menu. */
         $suite = $this->testsuite->getById($suiteID, true);
         if(!$suite) die(js::error($this->lang->notFound) . js::locate('back'));
         if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
-        $productID = $suite->product;
 
-        $this->view->products = $this->products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
-        $this->testsuite->setMenu($this->products, $productID);
+        /* Set product session. */
+        $productID = $this->product->saveState($suite->product, $this->products);
+        $this->loadModel('qa')->setMenu($this->products, $productID);
 
         /* Save session. */
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
@@ -183,8 +177,8 @@ class testsuite extends control
 
         $this->executeHooks($suiteID);
 
-        $this->view->title      = "SUITE #$suite->id $suite->name/" . $this->products[$productID];
-        $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]);
+        $this->view->title      = "SUITE #$suite->id $suite->name";
+        $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"));
         $this->view->position[] = $this->lang->testsuite->common;
         $this->view->position[] = $this->lang->testsuite->view;
 
@@ -237,15 +231,12 @@ class testsuite extends control
 
         if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
-        /* Get suite info. */
-        $this->view->products = $this->products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        /* Set product session. */
         $productID = $this->product->saveState($suite->product, $this->products);
-
-        /* Set menu. */
-        $this->testsuite->setMenu($this->products, $productID);
+        $this->loadModel('qa')->setMenu($this->products, $productID);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->testsuite->edit;
-        $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]);
+        $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"));
         $this->view->position[] = $this->lang->testsuite->common;
         $this->view->position[] = $this->lang->testsuite->edit;
 
@@ -308,22 +299,20 @@ class testsuite extends control
      */
     public function linkCase($suiteID, $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        /* Save session. */
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
+
         if(!empty($_POST))
         {
             $this->testsuite->linkCase($suiteID);
             $this->locate(inlink('view', "suiteID=$suiteID"));
         }
 
-        /* Save session. */
-        $this->session->set('caseList', $this->app->getURI(true));
+        $suite = $this->testsuite->getById($suiteID);
 
-        /* Get suite and product id. */
-        $this->view->products = $this->products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
-        $suite      = $this->testsuite->getById($suiteID);
+        /* Set product session. */
         $productID = $this->product->saveState($suite->product, $this->products);
-
-        /* Save session. */
-        $this->testsuite->setMenu($this->products, $productID);
+        $this->loadModel('qa')->setMenu($this->products, $productID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -343,7 +332,7 @@ class testsuite extends control
         $this->loadModel('search')->setSearchParams($this->config->testcase->search);
 
         $this->view->title      = $suite->name . $this->lang->colon . $this->lang->testsuite->linkCase;
-        $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]);
+        $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"));
         $this->view->position[] = $this->lang->testsuite->common;
         $this->view->position[] = $this->lang->testsuite->linkCase;
 
diff --git a/module/testsuite/css/browse.css b/module/testsuite/css/browse.css
index 1af0cf5c5f..270231864f 100644
--- a/module/testsuite/css/browse.css
+++ b/module/testsuite/css/browse.css
@@ -1 +1,2 @@
-.c-desc {overflow: scroll;}
+.table td.c-desc div {height: 25px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; float: left; max-width: calc(100% - 20px);}
+.table td.c-desc .more {height: 25px; float: left;}
diff --git a/module/testsuite/js/common.js b/module/testsuite/js/common.js
index 0c109aebfb..37eb430a8f 100644
--- a/module/testsuite/js/common.js
+++ b/module/testsuite/js/common.js
@@ -7,4 +7,32 @@ $(function()
             $(this).parent().toggleClass('active');
         });
     }
+
+    $('#suiteList tbody tr').each(function()
+    {
+        var $content = $(this).find('td.c-desc');
+        var content  = $content.find('div').html();
+        if(content.indexOf('<br') >= 0)
+        {
+            $content.append("<a href='###' class='more'><i class='icon icon-chevron-double-down'></i></a>");
+        }
+    });
 })
+$(document).on('click', 'td.c-desc .more', function(e)
+{
+    var $toggle = $(this);
+    if($toggle.hasClass('open'))
+    {
+        $toggle.removeClass('open');
+        $toggle.closest('.c-desc').find('div').css('height', '25px');
+        $toggle.css('padding-top', 0);
+        $toggle.find('i').removeClass('icon-chevron-double-up').addClass('icon-chevron-double-down');
+    }
+    else
+    {
+        $toggle.addClass('open');
+        $toggle.closest('.c-desc').find('div').css('height', 'auto');
+        $toggle.css('padding-top', ($toggle.closest('.c-desc').find('div').height() - $toggle.height()) / 2);
+        $toggle.find('i').removeClass('icon-chevron-double-down').addClass('icon-chevron-double-up');
+    }
+});
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 29277c1b7d..c610a4d56a 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -13,53 +13,6 @@
 <?php
 class testsuiteModel extends model
 {
-    /**
-     * Set the menu.
-     *
-     * @param  array $products
-     * @param  int   $productID
-     * @access public
-     * @return void
-     */
-    public function setMenu($products, $productID)
-    {
-        $this->loadModel('product')->setMenu($products, $productID);
-        $selectHtml = $this->select($products, $productID, 'testsuite', 'browse');
-        if(strpos($selectHtml, 'currentBranch') !== false) $selectHtml = substr($selectHtml, 0, strrpos($selectHtml, "<div class='btn-group'>")) . '</div>';
-
-        $pageNav     = '';
-        $pageActions = '';
-        $isMobile    = $this->app->viewType == 'mhtml';
-        if($isMobile)
-        {
-            $this->app->loadLang('qa');
-            $pageNav  = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
-        }
-        $pageNav .= $selectHtml;
-
-        $this->lang->modulePageNav = $pageNav;
-        $this->lang->TRActions     = $pageActions;
-        foreach($this->lang->testsuite->menu as $key => $value)
-        {
-            if($this->config->global->flow == 'full' and $this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testsuite', $key, $productID);
-            $replace = $productID;
-            if($this->lang->navGroup->testsuite == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->testsuite->menu, $key, $replace);
-        }
-
-        if($this->lang->navGroup->testsuite == 'qa')
-        {
-            foreach($this->lang->qa->subMenu->testcase as $key => $menu)
-            {
-                common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $productID);
-            }
-
-            $this->lang->qa->menu         = $this->lang->testsuite->menu;
-            $this->lang->testsuite->menu  = $this->lang->qa->subMenu->testcase;
-            $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', 0);
-        }
-    }
-
     /**
      * Build select string.
      *
@@ -79,7 +32,7 @@ class testsuiteModel extends model
             return;
         }
 
-        setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
         $currentProduct = $this->product->getById($productID);
 
         $dropMenuLink = helper::createLink('product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
@@ -108,7 +61,7 @@ class testsuiteModel extends model
     {
         $suite = fixer::input('post')
             ->stripTags($this->config->testsuite->editor->create['id'], $this->config->allowedTags)
-            ->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa', 'project', $this->session->project)
             ->add('product', (int)$productID)
             ->add('addedBy', $this->app->user->account)
             ->add('addedDate', helper::now())
@@ -140,7 +93,7 @@ class testsuiteModel extends model
     {
         return $this->dao->select("*")->from(TABLE_TESTSUITE)
             ->where('product')->eq((int)$productID)
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->project)->fi()
             ->andWhere('deleted')->eq(0)
             ->andWhere("(`type` = 'public' OR (`type` = 'private' and addedBy = '{$this->app->user->account}'))")
             ->orderBy($orderBy)
@@ -249,7 +202,7 @@ class testsuiteModel extends model
         $cases = $this->dao->select('t1.*,t2.version as caseVersion')->from(TABLE_CASE)->alias('t1')
             ->leftJoin(TABLE_SUITECASE)->alias('t2')->on('t1.id=t2.case')
             ->where('t2.suite')->eq($suiteID)
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->andWhere('t1.product')->eq($suite->product)
             ->andWhere('t1.product')->eq($suite->product)
             ->andWhere('t1.deleted')->eq(0)
@@ -293,7 +246,7 @@ class testsuiteModel extends model
         $linkedCases = $this->getLinkedCases($suite->id, 'id_desc', null, $append = false);
         $cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
             ->andWhere('id')->notIN(array_keys($linkedCases))
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->project)->fi()
             ->andWhere('deleted')->eq(0)
             ->orderBy('id desc')
             ->page($pager)
@@ -330,7 +283,6 @@ class testsuiteModel extends model
     {
         $importedCases = $this->dao->select('fromCaseID')->from(TABLE_CASE)
             ->where('product')->eq($productID)
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
             ->andWhere('lib')->eq($libID)
             ->andWhere('fromCaseID')->ne('')
             ->andWhere('deleted')->eq(0)
@@ -364,7 +316,6 @@ class testsuiteModel extends model
         return $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)
             ->beginIF($browseType != 'bysearch')->andWhere('lib')->eq($libID)->fi()
             ->beginIF($browseType == 'bysearch')->andWhere($query)->fi()
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
             ->andWhere('product')->eq(0)
             ->andWhere('id')->notIN($importedCases)
             ->orderBy($orderBy)
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index aed71746c0..977ba790d4 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -62,7 +62,10 @@
         <?php if($suite->type == 'private') echo "<span class='label label-info label-badge'>{$lang->testsuite->authorList['private']}</span> ";?>
         <?php echo html::a(inlink('view', "suiteID=$suite->id"), $suite->name);?>
       </td>
-      <td class='c-desc'><?php echo $suite->desc;?></td>
+      <td class='c-desc'>
+        <?php $desc = trim(strip_tags(str_replace(array('</p>', '<br />', '<br>', '<br/>'), "\n", str_replace(array("\n", "\r"), '', $suite->desc)), '<img>'));?>
+        <div title='<?php echo $desc;?>'><?php echo nl2br($desc);?></div>
+      </td>
       <td><?php echo zget($users, $suite->addedBy);?></td>
       <td><?php echo $suite->addedDate;?></td>
       <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $suite) . "</td>";?>
@@ -70,12 +73,7 @@
         <?php
         common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id", $suite, 'list', 'link');
         common::printIcon('testsuite', 'edit',     "suiteID=$suite->id", $suite, 'list');
-
-        if(common::hasPriv('testsuite', 'delete', $suite))
-        {
-            $deleteURL = $this->createLink('testsuite', 'delete', "suiteID=$suite->id&confirm=yes");
-            echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"suiteList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$lang->testsuite->delete}' class='btn'");
-        }
+        common::printIcon('testsuite', 'delete',   "suiteID=$suite->id", $suite, 'list', 'trash', 'hiddenwin');
         ?>
       </td>
     </tr>
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index 27289f6e51..e70bb6b157 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -40,18 +40,22 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='w-70px text-center'><nobr><?php echo $lang->testsuite->linkVersion;?></nobr></th>
-          <th class='w-70px text-center'><?php echo $lang->priAB;?></th>
+          <th class='w-70px'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->title;?></th>
-          <th class='w-type'><?php echo $lang->testcase->type;?></th>
-          <th class='c-user text-center'><?php echo $lang->openedByAB;?></th>
-          <th class='c-status text-center'><?php echo $lang->statusAB;?></th>
+          <th class='w-90px'><?php echo $lang->testcase->type;?></th>
+          <th class='c-user'><?php echo $lang->openedByAB;?></th>
+          <th class='c-status'><?php echo $lang->statusAB;?></th>
         </tr>
       </thead>
       <tbody>
       <?php foreach($cases as $case):?>
-      <tr class='text-center'>
-        <td class='cell-id'>
-          <?php echo html::checkbox('cases', array($case->id => sprintf('%03d', $case->id)));?>
+      <tr>
+        <td class='c-id'>
+          <div class="checkbox-primary">
+            <input type='checkbox' name='cases[]' value='<?php echo $case->id;?>'/>
+            <label></label>
+          </div>
+          <?php echo sprintf('%03d', $case->id);?>
         </td>
         <td><?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class="form-control"');?> </td>
         <td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
diff --git a/module/testtask/control.php b/module/testtask/control.php
index d4bf822da4..0c4a35f008 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -37,22 +37,28 @@ class testtask extends control
     {
         parent::__construct($moduleName, $methodName);
 
-        /* Set testtask menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID)
+        $this->loadModel('product');
+
+        /* Get product data. */
+        $objectID = 0;
+        if($this->app->openApp == 'project')
         {
-            $this->app->loadConfig('qa');
-            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
+            $objectID = $this->session->project;
+            $products  = $this->loadModel('project')->getProducts($objectID, false);
         }
-        else 
-        {    
-            $this->lang->testtask->menu    = $this->lang->projectQa->menu;
-            $this->lang->testtask->subMenu = $this->lang->projectQa->subMenu;
+        elseif($this->app->openApp == 'execution')
+        {
+            $objectID = $this->session->execution;
+            $products = $this->loadModel('execution')->getProducts($objectID, false);
+        }
+        else
+        {
+            $products = $this->product->getPairs();
         }
 
-        $this->loadModel('product');
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->projectID);
-        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=testtask&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=testtask')));
+        $this->view->products = $this->products = $products;
+        $openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
+        if(empty($this->products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=testtask&objectID=$objectID")));
     }
 
     /**
@@ -81,8 +87,8 @@ class testtask extends control
     public function browse($productID = 0, $branch = '', $type = 'local,totalStatus', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $beginTime = 0, $endTime = 0)
     {
         /* Save session. */
-        $this->session->set('testtaskList', $this->app->getURI(true));
-        $this->session->set('buildList', $this->app->getURI(true));
+        $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
 
         $scopeAndStatus = explode(',', $type);
         $this->session->set('testTaskVersionScope', $scopeAndStatus[0]);
@@ -94,7 +100,7 @@ class testtask extends control
         /* Set menu. */
         $productID = $this->product->saveState($productID, $this->products);
         if($branch === '') $branch = (int)$this->cookie->preBranch;
-        $this->testtask->setMenu($this->products, $productID, $branch);
+        $this->loadModel('qa')->setMenu($this->products, $productID, $branch, $type);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -139,13 +145,33 @@ class testtask extends control
     public function browseUnits($productID = 0, $browseType = 'newest', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
-        $this->session->set('testtaskList', $this->app->getURI(true));
+        $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
+        $this->session->set('caseList', $this->app->getURI(true), $this->app->openApp);
+        $this->session->set('buildList', $this->app->getURI(true) . '#app=' . $this->app->openApp, 'execution');
         $this->loadModel('testcase');
         $this->app->loadLang('tree');
 
         /* Set menu. */
-        $productID = $this->product->saveState($productID, $this->products);
-        $this->loadModel('testtask')->setUnitMenu($this->products, $productID);
+        $productID = $this->loadModel('product')->saveState($productID, $this->products);
+        if($this->app->openApp == 'project')
+        {
+            $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+            $this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
+
+            if(isset($this->config->maxVersion))
+            {
+                $this->lang->waterfall->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+                $this->lang->waterfall->menu->qa['subMenu']->testtask['subModule'] = '';
+            }
+
+            $this->loadModel('project')->setMenu($this->session->project);
+            $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID);
+            $this->app->rawModule = 'testcase';
+        }
 
         /* Load pager. */
         if($browseType == 'newest') $recPerPage = '10';
@@ -177,41 +203,65 @@ class testtask extends control
      * @param  int    $productID
      * @param  int    $executionID
      * @param  int    $build
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function create($productID, $executionID = 0, $build = 0)
+    public function create($productID, $executionID = 0, $build = 0, $projectID = 0)
     {
         if(!empty($_POST))
         {
-            $taskID = $this->testtask->create();
+            $taskID = $this->testtask->create($projectID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('testtask', $taskID, 'opened');
 
             $this->executeHooks($taskID);
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inLink('browse', "productID=$productID")));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $taskID));
+
+            $task = $this->dao->findById($taskID)->from(TABLE_TESTTASK)->fetch();
+            if($this->app->openApp == 'project') $link = $this->createLink('project', 'testtask', "projectID=$task->project");
+            if($this->app->openApp == 'execution') $link = $this->createLink('execution', 'testtask', "executionID=$task->execution");
+            if($this->app->openApp == 'qa') $link = $this->createLink('testtask', 'browse', "productID=$productID");
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
+        }
+
+        /* Set menu. */
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($projectID);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($executionID);
+        }
+        elseif($this->app->openApp == 'qa')
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID);
         }
 
         /* Create testtask from testtask of test.*/
         $productID  = $productID ? $productID : key($this->products);
-        $projectID  = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->PRJ;
-        $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
+        $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
         $builds     = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true);
 
+        $testreports = $this->testtask->getTestReportPairsByBuild($build);
+
         /* Set menu. */
         $productID  = $this->product->saveState($productID, $this->products);
-        $this->testtask->setMenu($this->products, $productID);
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->create;
         $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
         $this->view->position[] = $this->lang->testtask->common;
         $this->view->position[] = $this->lang->testtask->create;
 
-        $this->view->executions = $executions;
-        $this->view->productID  = $productID;
-        $this->view->builds     = $builds;
-        $this->view->build      = $build;
-        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|qdfirst|nodeleted');
+        $this->view->productID   = $productID;
+        $this->view->projectID   = $projectID;
+        $this->view->executionID = $executionID;
+        $this->view->executions  = $executions;
+        $this->view->builds      = $builds;
+        $this->view->build       = $build;
+        $this->view->testreports = $testreports;
+        $this->view->users       = $this->loadModel('user')->getPairs('noclosed|qdfirst|nodeleted');
 
         $this->display();
     }
@@ -226,12 +276,13 @@ class testtask extends control
     public function view($taskID)
     {
         /* Get test task, and set menu. */
-        $task = $this->testtask->getById($taskID, true);
+        $taskID = (int)$taskID;
+        $task   = $this->testtask->getById($taskID, true);
         if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
 
         /* When the session changes, you need to query the related products again. */
-        if($this->session->PRJ != $task->project) $this->view->products = $this->products = $this->product->getProductPairsByProject($task->project);
-        $this->session->PRJ = $task->project;
+        if($this->session->project != $task->project) $this->view->products = $this->products = $this->product->getProductPairsByProject($task->project);
+        $this->session->project = $task->project;
 
         $productID = $task->product;
         $buildID   = $task->build;
@@ -249,7 +300,18 @@ class testtask extends control
             $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
         }
 
-        $this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($task->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($task->execution);
+        }
+        elseif($this->app->openApp == 'qa')
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
+        }
 
         $this->executeHooks($taskID);
 
@@ -258,13 +320,14 @@ class testtask extends control
         $this->view->position[] = $this->lang->testtask->common;
         $this->view->position[] = $this->lang->testtask->view;
 
-        $this->view->productID = $productID;
-        $this->view->task      = $task;
-        $this->view->users     = $this->loadModel('user')->getPairs('noclosed|noletter');
-        $this->view->actions   = $this->loadModel('action')->getList('testtask', $taskID);
-        $this->view->build     = $build;
-        $this->view->stories   = $stories;
-        $this->view->bugs      = $bugs;
+        $this->view->productID       = $productID;
+        $this->view->task            = $task;
+        $this->view->users           = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->actions         = $this->loadModel('action')->getList('testtask', $taskID);
+        $this->view->build           = $build;
+        $this->view->testreportTitle = $this->dao->select('title')->from(TABLE_TESTREPORT)->where('id')->eq($task->testreport)->fetch('title');
+        $this->view->stories         = $stories;
+        $this->view->bugs            = $bugs;
         $this->display();
     }
 
@@ -282,13 +345,21 @@ class testtask extends control
 
         /* Set browseType, productID, moduleID and queryID. */
         $productID = $this->product->saveState($task->product, $this->products);
+        if($this->app->openApp == 'project')
+        {
+            $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+            $this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
+            $this->loadModel('project')->setMenu($this->session->project);
+            $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID);
+            $this->app->rawModule = 'testcase';
+        }
 
-        /* Set menu, save session. */
-        $this->lang->testtask->menu      = $this->lang->testcase->menu;
-        $this->lang->testtask->menuOrder = $this->lang->testcase->menuOrder;
-        $this->lang->testtask->subMenu->testcase->unit['subModule'] = 'testtask';
-        $this->loadModel('testtask')->setUnitMenu($this->products, $productID, 0, $taskID);
-        $this->session->set('caseList', $this->app->getURI(true));
+        /* Save session. */
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
 
         /* Load lang. */
         $this->app->loadLang('testtask');
@@ -372,7 +443,7 @@ class testtask extends control
         $this->loadModel('execution');
 
         /* Save the session. */
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -386,8 +457,19 @@ class testtask extends control
         if(!$task) die(js::error($this->lang->testtask->checkLinked) . js::locate('back'));
 
         $productID = $task->product;
-        $this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
-        setcookie('preTaskID', $taskID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($task->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($task->execution);
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
+        }
+        setcookie('preTaskID', $taskID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         /* Determines whether an object is editable. */
         $canBeChanged = common::canBeChanged('testtask', $task);
@@ -395,10 +477,10 @@ class testtask extends control
         if($this->cookie->preTaskID != $taskID)
         {
             $_COOKIE['taskCaseModule'] = 0;
-            setcookie('taskCaseModule', 0, 0, $this->config->webRoot, '', false, true);
+            setcookie('taskCaseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
         }
 
-        if($browseType == 'bymodule') setcookie('taskCaseModule', (int)$param, 0, $this->config->webRoot, '', false, true);
+        if($browseType == 'bymodule') setcookie('taskCaseModule', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
         if($browseType != 'bymodule') $this->session->set('taskCaseBrowseType', $browseType);
 
         /* Set the browseType, moduleID and queryID. */
@@ -409,7 +491,7 @@ class testtask extends control
         $execution = $this->execution->getById($task->execution);
         if($execution->acl == 'private')
         {
-            $assignedToList = $this->execution->getTeamMemberPairs($execution->id, 'nodeleted');
+            $assignedToList = $this->loadModel('user')->getTeamMemberPairs($execution->id, 'execution', 'nodeleted');
         }
         else
         {
@@ -448,24 +530,24 @@ class testtask extends control
         $this->view->position[] = $this->lang->testtask->common;
         $this->view->position[] = $this->lang->testtask->cases;
 
-        $this->view->productID     = $productID;
-        $this->view->productName   = $this->products[$productID];
-        $this->view->task          = $task;
-        $this->view->runs          = $runs;
-        $this->view->users         = $this->loadModel('user')->getPairs('noclosed|qafirst|noletter');
-        $this->view->assignedToList= $assignedToList;
-        $this->view->moduleTree    = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID);
-        $this->view->browseType    = $browseType;
-        $this->view->param         = $param;
-        $this->view->orderBy       = $orderBy;
-        $this->view->taskID        = $taskID;
-        $this->view->moduleID      = $moduleID;
-        $this->view->moduleName    = $moduleID ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
-        $this->view->treeClass     = $browseType == 'bymodule' ? '' : 'hidden';
-        $this->view->pager         = $pager;
-        $this->view->branches      = $this->loadModel('branch')->getPairs($productID);
-        $this->view->setModule     = false;
-        $this->view->canBeChanged  = $canBeChanged;
+        $this->view->productID      = $productID;
+        $this->view->productName    = $this->products[$productID];
+        $this->view->task           = $task;
+        $this->view->runs           = $runs;
+        $this->view->users          = $this->loadModel('user')->getPairs('noclosed|qafirst|noletter');
+        $this->view->assignedToList = $assignedToList;
+        $this->view->moduleTree     = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID);
+        $this->view->browseType     = $browseType;
+        $this->view->param          = $param;
+        $this->view->orderBy        = $orderBy;
+        $this->view->taskID         = $taskID;
+        $this->view->moduleID       = $moduleID;
+        $this->view->moduleName     = $moduleID ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
+        $this->view->treeClass      = $browseType == 'bymodule' ? '' : 'hidden';
+        $this->view->pager          = $pager;
+        $this->view->branches       = $this->loadModel('branch')->getPairs($productID);
+        $this->view->setModule      = false;
+        $this->view->canBeChanged   = $canBeChanged;
 
         $this->display();
     }
@@ -485,10 +567,11 @@ class testtask extends control
         $this->loadModel('report');
         $this->view->charts = array();
 
+        $task = $this->testtask->getById($taskID);
+
         if(!empty($_POST))
         {
             $this->app->loadLang('testcase');
-            $task    = $this->testtask->getById($taskID);
             $bugInfo = $this->testtask->getBugInfo($taskID, $productID);
             foreach($this->post->charts as $chart)
             {
@@ -502,7 +585,19 @@ class testtask extends control
             }
         }
 
-        $this->testtask->setMenu($this->products, $productID, $branchID, $taskID);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($task->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($task->execution);
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID, $branchID, $taskID);
+        }
+
         $this->view->title         = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common . $this->lang->colon . $this->lang->testtask->reportChart;
         $this->view->position[]    = html::a($this->createLink('testtask', 'cases', "taskID=$taskID"), $this->products[$productID]);
         $this->view->position[]    = $this->lang->testtask->reportChart;
@@ -531,14 +626,25 @@ class testtask extends control
         $this->loadModel('testcase');
         $this->app->loadLang('execution');
         $this->app->loadLang('task');
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
 
         /* Get task and product info, set menu. */
         $groupBy = empty($groupBy) ? 'story' : $groupBy;
         $task    = $this->testtask->getById($taskID);
         if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
         $productID = $task->product;
-        $this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($this->session->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($task->execution);
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
+        }
 
         /* Determines whether an object is editable. */
         $canBeChanged = common::canBeChanged('testtask', $task);
@@ -601,7 +707,7 @@ class testtask extends control
     {
         /* Get task info. */
         $task      = $this->testtask->getById($taskID);
-        $productID = $this->product->saveState($task->product, $this->products);
+        $productID = $this->loadModel('product')->saveState($task->product, $this->products);
 
         if(!empty($_POST))
         {
@@ -615,11 +721,24 @@ class testtask extends control
 
             $this->executeHooks($taskID);
 
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+            $link = isonlybody() ? 'parent' : $this->session->testtaskList;
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
         }
 
         /* Set menu. */
-        $this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($task->project);
+            $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($task->execution);
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
+        }
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->edit;
         $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -627,15 +746,17 @@ class testtask extends control
         $this->view->position[] = $this->lang->testtask->edit;
 
         /* Create testtask from testtask of test.*/
-        $productID  = $productID ? $productID : key($this->products);
-        $projectID  = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->PRJ;
-        $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
-        $builds     = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true);
+        $productID   = $productID ? $productID : key($this->products);
+        $projectID   = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->project;
+        $executions  = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
+        $builds      = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true);
+        $testreports = $this->testtask->getTestReportPairsByBuild($task->build);
 
         $this->view->task         = $task;
         $this->view->executions   = $executions;
         $this->view->builds       = $builds;
-        $this->view->users        = $this->loadModel('user')->getPairs('nodeleted', $task->owner);
+        $this->view->testreports  = $testreports;
+        $this->view->users        = $this->loadModel('user')->getPairs('nodeleted|noclosed', $task->owner);
         $this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote');
 
         $this->display();
@@ -672,7 +793,7 @@ class testtask extends control
         $productID = $this->product->saveState($testtask->product, $this->products);
 
         /* Set menu. */
-        $this->testtask->setMenu($this->products, $productID, $testtask->branch, $taskID);
+        $this->loadModel('qa')->setMenu($this->products, $productID, $testtask->branch, $taskID);
 
         $this->view->testtask   = $testtask;
         $this->view->title      = $testtask->name . $this->lang->colon . $this->lang->testtask->start;
@@ -714,7 +835,7 @@ class testtask extends control
         $productID = $this->product->saveState($testtask->product, $this->products);
 
         /* Set menu. */
-        $this->testtask->setMenu($this->products, $productID, $testtask->branch, $taskID);
+        $this->loadModel('qa')->setMenu($this->products, $productID, $testtask->branch, $taskID);
 
         $this->view->testtask   = $testtask;
         $this->view->title      = $testtask->name . $this->lang->colon . $this->lang->testtask->start;
@@ -756,7 +877,7 @@ class testtask extends control
         $productID = $this->product->saveState($testtask->product, $this->products);
 
         /* Set menu. */
-        $this->testtask->setMenu($this->products, $productID, $testtask->branch, $taskID);
+        $this->loadModel('qa')->setMenu($this->products, $productID, $testtask->branch, $taskID);
 
         $this->view->testtask     = $this->testtask->getById($taskID);
         $this->view->title        = $testtask->name . $this->lang->colon . $this->lang->close;
@@ -799,7 +920,7 @@ class testtask extends control
         $productID = $this->product->saveState($testtask->product, $this->products);
 
         /* Set menu. */
-        $this->testtask->setMenu($this->products, $productID, $testtask->branch, $taskID);
+        $this->loadModel('qa')->setMenu($this->products, $productID, $testtask->branch, $taskID);
 
         $this->view->testtask   = $testtask;
         $this->view->title      = $testtask->name . $this->lang->colon . $this->lang->testtask->start;
@@ -846,7 +967,11 @@ class testtask extends control
                 }
                 $this->send($response);
             }
-            die(js::locate(inlink('browse', "product=$task->product"), 'parent'));
+
+            $browseList = $this->createLink('testtask', 'browse', "productID=$task->product");
+            if($this->app->openApp == 'execution') $browseList = $this->createLink('execution', 'testtask', "executionID=$task->execution");
+            if($this->app->openApp == 'project')   $browseList = $this->createLink('project', 'testtask', "projectID=$task->project");
+            die(js::locate($browseList, 'parent'));
         }
     }
 
@@ -866,14 +991,25 @@ class testtask extends control
         }
 
         /* Save session. */
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
 
         /* Get task and product id. */
         $task      = $this->testtask->getById($taskID);
         $productID = $this->product->saveState($task->product, $this->products);
 
         /* Save session. */
-        $this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($task->project);
+        }
+        elseif($this->app->openApp == 'execution')
+        {
+            $this->loadModel('execution')->setMenu($task->execution);
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
+        }
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -941,12 +1077,14 @@ class testtask extends control
             $response['result']  = 'success';
             $response['message'] = '';
 
+            $testRun = $this->dao->select('task,`case`')->from(TABLE_TESTRUN)->where('id')->eq((int)$rowID)->fetch();
             $this->dao->delete()->from(TABLE_TESTRUN)->where('id')->eq((int)$rowID)->exec();
             if(dao::isError())
             {
                 $response['result']  = 'fail';
                 $response['message'] = dao::getError();
             }
+            $this->loadModel('action')->create('case' ,$testRun->case, 'unlinkedfromtesttask', '', $testRun->task);
             $this->send($response);
         }
     }
@@ -966,6 +1104,8 @@ class testtask extends control
                 ->where('task')->eq((int)$taskID)
                 ->andWhere('`case`')->in($this->post->caseIDList)
                 ->exec();
+            $this->loadModel('action');
+            foreach($_POST['caseIDList'] as $caseID) $this->action->create('case', $caseID, 'unlinkedfromtesttask', '', $taskID);
         }
 
         die(js::locate($this->createLink('testtask', 'cases', "taskID=$taskID")));
@@ -998,6 +1138,8 @@ class testtask extends control
             $caseResult = $this->testtask->createResult($runID);
             if(dao::isError()) die(js::error(dao::getError()));
 
+            $taskID = empty($run->task) ? 0 : $run->task;
+            $this->loadModel('action')->create('case', $caseID, 'run', '', $taskID);
             if($caseResult == 'fail')
             {
 
@@ -1008,7 +1150,7 @@ class testtask extends control
             else
             {
                 /* set cookie for ajax load caselist when close colorbox. */
-                setcookie('selfClose', 1, 0, $this->config->webRoot, '', false, false);
+                setcookie('selfClose', 1, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
 
                 if($preAndNext->next)
                 {
@@ -1072,28 +1214,56 @@ class testtask extends control
         if($this->post->results)
         {
             $this->testtask->batchRun($from, $taskID);
+            $this->loadModel('action');
+            foreach(array_keys($this->post->results) as $caseID) $this->action->create('case', $caseID, 'run', '', $taskID);
             die(js::locate($url, 'parent'));
         }
 
         $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($url, 'parent'));
         $caseIDList = array_unique($caseIDList);
+
         /* The case of tasks of qa. */
-        if($productID)
+        if($productID or ($this->app->openApp == 'project' and empty($productID)))
         {
-            $this->testtask->setMenu($this->products, $productID, $taskID);
-            $this->view->moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0);
+            if($this->app->openApp == 'project')
+            {
+                $this->loadModel('project')->setMenu($this->session->project);
+            }
+            elseif($this->app->openApp == 'execution')
+            {
+                $this->loadModel('execution')->setMenu($this->session->execution);
+            }
+            else
+            {
+                $this->loadModel('qa')->setMenu($this->products, $productID, $taskID);
+            }
+            $this->view->moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($productID, 'case');
+
+            $cases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($caseIDList)->fetchAll('id');
         }
         /* The case of my. */
         else
         {
-            $this->lang->testtask->menu = $this->lang->my->menu;
-            $this->lang->set('menugroup.testtask', 'my');
-            $this->lang->testtask->menuOrder = $this->lang->my->menuOrder;
-            $this->loadModel('my')->setMenu();
-            $this->view->title = $this->lang->testtask->batchRun;
-        }
+            if($this->app->openApp == 'project')
+            {
+                $this->loadModel('project')->setMenu($this->session->project);
+            }
+            else
+            {
+                $this->lang->testtask->menu = $this->lang->my->menu->work;
+                $this->lang->my->menu->work['subModule'] = 'testtask';
+            }
 
-        $cases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($caseIDList)->fetchAll('id');
+            $this->view->title = $this->lang->testtask->batchRun;
+
+            $cases = $this->dao->select('t1.*,t2.id as runID')->from(TABLE_CASE)->alias('t1')
+                ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.id = t2.case')
+                ->where('t2.id')->in($caseIDList)
+                ->fetchAll('id');
+
+            $caseIDList = array();
+            foreach($cases as $case) $caseIDList[] = $case->id;
+        }
 
         /* If case has changed and not confirmed, remove it. */
         if($from == 'testtask')
@@ -1111,7 +1281,7 @@ class testtask extends control
         $this->view->cases = $cases;
         $this->view->steps = $this->dao->select('t1.*')->from(TABLE_CASESTEP)->alias('t1')
             ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id')
-            ->where('t2.id')->in(array_keys($cases))
+            ->where('t2.id')->in($caseIDList)
             ->andWhere('t1.version=t2.version')
             ->andWhere('t2.status')->ne('wait')
             ->fetchGroup('case', 'id');
@@ -1173,6 +1343,8 @@ class testtask extends control
             ->where('task')->eq((int)$taskID)
             ->andWhere('`case`')->in($this->post->caseIDList)
             ->exec();
+        $this->loadModel('action');
+        foreach($this->post->caseIDList as $caseID) $this->action->create('case', $caseID, 'assigned', '', $taskID);
         die(js::locate($this->session->caseList, 'parent'));
     }
 
@@ -1194,13 +1366,33 @@ class testtask extends control
             die(js::locate($this->createLink('testtask', 'unitCases', "taskID=$taskID"), 'parent'));
         }
 
-        $this->testtask->setMenu($this->products, $productID);
+        /* Set menu. */
+        $productID = $this->loadModel('product')->saveState($productID, $this->products);
+        if($this->app->openApp == 'project')
+        {
+            $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+            $this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
+            $this->loadModel('project')->setMenu($this->session->project);
+            $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
+
+            /* Replace language. */
+            $project = $this->project->getByID($this->session->project);
+            if(!empty($project->model) and $project->model == 'waterfall')
+            {
+                $this->lang->testtask->execution = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->testtask->execution);
+            }
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID);
+            $this->app->rawModule = 'testcase';
+        }
 
         $this->app->loadLang('job');
+        $this->app->rawModule = 'testcase';
 
-        $productID  = $productID ? $productID : key($this->products);
-        $projectID  = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->PRJ;
-        $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
+        $projectID  = $this->app->openApp == 'qa' ? 0 : $this->session->project;
+        $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
         $builds     = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk');
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->importUnitResult;
@@ -1248,4 +1440,18 @@ class testtask extends control
         $pairs = $this->testtask->getPairs($productID, $executionID);
         die(html::select('testtask', $pairs, '', "class='form-control chosen'"));
     }
+
+    /**
+     * Ajax get test report.
+     *
+     * @param  int    $buildID
+     * @access public
+     * @return void
+     */
+    public function ajaxGetTestReports($buildID)
+    {
+        /* Testreport list. */
+        $pairs = $this->testtask->getTestReportPairsByBuild($buildID);
+        die(html::select('testreport', $pairs, '', "class='form-control chosen'"));
+    }
 }
diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js
index 17ed4d0430..848fe6be67 100644
--- a/module/testtask/js/common.js
+++ b/module/testtask/js/common.js
@@ -54,7 +54,11 @@ function createBug(obj)
 
     var onlybody    = config.onlybody;
     config.onlybody = 'no';
-    window.open(createLink('bug', 'create', params + ',stepIdList=' + stepIdList), '_parent');
+
+    var link = createLink('bug', 'create', params + ',stepIdList=' + stepIdList);
+    if(onlybody = 'yes') link += '#app=qa';
+    window.parent.$.apps.open(link);
+
     config.onlybody = onlybody;
 }
 
@@ -90,6 +94,25 @@ function loadExecutionBuilds(executionID)
     });
 }
 
+/**
+ * Load test report.
+ *
+ * @param  int    buildID
+ * @access public
+ * @return void
+ */
+function loadTestReports(buildID)
+{
+    link = createLink('testtask', 'ajaxGetTestReports', 'buildID=' + buildID);
+    $.get(link, function(data)
+    {
+        if(!data) data = '<select id="testreport" name="testreport" class="form-control"></select>';
+        $('#testreport').replaceWith(data);
+        $('#testreport_chosen').remove();
+        $("#testreport").chosen();
+    });
+}
+
 /**
  * when begin date input change and end date input is null
  * change end date input to begin's after day
diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js
index f3b17a474d..50a185667b 100755
--- a/module/testtask/js/create.js
+++ b/module/testtask/js/create.js
@@ -6,7 +6,31 @@
  */
 function loadProductRelated()
 {
-    loadExecutionBuilds(parseInt($('#execution').val()));
+    loadExecutions($('#product').val());
+    buildData = '<select id="build" name="build" class="form-control" onchange="loadTestReports(this.value)"></select>';
+    $('#build').replaceWith(buildData);
+    $('#build_chosen').remove();
+    $("#build").chosen();
+    $('#build').trigger("chosen:updated");
+}
+
+/**
+ * Load executions.
+ *
+ * @param  int    productID
+ * @access public
+ * @return void
+ */
+function loadExecutions(productID)
+{
+    link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID);
+    $.get(link, function(data)
+    {
+        if(!data) data = '<select id="execution" name="execution" class="form-control"></select>';
+        $('#execution').replaceWith(data);
+        $('#execution_chosen').remove();
+        $("#execution").chosen();
+    });
 }
 
 /* If the mouse hover over the manage contacts button, give tip. */
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index b655403523..b3d47405bf 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -57,7 +57,9 @@ $lang->testtask->expandAll        = 'Aufklappen';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Testaufgabe';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->execution      = $lang->executionCommon;
+$lang->testtask->project        = 'Project';
+$lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Typ';
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Besitzer';
 $lang->testtask->executor       = 'Executor';
@@ -70,6 +72,7 @@ $lang->testtask->desc           = 'Beschreibung';
 $lang->testtask->mailto         = 'Mail an';
 $lang->testtask->status         = 'Status';
 $lang->testtask->subStatus      = 'Sub Status';
+$lang->testtask->testreport     = 'Test Report';
 $lang->testtask->assignedTo     = 'Zugeordnet';
 $lang->testtask->linkVersion    = 'Version';
 $lang->testtask->lastRunAccount = 'Ausgeführt von';
@@ -173,6 +176,8 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Bugersteller Bericht'
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Gelöst von Bericht';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Lösungsbersicht';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Bug Modul Bericht';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();
 $lang->testtask->report->options->graph  = new stdclass();
@@ -192,3 +197,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 0a5539538e..27a68d5db9 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -12,7 +12,6 @@
 $lang->testtask->index            = "Request Home";
 $lang->testtask->create           = "Submit Request";
 $lang->testtask->reportChart      = 'Report';
-$lang->testtask->reportAction     = 'Case Report';
 $lang->testtask->delete           = "Delete Request";
 $lang->testtask->importUnitResult = "Import Unit Result";
 $lang->testtask->importunitresult = "Import Unit Result"; //Fix bug custom required testtask.
@@ -29,7 +28,6 @@ $lang->testtask->batchAssign      = "Batch Assign";
 $lang->testtask->runCase          = "Run";
 $lang->testtask->batchRun         = "Batch Run";
 $lang->testtask->results          = "Results";
-$lang->testtask->resultsAction    = "Case Result";
 $lang->testtask->createBug        = "Bug(+)";
 $lang->testtask->assign           = 'Assign';
 $lang->testtask->cases            = 'Case List';
@@ -37,14 +35,10 @@ $lang->testtask->groupCase        = "View By Group";
 $lang->testtask->pre              = 'Prev.';
 $lang->testtask->next             = 'Next';
 $lang->testtask->start            = "Start";
-$lang->testtask->startAction      = "Start Request";
 $lang->testtask->close            = "Close";
-$lang->testtask->closeAction      = "Close Request";
 $lang->testtask->wait             = "Waiting";
 $lang->testtask->block            = "Block";
-$lang->testtask->blockAction      = "Block Request";
 $lang->testtask->activate         = "Activate";
-$lang->testtask->activateAction   = "Activate Request";
 $lang->testtask->testing          = "Testing";
 $lang->testtask->blocked          = "Blocked";
 $lang->testtask->done             = "Tested";
@@ -54,10 +48,21 @@ $lang->testtask->allTasks         = 'All Requests';
 $lang->testtask->collapseAll      = 'Collapse';
 $lang->testtask->expandAll        = 'Expand';
 
+$lang->testtask->viewAction       = "View Testtask";
+$lang->testtask->casesAction      = 'View Case';
+$lang->testtask->activateAction   = "Activate Testtask";
+$lang->testtask->blockAction      = "Block Testtask";
+$lang->testtask->closeAction      = "Close Testtask";
+$lang->testtask->startAction      = "Start Testtask";
+$lang->testtask->resultsAction    = "Case Result";
+$lang->testtask->reportAction     = 'Report';
+
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Request';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->execution      = $lang->executionCommon;
+$lang->testtask->project        = 'Project';
+$lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Type';
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
 $lang->testtask->executor       = 'Executor';
@@ -70,6 +75,7 @@ $lang->testtask->desc           = 'Description';
 $lang->testtask->mailto         = 'Mailto';
 $lang->testtask->status         = 'Status';
 $lang->testtask->subStatus      = 'Sub Status';
+$lang->testtask->testreport     = 'Test Report';
 $lang->testtask->assignedTo     = 'Assigned';
 $lang->testtask->linkVersion    = 'Build';
 $lang->testtask->lastRunAccount = 'RunBy';
@@ -173,6 +179,8 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Bug ReportedBy Distri
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Bug ResolvedBy Distribution';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Bug Resolution Distribution';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Bug Module Distribution';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();
 $lang->testtask->report->options->graph  = new stdclass();
@@ -192,3 +200,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index e550c5df15..c3a65cffba 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -57,7 +57,9 @@ $lang->testtask->expandAll        = 'Déplier';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Recette';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->execution      = $lang->executionCommon;
+$lang->testtask->project        = 'Project';
+$lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Type';
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
 $lang->testtask->executor       = 'Executeur';
@@ -70,6 +72,7 @@ $lang->testtask->desc           = 'Description';
 $lang->testtask->mailto         = 'Mailto';
 $lang->testtask->status         = 'Statut';
 $lang->testtask->subStatus      = 'Sous-statut';
+$lang->testtask->testreport     = 'Test Report';
 $lang->testtask->assignedTo     = 'Affecté';
 $lang->testtask->linkVersion    = 'Build';
 $lang->testtask->lastRunAccount = 'Jouée par';
@@ -173,6 +176,8 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Distribution signalem
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Distribution Résolus par';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Distribution Résolution';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Distribution Bug Module';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();
 $lang->testtask->report->options->graph  = new stdclass();
@@ -192,3 +197,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index 22029492a1..fab3dd2f4e 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -57,7 +57,9 @@ $lang->testtask->expandAll        = 'Mở ra';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Yêu cầu';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->execution      = $lang->executionCommon;
+$lang->testtask->project        = 'Project';
+$lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Kiểu';
 $lang->testtask->build          = 'Bản dựng';
 $lang->testtask->owner          = 'Sở hữu';
 $lang->testtask->executor       = 'Executor';
@@ -70,6 +72,7 @@ $lang->testtask->desc           = 'Mô tả';
 $lang->testtask->mailto         = 'Mail tới';
 $lang->testtask->status         = 'Tình trạng';
 $lang->testtask->subStatus      = 'Tình trạng con';
+$lang->testtask->testreport     = 'Test Report';
 $lang->testtask->assignedTo     = 'Đã giao';
 $lang->testtask->linkVersion    = 'Bản dựng';
 $lang->testtask->lastRunAccount = 'Chạy bởi';
@@ -173,6 +176,8 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Phân chia người b
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Phân chia người giải quyết Bug';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Phân chia giải pháp Bug';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Phân chia Module Bug';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();
 $lang->testtask->report->options->graph  = new stdclass();
@@ -192,3 +197,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 8f06e0ec9b..9ee060c53d 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -12,7 +12,6 @@
 $lang->testtask->index            = "测试单首页";
 $lang->testtask->create           = "提交测试";
 $lang->testtask->reportChart      = '报表统计';
-$lang->testtask->reportAction     = '用例报表统计';
 $lang->testtask->delete           = "删除测试单";
 $lang->testtask->importUnitResult = "导入单元测试结果";
 $lang->testtask->importunitresult = "导入单元测试"; //Fix bug custom required testtask.
@@ -29,7 +28,6 @@ $lang->testtask->batchAssign      = "批量指派";
 $lang->testtask->runCase          = "执行";
 $lang->testtask->batchRun         = "批量执行";
 $lang->testtask->results          = "结果";
-$lang->testtask->resultsAction    = "用例结果";
 $lang->testtask->createBug        = "提Bug";
 $lang->testtask->assign           = '指派';
 $lang->testtask->cases            = '用例';
@@ -37,14 +35,10 @@ $lang->testtask->groupCase        = "分组浏览用例";
 $lang->testtask->pre              = '上一个';
 $lang->testtask->next             = '下一个';
 $lang->testtask->start            = "开始";
-$lang->testtask->startAction      = "开始测试单";
 $lang->testtask->close            = "关闭";
-$lang->testtask->closeAction      = "关闭测试单";
 $lang->testtask->wait             = "待测测试单";
 $lang->testtask->block            = "阻塞";
-$lang->testtask->blockAction      = "阻塞测试单";
 $lang->testtask->activate         = "激活";
-$lang->testtask->activateAction   = "激活测试单";
 $lang->testtask->testing          = "测试中测试单";
 $lang->testtask->blocked          = "被阻塞测试单";
 $lang->testtask->done             = "已测测试单";
@@ -54,10 +48,21 @@ $lang->testtask->allTasks         = '所有测试';
 $lang->testtask->collapseAll      = '全部折叠';
 $lang->testtask->expandAll        = '全部展开';
 
+$lang->testtask->viewAction       = "测试单概况";
+$lang->testtask->casesAction      = '查看用例';
+$lang->testtask->activateAction   = "激活测试单";
+$lang->testtask->blockAction      = "阻塞测试单";
+$lang->testtask->closeAction      = "关闭测试单";
+$lang->testtask->startAction      = "开始测试单";
+$lang->testtask->resultsAction    = "用例结果";
+$lang->testtask->reportAction     = '用例报表统计';
+
 $lang->testtask->id             = '编号';
 $lang->testtask->common         = '测试单';
 $lang->testtask->product        = '所属' . $lang->productCommon;
-$lang->testtask->execution      = '所属' . $lang->executionCommon;
+$lang->testtask->project        = '所属项目';
+$lang->testtask->execution      = '所属' . $lang->execution->common;
+$lang->testtask->type           = '测试类型';
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '负责人';
 $lang->testtask->executor       = '执行人';
@@ -70,6 +75,7 @@ $lang->testtask->desc           = '描述';
 $lang->testtask->mailto         = '抄送给';
 $lang->testtask->status         = '当前状态';
 $lang->testtask->subStatus      = '子状态';
+$lang->testtask->testreport     = '相关测试报告';
 $lang->testtask->assignedTo     = '指派给';
 $lang->testtask->linkVersion    = '版本';
 $lang->testtask->lastRunAccount = '执行人';
@@ -173,6 +179,8 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Bug创建者分布';
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Bug解决者分布';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Bug解决方案分布';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Bug模块分布';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug重要程度阶段分布';
+$lang->testtask->report->charts['bugHandleGroups']      = 'Bug每日处理情况分布';
 
 $lang->testtask->report->options = new stdclass();
 $lang->testtask->report->options->graph  = new stdclass();
@@ -192,3 +200,9 @@ $lang->testtask->unitTag['thisWeek']  = '本周';
 $lang->testtask->unitTag['lastWeek']  = '上周';
 $lang->testtask->unitTag['thisMonth'] = '本月';
 $lang->testtask->unitTag['lastMonth'] = '上月';
+
+$lang->testtask->typeList['integrate']   = '集成测试';
+$lang->testtask->typeList['system']      = '系统测试';
+$lang->testtask->typeList['acceptance']  = '验收测试';
+$lang->testtask->typeList['performance'] = '性能测试';
+$lang->testtask->typeList['safety']      = '安全测试';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 440e61df83..fb0f9dc1aa 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -12,7 +12,6 @@
 $lang->testtask->index            = "測試單首頁";
 $lang->testtask->create           = "提交測試";
 $lang->testtask->reportChart      = '報表統計';
-$lang->testtask->reportAction     = '用例報表統計';
 $lang->testtask->delete           = "刪除測試單";
 $lang->testtask->importUnitResult = "導入單元測試結果";
 $lang->testtask->importunitresult = "導入單元測試"; //Fix bug custom required testtask.
@@ -29,7 +28,6 @@ $lang->testtask->batchAssign      = "批量指派";
 $lang->testtask->runCase          = "執行";
 $lang->testtask->batchRun         = "批量執行";
 $lang->testtask->results          = "結果";
-$lang->testtask->resultsAction    = "用例結果";
 $lang->testtask->createBug        = "提Bug";
 $lang->testtask->assign           = '指派';
 $lang->testtask->cases            = '用例';
@@ -37,14 +35,10 @@ $lang->testtask->groupCase        = "分組瀏覽用例";
 $lang->testtask->pre              = '上一個';
 $lang->testtask->next             = '下一個';
 $lang->testtask->start            = "開始";
-$lang->testtask->startAction      = "開始測試單";
 $lang->testtask->close            = "關閉";
-$lang->testtask->closeAction      = "關閉測試單";
 $lang->testtask->wait             = "待測測試單";
 $lang->testtask->block            = "阻塞";
-$lang->testtask->blockAction      = "阻塞測試單";
 $lang->testtask->activate         = "激活";
-$lang->testtask->activateAction   = "激活測試單";
 $lang->testtask->testing          = "測試中測試單";
 $lang->testtask->blocked          = "被阻塞測試單";
 $lang->testtask->done             = "已測測試單";
@@ -54,10 +48,21 @@ $lang->testtask->allTasks         = '所有測試';
 $lang->testtask->collapseAll      = '全部摺疊';
 $lang->testtask->expandAll        = '全部展開';
 
+$lang->testtask->viewAction       = "測試單概況";
+$lang->testtask->casesAction      = '查看用例';
+$lang->testtask->activateAction   = "激活測試單";
+$lang->testtask->blockAction      = "阻塞測試單";
+$lang->testtask->closeAction      = "關閉測試單";
+$lang->testtask->startAction      = "開始測試單";
+$lang->testtask->resultsAction    = "用例結果";
+$lang->testtask->reportAction     = '用例報表統計';
+
 $lang->testtask->id             = '編號';
 $lang->testtask->common         = '測試單';
 $lang->testtask->product        = '所屬' . $lang->productCommon;
-$lang->testtask->execution      = '所屬' . $lang->executionCommon;
+$lang->testtask->project        = '所屬項目';
+$lang->testtask->execution      = '所屬' . $lang->execution->common;
+$lang->testtask->type           = '測試類型';
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '負責人';
 $lang->testtask->executor       = '執行人';
@@ -70,6 +75,7 @@ $lang->testtask->desc           = '描述';
 $lang->testtask->mailto         = '抄送給';
 $lang->testtask->status         = '當前狀態';
 $lang->testtask->subStatus      = '子狀態';
+$lang->testtask->testreport     = '相關測試報告';
 $lang->testtask->assignedTo     = '指派給';
 $lang->testtask->linkVersion    = '版本';
 $lang->testtask->lastRunAccount = '執行人';
@@ -124,7 +130,7 @@ $lang->testtask->confirmDelete     = '您確認要刪除該測試單嗎？';
 $lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
 $lang->testtask->noticeNoOther     = '該產品還沒有其他測試單';
 $lang->testtask->noTesttask        = '暫時沒有測試單。';
-$lang->testtask->checkLinked       = '請檢查測試單的產品是否與項目相關聯';
+$lang->testtask->checkLinked       = "請檢查測試單的產品是否與{$lang->executionCommon}相關聯";
 $lang->testtask->noImportData      = '導入的XML沒有解析出數據。';
 $lang->testtask->unitXMLFormat     = '請選擇Junit XML 格式的檔案。';
 $lang->testtask->titleOfAuto       = "%s 自動化測試";
@@ -192,3 +198,9 @@ $lang->testtask->unitTag['thisWeek']  = '本週';
 $lang->testtask->unitTag['lastWeek']  = '上周';
 $lang->testtask->unitTag['thisMonth'] = '本月';
 $lang->testtask->unitTag['lastMonth'] = '上月';
+
+$lang->testtask->typeList['integrate']   = '整合測試';
+$lang->testtask->typeList['system']      = '系統測試';
+$lang->testtask->typeList['acceptance']  = '驗收測試';
+$lang->testtask->typeList['performance'] = '性能測試';
+$lang->testtask->typeList['safety']      = '安全測試';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 48f2094555..f9ef55c25e 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -13,164 +13,28 @@
 <?php
 class testtaskModel extends model
 {
-    /**
-     * Set the menu.
-     *
-     * @param  array $products
-     * @param  int   $productID
-     * @access public
-     * @return void
-     */
-    public function setMenu($products, $productID, $branch = 0, $testtask = 0)
-    {
-        $this->loadModel('product')->setMenu($products, $productID, $branch);
-        $selectHtml = $this->product->select($products, $productID, 'testtask', 'browse', '', $branch);
-
-        if($testtask and $this->app->viewType != 'mhtml')
-        {
-            $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'), 0, 0, $this->session->PRJ);
-            if(!isset($testtasks[$testtask])) $testtasks[$testtask] = $this->getById($testtask);
-
-            $selectHtml .= "<div class='btn-group angle-btn'>";
-            $selectHtml .= "<div class='btn-group'>";
-            $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $testtasks[$testtask]->name . " <span class='caret'></span></a>";
-            $selectHtml .= "<ul class='dropdown-menu'>";
-            foreach($testtasks as $testtask) $selectHtml .= '<li>' . html::a(helper::createLink('testtask', 'cases', "taskID=$testtask->id"), "<i class='icon icon-file-o'></i> {$testtask->name}") . '</li>';
-            $selectHtml .= "</ul>";
-            $selectHtml .= "</div>";
-            $selectHtml .= "</div>";
-
-            $this->lang->TRActions = '';
-            if(common::hasPriv('testtask', 'view'))     $this->lang->TRActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), "<i class='icon icon-file-text'> </i>" . $this->lang->testtask->view, '', "class='btn'");
-            if(common::hasPriv('testreport', 'browse')) $this->lang->TRActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), "<i class='icon icon-flag'> </i>" . $this->lang->testtask->reportField, '', "class='btn'");
-        }
-
-        $this->app->loadLang('qa');
-        $productIndex = $selectHtml;
-
-        $pageNav     = '';
-        $pageActions = '';
-        $isMobile    = $this->app->viewType == 'mhtml';
-        if($isMobile)
-        {
-            $this->app->loadLang('qa');
-            $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
-        }
-        $pageNav .= $selectHtml;
-
-        $this->lang->modulePageNav = $pageNav;
-        $this->lang->TRActions     = $pageActions;
-        foreach($this->lang->testtask->menu as $key => $value)
-        {
-            if($this->lang->navGroup->testtask != 'qa') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
-            $replace = ($key == 'product') ? $selectHtml : $productID;
-            if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->testtask->menu, $key, $replace);
-        }
-
-        if($this->lang->navGroup->testtask == 'qa')
-        {
-            foreach($this->lang->qa->subMenu->testtask as $key => $menu)
-            {
-                common::setMenuVars($this->lang->qa->subMenu->testtask, $key, $productID);
-            }
-            $this->lang->qa->menu         = $this->lang->testtask->menu;
-            $this->lang->testtask->menu   = $this->lang->qa->subMenu->testtask;
-            $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
-        }
-    }
-
-    /**
-     * Set unit menu.
-     *
-     * @param  array  $products
-     * @param  int    $productID
-     * @param  int    $branch
-     * @param  int    $testtask
-     * @access public
-     * @return void
-     */
-    public function setUnitMenu($products, $productID, $branch = 0, $testtask = 0)
-    {
-        $this->loadModel('product')->setMenu($products, $productID, $branch);
-        $selectHtml = $this->product->select($products, $productID, 'testtask', 'browseUnits', '', $branch);
-
-        if($testtask and $this->app->viewType != 'mhtml')
-        {
-            $testtasks = $this->getProductUnitTasks($productID, 'all', 'id_desc');
-            if(!isset($testtasks[$testtask])) $testtasks[$testtask] = $this->getById($testtask);
-
-            $selectHtml .= "<div class='btn-group angle-btn'>";
-            $selectHtml .= "<div class='btn-group'>";
-            $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $testtasks[$testtask]->name . " <span class='caret'></span></a>";
-            $selectHtml .= "<ul class='dropdown-menu'>";
-            foreach($testtasks as $testtask) $selectHtml .= '<li>' . html::a(helper::createLink('testtask', 'unitCases', "taskID=$testtask->id"), "<i class='icon icon-file-o'></i> {$testtask->name}") . '</li>';
-            $selectHtml .= "</ul>";
-            $selectHtml .= "</div>";
-            $selectHtml .= "</div>";
-        }
-
-        $this->app->loadLang('qa');
-        $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
-        $productIndex .= $selectHtml;
-
-        $pageNav     = '';
-        $pageActions = '';
-        $isMobile    = $this->app->viewType == 'mhtml';
-        if($isMobile)
-        {
-            $this->app->loadLang('qa');
-            $pageNav  = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
-        }
-        else
-        {
-            if($this->config->global->flow == 'full')
-            {
-                $this->app->loadLang('qa');
-                $pageNav = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
-            }
-        }
-        $pageNav .= $selectHtml;
-
-        $this->lang->modulePageNav = $pageNav;
-        $this->lang->TRActions     = $pageActions;
-        if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass();
-        foreach($this->lang->testtask->menu as $key => $value)
-        {
-            if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
-            $replace = ($key == 'product') ? $selectHtml : $productID;
-            if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
-            common::setMenuVars($this->lang->testtask->menu, $key, $replace);
-        }
-
-        $this->lang->testtask->menu->testcase['subModule'] = 'testtask';
-        if($this->lang->navGroup->testtask == 'qa')
-        {
-            foreach($this->lang->qa->subMenu->testcase as $key => $menu)
-            {
-                common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $productID);
-            }
-            $this->lang->qa->menu         = $this->lang->testcase->menu;
-            $this->lang->testtask->menu   = $this->lang->qa->subMenu->testcase;
-            $this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
-        }
-    }
-
     /**
      * Create a test task.
      *
-     * @param  int   $productID
+     * @param  int   $projectID
      * @access public
      * @return void
      */
-    function create()
+    function create($projectID = 0)
     {
+        if($this->post->execution)
+        {
+            $execution = $this->loadModel('execution')->getByID($this->post->execution);
+            $projectID = $execution->project;
+        }
+
         $task = fixer::input('post')
             ->setDefault('build', '')
-            ->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new', 'project', $projectID)
             ->stripTags($this->config->testtask->editor->create['id'], $this->config->allowedTags)
             ->join('mailto', ',')
-            ->remove('uid,contactListMenu')
+            ->join('type', ',')
+            ->remove('files,labels,uid,contactListMenu')
             ->get();
 
         $task = $this->loadModel('file')->processImgURL($task, $this->config->testtask->editor->create['id'], $this->post->uid);
@@ -186,6 +50,7 @@ class testtaskModel extends model
         {
             $taskID = $this->dao->lastInsertID();
             $this->file->updateObjectID($this->post->uid, $taskID, 'testtask');
+            $this->file->saveUpload('testtask', $taskID);
             return $taskID;
         }
     }
@@ -215,7 +80,6 @@ class testtaskModel extends model
             ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.execution = t5.project and t1.product = t5.product')
 
             ->where('t1.deleted')->eq(0)
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
             ->andWhere('t1.auto')->ne('unit')
             ->beginIF(!$this->app->user->admin)->andWhere('t3.id')->in("0,{$this->app->user->view->sprints}")->fi()
             ->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi()
@@ -243,6 +107,8 @@ class testtaskModel extends model
     public function getProductUnitTasks($productID, $browseType = '', $orderBy = 'id_desc', $pager = null)
     {
         $beginAndEnd = $this->loadModel('action')->computeBeginAndEnd($browseType);
+        if(empty($beginAndEnd)) $beginAndEnd = array('begin' => '', 'end' => '');
+
         if($browseType == 'newest') $orderBy = 'end_desc,' . $orderBy;
         $tasks = $this->dao->select("t1.*, t2.name AS productName, t3.name AS executionName, t4.name AS buildName")
             ->from(TABLE_TESTTASK)->alias('t1')
@@ -251,7 +117,7 @@ class testtaskModel extends model
             ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.product')->eq($productID)
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->andWhere('t1.auto')->eq('unit')
             ->beginIF($browseType != 'all' and $browseType != 'newest' and $beginAndEnd)
             ->andWhere('t1.end')->ge($beginAndEnd['begin'])
@@ -260,6 +126,7 @@ class testtaskModel extends model
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
+
         $resultGroups = $this->dao->select('t1.task, t2.*')->from(TABLE_TESTRUN)->alias('t1')
             ->leftJoin(TABLE_TESTRESULT)->alias('t2')->on('t1.id=t2.run')
             ->where('t1.task')->in(array_keys($tasks))
@@ -282,6 +149,28 @@ class testtaskModel extends model
         return $tasks;
     }
 
+    /**
+     * Get test tasks of a project.
+     *
+     * @param  int    $projectID
+     * @param  string $orderBy
+     * @param  object $pager
+     * @access public
+     * @return array
+     */
+    public function getProjectTasks($projectID, $orderBy = 'id_desc', $pager = null)
+    {
+        return $this->dao->select('t1.*, t2.name AS buildName')
+            ->from(TABLE_TESTTASK)->alias('t1')
+            ->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.build = t2.id')
+            ->where('t1.project')->eq((int)$projectID)
+            ->andWhere('t1.auto')->ne('unit')
+            ->andWhere('t1.deleted')->eq(0)
+            ->orderBy($orderBy)
+            ->page($pager)
+            ->fetchAll('id');
+    }
+
     /**
      * Get test tasks of a execution.
      *
@@ -380,6 +269,7 @@ class testtaskModel extends model
 
         $task = $this->loadModel('file')->replaceImgURL($task, 'desc');
         if($setImgSize) $task->desc = $this->loadModel('file')->setImgSize($task->desc);
+        $task->files = $this->loadModel('file')->getByObject('testtask', $task->id);
         return $task;
     }
 
@@ -495,7 +385,7 @@ class testtaskModel extends model
         {
             $cases = $this->dao->select('*')->from(TABLE_CASE)
                 ->where($query)
-                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
+                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->project)->fi()
                 ->andWhere('product')->eq($productID)
                 ->andWhere('status')->ne('wait')
                 ->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
@@ -528,7 +418,7 @@ class testtaskModel extends model
         if($bugs)
         {
             $cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
-                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
+                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->project)->fi()
                 ->andWhere('product')->eq($productID)
                 ->andWhere('status')->ne('wait')
                 ->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
@@ -561,7 +451,7 @@ class testtaskModel extends model
         return $this->dao->select('t1.*,t2.version as version')->from(TABLE_CASE)->alias('t1')
                 ->leftJoin(TABLE_SUITECASE)->alias('t2')->on('t1.id=t2.case')
                 ->where($query)
-                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+                ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
                 ->andWhere('t2.suite')->eq((int)$suite)
                 ->andWhere('t1.product')->eq($productID)
                 ->andWhere('status')->ne('wait')
@@ -596,12 +486,26 @@ class testtaskModel extends model
             ->where($query)
             ->andWhere('t1.id')->notin($linkedCases)
             ->andWhere('t2.task')->eq($testTask)
-            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->andWhere('t1.status')->ne('wait')
             ->page($pager)
             ->fetchAll();
     }
 
+    /**
+     * Get test report pairs by build.
+     *
+     * @param  string $build
+     * @access public
+     * @return array
+     */
+    public function getTestReportPairsByBuild($build = '')
+    {
+        if(empty($build)) return array();
+
+        return $this->dao->select('id,title')->from(TABLE_TESTREPORT)->where("CONCAT(',', builds, ',')")->like("%,$build,%")->fetchPairs('id','title');
+    }
+
     /**
      * Get related test tasks.
      *
@@ -843,7 +747,7 @@ class testtaskModel extends model
     public function update($taskID)
     {
         $oldTask = $this->dao->select("*")->from(TABLE_TESTTASK)->where('id')->eq((int)$taskID)->fetch();
-        $task = fixer::input('post')->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)->join('mailto', ',')->remove('uid,comment,contactListMenu')->get();
+        $task = fixer::input('post')->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)->join('mailto', ',')->join('type', ',')->remove('files,labels,uid,comment,contactListMenu')->get();
         $task = $this->loadModel('file')->processImgURL($task, $this->config->testtask->editor->edit['id'], $this->post->uid);
         $this->dao->update(TABLE_TESTTASK)->data($task)
             ->autoCheck()
@@ -854,6 +758,7 @@ class testtaskModel extends model
         if(!dao::isError())
         {
             $this->file->updateObjectID($this->post->uid, $taskID, 'testtask');
+            $this->file->saveUpload('testtask', $taskID);
             return common::createChanges($oldTask, $task);
         }
     }
@@ -974,21 +879,24 @@ class testtaskModel extends model
             $row->case       = $caseID;
             $row->version    = $postData->versions[$caseID];
             $row->assignedTo = '';
-            $row->status     = 'wait';
+            $row->status     = 'normal';
             if($type == 'bybuild') $row->assignedTo = zget($assignedToPairs, $caseID, '');
             $this->dao->replace(TABLE_TESTRUN)->data($row)->exec();
 
             /* When the cases linked the testtask, the cases link to the project. */
-            if($this->lang->navGroup->testtask != 'qa')
+            if($this->app->openApp != 'qa')
             {
                 $lastOrder = (int)$this->dao->select('*')->from(TABLE_PROJECTCASE)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order');
+                $project   = $this->app->openApp == 'project' ? $this->session->project : $this->session->execution;
+
                 $data = new stdclass();
-                $data->project = $this->session->PRJ;
+                $data->project = $project;
                 $data->product = $this->session->product;
                 $data->case    = $caseID;
                 $data->version = 1;
                 $data->order   = ++ $lastOrder;
                 $this->dao->replace(TABLE_PROJECTCASE)->data($data)->exec();
+                $this->loadModel('action')->create('case', $caseID, 'linked2testtask', '', $taskID);
             }
         }
     }
@@ -1241,7 +1149,7 @@ class testtaskModel extends model
             /* Update testRun's status. */
             if(!dao::isError())
             {
-                $runStatus = $caseResult == 'blocked' ? 'blocked' : 'done';
+                $runStatus = $caseResult == 'blocked' ? 'blocked' : 'normal';
                 $this->dao->update(TABLE_TESTRUN)
                     ->set('lastRunResult')->eq($caseResult)
                     ->set('status')->eq($runStatus)
@@ -1268,7 +1176,7 @@ class testtaskModel extends model
     {
         $runs = array();
         $postData   = fixer::input('post')->get();
-        $caseIdList = array_keys($postData->results);
+        $caseIdList = isset($postData->caseIDList) ? array_keys($postData->caseIDList) : array_keys($postData->results);
         if($runCaseType == 'testtask')
         {
             $runs = $this->dao->select('id, `case`')->from(TABLE_TESTRUN)
@@ -1287,7 +1195,8 @@ class testtaskModel extends model
         $now = helper::now();
         foreach($postData->results as $caseID => $result)
         {
-            $runID       = isset($runs[$caseID]) ? $runs[$caseID] : 0;
+            $runID       = isset($runs[$caseID]) ? $runs[$caseID] : (isset($postData->caseIDList) ? $caseID : 0);
+            $version     = $postData->version[$caseID];
             $dbSteps     = isset($stepGroups[$caseID]) ? $stepGroups[$caseID] : array();
             $postSteps   = isset($postData->steps[$caseID]) ? $postData->steps[$caseID] : array();
             $postReals   = $postData->reals[$caseID];
@@ -1309,13 +1218,16 @@ class testtaskModel extends model
                 $step           = array();
                 $step['result'] = $caseResult;
                 $step['real']   = $caseResult == 'pass' ? '' : $postReals[0];
-                $stepResults[] = $step;
+                $stepResults[]  = $step;
             }
 
+            /* Replace caseID if caseID is runID. */
+            if(isset($postData->caseIDList[$caseID])) $caseID = $postData->caseIDList[$caseID];
+
             $result              = new stdClass();
             $result->run         = $runID;
             $result->case        = $caseID;
-            $result->version     = $postData->version[$caseID];
+            $result->version     = $version;
             $result->caseResult  = $caseResult;
             $result->stepResults = serialize($stepResults);
             $result->lastRunner  = $this->app->user->account;
@@ -1328,7 +1240,7 @@ class testtaskModel extends model
                 /* Update testRun's status. */
                 if(!dao::isError())
                 {
-                    $runStatus = $caseResult == 'blocked' ? 'blocked' : 'done';
+                    $runStatus = $caseResult == 'blocked' ? 'blocked' : 'normal';
                     $this->dao->update(TABLE_TESTRUN)
                         ->set('lastRunResult')->eq($caseResult)
                         ->set('status')->eq($runStatus)
@@ -1536,7 +1448,16 @@ class testtaskModel extends model
                 foreach(explode(',', trim($run->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '<br />';
                 break;
             case 'status':
-                echo $caseChanged ? "<span class='warning'>{$this->lang->testcase->changed}</span>" : $this->processStatus('testtask', $run);
+                if($caseChanged)
+                {
+                    echo "<span title='{$this->lang->testcase->changed}' class='warning'>{$this->lang->testcase->changed}</span>";
+                }
+                else
+                {
+                    $status = $this->processStatus('testcase', $run);
+                    if($run->status == $status) $status = $this->processStatus('testtask', $run);
+                    echo $status;
+                }
                 break;
             case 'precondition':
                 echo $run->precondition;
@@ -1601,12 +1522,12 @@ class testtaskModel extends model
                 common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=executionID=$task->execution,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
 
                 common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'");
-                common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'");
+                common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");
 
                 if(common::hasPriv('testtask', 'unlinkCase', $run))
                 {
                     $unlinkURL = helper::createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
-                    echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"casesForm\", confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$this->lang->testtask->unlinkCase}' class='btn'");
+                    echo html::a("javascript:void(0)", '<i class="icon-unlink"></i>', '', "title='{$this->lang->testtask->unlinkCase}' class='btn' onclick='ajaxDelete(\"$unlinkURL\", \"casesForm\", confirmUnlink)'");
                 }
 
                 break;
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index bfcf061d23..bc99558c5b 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -20,7 +20,7 @@
     <table class='table table-fixed table-form table-bordered'>
       <thead>
         <tr>
-          <th class='w-id'>   <?php  echo $lang->idAB;?></th> 
+          <th class='w-id'>   <?php  echo $lang->idAB;?></th>
           <th class='w-100px'><?php echo $lang->testcase->module;?></th>
           <th class='w-200px'><?php echo $lang->testcase->title;?></th>
           <th class='precondition w-90px'><?php echo $lang->testcase->precondition;?></th>
@@ -28,14 +28,20 @@
           <th><?php echo $lang->testcase->stepDesc . '/' . $lang->testcase->stepExpect?></th>
         </tr>
       </thead>
-      <?php foreach($caseIDList as $caseID):?>
-      <?php if($cases[$caseID]->status == 'wait') continue;?>
-      <?php if(!$productID) $moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?>
+      <?php foreach($cases as $caseID => $case):?>
+      <?php if($case->status == 'wait') continue;?>
+      <?php
+      if(!$productID)
+      {
+          echo html::hidden("caseIDList[$case->id]", $caseID);
+          $moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($case->product, $viewType = 'case', $startModuleID = 0);
+      }
+       ?>
       <tr class='text-center'>
-        <td><?php echo $caseID . html::hidden("version[$caseID]", $cases[$caseID]->version)?></td>
-        <td class='text-left'><?php echo "<span title='" . $moduleOptionMenu[$cases[$caseID]->module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . "</span>"?></td>
-        <td class='text-left wordwrap'><?php echo "<span title='{$cases[$caseID]->title}'>{$cases[$caseID]->title}</span>"?></td>
-        <td class='text-left precondition wordwrap'><?php echo "<span title='{$cases[$caseID]->precondition}'>{$cases[$caseID]->precondition}</span>"?></td>
+        <td><?php echo $caseID . html::hidden("version[$caseID]", $case->version)?></td>
+        <td class='text-left'><?php echo "<span title='" . $moduleOptionMenu[$case->module] . "'>" . $moduleOptionMenu[$case->module] . "</span>"?></td>
+        <td class='text-left wordwrap'><?php echo "<span title='{$case->title}'>{$case->title}</span>"?></td>
+        <td class='text-left precondition wordwrap'><?php echo "<span title='{$case->precondition}'>{$case->precondition}</span>"?></td>
         <td class='text-left'><?php echo html::radio("results[$caseID]", $this->lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'", 'block')?></td>
         <td>
           <?php if(!empty($steps[$caseID])):?>
@@ -66,7 +72,7 @@
           <span class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][]", '', "class='form-control'");?></span>
           <?php endif;?>
         </td>
-      </tr>  
+      </tr>
       <?php endforeach;?>
       <tr><td colspan='6' class='text-center'><?php echo html::submitButton();?></td></tr>
     </table>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 0fd7fac9aa..47294aecae 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -40,9 +40,9 @@ $status = $this->session->testTaskVersionStatus;
     <?php $condition = "productID=$productID&branch=$branch&type=$scope,$status&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}&pageID=1"?>
     <div class='input-group w-300px input-group-sm'>
       <span class='input-group-addon'><?php echo $lang->testtask->beginAndEnd;?></span>
-      <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $beginTime, "class='form-control form-date' onchange='changeDate(this.value, \"$endTime\", \"$condition\")'");?></div>
+      <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $beginTime, "class='form-control form-date' onchange='changeDate(this.value, \"$endTime\", \"$condition\")' placeholder='" . $lang->testtask->begin . "'");?></div>
       <span class='input-group-addon'><?php echo $lang->testtask->to;?></span>
-      <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $endTime, "class='form-control form-date' onchange='changeDate(\"$beginTime\", this.value, \"$condition\")'");?></div>
+      <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $endTime, "class='form-control form-date' onchange='changeDate(\"$beginTime\", this.value, \"$condition\")' placeholder='" . $lang->testtask->end . "'");?></div>
     </div>
   </div>
   <?php if(common::canModify('product', $product)):?>
@@ -89,7 +89,7 @@ $status = $this->session->testTaskVersionStatus;
       <td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('cases', "taskID=$task->id"), $task->name);?></td>
       <td class='c-name' title="<?php echo $task->productName?>"><?php echo $task->productName?></td>
       <td class='c-name' title="<?php echo $task->executionName?>"><?php echo $task->executionName?></td>
-      <td class='c-name'><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', "data-group={$lang->navGroup->testtask}");?></td>
+      <td class='c-name'><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', "data-group=execution");?></td>
       <td title="<?php echo zget($users, $task->owner);?>"><?php echo zget($users, $task->owner);?></td>
       <td><?php echo $task->begin?></td>
       <td><?php echo $task->end?></td>
@@ -105,9 +105,9 @@ $status = $this->session->testTaskVersionStatus;
         echo '<div id="action-divider">';
         common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
         common::printIcon('testtask',   'linkCase', "taskID=$task->id&type=all&param=myQueryID", $task, 'list', 'link');
-        common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag');
+        common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag');
         echo '</div>';
-        common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt','','iframe',true);
+        common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, "data-width='90%'");
         common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list');
         if(common::hasPriv('testtask', 'delete', $task))
         {
diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php
index 8055836e6f..7e9c63ca74 100644
--- a/module/testtask/view/browseunits.html.php
+++ b/module/testtask/view/browseunits.html.php
@@ -27,7 +27,7 @@
       <div class='panel-body'>
         <div class='list-group'>
         <?php foreach($lang->testtask->unitTag as $key => $label):?>
-        <?php echo html::a(inlink('browseUnits', "productID=$productID&browseType=$key&orderBy=$orderBy"), "<span class='text'>$label</span>", '', "id='{$key}UnitTab' class='btn btn-link'");?>
+        <?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->openApp}'");?>
         <?php endforeach;?>
         </div>
       </div>
@@ -52,9 +52,9 @@
           <th class='text-left'>        <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
           <th class='c-user text-left'> <?php common::printOrderLink('owner',     $orderBy, $vars, $lang->testtask->owner);?></th>
           <th class='w-90px text-left'> <?php common::printOrderLink('begin',     $orderBy, $vars, $lang->testtask->execTime);?></th>
-          <th class='w-50px text-center'><?php echo $lang->testtask->caseCount;?></th>
-          <th class='w-40px text-center'><?php echo $lang->testtask->passCount;?></th>
-          <th class='w-40px text-center'><?php echo $lang->testtask->failCount;?></th>
+          <th class='w-60px text-center'><?php echo $lang->testtask->caseCount;?></th>
+          <th class='w-60px text-center'><?php echo $lang->testtask->passCount;?></th>
+          <th class='w-60px text-center'><?php echo $lang->testtask->failCount;?></th>
           <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
@@ -62,9 +62,9 @@
       <?php foreach($tasks as $task):?>
       <tr class='text-left'>
         <td><?php printf('%03d', $task->id);?></td>
-        <td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('unitCases', "taskID=$task->id"), $task->name);?></td>
+        <td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('unitCases', "taskID=$task->id"), $task->name, '', "data-app={$this->app->openApp}");?></td>
         <td class='c-name' title="<?php echo $task->executionName?>"><?php echo $task->executionName?></td>
-        <td class='c-name'><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build",'',true), $task->buildName);?></td>
+        <td class='c-name' title="<?php echo $task->buildName;?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', 'data-app="execution"');?></td>
         <td><?php echo zget($users, $task->owner);?></td>
         <td><?php echo $task->begin?></td>
         <td class='text-center'><?php echo $task->caseCount?></td>
@@ -72,12 +72,12 @@
         <td class='text-center fail'><?php echo $task->failCount?></td>
         <td class='c-actions'>
           <?php
-          common::printIcon('testtask',  'unitCases', "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, 'data-width="70%"');
-          common::printIcon('testtask',  'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+          common::printIcon('testtask',  'unitCases', "taskID=$task->id", '', 'list', 'list-alt');
+          common::printIcon('testtask',  'edit', "taskID=$task->id", $task, 'list');
           if(common::hasPriv('testtask', 'delete', $task))
           {
               $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
+              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testcase->delete}' class='btn'");
           }
           ?>
         </td>
diff --git a/module/testtask/view/caseheader.html.php b/module/testtask/view/caseheader.html.php
index dbeac032eb..167e1c3c15 100644
--- a/module/testtask/view/caseheader.html.php
+++ b/module/testtask/view/caseheader.html.php
@@ -18,8 +18,8 @@
     $hasGroupPriv = common::hasPriv('testtask', 'groupcase');
     ?>
     <?php
-    if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), "<span class='text'>{$lang->testtask->allCases}</span>", '', "id='allTab' class='btn btn-link'");
-    if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), "<span class='text'>{$lang->testtask->assignedToMe}</span>", '', "id='assignedtomeTab' class='btn btn-link'");
+    if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), "<span class='text'>{$lang->testtask->allCases}</span>", '', "id='allTab' class='btn btn-link' data-app='{$app->openApp}'");
+    if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), "<span class='text'>{$lang->testtask->assignedToMe}</span>", '', "id='assignedtomeTab' class='btn btn-link' data-app='{$app->openApp}'");
 
     if($hasGroupPriv)
     {
@@ -27,7 +27,7 @@
         $active   = !empty($groupBy) ? 'btn-active-text' : '';
 
         echo "<div id='groupTab' class='btn-group'>";
-        echo html::a($this->createLink('testtask', 'groupCase', "taskID=$taskID&groupBy=story"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active'");
+        echo html::a($this->createLink('testtask', 'groupCase', "taskID=$taskID&groupBy=story"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active' data-app='{$app->openApp}'");
         echo '</div>';
     }
 
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 3d6608cf3f..de900349e5 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.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('projectID', $this->session->PRJ);?>
+<?php js::set('projectID', $projectID);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -24,7 +24,7 @@
       <table class='table table-form'>
         <?php if(isset($executionID)):?>
         <tr>
-          <th class='w-80px'><?php echo $lang->testtask->product;?></th>
+          <th class='w-100px'><?php echo $lang->testtask->product;?></th>
           <td class='w-p35-f'><?php echo html::select('product', $products, $productID, "class='form-control chosen' onchange='loadProductRelated()'");?></td><td></td>
         </tr>
         <?php else:?>
@@ -35,21 +35,25 @@
         <?php endif;?>
         <tr>
           <th class='w-80px'><?php echo $lang->testtask->execution;?></th>
-          <td class='w-p35-f'><?php echo html::select('execution', $executions, '', "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?></td><td></td>
+          <td class='w-p35-f'><?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?></td><td></td>
         </tr>
         <tr>
           <th class='w-80px'><?php echo $lang->testtask->build;?></th>
           <td class='w-p35-f'>
             <div class='input-group' id='buildBox'>
-            <?php echo html::select('build', empty($builds) ? '' : $builds, $build, "class='form-control chosen'");?>
+            <?php echo html::select('build', empty($builds) ? '' : $builds, $build, "class='form-control chosen' onchange='loadTestReports(this.value)'");?>
             <?php if(isset($executionID) and $executionID and empty($builds)):?>
-            <span class='input-group-addon'><?php echo html::a(helper::createLink('build', 'create', "executionID=$executionID&productID=$productID", '', true), $lang->build->create, '', "data-toggle='modal' data-type='iframe' data-width='95%'")?> </span>
+            <span class='input-group-addon'><?php echo html::a(helper::createLink('build', 'create', "executionID=$executionID&productID=$productID&projectID=$projectID", '', true), $lang->build->create, '', "data-toggle='modal' data-type='iframe' data-width='95%'")?> </span>
             </div>
             <div class='hidden'><?php echo '&nbsp; ' .  html::a("javascript:void(0)", $lang->refresh, '', "class='refresh' onclick='loadExecutionBuilds($executionID)'");?></div>
             <?php endif;?>
           </td>
           <td></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->testtask->type;?></th>
+          <td><?php echo html::select('type[]', $lang->testtask->typeList, '', "class='form-control chosen' multiple");?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->owner;?></th>
           <td>
@@ -74,6 +78,10 @@
           <th><?php echo $lang->testtask->status;?></th>
           <td><?php echo html::select('status', $lang->testtask->statusList, '',  "class='form-control chosen'");?></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->testtask->testreport;?></th>
+          <td><?php echo html::select('testreport', $testreports, '',  "class='form-control chosen'");?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->name;?></th>
           <td colspan='2'><?php echo html::input('name', '', "class='form-control'");?></td>
@@ -82,6 +90,10 @@
           <th><?php echo $lang->testtask->desc;?></th>
           <td colspan='2'><?php echo html::textarea('desc', '', "rows=10 class='form-control'");?></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->files;?></th>
+          <td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->mailto;?></th>
           <td colspan='2'>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 05ad141a09..73ddc6c136 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -25,7 +25,7 @@
     <form method='post' class="main-form form-ajax" enctype="multipart/form-data" id='dataform'>
       <table class='table table-form'>
         <tr>
-          <th class='w-80px'><?php echo $lang->testtask->execution;?></th>
+          <th class='w-100px'><?php echo $lang->testtask->execution;?></th>
           <td class='w-p35-f'>
           <?php
           echo html::select('execution', $executions, $task->execution, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");
@@ -35,10 +35,14 @@
           <td></td>
         </tr>
         <tr>
-          <th class='w-80px'><?php echo $lang->testtask->build;?></th>
-          <td class='w-p35-f'><span id='buildBox'><?php echo html::select('build', $builds, $task->build, "class='form-control chosen'");?></span></td>
+          <th><?php echo $lang->testtask->build;?></th>
+          <td class='w-p35-f'><span id='buildBox'><?php echo html::select('build', $builds, $task->build, "class='form-control chosen' onchange='loadTestReports(this.value)'");?></span></td>
           <td></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->testtask->type;?></th>
+          <td><?php echo html::select('type[]', $lang->testtask->typeList, $task->type, "class='form-control chosen' multiple");?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->owner;?></th>
           <td>
@@ -63,6 +67,10 @@
           <th><?php echo $lang->testtask->status;?></th>
           <td><?php echo html::select('status', $lang->testtask->statusList, $task->status,  "class='form-control chosen'");?></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->testtask->testreport;?></th>
+          <td><?php echo html::select('testreport', $testreports, $task->testreport,  "class='form-control chosen'");?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->name;?></th>
           <td colspan='2'><?php echo html::input('name', $task->name, "class='form-control'");?></td>
@@ -75,6 +83,10 @@
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->files;?></th>
+          <td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->mailto;?></th>
           <td colspan='2'>
diff --git a/module/testtask/view/importunitresult.html.php b/module/testtask/view/importunitresult.html.php
index 20cb957717..2212a742e6 100644
--- a/module/testtask/view/importunitresult.html.php
+++ b/module/testtask/view/importunitresult.html.php
@@ -13,6 +13,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<style>
+.input-group>.chosen-container.required:after {top: 6px;}
+</style>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
@@ -92,11 +95,16 @@
             <?php echo html::submitButton();?>
             <?php echo html::backButton();?>
             <?php echo html::hidden('product', $productID);?>
-            <?php echo html::hidden('status', 'done');?>
           </td>
         </tr>
       </table>
     </form>
   </div>
 </div>
+<script>
+$(function()
+{
+    $('#subNavbar li[data-id="case"]').addClass('active');
+})
+</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 9cf7c72ab4..417c76c810 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -50,10 +50,12 @@
           <td class='w-60px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?></td>
           <td class='w-50px text-center'><i class='collapse-handle icon-angle-down text-muted'></i></td>
         </tr>
-        <?php $params = isset($testtask) ? ",testtask=$testtask->id,executionID=$testtask->execution,buildID=$testtask->build" : '';?>
+        <?php $executionParam = ($this->app->openApp == 'execution' and isset($testtask)) ? "executionID=$testtask->execution," : "executionID={$this->session->execution}";?>
+        <?php $params = isset($testtask) ? ",testtask=$testtask->id,{$executionParam}buildID=$testtask->build" : ",$executionParam";?>
         <tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
           <td colspan='7' class='pd-0'>
-            <form data-params='<?php echo "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . $params?>' method='post'>
+            <?php $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}," : ''?>
+            <form data-params='<?php echo "product=$case->product&branch=$case->branch&extras={$projectParam}caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . $params?>' method='post'>
               <table class='table table-condensed resultSteps'>
                 <thead>
                   <tr>
diff --git a/module/testtask/view/unitcases.html.php b/module/testtask/view/unitcases.html.php
index 9eef87c5b3..d4056aa96c 100644
--- a/module/testtask/view/unitcases.html.php
+++ b/module/testtask/view/unitcases.html.php
@@ -24,7 +24,8 @@ js::set('flow', $config->global->flow);
 <?php if($config->global->flow == 'full'):?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php common::printBack($this->createLink('testtask', 'browseUnits'), 'btn btn-primary');?>
+    <?php $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browseUnits');?>
+    <?php echo html::a($browseLink, '<i class="icon-goback icon-back"></i> ' . $lang->goback, '', "class='btn btn-secondary' data-app={$this->app->openApp}");?>
     <?php if(isonlybody()) echo "<div class='page-title'>{$task->name}</div>";?>
   </div>
   <div class='btn-toolbar pull-right <?php if(isonlybody()) echo 'hidden';?>'>
@@ -51,12 +52,7 @@ js::set('flow', $config->global->flow);
 <script>
 $(function()
 {
-    <?php if($this->config->global->flow == 'full'):?>
-    $('#subNavbar [data-id=testcase]').addClass('active');
-    <?php else:?>
-    $('#navbar li.active').removeClass('active');
-    $('#navbar li[data-id=unit]').addClass('active');
-    <?php endif;?>
+    $('#subNavbar li[data-id="case"]').addClass('active');
 })
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 20c0914883..c53de02334 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -33,6 +33,7 @@
         <div class="detail-title"><?php echo $lang->testtask->desc;?></div>
         <div class="detail-content article-content"><?php echo !empty($task->desc) ? $task->desc : $lang->noData;?></div>
       </div>
+      <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true', 'object' => $task));?>
       <?php if($task->report):?>
       <div class="detail">
         <div class="detail-title"><?php echo $lang->testtask->report;?></div>
@@ -79,7 +80,7 @@
           <table class="table table-data table-fixed">
             <?php $isOnlybody = helper::inOnlyBodyMode(); ?>
             <tr>
-              <th class='w-60px'><?php echo $lang->testtask->execution;?></th>
+              <th class='w-90px'><?php echo $lang->testtask->execution;?></th>
               <td><?php echo $isOnlybody ? $task->executionName : html::a($this->createLink('execution', 'story', "executionID=$task->execution"), $task->executionName, '', "title='{$task->executionName}'");?></td>
             </tr>
             <tr>
@@ -97,6 +98,12 @@
                 ?>
               </td>
             </tr>
+            <tr>
+              <th><?php echo $lang->testtask->type;?></th>
+              <?php $testType = '';?>
+              <?php foreach(explode(',', $task->type) as $type) $testType .= zget($lang->testtask->typeList, $type) . ' ';?>
+              <td class="c-name" title="<?php echo $testType;?>"><?php echo $testType;?></td>
+            </tr>
             <tr>
               <th><?php echo $lang->testtask->owner;?></th>
               <td><?php echo zget($users, $task->owner);?></td>
@@ -121,6 +128,10 @@
               <th><?php echo $lang->testtask->status;?></th>
               <td class='task-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>
             </tr>
+            <tr>
+              <th><?php echo $lang->testtask->testreport;?></th>
+              <td class="c-name" title="<?php echo $testreportTitle;?>"><?php echo empty($task->testreport) ? '' : html::a($this->createLink('testreport', 'view', "reportID=$task->testreport"), $testreportTitle);?></td>
+            </tr>
           </table>
         </div>
       </div>
diff --git a/module/todo/config.php b/module/todo/config.php
index c14dcd2da6..91e5d79ecf 100644
--- a/module/todo/config.php
+++ b/module/todo/config.php
@@ -27,4 +27,16 @@ $config->todo->custom = new stdclass();
 $config->todo->custom->batchCreateFields = 'type,pri,desc,beginAndEnd';
 $config->todo->custom->batchEditFields   = 'pri,beginAndEnd,status';
 
-$config->todo->moduleList = array('bug', 'task', 'story', 'issue', 'risk', 'review', 'testtask', 'feedback');
+$config->todo->moduleList = array('bug', 'task', 'story', 'testtask');
+
+$config->todo->getUserObjectsMethod = array();
+$config->todo->getUserObjectsMethod['bug']      = 'ajaxGetUserBugs';
+$config->todo->getUserObjectsMethod['task']     = 'ajaxGetUserTasks';
+$config->todo->getUserObjectsMethod['story']    = 'ajaxGetUserStories';
+$config->todo->getUserObjectsMethod['testtask'] = 'ajaxGetUserTestTasks';
+
+$config->todo->objectList = array();
+$config->todo->objectList['bug']      = 'bugs';
+$config->todo->objectList['task']     = 'tasks';
+$config->todo->objectList['story']    = 'stories';
+$config->todo->objectList['testtask'] = 'testtasks';
diff --git a/module/todo/control.php b/module/todo/control.php
index 3a011752ff..e938ff903e 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -24,7 +24,6 @@ class todo extends control
         $this->loadModel('task');
         $this->loadModel('bug');
         $this->loadModel('my')->setMenu();
-        if(!isset($this->config->qcVersion)) unset($this->lang->todo->typeList['review']);
     }
 
     /**
@@ -69,7 +68,8 @@ class todo extends control
                 $this->send(array('result' => 'success', 'id' => $todoID, 'name' => $todo->name, 'pri' => $todo->pri, 'priName' => $this->lang->todo->priList[$todo->pri], 'time' => date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin));
             }
 
-            if($this->app->getViewType() == 'xhtml') die(js::locate($this->createLink('todo', 'view', "todoID=$todoID"), 'parent'));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $todoID));
+            if($this->viewType == 'xhtml') die(js::locate($this->createLink('todo', 'view', "todoID=$todoID"), 'parent'));
             if(isonlybody()) die(js::closeModal('parent.parent'));
             die(js::locate($this->createLink('my', 'todo', "type=all&userID=&status=all&orderBy=id_desc"), 'parent'));
         }
@@ -96,7 +96,7 @@ class todo extends control
         if($date == 'today') $date = date(DT_DATE1, time());
         if(!empty($_POST))
         {
-            $this->todo->batchCreate();
+            $todoIDList = $this->todo->batchCreate();
             if(dao::isError()) die(js::error(dao::getError()));
 
             /* Locate the browser. */
@@ -109,6 +109,8 @@ class todo extends control
             {
                 $date= 'today';
             }
+
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $todoIDList));
             if(isonlybody())die(js::reload('parent.parent'));
             die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent'));
         }
@@ -191,16 +193,18 @@ class todo extends control
             $bugs      = $this->bug->getUserBugPairs($account);
             $tasks     = $this->task->getUserTaskPairs($account, $status);
             $storys    = $this->loadModel('story')->getUserStoryPairs($account);
+            if(isset($this->config->bizVersion) or isset($this->config->maxVersion)) $this->view->feedbacks = $this->loadModel('feedback')->getUserFeedbackPairs($account);
             if(isset($this->config->maxVersion))
             {
-                $issues = $this->loadModel('issue')->getUserIssuePairs($account);
-                $risks  = $this->loadModel('risk')->getUserRiskPairs($account);
+                $issues        = $this->loadModel('issue')->getUserIssuePairs($account);
+                $risks         = $this->loadmodel('risk')->getUserRiskPairs($account);
+                $opportunities = $this->loadmodel('opportunity')->getUserOpportunityPairs($account);
             }
             $testtasks = $this->loadModel('testtask')->getUserTestTaskPairs($account);
 
             $reviews = array();
-            if(isset($this->config->qcVersion)) $reviews = $this->loadModel('review')->getUserReviewPairs($account);
-            $allTodos  = $this->todo->getList($type, $account, $status);
+            if(isset($this->config->qcVersion) or isset($this->config->maxVersion)) $reviews = $this->loadModel('review')->getUserReviewPairs($account);
+            $allTodos = $this->todo->getList($type, $account, $status);
             if($this->post->todoIDList) $todoIDList = $this->post->todoIDList;
 
             /* Initialize todos whose need to edited. */
@@ -211,21 +215,6 @@ class todo extends control
                     $editedTodos[$todo->id] = $todo;
                 }
             }
-            foreach($editedTodos as $todo)
-            {
-                if($todo->type == 'story')    $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_STORY)->fetch('title');
-                if($todo->type == 'task')     $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name');
-                if($todo->type == 'bug')      $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_BUG)->fetch('title');
-                if(isset($this->config->maxVersion))
-                {
-                    if($todo->type == 'issue') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
-                    if($todo->type == 'risk')  $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
-                }
-                if($todo->type == 'review')   $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
-                if($todo->type == 'testtask') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TESTTASK)->fetch('name');
-                $todo->begin = $todo->begin ? str_replace(':', '', $todo->begin) : '2400';
-                $todo->end   = $todo->end ? str_replace(':', '', $todo->end) : '2400';
-            }
 
             /* Judge whether the edited todos is too large. */
             $countInputVars  = count($editedTodos) * $columns;
@@ -250,8 +239,9 @@ class todo extends control
             $this->view->storys      = $storys;
             if(isset($this->config->maxVersion))
             {
-                $this->view->issues = $issues;
-                $this->view->risks  = $risks;
+                $this->view->issues        = $issues;
+                $this->view->risks         = $risks;
+                $this->view->opportunities = $opportunities;
             }
             $this->view->reviews     = $reviews;
             $this->view->testtasks   = $testtasks;
@@ -294,8 +284,12 @@ class todo extends control
         {
             $confirmNote = 'confirm' . ucfirst($todo->type);
             $confirmURL  = $this->createLink($todo->type, 'view', "id=$todo->idvalue");
+            $okTarget    = isonlybody() ? 'parent' : 'window.parent.$.apps.open';
+            if($todo->type == 'bug')   $app = 'qa';
+            if($todo->type == 'task')  $app = 'execution';
+            if($todo->type == 'story') $app = 'product';
             $cancelURL   = $this->server->HTTP_REFERER;
-            die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, 'parent', 'parent'));
+            die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
         }
         if(isonlybody())die(js::reload('parent.parent'));
         die(js::reload('parent'));
@@ -372,8 +366,11 @@ class todo extends control
         if(!$todo) die(js::error($this->lang->notFound) . js::locate('back'));
 
         /* Save the session. */
-        $this->session->set('taskList', $this->app->getURI(true));
-        $this->session->set('bugList',  $this->app->getURI(true));
+        $uri = $this->app->getURI(true);
+        $this->session->set('bugList',      $uri, 'qa');
+        $this->session->set('taskList',     $uri, 'execution');
+        $this->session->set('storyList',    $uri, 'product');
+        $this->session->set('testtaskList', $uri, 'qa');
 
         /* Fix bug #936. */
         if($this->app->user->account != $todo->account and !common::hasPriv('company', 'index'))
@@ -381,26 +378,11 @@ class todo extends control
             $this->locate($this->createLink('user', 'deny', "module=company&method=index"));
         }
 
-        /* Set menus. */
         $this->loadModel('user');
-        if($from == 'company')
-        {
-            $this->lang->todo->menu      = $this->lang->user->menu;
-            $this->lang->todo->menuOrder = $this->lang->user->menuOrder;
-            $this->lang->company->menu->browseUser['subModule'] = 'todo';
-            $this->lang->set('menugroup.todo', $from);
-        }
-        elseif($from == 'my')
-        {
-            $this->lang->todo->menu      = $this->lang->my->menu;
-            $this->lang->todo->menuOrder = $this->lang->my->menuOrder;
-            $this->loadModel('my')->setMenu();
-            $this->lang->my->menu->todo['subModule'] = 'todo';
-            $this->lang->set('menugroup.todo', $from);
-        }
 
-        $projects = $this->loadModel('project')->getPairsByModel('all');
-        if(!isset($this->session->PRJ)) $this->session->set('project', key($projects));
+        $model = $todo->type == 'opportunity' ? 'waterfall' : 'all';
+        $projects = $this->loadModel('project')->getPairsByModel($model);
+        if(!isset($this->session->project)) $this->session->set('project', key($projects));
 
         $this->view->title           = $this->app->user->account == $todo->account ? "{$this->lang->todo->common} #$todo->id $todo->name" : $this->lang->todo->common ;
         $this->view->position[]      = $this->lang->todo->view;
@@ -411,9 +393,9 @@ class todo extends control
         $this->view->actions         = $this->loadModel('action')->getList('todo', $todoID);
         $this->view->from            = $from;
         $this->view->projects        = $projects;
-        $this->view->executions      = $this->loadModel('execution')->getPairs($this->session->PRJ);
-        $this->view->products        = $this->loadModel('product')->getPairs();
-        $this->view->projectProducts = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $this->view->executions      = $this->loadModel('execution')->getPairs($this->session->project);
+        $this->view->products        = $todo->type == 'opportunity' ? $this->loadModel('product')->getPairsByProjectModel('waterfall') : $this->loadModel('product')->getPairs();
+        $this->view->projectProducts = $this->loadModel('product')->getProductPairsByProject($this->session->project);
 
         $this->display();
     }
@@ -435,8 +417,7 @@ class todo extends control
         }
         else
         {
-            $this->dao->delete()->from(TABLE_TODO)->where('id')->eq($todoID)->exec();
-            $this->loadModel('action')->create('todo', $todoID, 'erased');
+            $this->todo->delete(TABLE_TODO, $todoID);
 
             /* if ajax request, send result. */
             if($this->server->ajax)
@@ -474,9 +455,13 @@ class todo extends control
         if(in_array($todo->type, array('bug', 'task', 'story')))
         {
             $confirmNote = 'confirm' . ucfirst($todo->type);
+            $okTarget    = isonlybody() ? 'parent' : 'window.parent.$.apps.open';
             $confirmURL  = $this->createLink($todo->type, 'view', "id=$todo->idvalue");
+            if($todo->type == 'bug')   $app = 'qa';
+            if($todo->type == 'task')  $app = 'execution';
+            if($todo->type == 'story') $app = 'product';
             $cancelURL   = $this->server->HTTP_REFERER;
-            die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, 'parent', 'parent'));
+            die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
         }
         if(isonlybody())die(js::reload('parent.parent'));
         die(js::reload('parent'));
@@ -576,8 +561,9 @@ class todo extends control
             $tasks     = $this->loadModel('task')->getUserTaskPairs($account);
             if(isset($this->config->maxVersion))
             {
-                $issues = $this->loadModel('issue')->getUserIssuePairs($account);
-                $risks  = $this->loadModel('risk')->getUserRiskPairs($account);
+                $issues        = $this->loadModel('issue')->getUserIssuePairs($account);
+                $risks         = $this->loadModel('risk')->getUserRiskPairs($account);
+                $opportunities = $this->loadModel('opprotunity')->getUserOpportunityPairs($account);
             }
             $testTasks = $this->loadModel('testtask')->getUserTesttaskPairs($account);
             if(isset($this->config->qcVersion)) $reviews = $this->loadModel('review')->getUserReviewPairs($account, 0, 'wait');
@@ -599,6 +585,7 @@ class todo extends control
                 {
                     if($type == 'issue') $todo->name = isset($issues[$todo->idvalue]) ? $issues[$todo->idvalue] . "(#$todo->idvalue)" : '';
                     if($type == 'risk')  $todo->name = isset($risks[$todo->idvalue])  ? $risks[$todo->idvalue] . "(#$todo->idvalue)" : '';
+                    if($type == 'opportunity')  $todo->name = isset($opportunities[$todo->idvalue])  ? $opportunities[$todo->idvalue] . "(#$todo->idvalue)" : '';
                 }
                 if($type == 'testtask')           $todo->name    = isset($testTasks[$todo->idvalue]) ? $testTasks[$todo->idvalue] . "(#$todo->idvalue)" : '';
                 if($type == 'review' && isset($this->config->qcVersion)) $todo->name = isset($reviews[$todo->idvalue]) ? $reviews[$todo->idvalue] . "(#$todo->idvalue)" : '';
@@ -681,7 +668,7 @@ class todo extends control
         $this->session->set('project', $projectID);
 
         $products = $this->loadModel('product')->getProductPairsByProject($projectID);
-        die(html::select('product', $products, '', "class='form-control chosen'"));
+        die(html::select('bugProduct', $products, '', "class='form-control chosen'"));
     }
 
     /**
@@ -692,7 +679,7 @@ class todo extends control
      */
     public function createCycle()
     {
-        $todoList = $this->dao->select('*')->from(TABLE_TODO)->where('cycle')->eq(1)->fetchAll('id');
+        $todoList = $this->dao->select('*')->from(TABLE_TODO)->where('cycle')->eq(1)->andWhere('deleted')->eq(0)->fetchAll('id');
         $this->todo->createByCycle($todoList);
     }
 }
diff --git a/module/todo/css/batchcreate.css b/module/todo/css/batchcreate.css
index 222fe0e42e..19576bc2ab 100755
--- a/module/todo/css/batchcreate.css
+++ b/module/todo/css/batchcreate.css
@@ -16,3 +16,7 @@ html[lang="en"] .main-header > .input-group {width: 250px;}
 
 #formSettingBtn {position: absolute; top: 14px; right: 20px; z-index: 1000;}
 #formSettingBtn .dropdown {margin-right: 0px;}
+#formSettingBtn #formSetting {padding: 10px 12px;}
+#formSettingBtn .checkboxes {padding: 10px 3px;}
+#formSettingBtn .checkbox-primary {width: 50%; float: left; margin: 3px 0;}
+#formSetting .btn {margin-right: 8px;}
diff --git a/module/todo/js/common.js b/module/todo/js/common.js
index 65789831af..bd8e00ce07 100644
--- a/module/todo/js/common.js
+++ b/module/todo/js/common.js
@@ -25,36 +25,12 @@ function loadList(type, id)
 
     var param = 'userID=' + userID;
     if(id) param += '&id=' + id;
-    if(type == 'bug')
+    if(moduleList.indexOf(type) !== -1)
     {
-        link = createLink('bug', 'ajaxGetUserBugs', param);
-    }
-    else if(type == 'task')
-    {
-        link = createLink('task', 'ajaxGetUserTasks', param);
-    }
-    else if(type == 'story')
-    {
-        link = createLink('story', 'ajaxGetUserStories', param);
-    }
-    else if(type == 'issue')
-    {
-        link = createLink('issue', 'ajaxGetUserIssues', param);
-    }
-    else if(type == 'risk')
-    {
-        link = createLink('risk', 'ajaxGetUserRisks', param);
-    }
-    else if(type == 'testtask')
-    {
-        link = createLink('testtask', 'ajaxGetUserTestTasks', param);
-    }
-    else if(type == 'review')
-    {
-        link = createLink('review', 'ajaxGetUserReviews', param);
+        link = createLink(type, objectsMethod[type], param);
     }
 
-    if(type == 'bug' || type == 'task' || type == 'story' || type == 'issue' || type == 'risk' || type == 'testtask' || type == 'review' )
+    if(moduleList.indexOf(type) !== -1)
     {
         $.get(link, function(data, status)
         {
diff --git a/module/todo/js/view.js b/module/todo/js/view.js
index 70b1d6c92b..f5919b9bbf 100644
--- a/module/todo/js/view.js
+++ b/module/todo/js/view.js
@@ -31,7 +31,6 @@ $(function()
     {
         var onlybody  = config.onlybody;
         var programID = $('#productProgram').val();
-
         var productID = $('#product').val();
         var link      = createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&projectID=0&bugID=0&planID=0&todoID=' + todoID, config.defaultView, 'no', programID);
 
@@ -41,9 +40,8 @@ $(function()
     $('#toBugButton').click(function()
     {
         var onlybody  = config.onlybody;
-        var projectID = $('#project').val();
-
-        var productID = $('#product').val();
+        var projectID = $('#bugProject').val();
+        var productID = $('#bugProduct').val();
         var link      = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, 'no', projectID);
 
         location.href = link;
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 26dffdeb3c..7d1eb36eaa 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -97,7 +97,6 @@ $lang->todo->typeList['cycle']    = 'Wiederkehrend';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = 'Aufgabe';
 $lang->todo->typeList['story']    = 'Story';
-$lang->todo->typeList['review']   = 'Review';
 $lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Möchten Sie diesen ToDo löschen?";
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index c1b5da7221..2028431127 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -68,6 +68,7 @@ $lang->todo->finishedDate = 'FinishedDate';
 $lang->todo->closedBy     = 'ClosedBy';
 $lang->todo->closedDate   = 'ClosedDate';
 $lang->todo->deadline     = 'Expiration';
+$lang->todo->deleted      = 'Deleted';
 
 $lang->todo->every        = 'Every';
 $lang->todo->specify      = 'Specify';
@@ -97,7 +98,6 @@ $lang->todo->typeList['cycle']    = 'Recur';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = 'Task';
 $lang->todo->typeList['story']    = 'Story';
-$lang->todo->typeList['review']   = 'Review';
 $lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Do you want to delete this todo?";
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 89ccead940..dbd582426a 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -97,7 +97,6 @@ $lang->todo->typeList['cycle']    = 'Récur';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = 'Tâche';
 $lang->todo->typeList['story']    = 'Story';
-$lang->todo->typeList['review']   = 'Review';
 $lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Voulez-vous supprimer cette entrée de l'agenda ?";
diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php
index 7230793679..9a3a86806d 100644
--- a/module/todo/lang/vi.php
+++ b/module/todo/lang/vi.php
@@ -97,7 +97,6 @@ $lang->todo->typeList['cycle']    = 'Lặp lại';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = 'Nhiệm vụ';
 $lang->todo->typeList['story']    = 'Câu chuyện';
-$lang->todo->typeList['review']   = 'Review';
 $lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Bạn có muốn xóa việc này?";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 8c4951edb2..6121619b1d 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期设置";
 $lang->todo->project      = "所属项目";
 $lang->todo->product      = "所属产品";
-$lang->todo->execution    = "所属" . $lang->sprintCommon;
+$lang->todo->execution    = "所属执行";
 
 $lang->todo->reasonList['story'] = "转{$lang->SRCommon}";
 $lang->todo->reasonList['task']  = "转任务";
@@ -68,6 +68,7 @@ $lang->todo->finishedDate = '完成时间';
 $lang->todo->closedBy     = '由谁关闭';
 $lang->todo->closedDate   = '关闭时间';
 $lang->todo->deadline     = '过期时间';
+$lang->todo->deleted      = '已删除';
 
 $lang->todo->every        = '间隔';
 $lang->todo->specify      = '指定';
@@ -97,7 +98,6 @@ $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = '任务';
 $lang->todo->typeList['story']    = $lang->SRCommon;
-$lang->todo->typeList['review']   = '评审';
 $lang->todo->typeList['testtask'] = '测试单';
 
 $lang->todo->confirmDelete  = "您确定要删除这条待办吗？";
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index cfc4546b19..d7f8c9d3d5 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期設置";
 $lang->todo->project      = "所屬項目";
 $lang->todo->product      = "所屬產品";
-$lang->todo->execution    = "所屬" . $lang->sprintCommon;
+$lang->todo->execution    = "所屬執行";
 
 $lang->todo->reasonList['story'] = "轉{$lang->SRCommon}";
 $lang->todo->reasonList['task']  = "轉任務";
@@ -68,6 +68,7 @@ $lang->todo->finishedDate = '完成時間';
 $lang->todo->closedBy     = '由誰關閉';
 $lang->todo->closedDate   = '關閉時間';
 $lang->todo->deadline     = '過期時間';
+$lang->todo->deleted      = '已刪除';
 
 $lang->todo->every        = '間隔';
 $lang->todo->specify      = '指定';
@@ -96,9 +97,7 @@ $lang->todo->typeList['custom']   = '自定義';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = '任務';
-$lang->todo->typeList['story']    = '軟需';
-$lang->todo->typeList['issue']    = '問題';
-$lang->todo->typeList['risk']     = '風險';
+$lang->todo->typeList['story']    = $lang->SRCommon;
 $lang->todo->typeList['review']   = '評審';
 $lang->todo->typeList['testtask'] = '測試單';
 
diff --git a/module/todo/model.php b/module/todo/model.php
index b782497287..6c8acbd854 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -26,6 +26,7 @@ class todoModel extends model
 
         $idvalue = 0;
         if($hasObject && $objectType) $idvalue = $this->post->uid ? $this->post->$objectType : $this->post->idvalue;
+
         $todo = fixer::input('post')
             ->add('account', $this->app->user->account)
             ->setDefault('idvalue', 0)
@@ -38,6 +39,23 @@ class todoModel extends model
             ->remove(implode(',', $this->config->todo->moduleList) . ',uid')
             ->get();
 
+        if(!isset($todo->pri) and in_array($this->post->type, $this->config->todo->moduleList) and $this->post->type !== 'review' and $this->post->type !== 'feedback')
+        {
+            $todo->pri = $this->dao->select('pri')->from($this->config->objectTables[$this->post->type])->where('id')->eq($this->post->idvalue)->fetch('pri');
+
+            if($todo->pri == 'high')   $todo->pri = 1;
+            if($todo->pri == 'middle') $todo->pri = 2;
+            if($todo->pri == 'low')    $todo->pri = 3;
+        }
+
+        if($todo->type != 'custom')
+        {
+            $type   = $todo->type;
+            $object = $this->loadModel($type)->getByID($this->post->$type);
+            if(isset($object->name))  $todo->name = $object->name;
+            if(isset($object->title)) $todo->name = $object->title;
+        }
+
         if($todo->end < $todo->begin)
         {
             dao::$errors[] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
@@ -93,7 +111,7 @@ class todoModel extends model
      * Create batch todo
      *
      * @access public
-     * @return void
+     * @return array
      */
     public function batchCreate()
     {
@@ -102,7 +120,17 @@ class todoModel extends model
         $validTodos = array();
         for($i = 0; $i < $this->config->todo->batchCreate; $i++)
         {
-            if($todos->names[$i] != '' || isset($todos->bugs[$i + 1]) || isset($todos->tasks[$i + 1]) || isset($todos->stories[$i + 1]) || isset($todos->issues[$i + 1]) || isset($todos->risks[$i + 1]) || isset($todos->reviews[$i + 1]) || isset($todos->testtask[$i + 1]))
+            $isExist = false;
+            foreach($this->config->todo->objectList as $objects)
+            {
+                if(isset($todos->{$objects}[$i + 1]))
+                {
+                    $isExist = true;
+                    break;
+                }
+            }
+
+            if($todos->names[$i] != '' || $isExist)
             {
                 $todo          = new stdclass();
                 $todo->account = $this->app->user->account;
@@ -125,13 +153,15 @@ class todoModel extends model
                 $todo->private = 0;
                 $todo->idvalue = 0;
 
-                if($todo->type == 'bug')      $todo->idvalue = isset($todos->bugs[$i + 1])      ? $todos->bugs[$i + 1] : 0;
-                if($todo->type == 'task')     $todo->idvalue = isset($todos->tasks[$i + 1])     ? $todos->tasks[$i + 1] : 0;
-                if($todo->type == 'story')    $todo->idvalue = isset($todos->stories[$i + 1])   ? $todos->stories[$i + 1] : 0;
-                if($todo->type == 'issue')    $todo->idvalue = isset($todos->issues[$i + 1])    ? $todos->issues[$i + 1] : 0;
-                if($todo->type == 'risk')     $todo->idvalue = isset($todos->risks[$i + 1])     ? $todos->risks[$i + 1] : 0;
-                if($todo->type == 'review')   $todo->idvalue = isset($todos->reviews[$i + 1])   ? $todos->reviews[$i + 1] : 0;
-                if($todo->type == 'testtask') $todo->idvalue = isset($todos->testtasks[$i + 1]) ? $todos->testtasks[$i + 1] : 0;
+                if(in_array($todo->type, $this->config->todo->moduleList)) $todo->idvalue = isset($todos->{$this->config->todo->objectList[$todo->type]}[$i + 1]) ? $todos->{$this->config->todo->objectList[$todo->type]}[$i + 1] : 0;
+
+                if($todo->type != 'custom' and $todo->idvalue)
+                {
+                    $type   = $todo->type;
+                    $object = $this->loadModel($type)->getByID($todo->idvalue);
+                    if(isset($object->name))  $todo->name = $object->name;
+                    if(isset($object->title)) $todo->name = $object->title;
+                }
 
                 if($todo->end < $todo->begin) die(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
 
@@ -148,6 +178,7 @@ class todoModel extends model
             }
         }
 
+        $todoIDList = array();
         foreach($validTodos as $todo)
         {
             $this->dao->insert(TABLE_TODO)->data($todo)->autoCheck()->exec();
@@ -156,10 +187,13 @@ class todoModel extends model
                 echo js::error(dao::getError());
                 die(js::reload('parent'));
             }
-            $todoID = $this->dao->lastInsertID();
+            $todoID       = $this->dao->lastInsertID();
+            $todoIDList[] = $todoID;
             $this->loadModel('score')->create('todo', 'create', $todoID);
             $this->loadModel('action')->create('todo', $todoID, 'opened');
         }
+
+        return $todoIDList;
     }
 
     /**
@@ -187,7 +221,7 @@ class todoModel extends model
             ->setIF($this->post->end   == false, 'end', '2400')
             ->setDefault('private', 0)
             ->stripTags($this->config->todo->editor->edit['id'], $this->config->allowedTags)
-            ->remove(implode(',', $this->config->todo->moduleList) . 'uid')
+            ->remove(implode(',', $this->config->todo->moduleList) . ',uid')
             ->get();
 
         if($todo->end < $todo->begin)
@@ -225,7 +259,7 @@ class todoModel extends model
         $todo = $this->loadModel('file')->processImgURL($todo, $this->config->todo->editor->edit['id'], $this->post->uid);
         $this->dao->update(TABLE_TODO)->data($todo)
             ->autoCheck()
-            ->checkIF($todo->type == 'custom', $this->config->todo->edit->requiredFields, 'notempty')
+            ->checkIF(in_array($todo->type, array('custom', 'feedback')), $this->config->todo->edit->requiredFields, 'notempty')
             ->checkIF($hasObject && $todo->idvalue == 0, 'idvalue', 'notempty')
             ->where('id')->eq($todoID)
             ->exec();
@@ -260,18 +294,14 @@ class todoModel extends model
                 $todo->type   = $data->types[$todoID];
                 $todo->pri    = $data->pris[$todoID];
                 $todo->status = $data->status[$todoID];
-                $todo->name   = ($todo->type == 'custom' or $todo->type == 'cycle') ? $data->names[$todoID] : '';
+                $todo->name   = ($todo->type == 'custom' or $todo->type == 'cycle' or $todo->type == 'feedback') ? $data->names[$todoID] : '';
                 $todo->begin  = isset($data->begins[$todoID]) ? $data->begins[$todoID] : 2400;
                 $todo->end    = isset($data->ends[$todoID]) ? $data->ends[$todoID] : 2400;
-                if($todo->type == 'task')     $todo->idvalue = isset($data->tasks[$todoID]) ? $data->tasks[$todoID] : 0;
-                if($todo->type == 'bug')      $todo->idvalue = isset($data->bugs[$todoID]) ? $data->bugs[$todoID] : 0;
-                if($todo->type == 'story')    $todo->idvalue = isset($data->storys[$todoID]) ? $data->storys[$todoID] : 0;
-                if($todo->type == 'issue')    $todo->idvalue = isset($data->issues[$todoID]) ? $data->issues[$todoID] : 0;
-                if($todo->type == 'risk')     $todo->idvalue = isset($data->risks[$todoID]) ? $data->risks[$todoID] : 0;
-                if($todo->type == 'review')   $todo->idvalue = isset($data->reviews[$todoID]) ? $data->reviews[$todoID] : 0;
-                if($todo->type == 'testtask') $todo->idvalue = isset($data->testtasks[$todoID]) ? $data->testtasks[$todoID] : 0;
-                if($todo->type == 'feedback') $todo->idvalue = isset($data->feedbacks[$todoID]) ? $data->feedbacks[$todoID] : 0;
 
+                if(in_array($todo->type, $this->config->todo->moduleList))
+                {
+                    $todo->idvalue = isset($data->{$this->config->todo->objectList[$todo->type]}[$todoID]) ? $data->{$this->config->todo->objectList[$todo->type]}[$todoID] : 0;
+                }
                 if($todo->end < $todo->begin) die(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
 
                 $todos[$todoID] = $todo;
@@ -284,12 +314,13 @@ class todoModel extends model
                 if($oldTodo->type == 'bug' or $oldTodo->type == 'task' or $oldTodo->type == 'story' or $oldTodo->type == 'feedback') $oldTodo->name = '';
                 $this->dao->update(TABLE_TODO)->data($todo)
                     ->autoCheck()
-                    ->checkIF($todo->type == 'custom', $this->config->todo->edit->requiredFields, 'notempty')
+                    ->checkIF(in_array($todo->type, array('custom', 'feedback')), $this->config->todo->edit->requiredFields, 'notempty')
                     ->checkIF($todo->type == 'bug'   and $todo->idvalue == 0, 'idvalue', 'notempty')
                     ->checkIF($todo->type == 'task'  and $todo->idvalue == 0, 'idvalue', 'notempty')
                     ->checkIF($todo->type == 'story' and $todo->idvalue == 0, 'idvalue', 'notempty')
                     ->checkIF($todo->type == 'issue' and $todo->idvalue == 0, 'idvalue', 'notempty')
                     ->checkIF($todo->type == 'risk' and $todo->idvalue == 0, 'idvalue', 'notempty')
+                    ->checkIF($todo->type == 'opportunity' and $todo->idvalue == 0, 'idvalue', 'notempty')
                     ->checkIF($todo->type == 'review' and $todo->idvalue == 0, 'idvalue', 'notempty')
                     ->checkIF($todo->type == 'testtask' and $todo->idvalue == 0, 'idvalue', 'notempty')
                     ->checkIF($todo->type == 'feedback' and $todo->idvalue == 0, 'idvalue', 'notempty')
@@ -363,9 +394,10 @@ class todoModel extends model
         if($todo->type == 'story')    $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_STORY)->fetch('title');
         if($todo->type == 'task')     $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name');
         if($todo->type == 'bug')      $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_BUG)->fetch('title');
-        if($todo->type == 'issue')    $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
-        if($todo->type == 'risk')     $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
-        if($todo->type == 'review')   $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
+        if($todo->type == 'issue'  and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
+        if($todo->type == 'risk'   and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
+        if($todo->type == 'opportunity' and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_OPPORTUNITY)->fetch('name');
+        if($todo->type == 'review' and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
         if($todo->type == 'testtask') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TESTTASK)->fetch('name');
         $todo->date = str_replace('-', '', $todo->date);
         return $todo;
@@ -450,7 +482,7 @@ class todoModel extends model
         if(empty($account)) $account = $this->app->user->account;
 
         $stmt = $this->dao->select('*')->from(TABLE_TODO)
-            ->where('1')
+            ->where('deleted')->eq('0')
             ->andWhere('account', true)->eq($account)
             ->orWhere('assignedTo')->eq($account)
             ->orWhere('finishedBy')->eq($account)
@@ -480,6 +512,7 @@ class todoModel extends model
             if($todo->type == 'testtask') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TESTTASK)->fetch('name');
             if($todo->type == 'issue'  && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
             if($todo->type == 'risk'   && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
+            if($todo->type == 'opportunity' && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_OPPORTUNITY)->fetch('name');
             if($todo->type == 'review' && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
             $todo->begin = date::formatTime($todo->begin);
             $todo->end   = date::formatTime($todo->end);
@@ -499,8 +532,8 @@ class todoModel extends model
      * @access public
      * @return object
      */
-    public function getByList($todoIDList = 0) 
-    {    
+    public function getByList($todoIDList = 0)
+    {
         return $this->dao->select('*')->from(TABLE_TODO)
             ->beginIF($todoIDList)->where('id')->in($todoIDList)->fi()
             ->fetchAll('id');
@@ -545,7 +578,7 @@ class todoModel extends model
         $this->loadModel('action');
         $today = helper::today();
         $now   = helper::now();
-        $lastCycleList = $this->dao->select('*')->from(TABLE_TODO)->where('type')->eq('cycle')->andWhere('idvalue')->in(array_keys($todoList))->orderBy('date_asc')->fetchAll('idvalue');
+        $lastCycleList = $this->dao->select('*')->from(TABLE_TODO)->where('type')->eq('cycle')->andWhere('deleted')->eq('0')->andWhere('idvalue')->in(array_keys($todoList))->orderBy('date_asc')->fetchAll('idvalue');
         $activedUsers  = $this->dao->select('account')->from(TABLE_USER)->where('deleted')->eq(0)->fetchPairs('account', 'account');
         foreach($todoList as $todoID => $todo)
         {
@@ -698,9 +731,9 @@ class todoModel extends model
     }
 
     /**
-     * Assign todo. 
-     * 
-     * @param  int    $todoID 
+     * Assign todo.
+     *
+     * @param  int    $todoID
      * @access public
      * @return bool
      */
@@ -722,8 +755,8 @@ class todoModel extends model
 
     /**
      * Get todo count.
-     * 
-     * @param  string $account 
+     *
+     * @param  string $account
      * @access public
      * @return int
      */
@@ -732,6 +765,7 @@ class todoModel extends model
         if(empty($account)) $account = $this->app->user->account;
         return $this->dao->select('count(*) as count')->from(TABLE_TODO)
             ->where('cycle')->eq('0')
+            ->andWhere('deleted')->eq('0')
             ->andWhere('account', true)->eq($account)
             ->orWhere('assignedTo')->eq($account)
             ->orWhere('finishedBy')->eq($account)
@@ -763,6 +797,7 @@ class todoModel extends model
             if($type == 'bug')      $projectIdList[$type] = $this->dao->select('id,project')->from(TABLE_BUG)->where('id')->in($todoIdList)->fetchPairs('id', 'project');
             if($type == 'issue')    $projectIdList[$type] = $this->dao->select('id,project')->from(TABLE_ISSUE)->where('id')->in($todoIdList)->fetchPairs('id', 'project');
             if($type == 'risk')     $projectIdList[$type] = $this->dao->select('id,project')->from(TABLE_RISK)->where('id')->in($todoIdList)->fetchPairs('id', 'project');
+            if($type == 'opportunity') $projectIdList[$type] = $this->dao->select('id,project')->from(TABLE_OPPORTUNITY)->where('id')->in($todoIdList)->fetchPairs('id', 'project');
             if($type == 'review')   $projectIdList[$type] = $this->dao->select('id,project')->from(TABLE_REVIEW)->where('id')->in($todoIdList)->fetchPairs('id', 'project');
             if($type == 'testtask') $projectIdList[$type] = $this->dao->select('id,project')->from(TABLE_TESTTASK)->where('id')->in($todoIdList)->fetchPairs('id', 'project');
         }
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index fbe62153aa..1d1b307da9 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -12,7 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-
+<?php js::set('moduleList', $config->todo->moduleList)?>
+<?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <form id='todoBatchAddForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'batchCreate');?>'>
   <div id="mainContent">
     <div class="main-header">
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 3c1a61ba59..e3efe5ad05 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php js::set('moduleList', $config->todo->moduleList)?>
+<?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
     <h2><?php echo $lang->todo->common . $lang->colon . $lang->todo->batchEdit;?></h2>
@@ -69,7 +71,7 @@
           <?php
           if($todo->type == 'custom' or $todo->type == 'cycle')
           {
-              echo html::input("names[$todo->id]", $todo->name, "class='form-control'"); ;
+              echo html::input("names[$todo->id]", $todo->name, "class='form-control'");
           }
           elseif($todo->type == 'task')
           {
@@ -81,7 +83,7 @@
           }
           elseif($todo->type == 'story')
           {
-              echo html::select("storys[$todo->id]", $storys, $todo->idvalue, 'class="form-control chosen"');
+              echo html::select("stories[$todo->id]", $storys, $todo->idvalue, 'class="form-control chosen"');
           }
           elseif($todo->type == 'issue')
           {
@@ -99,6 +101,14 @@
           {
               echo html::select("testtasks[$todo->id]", $testtasks, $todo->idvalue, 'class="form-control chosen"');
           }
+          elseif($todo->type == 'opportunity')
+          {
+              echo html::select("opportunities[$todo->id]", $opportunities, $todo->idvalue, 'class="form-control chosen"');
+          }
+          elseif($todo->type == 'feedback')
+          {
+              echo html::select("feedbacks[$todo->id]", $feedbacks, $todo->idvalue, 'class="form-control chosen"');
+          }
           ?>
           </div>
         </td>
@@ -106,13 +116,13 @@
         <td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
           <div class='input-group'>
             <?php
-            echo html::select("begins[$todo->id]", $times, $todo->begin, "onchange=\"setBeginsAndEnds($todo->id, 'begin');\" class='form-control chosen control-time-begin'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
+            echo html::select("begins[$todo->id]", $times, substr($todo->begin, 0, 2) . substr($todo->begin, 3, 2), "onchange=\"setBeginsAndEnds($todo->id, 'begin');\" class='form-control chosen control-time-begin'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '') ? '' : " disabled"));
             echo '<span class="input-group-addon fix-border fix-padding"></span>';
-            echo html::select("ends[$todo->id]", $times, $todo->end, "onchange=\"setBeginsAndEnds($todo->id, 'end');\" class='form-control chosen control-time-end'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
+            echo html::select("ends[$todo->id]", $times, substr($todo->end, 0, 2) . substr($todo->end, 3, 2), "onchange=\"setBeginsAndEnds($todo->id, 'end');\" class='form-control chosen control-time-end'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '') ? '' : " disabled"));
             ?>
             <span class="input-group-addon">
               <div class='checkbox-primary dateSwitcher'>
-                <input type='checkbox' name="switchTime[<?php echo $todo->id;?>]" id="switchTime<?php echo $todo->id;?>" data-key="<?php echo $todo->id;?>" onclick='switchTimeList(<?php echo $todo->id?>);' <?php if($todo->begin == '2400') echo "checked='checked'";?>>
+                <input type='checkbox' name="switchTime[<?php echo $todo->id;?>]" id="switchTime<?php echo $todo->id;?>" data-key="<?php echo $todo->id;?>" onclick='switchTimeList(<?php echo $todo->id?>);' <?php if($todo->begin == '') echo "checked='checked'";?>>
                 <label for='switchTime'><?php echo $lang->todo->periods['future'];?></label>
               </div>
             </span>
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 746c8b9632..029dd74a8b 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -14,6 +14,8 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('noTodo', $lang->todo->noTodo);?>
+<?php js::set('moduleList', $config->todo->moduleList)?>
+<?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 14824c5ceb..bb6454d7bf 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -13,6 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::set('moduleList', $config->todo->moduleList)?>
+<?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <?php if(common::checkNotCN()):?>
 <style> label.col-sm-1{width:100px;} </style>
 <?php endif;?>
@@ -130,7 +132,7 @@
             <div class='input-group title-group required'>
               <div class='nameBox'><?php echo html::input('name', $todo->name, "class='form-control'");?></div>
               <span class="input-group-addon fix-border br-0" style="border-radius: 0px;"><?php echo $lang->todo->pri;?></span>
-			  <div class="input-group-btn pri-selector" data-type="pri">
+              <div class="input-group-btn pri-selector" data-type="pri">
                 <button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
                   <span class="pri-text"><span class="label-pri label-pri-<?php echo $todo->pri;?>"><?php echo $todo->pri;?></span></span> &nbsp;<span class="caret"></span>
                 </button>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index a9c7c7547f..7f1a2f0e9d 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -19,6 +19,9 @@
     <div class="page-title">
       <span class="label label-id"><?php echo $todo->id?></span>
       <span class='text' title='<?php echo $todo->name;?>'><?php echo $todo->name;?></span>
+      <?php if($todo->deleted):?>
+      <span class='label label-danger'><?php echo $lang->todo->deleted;?></span>
+      <?php endif;?>
     </div>
   </div>
 </div>
@@ -56,34 +59,37 @@
             $browseLink = $this->createLink('user', 'todo', "userID=$user->id");
         }
 
-        if($this->app->user->admin or ($this->app->user->account == $todo->account) or ($this->app->user->account == $todo->assignedTo))
+        if(!$todo->deleted)
         {
-            if($todo->status == 'wait') common::printLink('todo', 'start', "todoID=$todo->id", "<i class='icon icon-play'></i>", 'hiddenwin', "title='{$lang->todo->start}' class='btn showinonlybody'");
-            if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
-            if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
-            common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
-            common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
-
-            if($todo->status != 'done' && $todo->status != 'closed')
+            if($this->app->user->admin or ($this->app->user->account == $todo->account) or ($this->app->user->account == $todo->assignedTo))
             {
-                echo "<div class='btn-group dropup'>";
-                echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
-                $createStoryPriv = common::hasPriv('story', 'create');
-                $createTaskPriv  = common::hasPriv('task', 'create');
-                $createBugPriv   = common::hasPriv('bug', 'create');
-                if($createStoryPriv or $createTaskPriv or $createBugPriv)
+                if($todo->status == 'wait') common::printLink('todo', 'start', "todoID=$todo->id", "<i class='icon icon-play'></i>", 'hiddenwin', "title='{$lang->todo->start}' class='btn showinonlybody'");
+                if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
+                if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
+                common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
+                common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
+
+                if($todo->status != 'done' && $todo->status != 'closed')
                 {
-                    $isonlybody = isonlybody();
-                    unset($_GET['onlybody']);
-                    echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'>{$this->lang->more}<span class='caret'></span></button>";
-                    echo "<ul class='dropdown-menu pull-right' role='menu'>";
-                    if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
-                    if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#executionModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
-                    if($createBugPriv)   echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#projectProductModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
-                    echo "</ul>";
-                    if($isonlybody) $_GET['onlybody'] = 'yes';
+                    echo "<div class='btn-group dropup'>";
+                    echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
+                    $createStoryPriv = common::hasPriv('story', 'create');
+                    $createTaskPriv  = common::hasPriv('task', 'create');
+                    $createBugPriv   = common::hasPriv('bug', 'create');
+                    if($createStoryPriv or $createTaskPriv or $createBugPriv)
+                    {
+                        $isonlybody = isonlybody();
+                        unset($_GET['onlybody']);
+                        echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'>{$this->lang->more}<span class='caret'></span></button>";
+                        echo "<ul class='dropdown-menu pull-right' role='menu'>";
+                        if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
+                        if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#executionModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
+                        if($createBugPriv)   echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#projectProductModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
+                        echo "</ul>";
+                        if($isonlybody) $_GET['onlybody'] = 'yes';
+                    }
+                    echo "</div>";
                 }
-                echo "</div>";
             }
         }
         common::printRPN($browseLink);
@@ -266,11 +272,11 @@
         <table align='center' class='table table-form'>
           <tr>
             <th><?php echo $lang->todo->project;?></th>
-            <td><?php echo html::select('project', $projects, '', "class='form-control chosen' onchange=getProductByProject(this.value);");?></td>
+            <td><?php echo html::select('bugProject', $projects, '', "class='form-control chosen' onchange=getProductByProject(this.value);");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->todo->product;?></th>
-            <td id='productIdBox'><?php echo html::select('product', $projectProducts, '', "class='form-control chosen'");?></td>
+            <td id='productIdBox'><?php echo html::select('bugProduct', $projectProducts, '', "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <td colspan='2' class='text-center'><?php echo html::commonButton($lang->todo->reasonList['bug'], "id='toBugButton'", 'btn btn-primary');?></td>
diff --git a/module/tree/control.php b/module/tree/control.php
index 0989edf5ba..e02f14bf6c 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -28,10 +28,24 @@ class tree extends control
     {
         $this->loadModel('product');
 
+        if($this->app->openApp == 'product')
+        {
+            $this->product->setMenu($rootID, 0, 0, '', $viewType);
+        }
+        else if($this->app->openApp == 'qa' and $viewType != 'caselib')
+        {
+            $products = $this->product->getPairs('noclosed');
+            $this->loadModel('qa')->setMenu($products, $rootID, 0, $viewType);
+        }
+        else if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($this->session->project);
+        }
+
         /* According to the type, set the module root and modules. */
         if(strpos('story|bug|case', $viewType) !== false)
         {
-            $product = $this->product->getById($rootID);
+            $product = $this->loadModel('product')->getById($rootID);
             if(empty($product)) $this->locate($this->createLink('product', 'create'));
             if(!empty($product->type) && $product->type != 'normal')
             {
@@ -67,17 +81,8 @@ class tree extends control
         if($viewType == 'story')
         {
             /* Set menu.*/
-            $moduleIndex = array_search('tree', $this->lang->noMenuModule);
-            if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-            $this->lang->product->menu  = $this->lang->product->viewMenu;
-            $this->lang->product->switcherMenu   = $this->loadModel('product')->getSwitcher($rootID, 'story');
-            $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
-
             $products = $this->product->getPairs();
-
             $this->product->saveState($rootID, $products);
-            $this->product->setMenu($products, $rootID, $branch, 'story', '', 'story');
-            $this->lang->tree->menu = $this->lang->product->setMenu;
 
             unset($products[$rootID]);
             $currentProduct = key($products);
@@ -93,26 +98,9 @@ class tree extends control
         }
         elseif($viewType == 'bug')
         {
-            $this->lang->navGroup->tree = 'qa';
-            $productPairs = array();
-            if($from == 'project')
-            {
-                $this->lang->navGroup->tree = 'project';
-                $productPairs = $this->product->getProductPairsByProject($this->session->PRJ);
-            }
-            elseif($from == 'qa')
-            {
-                $this->lang->noMenuModule[] = 'tree';
-                $this->lang->navGroup->tree = 'qa';
-                $this->app->loadConfig('qa');
-                foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-                $productPairs = $this->product->getPairs();
-            }
-
-            $this->loadModel('bug')->setMenu($productPairs, $rootID);
-            $this->lang->tree->menu      = $this->lang->bug->menu;
-            $this->lang->tree->menuOrder = $this->lang->bug->menuOrder;
-            $this->lang->set('menugroup.tree', 'qa');
+            $this->app->loadConfig('qa');
+            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
+            $this->app->rawModule = 'bug';
 
             $title      = $this->lang->tree->manageBug;
             $position[] = html::a($this->createLink('bug', 'browse', "product=$rootID"), $product->name);
@@ -120,10 +108,6 @@ class tree extends control
         }
         elseif($viewType == 'feedback')
         {
-            $this->lang->navGroup->tree = 'feedback';
-            $this->lang->noMenuModule[] = 'tree';
-
-            $this->lang->set('menugroup.tree', 'feedback');
             $this->app->loadLang('feedback');
             $this->lang->tree->menu = $this->lang->feedback->menu;
             $root = new stdclass();
@@ -135,27 +119,9 @@ class tree extends control
         }
         elseif($viewType == 'case')
         {
-            $this->lang->navGroup->tree = 'qa';
-
-            $productPairs = array();
-            if($from == 'project')
-            {
-                $this->lang->navGroup->tree = 'project';
-                $productPairs = $this->product->getProductPairsByProject($this->session->PRJ);
-            }
-            elseif($from == 'qa')
-            {
-                $this->lang->noMenuModule[] = 'tree';
-                $this->lang->navGroup->tree = 'qa';
-                $this->app->loadConfig('qa');
-                foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-                $productPairs = $this->product->getPairs();
-            }
-
-            $this->loadModel('testcase')->setMenu($productPairs, $rootID);
-            $this->lang->tree->menu      = $this->lang->testcase->menu;
-            $this->lang->tree->menuOrder = $this->lang->testcase->menuOrder;
-            $this->lang->set('menugroup.tree', 'qa');
+            $this->app->loadConfig('qa');
+            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
+            $this->app->rawModule = 'testcase';
 
             $title      = $this->lang->tree->manageCase;
             $position[] = html::a($this->createLink('testcase', 'browse', "product=$rootID"), $product->name);
@@ -163,23 +129,11 @@ class tree extends control
         }
         elseif($viewType == 'caselib')
         {
-            $this->lang->navGroup->tree = 'qa';
-            if($from == 'project')
-            {
-                $this->lang->navGroup->tree  = 'project';
-            }
-            elseif($from == 'qa')
-            {
-                $this->lang->noMenuModule[] = 'tree';
-                $this->lang->navGroup->tree = 'qa';
-                $this->app->loadConfig('qa');
-                foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
-            }
+            $this->app->loadConfig('qa');
+            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
 
             $this->caselib->setLibMenu($this->caselib->getLibraries(), $rootID);
-            $this->lang->tree->menu      = $this->lang->caselib->menu;
-            $this->lang->tree->menuOrder = $this->lang->caselib->menuOrder;
-            $this->lang->set('menugroup.tree', 'qa');
+            $this->app->rawModule = 'caselib';
 
             $title      = $this->lang->tree->manageCaseLib;
             $position[] = html::a($this->createLink('caselib', 'browse', "libID=$rootID"), $lib->name);
@@ -192,16 +146,11 @@ class tree extends control
             if($from == 'product')
             {
                 $productID = $lib->product;
-                $this->lang->noMenuModule[] = 'tree';
-                unset($this->lang->product->viewMenu->set['subModule']);
-                $this->lang->navGroup->tree = 'product';
-                $this->lang->product->menu  = $this->lang->product->viewMenu;
-                $this->lang->product->switcherMenu   = $this->loadModel('product')->getSwitcher($productID, 'story');
-                $this->lang->product->mainMenuAction = $this->product->getProductMainAction();
+                unset($this->lang->product->menu->set['subModule']);
 
                 $products = $this->product->getPairs();
                 $this->product->saveState($productID, $products);
-                $this->product->setMenu($products, $productID, $branch);
+                $this->product->setMenu($productID, $branch);
             }
             elseif($from == 'project')
             {
@@ -210,15 +159,13 @@ class tree extends control
                 $this->lang->tree->menuOrder = $this->lang->project->menuOrder;
 
                 /* The project parameter needs to be present when the tree module belongs to the project grouping. */
-                if($this->session->docList && $this->session->PRJ && strpos($this->session->docList, 'project') === false) $this->session->set('docList', $this->session->docList . '?project=' . $this->session->PRJ);
+                if($this->session->docList && $this->session->project && strpos($this->session->docList, 'project') === false) $this->session->set('docList', $this->session->docList . '?project=' . $this->session->project, 'project');
             }
 
             if($from == 'doc') $this->lang->navGroup->doc = 'doc';
-            $type = $lib->product ? 'product' : ($lib->execution ? 'project' : 'custom');
-            $this->doc->setMenu($type, $rootID, $currentModuleID);
+            $type = $lib->product ? 'product' : ($lib->project ? 'project' : ($lib->execution ? 'execution' : 'custom'));
             $this->lang->tree->menu      = $this->lang->doc->menu;
             $this->lang->tree->menuOrder = $this->lang->doc->menuOrder;
-            $this->lang->set('menugroup.tree', 'doc');
 
             $title      = $this->lang->tree->manageCustomDoc;
             $position[] = html::a($this->createLink('doc', 'browse', "libID=$rootID"), $lib->name);
@@ -226,9 +173,8 @@ class tree extends control
         }
         elseif($viewType == 'line')
         {
-            $products = $this->product->getPairs('', $this->session->PRJ);
+            $products = $this->product->getPairs('', $this->session->project);
 
-            $this->lang->set('menugroup.tree', 'product');
             $this->product->setMenu($products, $rootID, $branch, 'line', '', 'line');
             $this->lang->tree->menu      = $this->lang->product->menu;
             $this->lang->tree->menuOrder = $this->lang->product->menuOrder;
@@ -245,7 +191,6 @@ class tree extends control
         }
         elseif($viewType == 'trainskill')
         {
-            $this->lang->set('menugroup.tree', 'train');
             $this->lang->tree->menu = $this->lang->trainskill->menu;
 
             $title      = $this->lang->tree->manageTrainskill;
@@ -256,12 +201,10 @@ class tree extends control
             $postBrowseType = $this->session->postBrowseType ? $this->session->postBrowseType : 'train';
             if($postBrowseType == 'train')
             {
-                $this->lang->set('menugroup.tree', 'train');
                 $this->lang->tree->menu = $this->lang->train->menu;
             }
             else
             {
-                $this->lang->set('menugroup.tree', 'company');
                 $this->lang->tree->menu = $this->lang->company->menu;
             }
 
@@ -306,11 +249,10 @@ class tree extends control
         $products = $this->execution->getProducts($rootID);
         $this->view->products = $products;
 
-        $executions = $this->execution->getPairs($this->session->PRJ);
+        $executions = $this->execution->getPairs($this->session->project);
 
         /* Set menu. */
-        $this->lang->set('menugroup.tree', 'execution');
-        $this->execution->setMenu($executions, $rootID);
+        $this->execution->setMenu($rootID);
         $this->lang->tree->menu      = $this->lang->execution->menu;
         $this->lang->tree->menuOrder = $this->lang->execution->menuOrder;
 
@@ -429,8 +371,10 @@ class tree extends control
     {
         if(!empty($_POST))
         {
-            $this->tree->manageChild($rootID, $viewType);
+            $moduleIDList = $this->tree->manageChild($rootID, $viewType);
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $moduleIDList));
+            if($viewType == 'doc' and isonlybody()) die(js::reload('parent.parent'));
             if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.$('a.refresh').click()}"));
 
             die(js::reload('parent'));
@@ -451,7 +395,10 @@ class tree extends control
         if($confirm == 'no')
         {
             $module = $this->tree->getByID($moduleID);
-            $confirmLang = $module->type == 'line' ? $this->lang->tree->confirmDeleteLine : $this->lang->tree->confirmDelete;
+            $confirmLang = $this->lang->tree->confirmDelete;
+            if($module->type == 'line') $confirmLang = $this->lang->tree->confirmDeleteLine;
+            if($module->type == 'host') $confirmLang = $this->lang->tree->confirmDeleteHost;
+            if($module->type == 'feedback') $confirmLang = $this->lang->tree->confirmDelCategory;
             die(js::confirm($confirmLang, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes")));
         }
         else
@@ -473,10 +420,12 @@ class tree extends control
      * @param  string $returnType
      * @param  string $fieldID
      * @param  bool   $needManage
+     * @param  string $extra
+     * @param  int    $currentModuleID
      * @access public
      * @return string the html select string.
      */
-    public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false, $extra = '')
+    public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false, $extra = '', $currentModuleID = 0)
     {
         if($viewType == 'task')
         {
@@ -502,7 +451,7 @@ class tree extends control
                 $changeFunc = '';
                 if($viewType == 'task' or $viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
                 $field = $fieldID ? "modules[$fieldID]" : 'module';
-                $output = html::select("$field", $optionMenu, '', "class='form-control' $changeFunc");
+                $output = html::select("$field", $optionMenu, $currentModuleID, "class='form-control' $changeFunc");
                 if(count($optionMenu) == 1 and $needManage)
                 {
                     $output .=  "<span class='input-group-addon'>";
diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php
index c4c54e2fcc..44d1c984a0 100644
--- a/module/tree/lang/de.php
+++ b/module/tree/lang/de.php
@@ -37,6 +37,7 @@ $lang->tree->dragAndSort        = "Ziehen und Sotieren";
 $lang->tree->sort               = "Sortieren";
 $lang->tree->addChild           = "Hinzufügen";
 $lang->tree->confirmDelete      = 'Do you want to delete this module and its child modules?';
+$lang->tree->confirmDelCategory = 'Möchten Sie diese Kategorie und ihre Kinderkategorien löschen?';
 $lang->tree->confirmDeleteLine  = "Do you want to delete this {$lang->productCommon} line?";
 $lang->tree->confirmRoot        = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
 $lang->tree->confirmRoot4Doc    = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
@@ -56,6 +57,9 @@ $lang->tree->type         = 'Typ';
 $lang->tree->parent       = 'Übergeordnet';
 $lang->tree->parentCate   = 'Parent Category';
 $lang->tree->child        = 'Untergeordnet';
+$lang->tree->subCategory  = 'SubCategory';
+$lang->tree->editCategory = 'Kategorie bearbeiten';
+$lang->tree->delCategory  = 'Kategorie löschen';
 $lang->tree->lineChild    = "Child {$lang->productCommon} Line";
 $lang->tree->owner        = 'Besitzer';
 $lang->tree->order        = 'Reihenfolge';
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index f7d3139185..504aeb7b7a 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -37,6 +37,7 @@ $lang->tree->dragAndSort        = "Drag to order";
 $lang->tree->sort               = "Order";
 $lang->tree->addChild           = "Add Child Module";
 $lang->tree->confirmDelete      = 'Do you want to delete this module and its child modules?';
+$lang->tree->confirmDelCategory = 'Do you want to delete this category and its child categories?';
 $lang->tree->confirmDeleteLine  = "Do you want to delete this {$lang->productCommon} line?";
 $lang->tree->confirmRoot        = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
 $lang->tree->confirmRoot4Doc    = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
@@ -56,6 +57,9 @@ $lang->tree->type         = 'Type';
 $lang->tree->parent       = 'Parent Module';
 $lang->tree->parentCate   = 'Parent Category';
 $lang->tree->child        = 'Children';
+$lang->tree->subCategory  = 'SubCategory';
+$lang->tree->editCategory = 'Edit Category';
+$lang->tree->delCategory  = 'Delete Category';
 $lang->tree->lineChild    = "Child {$lang->productCommon} Line";
 $lang->tree->owner        = 'Owner';
 $lang->tree->order        = 'Order';
diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php
index 1d717b6773..079ba1a056 100644
--- a/module/tree/lang/fr.php
+++ b/module/tree/lang/fr.php
@@ -37,6 +37,7 @@ $lang->tree->dragAndSort        = "Faites glisser pour ordonner";
 $lang->tree->sort               = "Ordonnez";
 $lang->tree->addChild           = "Ajout Sous-Module";
 $lang->tree->confirmDelete      = 'Voulez-vous supprimer ce module et tous ses sous-modules ?';
+$lang->tree->confirmDelCategory = 'Voulez-vous supprimer cette catégorie et ses sous-catégories?';
 $lang->tree->confirmDeleteLine  = 'Voulez-vous supprimer cette ligne de produit ?';
 $lang->tree->confirmRoot        = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?";
 $lang->tree->confirmRoot4Doc    = "Toute modification apportée à la bibliothèque modifiera le document de la bibliothèque à laquelle elle appartient, ce qui est dangereux. Voulez-vous le changer ?";
@@ -56,6 +57,9 @@ $lang->tree->type         = 'Type';
 $lang->tree->parent       = 'Module Parent';
 $lang->tree->parentCate   = 'Catégorie Parente';
 $lang->tree->child        = 'Enfants';
+$lang->tree->subCategory  = 'SubCategory';
+$lang->tree->editCategory = 'Modifier la catégorie';
+$lang->tree->delCategory  = 'Supprimer la catégorie';
 $lang->tree->lineChild    = 'Sous-Ligne Produit';
 $lang->tree->owner        = 'Propriétaire';
 $lang->tree->order        = 'Ordre';
diff --git a/module/tree/lang/vi.php b/module/tree/lang/vi.php
index 5531f5a04e..966243e7b1 100644
--- a/module/tree/lang/vi.php
+++ b/module/tree/lang/vi.php
@@ -37,6 +37,7 @@ $lang->tree->dragAndSort        = "Drag để sắp xếp";
 $lang->tree->sort               = "Thứ tự";
 $lang->tree->addChild           = "Thêm Module con";
 $lang->tree->confirmDelete      = 'Bạn có muốn xóa module này và module con của nó?';
+$lang->tree->confirmDelCategory = 'Bạn có muốn xoá hạng mục này và loại con của nó không?';
 $lang->tree->confirmDeleteLine  = "Bạn có muốn xóa dòng {$lang->productCommon} này không?";
 $lang->tree->confirmRoot        = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của  {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->executionCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
 $lang->tree->confirmRoot4Doc    = "Mọi sự thay đổi tới thư viện này sẽ thay đổi thư viện tài liệu nó sở hữu, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
@@ -56,6 +57,9 @@ $lang->tree->type         = 'Loại';
 $lang->tree->parent       = 'Module mẹ';
 $lang->tree->parentCate   = 'Danh mục mẹ';
 $lang->tree->child        = 'Con';
+$lang->tree->subCategory  = 'SubCategory';
+$lang->tree->editCategory = 'Sửa phân loại';
+$lang->tree->delCategory  = 'Xoá phân loại';
 $lang->tree->lineChild    = "Dòng {$lang->productCommon} con";
 $lang->tree->owner        = 'Sở hữu';
 $lang->tree->order        = 'Sắp xếp';
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 3ac73e24c5..45e6fee09a 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -37,6 +37,7 @@ $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模块";
 $lang->tree->confirmDelete      = '该模块及其子模块都会被删除，您确定删除吗？';
+$lang->tree->confirmDelCategory = '该分类及其子分类都会被删除，您确定删除吗？';
 $lang->tree->confirmDeleteLine  = "您确定删除该{$lang->productCommon}线吗？";
 $lang->tree->confirmRoot        = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->SRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
 $lang->tree->confirmRoot4Doc    = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
@@ -56,6 +57,9 @@ $lang->tree->type         = '类型';
 $lang->tree->parent       = '上级模块';
 $lang->tree->parentCate   = '上级分类';
 $lang->tree->child        = '子模块';
+$lang->tree->subCategory  = '子分类';
+$lang->tree->editCategory = '编辑分类';
+$lang->tree->delCategory  = '删除分类';
 $lang->tree->lineChild    = "子{$lang->productCommon}线";
 $lang->tree->owner        = '负责人';
 $lang->tree->order        = '排序';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 2a8ac36e59..0922ce41a4 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = '任務模組維護';
 $lang->tree->manage             = '維護模組';
 $lang->tree->fix                = '修正數據';
 $lang->tree->manageProduct      = "維護{$lang->productCommon}視圖模組";
-$lang->tree->manageProject      = "維護{$lang->executionCommon}視圖模組";
+$lang->tree->manageExecution    = "維護{$lang->executionCommon}視圖模組";
 $lang->tree->manageLine         = "維護{$lang->productCommon}綫";
 $lang->tree->manageBug          = '維護測試視圖模組';
 $lang->tree->manageCase         = '維護用例視圖模組';
@@ -37,6 +37,7 @@ $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模組";
 $lang->tree->confirmDelete      = '該模組及其子模組都會被刪除，您確定刪除嗎？';
+$lang->tree->confirmDelCategory = '該分類及其子分類都會被刪除，您確定刪除嗎？';
 $lang->tree->confirmDeleteLine  = "您確定刪除該{$lang->productCommon}綫嗎？";
 $lang->tree->confirmRoot        = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->SRCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
 $lang->tree->confirmRoot4Doc    = "修改所屬文檔庫，會同時修改該分類下文檔的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
@@ -45,21 +46,24 @@ $lang->tree->successFixed       = '成功修正數據！';
 $lang->tree->repeatName         = '模組名“%s”已經存在！';
 $lang->tree->shouldNotBlank     = '模組名不能為空格！';
 
-$lang->tree->module     = '模組';
-$lang->tree->name       = '模組名稱';
-$lang->tree->line       = "{$lang->productCommon}綫名稱";
-$lang->tree->cate       = '分類名稱';
-$lang->tree->root       = '所屬根';
-$lang->tree->branch     = '平台/分支';
-$lang->tree->path       = '路徑';
-$lang->tree->type       = '類型';
-$lang->tree->parent     = '上級模組';
-$lang->tree->parentCate = '上級分類';
-$lang->tree->child      = '子模組';
-$lang->tree->lineChild  = "子{$lang->productCommon}綫";
-$lang->tree->owner      = '負責人';
-$lang->tree->order      = '排序';
-$lang->tree->short      = '簡稱';
-$lang->tree->all        = '所有模組';
-$lang->tree->projectDoc = "{$lang->executionCommon}文檔";
-$lang->tree->product    = "所屬{$lang->productCommon}";
+$lang->tree->module       = '模組';
+$lang->tree->name         = '模組名稱';
+$lang->tree->line         = "{$lang->productCommon}綫名稱";
+$lang->tree->cate         = '分類名稱';
+$lang->tree->root         = '所屬根';
+$lang->tree->branch       = '平台/分支';
+$lang->tree->path         = '路徑';
+$lang->tree->type         = '類型';
+$lang->tree->parent       = '上級模組';
+$lang->tree->parentCate   = '上級分類';
+$lang->tree->child        = '子模組';
+$lang->tree->subCategory  = '子分類';
+$lang->tree->editCategory = '編輯分類';
+$lang->tree->delCategory  = '刪除分類';
+$lang->tree->lineChild    = "子{$lang->productCommon}綫";
+$lang->tree->owner        = '負責人';
+$lang->tree->order        = '排序';
+$lang->tree->short        = '簡稱';
+$lang->tree->all          = '所有模組';
+$lang->tree->executionDoc = "{$lang->executionCommon}文檔";
+$lang->tree->product      = "所屬{$lang->productCommon}";
diff --git a/module/tree/model.php b/module/tree/model.php
index 2a6b8f9e78..9bfb5e20c5 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -393,6 +393,7 @@ class treeModel extends model
         foreach($branches as $branchID => $branch)
         {
             $treeMenu = array();
+            if($branchID == 0) $branchID = 'null';
             $stmt = $this->dbh->query($this->buildMenuQuery($rootID, $type, $startModule, $branchID));
             while($module = $stmt->fetch()) $this->buildTree($treeMenu, $module, $type, $userFunc, $extra, $branchID);
             if(!empty($extra) and empty($treeMenu)) continue;
@@ -636,11 +637,6 @@ class treeModel extends model
             if($startModule) $startModulePath = $startModule->path . '%';
         }
 
-        $manage = $userFunc[1] == 'createBugLink' ? true : false;
-
-        /* if not manage, only get linked modules and ignore others. */
-        if(!$manage) $executionModules = $this->getBugTreeModules($rootID, true);
-
         /* Get module according to product. */
         $productNum = count($products);
         foreach($products as $id => $product)
@@ -704,7 +700,93 @@ class treeModel extends model
     }
 
     /**
-     * Get execution story tree menu.
+     * Get the tree menu of case in html.
+     *
+     * @param  int    $rootID
+     * @param  int    $productID
+     * @param  int    $startModule
+     * @param  int    $userFunc
+     * @param  string $extra
+     * @access public
+     * @return void
+     */
+    public function getCaseTreeMenu($rootID, $productID = 0, $startModule = 0, $userFunc, $extra = '')
+    {
+        $extra = array('projectID' => $rootID, 'productID' => $productID, 'tip' => true, 'extra' => $extra);
+
+        /* If createdVersion <= 4.1, go to getTreeMenu(). */
+        $products     = $this->loadModel('product')->getProductPairsByProject($rootID);
+        $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
+
+        /* createdVersion > 4.1. */
+        $menu = "<ul id='modules' class='tree' data-ride='tree' data-name='tree-case'>";
+
+        /* Set the start module. */
+        $startModulePath = '';
+        if($startModule > 0)
+        {
+            $startModule = $this->getById($startModule);
+            if($startModule) $startModulePath = $startModule->path . '%';
+        }
+
+        /* Get module according to product. */
+        $productNum   = count($products);
+        $moduleName   = $this->app->openApp == 'project' ? 'project'  : 'testcase';
+        $methodName   = $this->app->openApp == 'project' ? 'testcase' : 'browse';
+        $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}&" : '';
+        foreach($products as $id => $product)
+        {
+            $extra['productID'] = $id;
+            $link  = helper::createLink($moduleName, $methodName, $projectParam . "productID=$id");
+            $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id' data-app='project'");
+
+            /* tree menu. */
+            $tree = '';
+            if(empty($branchGroups[$id])) $branchGroups[$id]['0'] = '';
+            foreach($branchGroups[$id] as $branch => $branchName)
+            {
+                $treeMenu = array();
+                $query = $this->dao->select('*')->from(TABLE_MODULE)->where("((root = $id and type = 'case') OR (root = $id and type = 'story' and branch ='$branch'))")
+                    ->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
+                    ->andWhere('deleted')->eq(0)
+                    ->orderBy('grade desc, `order`, type')
+                    ->get();
+                $stmt = $this->dbh->query($query);
+                while($module = $stmt->fetch())
+                {
+                    $this->buildTree($treeMenu, $module, 'case', $userFunc, $extra);
+                }
+                if(isset($treeMenu[0]) and $branch) $treeMenu[0] = "<li><a>$branchName</a><ul>{$treeMenu[0]}</ul></li>";
+                $tree .= isset($treeMenu[0]) ? $treeMenu[0] : '';
+            }
+
+            if($tree) $tree = "<ul>" . $tree . "</ul>\n</li>";
+            $menu .= $tree;
+        }
+
+        /* Get case module. */
+        if($startModule == 0)
+        {
+            /* tree menu. */
+            $treeMenu = array();
+            $query = $this->dao->select('*')->from(TABLE_MODULE)
+                ->where('root')->eq((int)$rootID)
+                ->andWhere('type')->eq('case')
+                ->andWhere('deleted')->eq(0)
+                ->orderBy('grade desc, `order`, type')
+                ->get();
+            $stmt  = $this->dbh->query($query);
+            while($module = $stmt->fetch()) $this->buildTree($treeMenu, $module, 'case', $userFunc, $extra);
+
+            $tree  = isset($treeMenu[0]) ? $treeMenu[0] : '';
+            $menu .= $tree . '</li>';
+        }
+        $menu .= '</ul>';
+        return $menu;
+    }
+
+    /**
+     * Get project story tree menu.
      *
      * @param  int    $rootID
      * @param  int    $startModule
@@ -712,9 +794,10 @@ class treeModel extends model
      * @access public
      * @return string
      */
-    public function getExecutionStoryTreeMenu($rootID, $startModule = 0, $userFunc)
+    public function getProjectStoryTreeMenu($rootID, $startModule = 0, $userFunc)
     {
-        $extra['executionID'] = $rootID;
+        if($this->app->rawModule == 'projectstory') $extra['projectID'] = $rootID;
+        if($this->app->rawModule == 'execution') $extra['executionID'] = $rootID;
         $menu = "<ul id='modules' class='tree' data-ride='tree' data-name='tree-story'>";
         $startModulePath = '';
         if($startModule > 0)
@@ -736,8 +819,8 @@ class treeModel extends model
         $productNum   = count($products);
         foreach($products as $id => $product)
         {
-            $extra['productID'] = $id;
-            $projectProductLink   = helper::createLink('projectstory', 'story', "productID=$id");
+            $extra['productID']   = $id;
+            $projectProductLink   = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id");
             $executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
             $link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink;
             if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id'");
@@ -766,7 +849,7 @@ class treeModel extends model
                 if((isset($treeMenu[0]) and $branch) or isset($executionBranches[$branch]))
                 {
                     $childMenu = isset($treeMenu[0]) ? "<ul>{$treeMenu[0]}</ul>" : '';
-                    $projectBranchLink   = helper::createLink('projectstory', 'story', "productID=$id&branch=" . (empty($branch) ? 0 : $branch) . "&browseType=byBranch");
+                    $projectBranchLink   = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=" . (empty($branch) ? 0 : $branch) . "&browseType=byBranch");
                     $executionBranchLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byBranch&praram=" . (empty($branch) ? "{$id},0" : $branch));
                     $link = $this->app->rawModule == 'projectstory' ? $projectBranchLink : $executionBranchLink;
                     if($branchName) $treeMenu[0] = "<li>" . html::a($link, $branchName, '_self', "id='branch" . (empty($branch) ? "{$id}_0" : $branch) . "'") . "{$childMenu}</li>";
@@ -932,12 +1015,27 @@ class treeModel extends model
      *
      * @param  string $type
      * @param  object $module
+     * @param  array  $extra
      * @access public
      * @return string
      */
-    public function createStoryLink($type, $module)
+    public function createStoryLink($type, $module, $extra = array())
     {
-        return html::a(helper::createLink($this->app->rawModule, $this->app->rawMethod, "root={$module->root}&branch=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+        if(isset($extra['projectID']) and !empty($extra['projectID']))
+        {
+            $productID = zget($extra, 'productID', 0);
+            $projectID = $extra['projectID'];
+            return html::a(helper::createLink('projectstory', 'story', "projectID=$projectID&productID=$productID&branch=&browseType=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+        }
+        elseif(isset($extra['executionID']) and !empty($extra['executionID']))
+        {
+            $executionID = $extra['executionID'];
+            return html::a(helper::createLink('execution', 'story', "executionID=$executionID&orderBy=order_desc&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+        }
+        else
+        {
+            return html::a(helper::createLink('product', 'browse', "root={$module->root}&branch=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+        }
     }
 
     /**
@@ -984,23 +1082,7 @@ class treeModel extends model
     public function createProjectStoryLink($type, $module, $extra)
     {
         $productID = $extra['productID'];
-        return html::a(helper::createLink('projectstory', 'story', "productID=$productID&branch=&browseType=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
-    }
-
-    /**
-     * Create link of execution story.
-     *
-     * @param  string $type
-     * @param  object $module
-     * @param  array  $extra
-     * @access public
-     * @return string
-     */
-    public function createExecutionStoryLink($type, $module, $extra)
-    {
-        $executionID = $extra['executionID'];
-        $productID   = $extra['productID'];
-        return html::a(helper::createLink('execution', 'story', "executionID={$executionID}&orderBy=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+        return html::a(helper::createLink('projectstory', 'story', "projectID={$extra['executionID']}&productID=$productID&branch=&browseType=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
     }
 
     /**
@@ -1109,7 +1191,10 @@ class treeModel extends model
      */
     public function createCaseLink($type, $module)
     {
-        return html::a(helper::createLink('testcase', 'browse', "root={$module->root}&branch=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+        $moduleName   = $this->app->openApp == 'project' ? 'project'  : 'testcase';
+        $methodName   = $this->app->openApp == 'project' ? 'testcase' : 'browse';
+        $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}&" : '';
+        return html::a(helper::createLink($moduleName, $methodName, $projectParam . "root={$module->root}&branch=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}' data-app='{$this->app->openApp}'");
     }
 
     /**
@@ -1457,7 +1542,7 @@ class treeModel extends model
      * @param  int    $rootID
      * @param  string $type
      * @access public
-     * @return void
+     * @return array
      */
     public function manageChild($rootID, $type)
     {
@@ -1495,6 +1580,8 @@ class treeModel extends model
             $parentPath = ',';
         }
         $i = 1;
+
+        $moduleIDList = array();
         foreach($childs as $moduleID => $moduleName)
         {
             if(empty($moduleName)) continue;
@@ -1522,8 +1609,9 @@ class treeModel extends model
                 $module->type   = $type;
                 $module->order  = $order;
                 $this->dao->insert(TABLE_MODULE)->data($module)->exec();
-                $moduleID  = $this->dao->lastInsertID();
-                $childPath = $parentPath . "$moduleID,";
+                $moduleID       = $this->dao->lastInsertID();
+                $moduleIDList[] = $moduleID;
+                $childPath      = $parentPath . "$moduleID,";
                 $this->dao->update(TABLE_MODULE)->set('path')->eq($childPath)->where('id')->eq($moduleID)->limit(1)->exec();
             }
             else
@@ -1534,6 +1622,8 @@ class treeModel extends model
                 $this->dao->update(TABLE_MODULE)->set('name')->eq(strip_tags(trim($moduleName)))->set('short')->eq($short)->set('order')->eq($order)->where('id')->eq($moduleID)->limit(1)->exec();
             }
         }
+
+        return $moduleIDList;
     }
 
     /**
@@ -1679,7 +1769,7 @@ class treeModel extends model
                 break;
         }
         if(strpos($this->session->{$module->type . 'List'}, 'param=' . $moduleID)) $this->session->set($module->type . 'List', str_replace('param=' . $moduleID, 'param=0', $this->session->{$module->type . 'List'}));
-        if($cookieName) setcookie($cookieName, 0, time() - 3600, $this->config->webRoot, '', false, false);
+        if($cookieName) setcookie($cookieName, 0, time() - 3600, $this->config->webRoot, '', $this->config->cookieSecure, false);
 
         return true;
     }
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index dc9f891b64..5e5b9e7b14 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -10,9 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if($lang->navGroup->doc == 'doc'):?>
-<?php $pageCSS .= $this->doc->appendNavCSS();?>
-<?php endif;?>
 <?php include '../../common/view/header.html.php';?>
 
 <?php if($viewType != 'story'):?>
@@ -25,8 +22,9 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete] {display: none
 <?php $this->app->loadLang('doc');?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and (!empty($root->type) && $root->type != 'normal')) ? true : false;?>
 <?php $name = $viewType == 'line' ? $lang->tree->line : (($viewType == 'doc' or $viewType == 'feedback' or $viewType == 'trainskill' or $viewType == 'trainpost') ? $lang->tree->cate : $lang->tree->name);?>
-<?php $title = ($viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost') ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
-<div id="mainMenu" class="clearfix">
+<?php $name = $viewType == 'doc' ? $lang->doc->catalogName : $name;?>
+<?php $title = ($viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost') ? '' : ((strpos($viewType, 'doc') !== false) ? $lang->doc->childType : ((strpos($viewType, 'feedback') !== false) ? $lang->tree->subCategory : $lang->tree->child));?>
+<!--div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>
     <?php echo html::a($backLink, '<i class="icon icon-back icon-sm"></i>' . $lang->goback, '', 'class="btn btn-secondary"');?>
@@ -63,7 +61,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete] {display: none
       </span>
     </div>
   </div>
-</div>
+</div-->
 <div id="mainContent" class="main-row">
   <div class="side-col col-4">
     <div class="panel">
@@ -93,10 +91,10 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete] {display: none
               <?php if($viewType != 'line' && $viewType != 'trainskill' && $viewType != 'trainpost'):?>
               <td class="text-middle text-right with-padding">
                 <?php
-                echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&currentModuleID=0&branch=0&from=$from"), empty($root->name) ? '' : $root->name) . "<i class='icon icon-angle-right muted'></i></span>";
+                echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&currentModuleID=0&branch=0&from=$from", '', ''), empty($root->name) ? '' : $root->name, '', "data-app='{$this->app->openApp}'") . "<i class='icon icon-angle-right muted'></i></span>";
                 foreach($parentModules as $module)
                 {
-                    echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&currentModuleID=$module->id&branch=0&from=$from"), $module->name) . " <i class='icon icon-angle-right muted'></i></span>";
+                    echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&currentModuleID=$module->id&branch=0&from=$from"), $module->name, '', "data-app='{$this->app->openApp}'") . " <i class='icon icon-angle-right muted'></i></span>";
                 }
                 ?>
               </td>
@@ -162,7 +160,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete] {display: none
               <?php endif;?>
               <td colspan="2" class="form-actions">
                 <?php if($canBeChanged) echo html::submitButton();?>
-                <?php echo html::a($backLink, $lang->goback, '', "class='btn btn-wide'");?>
+                <?php if(!isonlybody()) echo html::a($backLink, $lang->goback, '', "class='btn btn-wide'");?>
                 <?php echo html::hidden('parentModuleID', $currentModuleID);?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
               </td>
@@ -174,7 +172,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete] {display: none
     </div>
   </div>
 </div>
-
+<?php js::set('openApp', $this->app->openApp);?>
 <script>
 $(function()
 {
@@ -194,7 +192,7 @@ $(function()
         },
         itemCreator: function($li, item)
         {
-            var link = (item.id !== undefined && item.type != 'line') ? ('<a href="' + createLink('tree', 'browse', 'rootID=<?php echo $rootID ?>&viewType=<?php echo $viewType ?>&moduleID={0}&branch={1}&from=<?php echo $from;?>'.format(item.id, item.branch)) + '">' + item.name + '</a>') : ('<span class="tree-toggle">' + item.name + '</span>');
+            var link = (item.id !== undefined && item.type != 'line') ? ('<a href="' + createLink('tree', 'browse', 'rootID=<?php echo $rootID ?>&viewType=<?php echo $viewType ?>&moduleID={0}&branch={1}&from=<?php echo $from;?>'.format(item.id, item.branch)) + '" data-app="' + openApp + '">' + item.name + '</a>') : ('<span class="tree-toggle">' + item.name + '</span>');
             var $toggle = $('<span class="module-name" data-id="' + item.id + '">' + link + '</span>');
             if(item.type === 'bug') $toggle.append('&nbsp; <span class="text-muted">[B]</span>');
             if(item.type === 'case') $toggle.append('&nbsp; <span class="text-muted">[C]</span>');
@@ -213,13 +211,13 @@ $(function()
             edit:
             {
                 linkTemplate: '<?php echo helper::createLink('tree', 'edit', "moduleID={0}&type=$viewType"); ?>',
-                title: '<?php echo $viewType == 'doc' ? $lang->doc->editType : $lang->tree->edit ?>',
+                title: '<?php echo $viewType == 'doc' ? $lang->doc->editType : ($viewType == 'feedback' ? $lang->tree->editCategory : $lang->tree->edit);?>',
                 template: '<a><i class="icon-edit"></i></a>'
             },
             "delete":
             {
                 linkTemplate: '<?php echo helper::createLink('tree', 'delete', "rootID=$rootID&moduleID={0}"); ?>',
-                title: '<?php echo $viewType == 'doc' ? $lang->doc->deleteType : $lang->tree->delete ?>',
+                title: '<?php echo $viewType == 'doc' ? $lang->doc->deleteType : ($viewType == 'feedback' ? $lang->tree->delCategory : $lang->tree->delete)?>',
                 template: '<a><i class="icon-trash"></i></a>'
             },
             subModules:
@@ -290,6 +288,7 @@ $(function()
 
     $('#subNavbar > ul > li > a[href*=tree][href*=browse]').not('[href*=<?php echo $viewType;?>]').parent().removeClass('active');
     if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active');
+    if(viewType == 'case' || viewType == 'caselib') $('#subNavbar li[data-id="' + viewType +'"]').addClass('active');
 });
 </script>
 <?php
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index d2dde15524..cbff9e7a89 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php js::set('openApp', $app->openApp);?>
 <style>
 li.story-item > .tree-actions .tree-action[data-type=sort] {display: none;}
 li.story-item > .tree-actions .tree-action[data-type=edit] {display: none;}
@@ -50,10 +51,10 @@ li.story-item > .tree-actions .tree-action[data-type=delete] {display: none;}
             <tr>
               <td class="text-middle text-right with-padding">
                 <?php
-                echo "<span>" . html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&viewType=task"), $root->name) . "<i class='icon icon-angle-right muted'></i></span>";
+echo "<span>" . html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&viewType=task"), $root->name, '', "data-app='{$app->openApp}'") . "<i class='icon icon-angle-right muted'></i></span>";
                 foreach($parentModules as $module)
                 {
-                    echo "<span>" . html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&moduleID=$module->id"), $module->name) . " <i class='icon icon-angle-right muted'></i></span>";
+                    echo "<span>" . html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&moduleID=$module->id"), $module->name, '', "data-app='{$app->openApp}'") . " <i class='icon icon-angle-right muted'></i></span>";
                 }
                 ?>
               </td>
@@ -138,7 +139,7 @@ $(function()
             var $toggle = $('<span class="module-name" data-id="' + item.id + '">' + link + '</span>');
 
             var title = (item.type === 'product' ? '<i class="icon icon-cube text-muted"></i> ' : '') + item.name;
-            var link = item.id !== undefined ? ('<a href="' + createLink('tree', 'browsetask', 'rootID=<?php echo $rootID ?>&viewType=task&moduleID={0}'.format(item.id)) + '">' + title + '</a>') : ('<span class="tree-toggle">' + title + '</span>');
+            var link = item.id !== undefined ? ('<a data-app=' + openApp + ' href="' + createLink('tree', 'browsetask', 'rootID=<?php echo $rootID ?>&viewType=task&moduleID={0}'.format(item.id)) + '">' + title + '</a>') : ('<span class="tree-toggle">' + title + '</span>');
             var $toggle = $('<span class="module-name" data-id="' + item.id + '">' + link + '</span>');
             if(item.type === 'task')
             {
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php
index ea8b1c1625..a73ca853ed 100644
--- a/module/tree/view/edit.html.php
+++ b/module/tree/view/edit.html.php
@@ -134,6 +134,12 @@ $(function()
     })
 
     $('#dataform .chosen').chosen();
+    $("#dataform .picker-select[data-pickertype!='remote']").picker({chosenMode: true});
+    $("#dataform [data-pickertype='remote']").each(function()
+    {
+        var pickerremote = $(this).attr('data-pickerremote');
+        $(this).picker({chosenMode: true, remote: pickerremote});
+    })
 
     // hide #parent chosen dropdown on root dropdown show
     $('#root').on('chosen:showing_dropdown', function()
@@ -144,8 +150,8 @@ $(function()
 
 /**
  * Load branches by product.
- * 
- * @param  object $obj 
+ *
+ * @param  object $obj
  * @access public
  * @return void
  */
diff --git a/module/tutorial/control.php b/module/tutorial/control.php
index a380e88dfb..ebf7d5f344 100644
--- a/module/tutorial/control.php
+++ b/module/tutorial/control.php
@@ -109,7 +109,6 @@ class tutorial extends control
         {
             $taskModule = strtolower($taskName['nav']['module']);
             if($taskModule == strtolower($module)) $hasPriv = true;
-            if(isset($this->lang->menugroup->$taskModule) and $this->lang->menugroup->$taskModule == strtolower($module)) $hasPriv = true;
             if($hasPriv) break;
         }
         if(!$hasPriv and $module == 'my' and $method == 'index') $hasPriv = true;
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index 49ceb2270c..1412008f5e 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -56,22 +56,22 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
 if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
 {
     $lang->tutorial->tasks['createProject']         = array('title' => '創建' . $lang->executionCommon);
-    $lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon);
+    $lang->tutorial->tasks['createProject']['nav']  = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon);
     $lang->tutorial->tasks['createProject']['desc'] = "<p>在系統創建一個新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
 
     $lang->tutorial->tasks['manageTeam']         = array('title' => '管理團隊');
-    $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
+    $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
     $lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->executionCommon}團隊成員：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <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>";
 
     if($config->global->flow == 'full')
     {
         $lang->tutorial->tasks['linkStory']         = array('title' => "關聯{$lang->SRCommon}");
-        $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->SRCommon}");
+        $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->SRCommon}");
         $lang->tutorial->tasks['linkStory']['desc'] = "<p>將{$lang->SRCommon}關聯到{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <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->SRCommon}列表中勾選要關聯的{$lang->SRCommon}；</li><li data-target='submit'>保存關聯的{$lang->SRCommon}信息。</li></ul>";
     }
 
     $lang->tutorial->tasks['createTask']         = array('title' => '分解任務');
-    $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
+    $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
     $lang->tutorial->tasks['createTask']['desc'] = "<p>將{$lang->executionCommon}{$lang->SRCommon}分解為任務：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 分解任務</span> 頁面；</li><li data-target='form'>在表單中填寫任務信息；</li><li data-target='submit'>保存任務信息。</li></ul>";
 }
 
diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php
index b134271800..ee6abab461 100644
--- a/module/tutorial/view/index.html.php
+++ b/module/tutorial/view/index.html.php
@@ -208,13 +208,19 @@ $(function()
         var offset   = $e.offset();
         var winWidth = $(window).width();
         var placement = 'top';
-        if (offset.left > (winWidth*2/3)) {
+        if(offset.left > (winWidth*2/3))
+        {
             placement = 'left';
-        } else if (offset.left < (winWidth/3) && (offset.left + $e.outerWidth()) < (winWidth*2/3)) {
+        }
+        else if(offset.left < (winWidth/3) && (offset.left + $e.outerWidth()) < (winWidth*2/3))
+        {
             placement = 'right';
-        } else if (offset.top < 50) {
+        }
+        else if (offset.top < 50)
+        {
             placement = 'bottom';
         }
+
         options = $.extend(
         {
             trigger: 'manual',
@@ -334,7 +340,8 @@ $(function()
                         e.preventDefault();
                         e.stopPropagation();
                         return false;
-                    } else
+                    }
+                    else
                     {
                         finishTask();
                     }
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 0f094a5ece..3f1b722dc8 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -49,5 +49,4 @@ $config->upgrade->discardedBugTypes['zh-tw']['newfeature']   = "新增需求";
 $config->upgrade->discardedBugTypes['zh-tw']['trackthings']  = '事務跟蹤';
 
 $config->delete['10.6'][]   = 'module/chat/ext/control/extensions.php';
-$config->delete['10.6'][]   = 'module/common/ext/model/xuanxuan.php';
 $config->delete['12.4.2'][] = 'www/js/ueditor';
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index b2fa00c40f..cff56ea18d 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -23,10 +23,10 @@ class upgrade extends control
         $upgradeFile = $this->app->wwwRoot . 'upgrade.php';
         if(!file_exists($upgradeFile)) $this->locate($this->createLink('my', 'index'));
 
-        if((version_compare($this->config->installedVersion, '15', '<')
-            || strpos($this->config->installedVersion, 'biz') !== false
-            || strpos($this->config->installedVersion, 'pro') !== false)
-            && strpos($this->config->installedVersion, 'max') === false)
+        $this->upgrade->deleteTmpModel();
+
+        $systemMode = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=mode');
+        if(empty($systemMode) && !isset($this->config->qcVersion))
         {
             /* Judge upgrade step. */
             $upgradeStep = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=upgradeStep');
@@ -137,11 +137,12 @@ class upgrade extends control
 
         if(!$this->upgrade->isError())
         {
-            if((version_compare($fromVersion, '15', '<')
-                || strpos($fromVersion, 'biz') !== false
-                || strpos($fromVersion, 'pro') !== false)
-                && strpos($fromVersion, 'max') === false
-                && !isset($this->config->qcVersion)) $this->locate(inlink('to15Guide', "fromVersion=$fromVersion"));
+            $systemMode = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=mode');
+            if((empty($systemMode) && !isset($this->config->qcVersion) && strpos($fromVersion, 'max') === false) or
+               ($systemMode != 'new' && strpos($fromVersion, 'max') === false && strpos($this->config->version, 'max') !== false))
+            {
+                $this->locate(inlink('to15Guide', "fromVersion=$fromVersion"));
+            }
             $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
         }
 
@@ -164,11 +165,31 @@ class upgrade extends control
             $mode = fixer::input('post')->get('mode');
             $this->loadModel('setting')->setItem('system.common.global.mode', $mode);
 
-            if($mode == 'old') $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
-            if($mode == 'new') $this->locate(inlink('mergeTips'));
+            if($mode == 'classic') $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
+            if($mode == 'new')     $this->locate(inlink('mergeTips'));
         }
 
-        $this->view->title = $this->lang->upgrade->to15Guide;
+        if(isset($this->config->maxVersion))
+        {
+            $this->lang->upgrade->to15Desc = str_replace('15', 'Max', $this->lang->upgrade->to15Desc);
+            $title = $this->lang->upgrade->toMAXGuide;
+        }
+        elseif(isset($this->config->bizVersion))
+        {
+            $this->lang->upgrade->to15Desc = str_replace('15', 'Biz5', $this->lang->upgrade->to15Desc);
+            $title = $this->lang->upgrade->toBIZ5Guide;
+        }
+        elseif(isset($this->config->proVersion))
+        {
+            $this->lang->upgrade->to15Desc = str_replace('15', 'Pro10', $this->lang->upgrade->to15Desc);
+            $title = $this->lang->upgrade->toPRO10Guide;
+        }
+        else
+        {
+            $title = $this->lang->upgrade->toPMS15Guide;
+        }
+
+        $this->view->title = $title;
         $this->display();
     }
 
@@ -265,6 +286,9 @@ class upgrade extends control
                 list($programID, $projectID, $lineID) = $this->upgrade->createProgram($linkedProducts, $linkedSprints);
                 if(dao::isError()) die(js::error(dao::getError()));
 
+                /* Process productline. */
+                $this->dao->delete()->from(TABLE_MODULE)->where('`root`')->eq(0)->andWhere('`type`')->eq('line')->exec();
+
                 /* Process merged products and projects. */
                 $this->upgrade->processMergedData($programID, $projectID, $lineID, $linkedProducts, $linkedSprints);
             }
@@ -294,7 +318,7 @@ class upgrade extends control
 
         /* Get no merged product and project count. */
         $noMergedProductCount = $this->dao->select('count(*) as count')->from(TABLE_PRODUCT)->where('program')->eq(0)->fetch('count');
-        $noMergedSprintCount  = $this->dao->select('count(*) as count')->from(TABLE_PROJECT)->where('grade')->eq(0)->andWhere('path')->eq('')->fetch('count');
+        $noMergedSprintCount  = $this->dao->select('count(*) as count')->from(TABLE_PROJECT)->where('grade')->eq(0)->andWhere('path')->eq('')->andWhere('type')->ne('program')->fetch('count');
 
         /* When all products and projects merged then finish and locate afterExec page. */
         if(empty($noMergedProductCount) and empty($noMergedSprintCount))
@@ -452,7 +476,7 @@ class upgrade extends control
                     if($project) $sprint->projects[$project->id] = $project->name;
                 }
 
-                if(!isset($sprint->projects)) $sprint->projects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('program')->fetchPairs();
+                if(!isset($sprint->projects)) $sprint->projects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchPairs();
             }
 
             $this->view->noMergedSprints = $noMergedSprints;
@@ -490,8 +514,6 @@ class upgrade extends control
         if(empty($repos))
         {
             $this->loadModel('setting')->deleteItems('owner=system&module=common&section=global&key=upgradeStep');
-
-            if($this->config->version == $this->config->installedVersion) die(js::alert($this->lang->upgrade->successTip) . js::locate($this->createLink('user', 'logout')));
             die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
         }
 
@@ -546,6 +568,8 @@ class upgrade extends control
             die($this->display('upgrade', 'consistency'));
         }
 
+        unset($_SESSION['user']);
+
         if($processed == 'no')
         {
             $this->app->loadLang('install');
@@ -650,8 +674,8 @@ class upgrade extends control
         if($result['type'] == 'finish')
         {
             $response['result']  = 'finished';
-            $response['type']     = $type;
-            $response['count']    = $result['count'];
+            $response['type']    = $type;
+            $response['count']   = $result['count'];
             $response['message'] = 'Finished';
         }
         else
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index 0039c8f776..37b494c0e4 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -51,7 +51,9 @@ $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard
 $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you delete it.';
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
-$lang->upgrade->to15Guide     = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPRO10Guide  = 'ZenTao profession version 10.0.rc1 upgrade';
+$lang->upgrade->toBIZ5Guide   = 'ZenTao enterprise version 5.0.rc1 upgrade';
 $lang->upgrade->to15Desc      = <<<EOD
 <p>Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:</p>
 <ol>
@@ -117,4 +119,8 @@ $lang->upgrade->mergeByProject     = "Independent iterations: You can select sev
 $lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 
+$lang->upgrade->needBuild4Add    = 'Full text retrieval has been added in this upgrad. Please create an index.';
+$lang->upgrade->needBuild4Adjust = 'Full text retrieval has been adjusted. Please create an index.';
+$lang->upgrade->buildIndex       = 'Create Index';
+
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 9f6e9df3e1..fd19aaacea 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -30,6 +30,7 @@ $lang->upgrade->warnningContent = <<<EOT
    e.g. mysqldump -u root -p zentao >zentao.bak
 </pre>
 EOT;
+
 $lang->upgrade->createFileWinCMD   = 'Open command line and execute <strong style="color:#ed980f">echo > %s</strong>';
 $lang->upgrade->createFileLinuxCMD = 'Execute command line: <strong style="color:#ed980f">touch %s</strong>';
 $lang->upgrade->setStatusFile      = '<h4>Please complete the following actions</h4>
@@ -52,7 +53,10 @@ $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard
 $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you delete it.';
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
-$lang->upgrade->to15Guide     = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPRO10Guide  = 'ZenTao profession version 10.0.rc1 upgrade';
+$lang->upgrade->toBIZ5Guide   = 'ZenTao enterprise version 5.0.rc1 upgrade';
+$lang->upgrade->toMAXGuide    = 'ZenTao ultimate version upgrade';
 $lang->upgrade->to15Desc      = <<<EOD
 <p>Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:</p>
 <ol>
@@ -66,27 +70,6 @@ $lang->upgrade->to15Desc      = <<<EOD
 <p><strong>How do you plan to use the new version of ZenTao?</strong></p>
 EOD;
 
-$lang->upgrade->to15Mode['classic'] = 'Keep the old version';
-$lang->upgrade->to15Mode['new']     = 'New program management mode';
-
-$lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.';
-$lang->upgrade->selectedModeTips['new']     = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.';
-
-$lang->upgrade->demoURL       = 'http://zentao20.demo.zentao.net';
-$lang->upgrade->videoURL      = 'https://qc.zentao.net/zentao20.mp4';
-$lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
-$lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
-$lang->upgrade->to20TipsHeader= "<p>Dear user, thank you for your support of ZenTao。Since version 20, Zendo has been fully upgraded to a universal project management platform. Please see the following video for more information(If the video can not play properly, please visit directly <a href='http://zentao20.demo.zentao.net/zentao20.mp4' target='_blank'><u>Zentao20</u></a>)：</p><br />";
-$lang->upgrade->to20Desc      = <<<EOD
-<div class='text-warning'>
-  <p>Friendly reminder：</p>
-  <ol>
-    <li>You can start by installing a version 20 of ZenTao to experience the concepts and processes inside.</li>
-    <li>Version 20 of Zendo has made some major changes, please make a backup before upgrading.</li>
-    <li>Please feel free to upgrade, even if the first upgrade is not in place, subsequent adjustments can be made without affecting system data.</li>
-  </ol>
-</div>
-EOD;
 $lang->upgrade->mergeProgramDesc = <<<EOD
 <p>Next, we will migrate the previous historical product and iteration data to the project set and under the project, with the following scenario for migration.</p><br />
 <h4>Option 1: Product and iteration organized by product line </h4>
@@ -99,6 +82,12 @@ $lang->upgrade->mergeProgramDesc = <<<EOD
 <p>These iterations can be selected to fall under a new project.</p>
 EOD;
 
+$lang->upgrade->to15Mode['classic'] = 'Keep the old version';
+$lang->upgrade->to15Mode['new']     = 'New program management mode';
+
+$lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.';
+$lang->upgrade->selectedModeTips['new']     = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.';
+
 $lang->upgrade->line         = 'Product Line';
 $lang->upgrade->program      = 'Merge Project';
 $lang->upgrade->existProgram = 'Existing programs';
@@ -117,5 +106,6 @@ $lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select m
 $lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
 $lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
+$lang->upgrade->needBuild4Add      = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index dc27e3aefe..8488029881 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -52,7 +52,9 @@ $lang->upgrade->noticeSQL     = 'Votre base de donnée est inconsistente avec le
 $lang->upgrade->afterDeleted  = "Le fichier n'est pas supprimé. Recommencez après l'avoir supprimé.";
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
-$lang->upgrade->to15Guide     = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPRO10Guide  = 'ZenTao profession version 10.0.rc1 upgrade';
+$lang->upgrade->toBIZ5Guide   = 'ZenTao enterprise version 5.0.rc1 upgrade';
 $lang->upgrade->to15Desc      = <<<EOD
 <p>Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:</p>
 <ol>
@@ -118,4 +120,8 @@ $lang->upgrade->mergeByProject     = "Independent iterations: You can select sev
 $lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 
+$lang->upgrade->needBuild4Add    = 'Full text retrieval has been added in this upgrad. Please create an index.';
+$lang->upgrade->needBuild4Adjust = 'Full text retrieval has been adjusted. Please create an index.';
+$lang->upgrade->buildIndex       = 'Create Index';
+
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 9d6b9f23e2..07e1db8d74 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -132,3 +132,8 @@ $lang->upgrade->fromVersions['12_4_4']     = '12.4.4';
 $lang->upgrade->fromVersions['12_5']       = '12.5';
 $lang->upgrade->fromVersions['12_5_1']     = '12.5.1';
 $lang->upgrade->fromVersions['12_5_2']     = '12.5.2';
+$lang->upgrade->fromVersions['12_5_3']     = '12.5.3';
+$lang->upgrade->fromVersions['15_0_rc1']   = '15.0.rc1';
+$lang->upgrade->fromVersions['15_0_rc2']   = '15.0.rc2';
+$lang->upgrade->fromVersions['15_0_rc3']   = '15.0.rc3';
+$lang->upgrade->fromVersions['15_0']       = '15.0';
diff --git a/module/upgrade/lang/vi.php b/module/upgrade/lang/vi.php
index 8e42687f67..8ab41b28ea 100644
--- a/module/upgrade/lang/vi.php
+++ b/module/upgrade/lang/vi.php
@@ -52,7 +52,9 @@ $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard
 $lang->upgrade->afterDeleted  = 'File không là deleted. Vui lòng refresh after you xóa it.';
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
-$lang->upgrade->to15Guide     = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->toPRO10Guide  = 'ZenTao profession version 10.0.rc1 upgrade';
+$lang->upgrade->toBIZ5Guide   = 'ZenTao enterprise version 5.0.rc1 upgrade';
 $lang->upgrade->to15Desc      = <<<EOD
 <p>Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:</p>
 <ol>
@@ -118,4 +120,8 @@ $lang->upgrade->mergeByProject     = "Independent iterations: You can select sev
 $lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 
+$lang->upgrade->needBuild4Add    = 'Full text retrieval has been added in this upgrad. Vui lòng create an index.';
+$lang->upgrade->needBuild4Adjust = 'Full text retrieval has been adjusted. Vui lòng create an index.';
+$lang->upgrade->buildIndex       = 'Tạo Index';
+
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 318bd4775e..d742489d3f 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -53,7 +53,10 @@ $lang->upgrade->noticeSQL      = '检查到你的数据库跟标准不一致，
 $lang->upgrade->afterDeleted   = '以上文件未能删除， 删除后刷新！';
 $lang->upgrade->mergeProgram   = '数据迁移';
 $lang->upgrade->mergeTips      = '数据迁移提示';
-$lang->upgrade->to15Guide      = '禅道开源版15.0.beta1升级';
+$lang->upgrade->toPMS15Guide   = '禅道开源版15版本升级';
+$lang->upgrade->toPRO10Guide   = '禅道专业版10版本升级';
+$lang->upgrade->toBIZ5Guide    = '禅道企业版5版本升级';
+$lang->upgrade->toMAXGuide     = '禅道旗舰版版本升级';
 $lang->upgrade->to15Desc       = <<<EOD
 <p>尊敬的用户，禅道从15版本开始对导航和概念做了调整，主要改动如下：</p>
 <ol>
@@ -103,5 +106,6 @@ $lang->upgrade->mergeByProduct     = "以产品组织的迭代：可以选择多
 $lang->upgrade->mergeByProject     = "独立的迭代：可以选择若干迭代归并到一个项目中，也可以独立归并。";
 $lang->upgrade->mergeByMoreLink    = "关联多个产品的迭代：选择这个迭代归属于哪一个产品。";
 $lang->upgrade->mergeRepoTips      = "将选中的版本库归并到所选产品下。";
+$lang->upgrade->needBuild4Add      = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。';
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 891b91a906..8957beab51 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -9,13 +9,15 @@
  * @version     $Id: zh-tw.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->upgrade->common  = '升級';
-$lang->upgrade->result  = '升級結果';
-$lang->upgrade->fail    = '升級失敗';
-$lang->upgrade->success = "<p><i class='icon icon-check-circle'></i></p><p>恭喜您！</p><p>您的禪道已經成功升級。</p>";
-$lang->upgrade->tohome  = '訪問禪道';
-$lang->upgrade->license = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.2';
-$lang->upgrade->warnning= '警告';
+$lang->upgrade->common          = '升級';
+$lang->upgrade->start           = '開始';
+$lang->upgrade->result          = '升級結果';
+$lang->upgrade->fail            = '升級失敗';
+$lang->upgrade->successTip      = '升級成功';
+$lang->upgrade->success         = "<p><i class='icon icon-check-circle'></i></p><p>恭喜您！</p><p>您的禪道已經成功升級。</p>";
+$lang->upgrade->tohome          = '訪問禪道';
+$lang->upgrade->license         = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.2';
+$lang->upgrade->warnning        = '警告';
 $lang->upgrade->checkExtension  = '檢查插件';
 $lang->upgrade->consistency     = '一致性檢查';
 $lang->upgrade->warnningContent = <<<EOT
@@ -28,6 +30,7 @@ $lang->upgrade->warnningContent = <<<EOT
    比如： mysqldump -u root -p zentao >zentao.bak
 </pre>
 EOT;
+
 $lang->upgrade->createFileWinCMD   = '打開命令行，執行<strong style="color:#ed980f">echo > %s</strong>';
 $lang->upgrade->createFileLinuxCMD = '在命令行執行: <strong style="color:#ed980f">touch %s</strong>';
 $lang->upgrade->setStatusFile      = '<h4>升級之前請先完成下面的操作：</h4>
@@ -36,6 +39,7 @@ $lang->upgrade->setStatusFile      = '<h4>升級之前請先完成下面的操
                                       <li>或者刪掉"<strong style="color:#ed980f">%s</strong>" 這個檔案 ，重新創建一個<strong style="color:#ed980f">ok.txt</strong>檔案，不需要內容。</li>
                                       </ul>
                                       <p><strong style="color:red">我已經仔細閲讀上面提示且完成上述工作，<a href="#" onclick="location.reload()">繼續更新</a></strong></p>';
+
 $lang->upgrade->selectVersion  = '選擇版本';
 $lang->upgrade->continue       = '繼續';
 $lang->upgrade->noteVersion    = "務必選擇正確的版本，否則會造成數據丟失。";
@@ -49,22 +53,23 @@ $lang->upgrade->noticeSQL      = '檢查到你的資料庫跟標準不一致，
 $lang->upgrade->afterDeleted   = '以上檔案未能刪除， 刪除後刷新！';
 $lang->upgrade->mergeProgram   = '數據遷移';
 $lang->upgrade->mergeTips      = '數據遷移提示';
-$lang->upgrade->to20Demo       = '查看20版本Demo';
-$lang->upgrade->demoURL        = 'http://zentao20.demo.zentao.net';
-$lang->upgrade->videoURL       = 'https://qc.zentao.net/zentao20.mp4';
-$lang->upgrade->to20Tips       = '禪道20版本升級提示';
-$lang->upgrade->to20Button     = '我已經做好備份，開始升級吧！';
-$lang->upgrade->to20TipsHeader = "<p>尊敬的用戶，感謝對禪道的支持。自20版本開始，禪道全面升級成為通用的項目管理平台。相關介紹請看如下視頻(如視頻無法正常播放，請直接訪問 <a href='http://zentao20.demo.zentao.net/zentao20.mp4' target='_blank'><u>禪道20版本介紹</u></a>)：</p><br />";
-$lang->upgrade->to20Desc       = <<<EOD
-<div class='text-warning' style='width:60%; margin: auto;'>
-  <p>友情提示：</p>
-  <ol>
-    <li>您可以先安裝一個20版本的禪道，體驗一下里邊的概念和流程。</li>
-    <li>20版本禪道改動比較大，升級之前請做好備份。</li>
-    <li>請放心升級，即使第一次升級不到位，後續還可以再調整，不會影響系統數據。</li>
-  </ol>
-</div>
+$lang->upgrade->toPMS15Guide   = '禪道開源版15版本升級';
+$lang->upgrade->toPRO10Guide   = '禪道專業版10版本升級';
+$lang->upgrade->toBIZ5Guide    = '禪道企業版5版本升級';
+$lang->upgrade->toMAXGuide     = '禪道旗艦版版本升級';
+$lang->upgrade->to15Desc       = <<<EOD
+<p>尊敬的用戶，禪道從15版本開始對導航和概念做了調整，主要改動如下：</p>
+<ol>
+<p><li>增加了項目集概念。一個項目集可以包括多個產品和多個項目。</li></p>
+<p><li>細分了項目和迭代概念，一個項目可以包含多個迭代。</li></p>
+<p><li>導航增加了左側菜單並支持多頁面操作。</li></p>
+</ol>
+<br/>
+<p>您可以在綫體驗最新版本的功能，以決定是否啟用的模式：<a class='text-info' href='http://zentaomax.demo.zentao.net' target='_blank'>演示demo</a></p>
+</br>
+<p><strong>請問您計劃如何使用禪道的新版本呢？</strong></p>
 EOD;
+
 $lang->upgrade->mergeProgramDesc = <<<EOD
 <p>接下來我們會把之前歷史產品和迭代數據遷移到項目集和項目下，遷移的方案如下：</p><br />
 <h4>方案一：以產品綫組織的產品和迭代 </h4>
@@ -77,17 +82,24 @@ $lang->upgrade->mergeProgramDesc = <<<EOD
 <p>可以選擇這些迭代歸屬於某個新項目下。</p>
 EOD;
 
+$lang->upgrade->to15Mode['classic'] = '保持老版本的習慣';
+$lang->upgrade->to15Mode['new']     = '全新項目集管理模式';
+
+$lang->upgrade->selectedModeTips['classic'] = '後續您還可以在後台-自定義裡面切換為全新項目集管理的模式。';
+$lang->upgrade->selectedModeTips['new']     = '切換為項目集管理模式需要對之前的數據進行歸併處理，系統會引導您完成這個操作。';
+
 $lang->upgrade->line         = '產品綫';
 $lang->upgrade->program      = '目標項目集和項目';
 $lang->upgrade->existProgram = '已有項目集';
 $lang->upgrade->existProject = '已有項目';
+$lang->upgrade->existLine    = '已有' . $lang->productCommon . '綫';
 $lang->upgrade->product      = $lang->productCommon;
 $lang->upgrade->project      = '迭代';
 $lang->upgrade->repo         = '版本庫';
 $lang->upgrade->mergeRepo    = '歸併版本庫';
 
 $lang->upgrade->newProgram         = '新建';
-$lang->upgrade->projectEmpty       = '項目不能爲空！';
+$lang->upgrade->projectEmpty       = '所屬項目不能為空！';
 $lang->upgrade->mergeSummary       = "尊敬的用戶，您的系統中共有%s個產品，%s個迭代等待遷移。";
 $lang->upgrade->mergeByProductLine = "以產品綫組織的產品和迭代：將整個產品綫及其下面的產品和迭代歸併到一個項目集和項目中，也可以分開歸併。";
 $lang->upgrade->mergeByProduct     = "以產品組織的迭代：可以選擇多個產品及其下面的迭代歸併到一個項目集和項目中，也可以選擇某一個產品將其下面所屬的迭代歸併到項目集和項目中。";
@@ -95,4 +107,8 @@ $lang->upgrade->mergeByProject     = "獨立的迭代：可以選擇若干迭代
 $lang->upgrade->mergeByMoreLink    = "關聯多個產品的迭代：選擇這個迭代歸屬於哪一個產品。";
 $lang->upgrade->mergeRepoTips      = "將選中的版本庫歸併到所選產品下。";
 
+$lang->upgrade->needBuild4Add    = '本次升級新增全文檢索功能，需要創建索引。';
+$lang->upgrade->needBuild4Adjust = '本次升級全文檢索功能有調整，需要創建索引。';
+$lang->upgrade->buildIndex       = '創建索引';
+
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index a2c5f10be9..3407232c44 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -632,14 +632,53 @@ class upgradeModel extends model
         case '12_5_2':
             $this->saveLogs('Execute 12_5_2');
             $this->appendExec('12_5_2');
+        case '12_5_3':
+            $this->saveLogs('Execute 12_5_3');
+            $this->execSQL($this->getUpgradeFile('12.5.3'));
+            $this->adjustWhitelistOfProject();
+            $this->adjustWhitelistOfProduct();
+            $this->adjustPriv15_0();
+            $this->appendExec('12_5_3');
+        case '15_0_rc1':
+            $this->saveLogs('Execute 15_0_rc1');
+            $this->adjustUserView();
+            $this->appendExec('15_0_rc1');
+        case '15_0_rc2':
+            $this->saveLogs('Execute 15_0_rc2');
+            $this->execSQL($this->getUpgradeFile('15.0.rc2'));
+            $this->appendExec('15_0_rc2');
+        case '15_0_rc3':
+            $this->saveLogs('Execute 15_0_rc3');
+            $this->execSQL($this->getUpgradeFile('15.0.rc3'));
+            if(empty($this->config->isINT))
+            {
+                if(!$executeXuanxuan)
+                {
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan3.3.sql';
+                    $this->execSQL($xuanxuanSql);
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan4.0.sql';
+                    $this->execSQL($xuanxuanSql);
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan4.0.beta2.sql';
+                    $this->execSQL($xuanxuanSql);
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan4.0.beta3.sql';
+                    $this->execSQL($xuanxuanSql);
+                }
+            }
+            $this->updateLibType();
+            $this->updateRunCaseStatus();
+            $this->fix4TaskLinkProject();
+            $this->fixExecutionTeam();
+            $this->appendExec('15_0_rc3');
         case '15_0':
             $this->saveLogs('Execute 15_0');
             $this->execSQL($this->getUpgradeFile('15.0'));
-            $this->appendExec('15_0');
-        case '15_0_beta1':
-            $this->saveLogs('Execute 15_0_beta1');
             $this->adjustBugOfProject();
-            $this->appendExec('15_0_beta1');
+            $this->processBuildTable();
+            $this->appendExec('15_0');
+        case '15_0_1':
+            $this->saveLogs('Execute 15_0_1');
+            $this->updateProductVersion();
+            $this->appendExec('15_0_1');
         }
 
         $this->deletePatch();
@@ -823,7 +862,11 @@ class upgradeModel extends model
             case '12_5':
             case '12_5_1':
             case '12_5_2':
-            case '15_0'  : $confirmContent .= file_get_contents($this->getUpgradeFile('15.0'));
+            case '12_5_3': $confirmContent .= file_get_contents($this->getUpgradeFile('12.5.3'));
+            case '15_0_rc1':
+            case '15_0_rc2': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0.rc2'));
+            case '15_0_rc3': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0.rc3'));
+            case '15_0': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
@@ -944,6 +987,18 @@ class upgradeModel extends model
         return $alterSQL;
     }
 
+    /**
+     * Delete tmp model files.
+     *
+     * @access public
+     * @return void
+     */
+    public function deleteTmpModel()
+    {
+        $tmpModelDir = $this->app->getTmpRoot() . 'model/';
+        foreach(glob($tmpModelDir . '/*.php') as $tmpModelFile) unlink($tmpModelFile);
+    }
+
     /**
      * Delete Useless Files
      *
@@ -978,8 +1033,6 @@ class upgradeModel extends model
         return $result;
     }
 
-
-
     /**
      * Update ubb code in bug table and user Templates table to html.
      *
@@ -1468,7 +1521,7 @@ class upgradeModel extends model
 
         $this->saveLogs('Run Method ' . __FUNCTION__);
         $mysqlVersion = $this->loadModel('install')->getMysqlVersion();
-        $ignoreCode   = '|1050|1060|1091|1061|';
+        $ignoreCode   = '|1050|1054|1060|1091|1061|';
 
         /* Read the sql file to lines, remove the comment lines, then join theme by ';'. */
         $sqls = explode("\n", file_get_contents($sqlFile));
@@ -2757,7 +2810,22 @@ class upgradeModel extends model
     {
         $fromVersion = $this->config->installedVersion;
         $needProcess = array();
-        if(strpos($fromVersion, 'biz') === false and (strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($fromVersion, 'pro5.4', '<'))) $needProcess['updateFile'] = true;
+        if(strpos($fromVersion, 'max') === false and strpos($fromVersion, 'biz') === false and (strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($fromVersion, 'pro5.4', '<'))) $needProcess['updateFile'] = true;
+        if(strpos($fromVersion, 'max') === false and $this->config->systemMode == 'new')
+        {
+            if(strpos($fromVersion, 'pro') !== false and version_compare($fromVersion, 'pro10.0', '<'))
+            {
+                $needProcess['search'] = true;
+            }
+            elseif(strpos($fromVersion, 'biz') !== false and version_compare($fromVersion, 'biz5.0', '<'))
+            {
+                $needProcess['search'] = true;
+            }
+            elseif(version_compare($fromVersion, '15.0.rc1', '<'))
+            {
+                $needProcess['search'] = true;
+            }
+        }
         return $needProcess;
     }
 
@@ -3965,6 +4033,183 @@ class upgradeModel extends model
         return true;
     }
 
+    /**
+     * Adjust priv 15.0.
+     *
+     * @access public
+     * @return true
+     */
+    public function adjustPriv15_0()
+    {
+        $executionPriv = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('execution')->limit(1)->fetch();
+        if(empty($executionPriv)) $this->dao->update(TABLE_GROUPPRIV)->set('module')->eq('execution')->where('module')->eq('project')->exec();
+
+        $groups = $this->dao->select('id')->from(TABLE_GROUP)->fetchPairs('id', 'id');
+        foreach($groups as $groupID)
+        {
+            $groupPriv = new stdclass();
+            $groupPriv->group  = $groupID;
+            $groupPriv->module = 'my';
+            $groupPriv->method = 'work';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+
+            $groupPriv->method = 'contribute';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+
+            $groupPriv->method = 'team';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('my')->andWhere('method')->eq('project')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->method = 'execution';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('program')->andWhere('method')->like('PGM%')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $this->dao->delete()->from(TABLE_GROUPPRIV)->where('module')->eq($grouppriv->module)->andWhere('method')->eq($grouppriv->method)->exec();
+            $grouppriv->method = strtolower(str_ireplace('PGM', '', $grouppriv->method));
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+
+            $grouppriv->method = 'index';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('program')->andWhere('method')->like('PRJ%')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $this->dao->delete()->from(TABLE_GROUPPRIV)->where('module')->eq($grouppriv->module)->andWhere('method')->eq($grouppriv->method)->exec();
+            $grouppriv->module = 'project';
+            $grouppriv->method = strtolower(str_ireplace('PRJ', '', $grouppriv->method));
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+
+            $grouppriv->method = 'index';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('story')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->module = 'projectstory';
+            $grouppriv->method = 'story';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('story')->andWhere('method')->eq('view')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->module = 'projectstory';
+            $grouppriv->method = 'view';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('linkstory')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->module = 'projectstory';
+            $grouppriv->method = 'linkstory';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('unlinkstory')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->module = 'projectstory';
+            $grouppriv->method = 'unlinkstory';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('execution')->andWhere('method')->eq('all')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->module = 'project';
+            $grouppriv->method = 'execution';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+
+            $grouppriv->module = 'project';
+            $grouppriv->method = 'browse';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+
+            $grouppriv->module = 'project';
+            $grouppriv->method = 'index';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('doc')->andWhere('method')->eq('createlib')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->method = 'createLib';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('doc')->andWhere('method')->eq('editlib')->query();
+        while($grouppriv = $stmt->fetch())
+        {
+            $grouppriv->method = 'editLib';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+        }
+
+        return true;
+    }
+
+    /**
+     * Adjust userview.
+     *
+     * @access public
+     * @return bool
+     */
+    public function adjustUserView()
+    {
+        $userViews = $this->dao->select('`account`,`sprints`,`projects`')->from(TABLE_USERVIEW)->where('projects')->ne('')->fetchAll('account');
+
+        $projectIdList     = array();
+        $accountProjects   = array();
+        $accountExecutions = array();
+        foreach($userViews as $account => $userView)
+        {
+            $projects = explode(',', trim($userView->projects, ','));
+            foreach($projects as $projectID)
+            {
+                if(empty($projectID)) continue;
+                $accountProjects[$account][$projectID] = $projectID;
+
+                if(isset($projectIdList[$projectID])) continue;
+                $projectIdList[$projectID] = $projectID;
+            }
+
+            $executions = explode(',', trim($userView->sprints, ','));
+            foreach($executions as $executionID)
+            {
+                if(empty($executionID)) continue;
+                $accountExecutions[$account][$executionID] = $executionID;
+            }
+        }
+
+        $executionPairs = $this->dao->select('id')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->andWhere('type')->in('sprint,stage')->fetchAll('id', 'id');
+        foreach($userViews as $account => $userView)
+        {
+            $projects = zget($accountProjects, $account, array());
+            if(empty($projects)) continue;
+
+            $executions = zget($accountExecutions, $account, array());
+            foreach($projects as $projectID)
+            {
+                if(isset($executionPairs[$projectID]))
+                {
+                    $executions[$projectID] = $projectID;
+                    unset($projects[$projectID]);
+                }
+            }
+
+            $this->dao->update(TABLE_USERVIEW)->set('sprints')->eq(join(',', $executions))->set('projects')->eq(join(',', $projects))->where('account')->eq($account)->exec();
+        }
+
+        return true;
+    }
+
     /**
      * Save Logs.
      *
@@ -4010,6 +4255,7 @@ class upgradeModel extends model
             $program->openedDate    = helper::now();
             $program->openedVersion = $this->config->version;
             $program->acl           = 'open';
+            $program->days          = $this->computeDaysDelta($program->begin, $program->end);
 
             $this->app->loadLang('program');
             $this->app->loadLang('project');
@@ -4085,6 +4331,7 @@ class upgradeModel extends model
             $project->status         = $data->projectStatus;
             $project->begin          = $data->begin;
             $project->end            = isset($data->end) ? $data->end : LONG_TIME;
+            $project->days           = $this->computeDaysDelta($project->begin, $project->end);
             $project->PM             = $data->PM;
             $project->auth           = 'extend';
             $project->openedBy       = $account;
@@ -4112,6 +4359,16 @@ class upgradeModel extends model
                 ->where('id')->eq($projectID)
                 ->exec();
 
+            /* Create doc lib. */
+            $this->app->loadLang('doc');
+            $lib = new stdclass();
+            $lib->project = $projectID;
+            $lib->name    = $this->lang->doclib->main['project'];
+            $lib->type    = 'project';
+            $lib->main    = '1';
+            $lib->acl     = $project->acl != 'program' ? $project->acl : 'custom';
+            $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
+
             $this->loadModel('action')->create('project', $projectID, 'openedbysystem');
             if($data->projectStatus == 'closed') $this->loadModel('action')->create('project', $projectID, 'closedbysystem');
         }
@@ -4125,6 +4382,32 @@ class upgradeModel extends model
         return array($programID, $projectID, $lineID);
     }
 
+    /**
+     * Compute delta of two days.
+     *
+     * @param  string begin
+     * @param  string end
+     * @access public
+     * @return int
+     */
+    public function computeDaysDelta($begin, $end)
+    {
+        if($end == LONG_TIME) return 0;
+
+        $delta   = helper::diffDate($end, $begin);
+        $week    = date('w', strtotime($begin));
+        $weekend = 0;
+        for($i = 0; $i < $delta; $i++)
+        {
+            $week = $week % 7;
+            if($week == 0 or $week == 6) $weekend ++;
+
+            $week++;
+        }
+
+        return $delta - $weekend;
+    }
+
     /**
      * Replace program or project id for product and project linked objects.
      *
@@ -4139,8 +4422,7 @@ class upgradeModel extends model
     public function processMergedData($programID, $projectID, $lineID, $productIdList = array(), $sprintIdList = array())
     {
         /* Product linked objects. */
-        $this->dao->update(TABLE_STORY)->set('project')->eq($programID)->where('product')->in($productIdList)->exec();
-        $this->dao->update(TABLE_RELEASE)->set('project')->eq($programID)->where('product')->in($productIdList)->exec();
+        $this->dao->update(TABLE_RELEASE)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec();
 
         /* Compute product acl. */
         $products = $this->dao->select('id,program,acl')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->fetchAll();
@@ -4168,8 +4450,10 @@ class upgradeModel extends model
         $this->dao->update(TABLE_DOC)->set('project')->eq($projectID)->where("lib IN(SELECT id from " . TABLE_DOCLIB . " WHERE type = 'product' and product " . helper::dbIN($productIdList) . ')')->exec();
 
         /* Project linked objects. */
-        $this->dao->update(TABLE_TASK)->set('project')->eq($projectID)->where('project')->in($sprintIdList)->exec();
-        $this->dao->update(TABLE_DOC)->set('project')->eq($projectID)->where("lib IN(SELECT id from " . TABLE_DOCLIB . " WHERE type = 'project' and project " . helper::dbIN($sprintIdList) . ')')->exec();
+        $this->dao->update(TABLE_TASK)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->exec();
+        $this->dao->update(TABLE_BUILD)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->andWhere('project')->eq(0)->exec();
+        $this->dao->update(TABLE_BUG)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->andWhere('project')->eq(0)->exec();
+        $this->dao->update(TABLE_DOC)->set('project')->eq($projectID)->set('type')->eq('execution')->where("lib IN(SELECT id from " . TABLE_DOCLIB . " WHERE type = 'project' and execution " . helper::dbIN($sprintIdList) . ')')->exec();
 
         /* Put sprint stories into project story mdoule. */
         $sprintStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)
@@ -4199,8 +4483,11 @@ class upgradeModel extends model
             $this->dao->replace(TABLE_PROJECTCASE)->data($projectCase)->exec();
         }
 
-        /* Compute sprint path and grade. */
-        $sprints = $this->dao->select('id, type, acl')->from(TABLE_PROJECT)->where('id')->in($sprintIdList)->fetchAll();
+        /* Compute sprint path, grade and the minimum start date and end date of the project. */
+        $project      = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
+        $sprints      = $this->dao->select('id, type, acl, begin, end')->from(TABLE_PROJECT)->where('id')->in($sprintIdList)->fetchAll();
+        $minBeginDate = $project->begin;
+        $maxEndData   = $project->end;
         foreach($sprints as $sprint)
         {
             $data = new stdclass();
@@ -4210,9 +4497,11 @@ class upgradeModel extends model
             $data->path     = ",{$projectID},{$sprint->id},";
             $data->type     = 'sprint';
             $data->acl      = $sprint->acl == 'custom' ? 'private' : $sprint->acl;
-            $data->lifetime = $sprint->type;
 
             $this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($sprint->id)->exec();
+
+            $minBeginDate = ($sprint->begin < $minBeginDate) ? $sprint->begin : $minBeginDate;
+            $maxEndData   = $sprint->end > $maxEndData ? $sprint->end : $maxEndData;
         }
 
         /* Compute project date and status. */
@@ -4231,6 +4520,13 @@ class upgradeModel extends model
             $data->closedDate = $maxRealEnd;
         }
 
+        if($minBeginDate != $project->begin or $maxEndData != $project->end)
+        {
+            $data->begin = $minBeginDate;
+            $data->end   = $maxEndData;
+            $data->days  = $this->computeDaysDelta($data->begin, $data->end);
+        }
+
         $this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($projectID)->exec();
 
         /* Set product and project relation. */
@@ -4279,12 +4575,14 @@ class upgradeModel extends model
             if(isset($sprint->feedback)) $teams[$sprint->feedback] = $sprint->feedback;
         }
 
-        $teams += $this->dao->select('account')->from(TABLE_TEAM)->where('type')->eq('project')->andWhere('root')->in($sprintIdList)->fetchPairs('account', 'account');
+        $teams += $this->dao->select('account')->from(TABLE_TEAM)->where('type')->eq('execution')->andWhere('root')->in($sprintIdList)->fetchPairs('account', 'account');
         $users = $this->dao->select('account')->from(TABLE_USER)->where('deleted')->eq('0')->fetchPairs('account', 'account');
 
         /* Insert product and sprint team into project team. */
-        $today = helper::today();
-        foreach($teams as $account)
+        $today         = helper::today();
+        $project       = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
+        $projectMember = $this->dao->select('*')->from(TABLE_TEAM)->where('account')->in($teams)->fetchAll('account');
+        foreach($projectMember as $account => $user)
         {
             if(empty($account)) continue;
             if(!isset($users[$account])) continue;
@@ -4293,16 +4591,13 @@ class upgradeModel extends model
             $team->root    = $projectID;
             $team->type    = 'project';
             $team->account = $account;
+            $team->role    = $user->role;
             $team->join    = $today;
+            $team->days    = $project->days;
+            $team->hours   = '7.0';
             $this->dao->replace(TABLE_TEAM)->data($team)->exec();
         }
 
-        /* Update project type to sprint. */
-        $this->dao->update(TABLE_TEAM)->set('type')->eq('sprint')
-            ->where('type')->eq('project')
-            ->andWhere('root')->in($sprintIdList)
-            ->exec();
-
         /* Get all actor in sprint and product. */
         foreach($productIdList as $productID) $productIdList[$productID] = ",{$productID},";
         $whiteList = $this->dao->select('actor')->from(TABLE_ACTION)->where('execution')->in($sprintIdList)->orWhere('product')->in($productIdList)->fetchPairs('actor', 'actor');
@@ -4318,6 +4613,10 @@ class upgradeModel extends model
 
             $groups        = explode(',', $product->whitelist);
             $groupAccounts = $this->group->getGroupAccounts($groups);
+
+            /* Get the whitelist data from the classic version mode upgrade. */
+            $groupAccounts += $this->dao->select('account')->from(TABLE_ACL)->where('objectID')->eq($product->id)->andWhere('objectType')->eq('product')->andWhere('type')->eq('whitelist')->fetchPairs('account');
+
             $whiteList    += $groupAccounts;
             $this->personnel->updateWhitelist($groupAccounts, 'product', $product->id, 'whitelist', 'upgrade');
         }
@@ -4330,6 +4629,10 @@ class upgradeModel extends model
 
             $groups        = explode(',', $sprint->whitelist);
             $groupAccounts = $this->group->getGroupAccounts($groups);
+
+            /* Get the whitelist data from the classic version mode upgrade. */
+            $groupAccounts += $this->dao->select('account')->from(TABLE_ACL)->where('objectID')->eq($sprint->id)->andWhere('objectType')->eq('sprint')->andWhere('type')->eq('whitelist')->fetchPairs('account');
+
             $this->personnel->updateWhitelist($groupAccounts, 'sprint', $sprint->id, 'whitelist', 'upgrade');
         }
     }
@@ -4346,13 +4649,14 @@ class upgradeModel extends model
             if(isset($data->name))
             {
                 $product = new stdclass();
-                $product->program     = $data->program;
-                $product->name        = $data->name;
-                $product->acl         = 'open';
-                $product->PO          = isset($this->app->user->account) ? $this->app->user->account : '';
-                $product->createdBy   = isset($this->app->user->account) ? $this->app->user->account : '';
-                $product->createdDate = helper::now();
-                $product->status      = 'normal';
+                $product->program        = $data->program;
+                $product->name           = $data->name;
+                $product->acl            = 'open';
+                $product->PO             = isset($this->app->user->account) ? $this->app->user->account : '';
+                $product->createdBy      = isset($this->app->user->account) ? $this->app->user->account : '';
+                $product->createdDate    = helper::now();
+                $product->status         = 'normal';
+                $product->createdVersion = $this->config->version;
 
                 $this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
                 $productID = $this->dao->lastInsertID();
@@ -4508,82 +4812,6 @@ class upgradeModel extends model
         return true;
     }
 
-    /**
-     * Process sprint concept.
-     *
-     * @access public
-     * @return bool
-     */
-    public function processSprintConcept()
-    {
-        $productProject = $this->dao->select('*')->from(TABLE_CONFIG)
-            ->where('module')->eq('custom')
-            ->andWhere('`key`')->eq('productProject')
-            ->fetch();
-
-        $newValue = substr($productProject->value, 2);
-        $this->dao->update(TABLE_CONFIG)
-            ->set('`value`')->eq($newValue)
-            ->set('`key`')->eq('sprintConcept')
-            ->where('id')->eq($productProject->id)
-            ->exec();
-
-        return true;
-    }
-
-    /**
-     * Adjust budget units and values.
-     *
-     * @access public
-     * @return bool
-     */
-    public function adjustBudget()
-    {
-        $budgets = $this->dao->select('id,budget,budgetUnit')->from(TABLE_PROJECT)
-            ->where('type')->in('project,program')
-            ->fetchAll('id');
-
-        foreach($budgets as $id => $budget)
-        {
-            $data = array();
-            if($budget->budgetUnit == 'yuan')
-            {
-                $data['budget']     = number_format($budget->budget / 10000, 2);
-                $data['budgetUnit'] = 'wanyuan';
-            }
-
-            if($data) $this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($id)->exec();
-        }
-
-        return true;
-    }
-
-    /**
-     * Adjust budget units and values.
-     *
-     * @access public
-     * @return bool
-     */
-    public function adjustBudgetUnit()
-    {
-        $budgets = $this->dao->select('id,budget,budgetUnit')->from(TABLE_PROJECT)
-            ->where('type')->in('project,program')
-            ->fetchAll('id');
-
-        foreach($budgets as $id => $budget)
-        {
-            $data = array();
-            $data['budgetUnit'] = 'CNY';
-            $data['budget']     = str_replace(',', '', $budget->budget);
-            if($budget->budgetUnit == 'wanyuan') $data['budget']     = (float)$data['budget'] * 10000;
-            if($budget->budgetUnit == 'dollar')  $data['budgetUnit'] = 'USD';
-
-            if($data) $this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($id)->exec();
-        }
-
-        return true;
-    }
-
     /**
      * Adjust the project field of the zt_bug table.
      *
@@ -4592,17 +4820,171 @@ class upgradeModel extends model
      */
     public function adjustBugOfProject()
     {
-        $bugs       = $this->dao->select('id,execution')->from(TABLE_BUG)->fetchAll('id');
-        $executions = $this->dao->select('id,project')->from(TABLE_EXECUTION)->fetchAll('id');
+        if($this->config->systemMode != 'new') return true;
 
-        foreach($bugs as $id => $bug)
+        $bugs       = $this->dao->select('id,execution')->from(TABLE_BUG)->where('execution')->ne('0')->andWhere('project')->eq(0)->fetchPairs('id', 'execution');
+        $executions = $this->dao->select('id,project')->from(TABLE_EXECUTION)->where('id')->in(array_unique(array_values($bugs)))->fetchPairs('id', 'project');
+
+        foreach($bugs as $id => $executionID)
         {
-            if($bug->execution == 0) continue;
-            $data = array();
-            $data['project'] = $executions[$bug->execution]->project;
-            if($data) $this->dao->update(TABLE_BUG)->data($data)->where('id')->eq($id)->exec();
+            if(isset($executions[$executionID])) $this->dao->update(TABLE_BUG)->set('project')->eq($executions[$executionID])->where('id')->eq($id)->exec();
         }
 
         return true;
     }
+
+    /**
+     * Adjust the whitelist of projects.
+     *
+     * @access public
+     * @return bool
+     */
+    public function adjustWhitelistOfProject()
+    {
+        $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('acl')->eq('custom')->andWhere('type')->eq('sprint')->fetchAll();
+        foreach($projects as $project)
+        {
+            $groups   = explode(',', $project->whitelist);
+            $accounts = $this->dao->select('account')->from(TABLE_USERGROUP)->where('`group`')->in($groups)->fetchPairs('account');
+            foreach($accounts as $account)
+            {
+                $acl = new stdclass();
+                $acl->account    = $account;
+                $acl->objectType = $project->type;
+                $acl->objectID   = $project->id;
+                $acl->type       = 'whitelist';
+                $acl->source     = 'upgrade';
+
+                $this->dao->insert(TABLE_ACL)->data($acl)->exec();
+            }
+
+            $this->dao->update(TABLE_PROJECT)->set('acl')->eq('private')->where('id')->eq($project->id)->exec();
+        }
+
+        return true;
+    }
+
+    /**
+     * Adjust the whitelist of projects.
+     *
+     * @access public
+     * @return bool
+     */
+    public function adjustWhitelistOfProduct()
+    {
+        $products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('acl')->eq('custom')->fetchAll();
+        foreach($products as $product)
+        {
+            $groups   = explode(',', $product->whitelist);
+            $accounts = $this->dao->select('account')->from(TABLE_USERGROUP)->where('`group`')->in($groups)->fetchPairs('account');
+            foreach($accounts as $account)
+            {
+                $acl = new stdclass();
+                $acl->account    = $account;
+                $acl->objectType = 'product';
+                $acl->objectID   = $product->id;
+                $acl->type       = 'whitelist';
+                $acl->source     = 'upgrade';
+
+                $this->dao->insert(TABLE_ACL)->data($acl)->exec();
+            }
+
+            $this->dao->update(TABLE_PRODUCT)->set('acl')->eq('private')->where('id')->eq($product->id)->exec();
+        }
+
+        return true;
+    }
+
+    /**
+     * Update execution main doclib type.
+     *
+     * @access public
+     * @return bool
+     */
+    public function updateLibType()
+    {
+        $executionList = $this->dao->select('id')->from(TABLE_EXECUTION)->where('type')->eq('sprint')->fetchAll('id');
+        $this->dao->update(TABLE_DOCLIB)->set('type')->eq('execution')->where('execution')->in(array_keys($executionList))->exec();
+
+        return true;
+    }
+
+    /**
+     * Update the testtask related cases status.
+     *
+     * @access public
+     * @return bool
+     */
+    public function updateRunCaseStatus()
+    {
+        $this->dao->update(TABLE_TESTRUN)->set('status')->eq('normal')->where('status')->in('wait,done')->exec();
+
+        return true;
+    }
+
+    /**
+     * Fix for task link project.
+     *
+     * @access public
+     * @return bool
+     */
+    public function fix4TaskLinkProject()
+    {
+        if($this->config->systemMode != 'new') return true;
+
+        $executionIdList = $this->dao->select('distinct execution')->from(TABLE_TASK)->where('project')->eq(0)->fetchPairs('execution', 'execution');
+        $executionPairs  = $this->dao->select('id,project')->from(TABLE_PROJECT)->where('id')->in($executionIdList)->andWhere('project')->ne('0')->fetchPairs('id', 'project');
+        foreach($executionPairs as $executionID => $projectID) $this->dao->update(TABLE_TASK)->set('project')->eq($projectID)->where('execution')->eq($executionID)->exec();
+
+        return true;
+    }
+
+    /**
+     * Fix execution team.
+     *
+     * @access public
+     * @return bool
+     */
+    public function fixExecutionTeam()
+    {
+        $errorTeams = $this->dao->select('id,root,account')->from(TABLE_TEAM)->where('type')->eq('')->fetchGroup('root', 'id');
+        $duplicateTeams = $this->dao->select('root,account')->from(TABLE_TEAM)->where('root')->in(array_keys($errorTeams))->andWhere('type')->ne('')->fetchGroup('root', 'account');
+
+        foreach($errorTeams as $root => $teams)
+        {
+            if(!isset($duplicateTeams[$root]))
+            {
+                $this->dao->update(TABLE_TASK)->set('type')->eq('execution')->where('id')->in(array_keys($teams))->exec();
+            }
+            else
+            {
+                $existsTeams = $duplicateTeams[$root];
+                foreach($teams as $team)
+                {
+                    if(isset($existsTeams[$team->account]))
+                    {
+                        $this->dao->delete()->from(TABLE_TEAM)->where('id')->eq($team->id);
+                    }
+                    else
+                    {
+                        $this->dao->update(TABLE_TASK)->set('type')->eq('execution')->where('id')->in($team->id)->exec();
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Update the createdVersion field of the zt_product table.
+     *
+     * @access public
+     * @return void
+     */
+    public function updateProductVersion()
+    {
+        $this->dao->update(TABLE_PRODUCT)->set('createdVersion')->eq($this->config->version)->where('createdVersion')->eq('')->andWhere('createdDate')->gt('2020-01-01')->exec();
+        return true;
+    }
 }
diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php
index e416a1d6f3..6a33329788 100644
--- a/module/upgrade/view/afterexec.html.php
+++ b/module/upgrade/view/afterexec.html.php
@@ -87,4 +87,12 @@ function updateFile(link)
 }
 <?php endif;?>
 </script>
+<?php if(isset($needProcess['search'])):?>
+<script>
+$(function()
+{
+    $('.col-md-6:first').append("<div class='alert alert-info'><p><?php echo $lang->upgrade->needBuild4Add;?></p></div>");
+})
+</script>
+<?php endif;?>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/upgrade/view/createprogram.html.php b/module/upgrade/view/createprogram.html.php
index caa8a43458..fa76636818 100644
--- a/module/upgrade/view/createprogram.html.php
+++ b/module/upgrade/view/createprogram.html.php
@@ -89,7 +89,7 @@
   </tr>
   <tr class='programParams'>
     <th><?php echo $lang->project->acl;?></th>
-    <td><?php echo nl2br(html::radio('acl', $lang->project->aclList, 'open', '', 'block'));?></td>
+    <td><?php echo nl2br(html::radio('acl', $lang->project->subAclList, 'open', '', 'block'));?></td>
   </tr>
 </table>
 <div class='table-foot text-center'><?php echo html::submitButton();?></div>
diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php
index 69482dfe59..dcc3c5b431 100644
--- a/module/upgrade/view/mergeprogram.html.php
+++ b/module/upgrade/view/mergeprogram.html.php
@@ -43,7 +43,7 @@
           <tbody>
           <?php foreach($noMergedSprints as $sprintID => $sprint):?>
           <tr>
-            <td><?php echo "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}" . html::hidden("sprints[]", $sprint->id);?></td>
+            <td><?php echo "{$sprint->name}" . html::hidden("sprints[]", $sprint->id);?></td>
             <td class='divider'><i class='icon icon-angle-double-right'></i></td>
             <td><?php echo html::select("projects[]", $sprint->projects, '', "class='form-control chosen'");?></td>
           </tr>
diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php
index 39c5e9b440..a3ca30534b 100644
--- a/module/upgrade/view/to15guide.html.php
+++ b/module/upgrade/view/to15guide.html.php
@@ -14,13 +14,33 @@
 <div class='container'>
   <div class='panel' style='padding:50px; margin:50px 300px;'>
     <form method='post'>
-      <div class='panel-title text-center'><?php echo $lang->upgrade->to15Guide;?></div>
+      <div class='panel-title text-center'>
+        <?php
+        if(isset($config->maxVersion))
+        {
+            echo $lang->upgrade->toMAXGuide;
+        }
+        elseif(isset($config->bizVersion))
+        {
+            echo $lang->upgrade->toBIZ5Guide;
+        }
+        elseif(isset($config->proVersion))
+        {
+            echo $lang->upgrade->toPRO10Guide;
+        }
+        else
+        {
+            echo $lang->upgrade->toPMS15Guide;
+        }
+        ?>
+      </div>
       <div class='panel-body'>
         <div style='width:600px; margin: auto;'>
           <?php echo $lang->upgrade->to15Desc;?>
-          <?php echo html::radio('mode', $lang->upgrade->to15Mode, 'classic');?>
+          <?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
+          <?php echo html::radio('mode', $lang->upgrade->to15Mode, $systemMode);?>
           <p> </p>
-          <div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips['classic'];?></div>
+          <div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips[$systemMode];?></div>
         </div>
       </div>
       <hr/>
diff --git a/module/user/control.php b/module/user/control.php
index 590db35134..da4a04c6f3 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -39,6 +39,7 @@ class user extends control
      */
     public function view($userID)
     {
+        $userID = (int)$userID;
         $this->locate($this->createLink('user', 'todo', "userID=$userID&type=all"));
     }
 
@@ -57,14 +58,15 @@ class user extends control
      */
     public function todo($userID, $type = 'today', $status = 'all', $orderBy = 'date,status,begin', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $user = $this->user->getById($userID, 'id');
+        $userID = (int)$userID;
+        $user   = $this->user->getById($userID, 'id');
         if(empty($user)) die(js::error($this->lang->notFound) . js::locate('back'));
 
         /* Set thie url to session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('todoList', $uri);
-        $this->session->set('bugList',  $uri);
-        $this->session->set('taskList', $uri);
+        $this->session->set('todoList', $uri, 'my');
+        $this->session->set('bugList',  $uri, 'qa');
+        $this->session->set('taskList', $uri, 'execution');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -77,13 +79,10 @@ class user extends control
         $account = $user->account;
         $todos   = $this->todo->getList($type, $account, $status, 0, $pager, $sort);
         $date    = (int)$type == 0 ? helper::today() : $type;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
-
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
+        if(!isset($users[$userID])) die(js::error($this->lang->user->error->noAccess) . js::locate('back'));
 
         /* set menus. */
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo;
@@ -115,7 +114,7 @@ class user extends control
     public function story($userID, $storyType = 'story', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
-        $this->session->set('storyList', $this->app->getURI(true));
+        $this->session->set('storyList', $this->app->getURI(true), 'product');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -123,13 +122,7 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
-
-        /* Set menu. */
-        $this->lang->set('menugroup.user', 'company');
-
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Modify story title. */
         $this->loadModel('story');
@@ -164,7 +157,7 @@ class user extends control
     public function task($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save the session. */
-        $this->session->set('taskList', $this->app->getURI(true));
+        $this->session->set('taskList', $this->app->getURI(true), 'execution');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -172,15 +165,11 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Set the menu. */
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
         /* Assign. */
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->task;
         $this->view->position[] = $this->lang->user->task;
@@ -209,7 +198,7 @@ class user extends control
     public function bug($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save the session. */
-        $this->session->set('bugList', $this->app->getURI(true));
+        $this->session->set('bugList', $this->app->getURI(true), 'qa');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -217,18 +206,14 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Set menu. */
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
         /* Load the lang of bug module. */
         $this->app->loadLang('bug');
 
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->bug;
         $this->view->position[] = $this->lang->user->bug;
         $this->view->tabID      = 'bug';
@@ -261,23 +246,20 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Set menu. */
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
         /* Save session. */
-        $this->session->set('testtaskList', $this->app->getURI(true));
+        $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
+        $this->session->set('buildList', $this->app->getURI(true), 'execution');
 
         $this->app->loadLang('testcase');
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->testTask;
         $this->view->position[] = $this->lang->user->testTask;
         $this->view->tasks      = $this->loadModel('testtask')->getByUser($account, $pager, $sort);
@@ -306,7 +288,7 @@ class user extends control
     public function testcase($userID, $type = 'case2Him', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session, load lang. */
-        $this->session->set('caseList', $this->app->getURI(true));
+        $this->session->set('caseList', $this->app->getURI(true), 'qa');
         $this->app->loadLang('testcase');
 
         /* Load pager. */
@@ -315,17 +297,11 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
-         /* Set menu. */
-        $this->lang->set('menugroup.user', 'company');
-
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
         $cases = array();
         if($type == 'case2Him')
         {
@@ -368,11 +344,11 @@ class user extends control
     public function execution($userID, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $uri = $this->app->getURI(true);
-        $this->session->set('projectList',  $uri);
+        $this->session->set('executionList', $uri, 'execution');
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -380,12 +356,8 @@ class user extends control
 
         /* Set the menus. */
         $this->loadModel('project');
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->execution;
         $this->view->position[] = $this->lang->user->execution;
         $this->view->tabID      = 'project';
@@ -412,23 +384,19 @@ class user extends control
     public function issue($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $uri = $this->app->getURI(true);
-        $this->session->set('issueList',  $uri);
+        $this->session->set('issueList', $uri, 'project');
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Set the menus. */
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->issue;
         $this->view->position[] = $this->lang->user->issue;
         $this->view->issues     = $this->loadModel('issue')->getUserIssues($type, $account, $orderBy, $pager);
@@ -456,23 +424,19 @@ class user extends control
     public function risk($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $uri = $this->app->getURI(true);
-        $this->session->set('riskList',  $uri);
+        $this->session->set('riskList', $uri, 'project');
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Set the menus. */
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->risk;
         $this->view->position[] = $this->lang->user->risk;
         $this->view->risks      = $this->loadModel('risk')->getUserRisks($type, $account, $orderBy, $pager);
@@ -497,10 +461,7 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
-
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         $this->view->title        = "USER #$user->id $user->account/" . $this->lang->user->profile;
         $this->view->position[]   = $this->lang->user->common;
@@ -545,7 +506,6 @@ class user extends control
      */
     public function create($deptID = 0)
     {
-        $this->lang->set('menugroup.user', 'company');
         $this->lang->user->menu      = $this->lang->company->menu;
         $this->lang->user->menuOrder = $this->lang->company->menuOrder;
 
@@ -556,9 +516,10 @@ class user extends control
                 $this->send(array('result' => 'fail', 'message' => str_replace('ID ', '', sprintf($this->lang->user->error->reserved, $_POST['account']))));
             }
 
-            $this->user->create();
+            $userID = $this->user->create();
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $userID));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('company', 'browse')));
         }
 
@@ -603,13 +564,14 @@ class user extends control
             if($group->role) $roleGroup[$group->role] = $group->id;
         }
 
-        $this->lang->set('menugroup.user', 'company');
         $this->lang->user->menu      = $this->lang->company->menu;
         $this->lang->user->menuOrder = $this->lang->company->menuOrder;
 
         if(!empty($_POST))
         {
-            $this->user->batchCreate();
+            $userIDList = $this->user->batchCreate();
+
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $userIDList));
             die(js::locate($this->createLink('company', 'browse'), 'parent'));
         }
 
@@ -647,7 +609,6 @@ class user extends control
      */
     public function edit($userID)
     {
-        $this->lang->set('menugroup.user', 'company');
         $this->lang->user->menu      = $this->lang->company->menu;
         $this->lang->user->menuOrder = $this->lang->company->menuOrder;
         if(!empty($_POST))
@@ -694,7 +655,6 @@ class user extends control
             if($this->post->account) $this->user->batchEdit();
             die(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse', "deptID=$deptID"), 'parent'));
         }
-        $this->lang->set('menugroup.user', 'company');
         $this->lang->user->menu      = $this->lang->company->menu;
         $this->lang->user->menuOrder = $this->lang->company->menuOrder;
 
@@ -808,12 +768,25 @@ class user extends control
      */
     public function login($referer = '', $from = '')
     {
+        /* Check if you can operating on the folder. */
+        $canModifyDIR = true;
         if($this->user->checkTmp() === false)
+        {
+            $canModifyDIR = false;
+            $floderPath   = $this->app->tmpRoot;
+        }
+        elseif(!is_dir($this->app->dataRoot) or substr(base_convert(@fileperms($this->app->dataRoot),10,8),-4) != '0777')
+        {
+            $canModifyDIR = false;
+            $floderPath   = $this->app->dataRoot;
+        }
+
+        if(!$canModifyDIR)
         {
             echo "<html><head><meta charset='utf-8'></head>";
             echo "<body><table align='center' style='width:700px; margin-top:100px; border:1px solid gray; font-size:14px;'><tr><td style='padding:8px'>";
-            echo "<div style='margin-bottom:8px;'>不能创建临时目录，请确认目录<strong style='color:#ed980f'>{$this->app->tmpRoot}</strong>是否存在并有操作权限。</div>";
-            echo "<div>Can't create tmp directory, make sure the directory <strong style='color:#ed980f'>{$this->app->tmpRoot}</strong> exists and has permission to operate.</div>";
+            echo "<div style='margin-bottom:8px;'>不能创建临时目录，请确认目录<strong style='color:#ed980f'>{$floderPath}</strong>是否存在并有操作权限。</div>";
+            echo "<div>Can't create tmp directory, make sure the directory <strong style='color:#ed980f'>{$floderPath}</strong> exists and has permission to operate.</div>";
             die("</td></tr></table></body></html>");
         }
         $this->setReferer($referer);
@@ -872,7 +845,6 @@ class user extends control
                 $this->send($response);
             }
 
-
             if((!empty($this->config->safe->loginCaptcha) and strtolower($this->post->captcha) != strtolower($this->session->captcha) and $this->app->getViewType() != 'json'))
             {
                 $response['result']  = 'fail';
@@ -1013,7 +985,7 @@ class user extends control
         $denyType = 'nopriv';
         if(isset($rights[$module][$method]))
         {
-            $menu = isset($this->lang->menugroup->$module) ? $this->lang->menugroup->$module : $module;
+            $menu = isset($lang->navGroup->$module) ? $lang->navGroup->$module : $module;
             $menu = strtolower($menu);
 
             if(!isset($acls['views'][$menu])) $denyType = 'noview';
@@ -1102,24 +1074,24 @@ class user extends control
     {
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
+        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
 
         /* set menus. */
-        $this->lang->set('menugroup.user', 'company');
         $this->view->userList = $this->user->setUserList($users, $userID);
 
         /* Save session. */
-        $uri   = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('projectList',     $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
+        $uri = $this->app->getURI(true);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
 
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
@@ -1130,10 +1102,7 @@ class user extends control
         $sort    = $this->loadModel('common')->appendOrder($orderBy);
         $date    = empty($date) ? '' : date('Y-m-d', $date);
 
-        /* Change the menu when in my module. */
-        $this->user->resetMenu();
-
-        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', 'all', $date, $direction);
+        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', 'all', 'all', $date, $direction);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->dynamic;
         $this->view->position[] = $this->lang->user->dynamic;
diff --git a/module/user/css/batchcreate.css b/module/user/css/batchcreate.css
index a00d948957..6a2d140124 100644
--- a/module/user/css/batchcreate.css
+++ b/module/user/css/batchcreate.css
@@ -1 +1,2 @@
 th.required:after {position: relative; right: 10px;}
+td .passwordBox {border-left-width: 0px!important;}
diff --git a/module/user/css/profile.css b/module/user/css/profile.css
index 8c8afd024b..26e159866b 100644
--- a/module/user/css/profile.css
+++ b/module/user/css/profile.css
@@ -4,7 +4,7 @@
 .row td {width: 33%; text-align: left; font-weight: 700;}
 .main-actions {margin: 20px 0 20px 0; text-align: center;}
 .user-title {margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
-.avatar {display: inline-block; width: 50px; height: 50px; line-height: 50px;}
+.cell .avatar {display: inline-block; width: 50px; height: 50px; line-height: 50px;}
 .user-name {margin-left: 15px; font-weight: bold;}
 .user-name, .user-role {font-size: 16px; vertical-align: top; line-height: 50px;}
 .line {border-top: 1px solid #eee; margin: 10px;}
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 61208b67fd..22a2adde58 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -204,6 +204,7 @@ $lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s]
 
 $lang->user->error->verifyPassword   = "Verifikation fehlgeschlagen. Bitte geben Sie ihr Loginpasswort ein.";
 $lang->user->error->originalPassword = "Altes Passwort ist falsch.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information.";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -242,4 +243,4 @@ $lang->user->noticeResetFile = "<h5>Kontaktieren Sie den Administrator um Ihr Pa
     </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
 $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
\ No newline at end of file
+$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index f3a9e8d02c..832665ba4f 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -56,6 +56,7 @@ $lang->user->type             = 'User Type';
 $lang->user->cropAvatar       = 'Crop Avatar';
 $lang->user->cropAvatarTip    = 'Drag and drop the box to select the image clipping range.';
 $lang->user->cropImageTip     = 'The image used is too small, the recommended image size is at least 48x48, the current image size is %s';
+$lang->user->captcha          = 'Captcha';
 
 $lang->user->legendBasic        = 'Basic Information';
 $lang->user->legendContribution = 'Contribution';
@@ -96,7 +97,7 @@ $lang->user->tplContentNotEmpty    = 'The template content cannot be empty!';
 
 $lang->user->profile   = 'Profile';
 $lang->user->project   = $lang->executionCommon . 's';
-$lang->user->execution = 'Execution';
+$lang->user->execution = $lang->execution->common;
 $lang->user->task      = 'Tasks';
 $lang->user->bug       = 'Bugs';
 $lang->user->test      = 'Test';
@@ -128,6 +129,7 @@ $lang->user->lockWarning  = "You can try %s times.";
 $lang->user->loginLocked  = "Please contact the administrator to unlock your account or try %s minutes later.";
 $lang->user->weakPassword = "Your password does not meet the requirements.";
 $lang->user->errorWeak    = "Passwords cannot use [%s] these commonly used weak passwords.";
+$lang->user->errorCaptcha = "Captcha Error";
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = 'Developer';
@@ -205,6 +207,7 @@ $lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s]
 $lang->user->error->verifyPassword   = "Verification failed. Please enter your Login Password.";
 $lang->user->error->originalPassword = "Old password is incorrect.";
 $lang->user->error->companyEmpty     = "Company name must be not empty.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information.";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -243,4 +246,4 @@ $lang->user->noticeResetFile = "<h5>Contact the Administrator to reset your pass
     </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
 $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
\ No newline at end of file
+$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index d00fa4eb48..65c8bf70cb 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -204,6 +204,7 @@ $lang->user->error->dangerPassword = "ID %s，Les mots de passe ne peuvent pas u
 
 $lang->user->error->verifyPassword   = "Vérification en échec. Entrez votre Mot de Passe de Connexion.";
 $lang->user->error->originalPassword = "Ancien Mot de Passe incorrect.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information.";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -242,4 +243,4 @@ $lang->user->noticeResetFile = "<h5>Contactez l'administrateur pour réinitialis
     </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
 $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
\ No newline at end of file
+$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php
index b89775236c..68e1d9a2af 100644
--- a/module/user/lang/vi.php
+++ b/module/user/lang/vi.php
@@ -204,6 +204,7 @@ $lang->user->error->dangerPassword = "ID %s，Mật khẩu không thể được
 
 $lang->user->error->verifyPassword   = "Xác thực thất bại. Vui lòng nhập mạt khẩu đăng nhập của bạn.";
 $lang->user->error->originalPassword = "Old password is incorrect.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information.";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -242,4 +243,4 @@ $lang->user->noticeResetFile = "<h5>Liên hệ quản trị viên để thiết
  </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
 $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
\ No newline at end of file
+$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index c62bcf6612..a43467e8f2 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -97,7 +97,7 @@ $lang->user->tplContentNotEmpty    = '模板内容不能为空!';
 
 $lang->user->profile   = '档案';
 $lang->user->project   = $lang->executionCommon;
-$lang->user->execution = '执行';
+$lang->user->execution = $lang->execution->common;
 $lang->user->task      = '任务';
 $lang->user->bug       = 'Bug';
 $lang->user->test      = '测试';
@@ -207,6 +207,7 @@ $lang->user->error->dangerPassword = "【ID %s】的密码不能使用【%s】
 $lang->user->error->verifyPassword   = "验证失败，请检查您的系统登录密码是否正确";
 $lang->user->error->originalPassword = "原密码不正确";
 $lang->user->error->companyEmpty     = "公司名称不能为空！";
+$lang->user->error->noAccess         = "该人员和你不是同一部门，你无权访问该人员的工作信息。";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -242,7 +243,7 @@ $lang->user->noticeResetFile = "<h5>普通用户请联系管理员重置密码</
     <ol>
     <li>文件内容为空。</li>
     <li>如果之前文件存在，删除之后重新创建。</li>
-    </ol>"; 
+    </ol>";
 $lang->user->notice4Safe = "警告：检测到一键安装包密码口令弱";
 $lang->user->process4DIR = "检测到您可能在使用一键安装包环境，该环境中其他站点还在用简单密码，安全起见，如果不使用其他站点，请及时处理。将 %s 目录删除或改名。详情查看：<a href='https://www.zentao.net/book/zentaopmshelp/467.html' target='_blank'>https://www.zentao.net/book/zentaopmshelp/467.html</a>";
 $lang->user->process4DB  = "检测到您可能在使用一键安装包环境，该环境中其他站点还在用简单密码，安全起见，如果不使用其他站点，请及时处理。请登录数据库，修改 %s 数据库的zt_user表的password字段。详情查看：<a href='https://www.zentao.net/book/zentaopmshelp/467.html' target='_blank'>https://www.zentao.net/book/zentaopmshelp/467.html</a>";
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index f1b0fef788..7aa993692b 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -56,6 +56,7 @@ $lang->user->type             = '用戶類型';
 $lang->user->cropAvatar       = '剪切頭像';
 $lang->user->cropAvatarTip    = '拖拽選框來選擇頭像剪切範圍';
 $lang->user->cropImageTip     = '所使用的頭像圖片過小，建議圖片大小至少為 48x48，當前圖片大小為 %s';
+$lang->user->captcha          = '驗證碼';
 
 $lang->user->legendBasic        = '基本資料';
 $lang->user->legendContribution = '個人貢獻';
@@ -96,7 +97,7 @@ $lang->user->tplContentNotEmpty    = '模板內容不能為空!';
 
 $lang->user->profile   = '檔案';
 $lang->user->project   = $lang->executionCommon;
-$lang->user->execution = '執行';
+$lang->user->execution = $lang->execution->common;
 $lang->user->task      = '任務';
 $lang->user->bug       = 'Bug';
 $lang->user->test      = '測試';
@@ -128,6 +129,7 @@ $lang->user->lockWarning  = "您還有%s次嘗試機會。";
 $lang->user->loginLocked  = "密碼嘗試次數太多，請聯繫管理員解鎖，或%s分鐘後重試。";
 $lang->user->weakPassword = "您的密碼強度小於系統設定。";
 $lang->user->errorWeak    = "密碼不能使用【%s】這些常用弱口令。";
+$lang->user->errorCaptcha = "驗證碼不正確！";
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = '研發';
@@ -204,6 +206,8 @@ $lang->user->error->dangerPassword = "【ID %s】的密碼不能使用【%s】
 
 $lang->user->error->verifyPassword   = "驗證失敗，請檢查您的系統登錄密碼是否正確";
 $lang->user->error->originalPassword = "原密碼不正確";
+$lang->user->error->companyEmpty     = "公司名稱不能為空！";
+$lang->user->error->noAccess         = "該人員和你不是同一部門，你無權訪問該人員的工作信息。";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -239,7 +243,7 @@ $lang->user->noticeResetFile = "<h5>普通用戶請聯繫管理員重置密碼</
     <ol>
     <li>檔案內容為空。</li>
     <li>如果之前檔案存在，刪除之後重新創建。</li>
-    </ol>"; 
+    </ol>";
 $lang->user->notice4Safe = "警告：檢測到一鍵安裝包密碼口令弱";
 $lang->user->process4DIR = "檢測到您可能在使用一鍵安裝包環境，該環境中其他站點還在用簡單密碼，安全起見，如果不使用其他站點，請及時處理。將 %s 目錄刪除或改名。詳情查看：<a href='https://www.zentao.net/book/zentaopmshelp/467.html' target='_blank'>https://www.zentao.net/book/zentaopmshelp/467.html</a>";
 $lang->user->process4DB  = "檢測到您可能在使用一鍵安裝包環境，該環境中其他站點還在用簡單密碼，安全起見，如果不使用其他站點，請及時處理。請登錄資料庫，修改 %s 資料庫的zt_user表的password欄位。詳情查看：<a href='https://www.zentao.net/book/zentaopmshelp/467.html' target='_blank'>https://www.zentao.net/book/zentaopmshelp/467.html</a>";
diff --git a/module/user/model.php b/module/user/model.php
index a2fe00432c..f2b301d7af 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -191,7 +191,8 @@ class userModel extends model
     /**
      * Get user info by ID.
      *
-     * @param  int    $userID
+     * @param  mix    $userID
+     * @param  string    $field id|account
      * @access public
      * @return object|bool
      */
@@ -232,7 +233,7 @@ class userModel extends model
      * Create a user.
      *
      * @access public
-     * @return void
+     * @return int
      */
     public function create()
     {
@@ -301,6 +302,8 @@ class userModel extends model
             $this->loadModel('action')->create('user', $userID, 'Created');
             $this->loadModel('mail');
             if($this->config->mail->mta == 'sendcloud' and !empty($user->email)) $this->mail->syncSendCloud('sync', $user->email, $user->realname);
+
+            return $userID;
         }
     }
 
@@ -309,7 +312,7 @@ class userModel extends model
      *
      * @param  int    $users
      * @access public
-     * @return void
+     * @return array
      */
     public function batchCreate()
     {
@@ -399,6 +402,7 @@ class userModel extends model
         }
 
         $this->loadModel('mail');
+        $userIDList = array();
         foreach($data as $user)
         {
             if($user->group)
@@ -412,7 +416,8 @@ class userModel extends model
             $this->dao->insert(TABLE_USER)->data($user)->autoCheck()->exec();
 
             /* Fix bug #2941 */
-            $userID = $this->dao->lastInsertID();
+            $userID       = $this->dao->lastInsertID();
+            $userIDList[] = $userID;
             $this->loadModel('action')->create('user', $userID, 'Created');
 
             if(dao::isError())
@@ -426,6 +431,7 @@ class userModel extends model
                 if($this->config->mail->mta == 'sendcloud' and !empty($user->email)) $this->mail->syncSendCloud('sync', $user->email, $user->realname);
             }
         }
+        return $userIDList;
     }
 
     /**
@@ -793,7 +799,7 @@ class userModel extends model
             if(defined('IN_USE')) $this->dao->update(TABLE_USER)->set('visits = visits + 1')->set('ip')->eq($ip)->set('last')->eq($last)->where('account')->eq($account)->exec();
 
             /* Create cycle todo in login. */
-            $todoList = $this->dao->select('*')->from(TABLE_TODO)->where('cycle')->eq(1)->andWhere('account')->eq($user->account)->fetchAll('id');
+            $todoList = $this->dao->select('*')->from(TABLE_TODO)->where('cycle')->eq(1)->andWhere('deleted')->eq('0')->andWhere('account')->eq($user->account)->fetchAll('id');
             $this->loadModel('todo')->createByCycle($todoList);
         }
         return $user;
@@ -814,6 +820,7 @@ class userModel extends model
 
         $user->rights = $this->authorize($account);
         $user->groups = $this->getGroups($account);
+        $user->view   = $this->grantUserView($user->account, $user->rights['acls']);
         $this->session->set('user', $user);
         $this->app->user = $this->session->user;
         $this->loadModel('action')->create('user', $user->id, 'login');
@@ -836,6 +843,7 @@ class userModel extends model
 
         $user->rights = $this->authorize($account);
         $user->groups = $this->getGroups($account);
+        $user->view   = $this->grantUserView($user->account, $user->rights['acls']);
         $this->session->set('user', $user);
         $this->app->user = $this->session->user;
         $this->loadModel('action')->create('user', $user->id, 'login');
@@ -986,9 +994,9 @@ class userModel extends model
      */
     public function keepLogin($user)
     {
-        setcookie('keepLogin', 'on', $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        setcookie('za', $user->account, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        setcookie('zp', sha1($user->account . $user->password . $this->server->request_time), $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        setcookie('keepLogin', 'on', $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        setcookie('za', $user->account, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        setcookie('zp', sha1($user->account . $user->password . $this->server->request_time), $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
     }
 
     /**
@@ -1020,15 +1028,18 @@ class userModel extends model
      * @param  string $account
      * @param  string $type project|execution
      * @param  string $status
+     * @param  string $orderBy
+     * @param  object $pager
      * @access public
      * @return array
      */
     public function getExecutions($account, $type = 'execution', $status = 'all', $orderBy = 'id_desc', $pager = null)
     {
-        if($type == 'execution') $type = 'sprint,stage';
+        $projectType    = $type == 'execution' ? 'sprint,stage' : $type;
         $myProjectsList = $this->dao->select('t1. *,t2. *')->from(TABLE_TEAM)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.root = t2.id')
-            ->where('t1.type')->in($type)
+            ->where('t1.type')->eq($type)
+            ->andWhere('t2.type')->in($projectType)
             ->beginIF(strpos('doing|wait|suspended|closed', $status) !== false)->andWhere('status')->eq($status)->fi()
             ->beginIF($status == 'done')->andWhere('status')->in('done,closed')->fi()
             ->beginIF($status == 'undone')->andWhere('status')->notin('done,closed')->fi()
@@ -1554,7 +1565,7 @@ class userModel extends model
             /* Get teams. */
             if($teams === null)
             {
-                $stmt = $this->dao->select('root,account')->from(TABLE_TEAM)->where('type')->in('project,sprint,stage')->query();
+                $stmt = $this->dao->select('root,account')->from(TABLE_TEAM)->where('type')->in('project,execution')->query();
                 while($team = $stmt->fetch()) $teams[$team->root][$team->account] = $team->account;
             }
 
@@ -1662,7 +1673,9 @@ class userModel extends model
         /* Get linked projects teams. */
         $teamGroups = array();
         $stmt       = $this->dao->select('root,account')->from(TABLE_TEAM)
-            ->where('type')->eq('project')
+            ->where('1=1')
+            ->beginIF($this->config->systemMode == 'new')->andWhere('type')->eq('project')->fi()
+            ->beginIF($this->config->systemMode == 'classic')->andWhere('type')->eq('execution')->fi()
             ->andWhere('root')->in(array_keys($projectProducts))
             ->query();
 
@@ -2070,7 +2083,7 @@ class userModel extends model
         /* Get team group. */
         $teamGroups = array();
         $stmt       = $this->dao->select('root,account')->from(TABLE_TEAM)
-            ->where('type')->in('project,sprint,stage')
+            ->where('type')->in('project,execution')
             ->andWhere('root')->in(array_merge($sprintIdList, $parentIdList))
             ->query();
 
@@ -2286,7 +2299,7 @@ class userModel extends model
         }
 
         /* Judge sprint auth. */
-        if(($project->type == 'sprint' || $project->type == 'stage') && $project->acl == 'private')
+        if(($project->type == 'sprint' || $project->type == 'stage') && $project->acl == 'private' && $this->config->systemMode == 'new')
         {
             $parent = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch();
             $users[$parent->openedBy] = $parent->openedBy;
@@ -2365,6 +2378,43 @@ class userModel extends model
         return $users;
     }
 
+    /**
+     * Get team members in object.
+     *
+     * @param  int    $objectID
+     * @param  string $type     project|execution
+     * @param  string $params
+     * @param  string $usersToAppended
+     * @access public
+     * @return array
+     */
+    public function getTeamMemberPairs($objectID, $type = 'project', $params = '', $usersToAppended = '')
+    {
+        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembersPairs();
+
+        $keyField = strpos($params, 'useid') !== false ? 'id' : 'account';
+        $users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
+            ->where('t1.root')->eq((int)$objectID)
+            ->andWhere('t1.type')->eq($type)
+            ->beginIF($params == 'nodeleted' or empty($this->config->user->showDeleted))
+            ->andWhere('t2.deleted')->eq(0)
+            ->fi()
+            ->fetchAll($keyField);
+
+        if($usersToAppended) $users += $this->dao->select("id, account, realname")->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll($keyField);
+
+        if(!$users) return array('' => '');
+
+        foreach($users as $account => $user)
+        {
+            $firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
+            if(!empty($this->config->isINT)) $firstLetter = '';
+            $users[$account] =  $firstLetter . ($user->realname ? $user->realname : $user->account);
+        }
+        return array('' => '') + $users;
+    }
+
     /**
      * Judge an action is clickable or not.
      *
@@ -2437,7 +2487,7 @@ class userModel extends model
         $count   = 'count(*) AS count';
 
         $personalData = array();
-        $personalData['createdTodos']        = $this->dao->select($count)->from(TABLE_TODO)->where('account')->eq($account)->fetch('count');
+        $personalData['createdTodos']        = $this->dao->select($count)->from(TABLE_TODO)->where('account')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
         $personalData['createdRequirements'] = $this->dao->select($count)->from(TABLE_STORY)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->andWhere('type')->eq('requirement')->fetch('count');
         $personalData['createdStories']      = $this->dao->select($count)->from(TABLE_STORY)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->andWhere('type')->eq('story')->fetch('count');
         $personalData['createdBugs']         = $this->dao->select($count)->from(TABLE_BUG)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
@@ -2459,16 +2509,4 @@ class userModel extends model
 
         return $personalData;
     }
-
-    /**
-     * Reset menu when from my module.
-     *
-     * @access public
-     * @return void
-     */
-    public function resetMenu()
-    {
-        $this->lang->navGroup->user = 'system';
-        $this->lang->noMenuModule[] = 'user';
-    }
 }
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 08bd654152..482ac89c4d 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -45,7 +45,7 @@
       <table class="table table-form">
         <thead>
           <tr class='text-center'>
-            <th class='w-40px'><?php echo $lang->idAB;?></th> 
+            <th class='w-40px'><?php echo $lang->idAB;?></th>
             <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden') . zget($requiredFields, 'dept', '', ' required');?>'>              <?php echo $lang->user->dept;?></th>
             <th class='accountThWidth required'><?php echo $lang->user->account;?></th>
             <th class='w-130px required'><?php echo $lang->user->realname;?></th>
@@ -87,7 +87,7 @@
             <?php
             echo html::input("password[$i]", '', "class='form-control' onkeyup='toggleCheck(this, $i)'");
             echo "<span class='input-group-addon passwordStrength'></span>";
-            if($i != 0) echo "<span class='input-group-addon'><input type='checkbox' name='ditto[$i]' id='ditto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->user->ditto}</span>";
+            if($i != 0) echo "<span class='input-group-addon passwordBox'><input type='checkbox' name='ditto[$i]' id='ditto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->user->ditto}</span>";
             ?>
             </div>
           </td>
diff --git a/module/user/view/cropavatar.html.php b/module/user/view/cropavatar.html.php
index 7b7a1b03e8..9522930261 100644
--- a/module/user/view/cropavatar.html.php
+++ b/module/user/view/cropavatar.html.php
@@ -49,6 +49,7 @@ $imgCutter.imgCutter(
     done: function(response)
     {
         window.parent.$('#main-avatar, #menu-avatar').html('<img src="<?php echo $user->avatar?>"/>');
+        window.parent.$('#mainContent .avatar').html('<img src="<?php echo $user->avatar?>"/>');
         if(window.parent.$('#main-avatar, #menu-avatar').hasClass('with-text')) window.parent.$('#main-avatar, #menu-avatar').toggleClass('with-text').css('background', 'none');
         location.href = createLink('my', 'profile');
     },
diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php
index a8b49a492b..24584d652b 100644
--- a/module/user/view/deny.html.php
+++ b/module/user/view/deny.html.php
@@ -64,12 +64,13 @@ function changeLeftNavigation()
 {
     if(window.parent && window.parent.$.apps && isOnlybody)
     {
-        window.parent.$.apps.close();
+        $.closeModal();
         window.parent.$.apps.open('my');
     }
     else
     {
-        window.location.href = indexLink;
+        $.apps.close();
+        $.apps.open('my');
     }
 }
 </script>
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 3f69a88f44..2b15182dd3 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -76,8 +76,8 @@ $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
 $lastDate  = substr($action->originalDate, 0, 10);
 $hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
 $hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
-$preLink   = $hasPre ? inlink('dynamic', "type=$type&userID={$user->id}&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
-$nextLink  = $hasNext ? inlink('dynamic', "type=$type&userID={$user->id}&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+$preLink   = $hasPre ? inlink('dynamic', "userID={$user->id}&type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "userID={$user->id}&type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
 ?>
 <?php if($hasPre or $hasNext):?>
 <div id="mainActions" class='main-actions'>
diff --git a/module/user/view/execution.html.php b/module/user/view/execution.html.php
index 184b0f3181..cbad243c6c 100644
--- a/module/user/view/execution.html.php
+++ b/module/user/view/execution.html.php
@@ -22,11 +22,11 @@
           <th class='w-id'>     <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
           <th class="text-left"><?php common::printOrderLink('name', $orderBy, $vars, $lang->user->name);?></th>
           <th class='w-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='w-user'>   <?php $lang->team->role;?></th>
+          <th class='w-user'>   <?php echo $lang->team->role;?></th>
           <th class='w-date'>   <?php common::printOrderLink('begin', $orderBy, $vars, $lang->execution->begin);?></th>
           <th class='w-date'>   <?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
-          <th class='w-date'>   <?php $lang->team->join;?></th>
-          <th class='w-110px'>  <?php $lang->team->hours;?></th>
+          <th class='w-date'>   <?php echo $lang->team->join;?></th>
+          <th class='w-110px'>  <?php echo $lang->team->hours;?></th>
         </tr>
       </thead>
       <tbody>
@@ -35,7 +35,9 @@
         <tr>
           <td><?php echo html::a($executionLink, $execution->id);?></td>
           <td>
+            <?php if(isset($config->maxVersion)):?>
             <span class='project-type-label label label-info label-outline'><?php echo zget($lang->user->executionTypeList, $execution->type);?></span>
+            <?php endif;?>
             <?php echo html::a($executionLink, $execution->name);?>
           </td>
           <?php if(isset($execution->delay)):?>
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index 96011fa96a..4fed34a2a6 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -10,7 +10,7 @@
 
     $label  = "<span class='text'>{$lang->user->schedule}</span>";
     $active = $methodName == 'todo' ? ' btn-active-text' : '';
-    common::printLink('user', 'todo', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+    common::printLink('user', 'todo', "userID={$user->id}&type=all", $label, '', "class='btn btn-link $active'");
 
     $label  = "<span class='text'>{$lang->user->task}</span>";
     $active = $methodName == 'task' ? ' btn-active-text' : '';
@@ -39,18 +39,21 @@
     $active = $methodName == 'testcase' ? ' btn-active-text' : '';
     common::printLink('user', 'testcase', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
 
-    $label  = "<span class='text'>{$lang->user->execution}</span>";
-    $active = $methodName == 'execution' ? ' btn-active-text' : '';
-    common::printLink('user', 'execution',  "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+    if($this->config->systemMode == 'new')
+    {
+        $label  = "<span class='text'>{$lang->user->execution}</span>";
+        $active = $methodName == 'execution' ? ' btn-active-text' : '';
+        common::printLink('user', 'execution',  "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+    }
 
     if(isset($this->config->maxVersion))
     {
         $label  = "<span class='text'>{$lang->user->issue}</span>";
-        $active = ($methodName == 'issue' or $methodName == 'issue')? ' btn-active-text' : '';
+        $active = $methodName == 'issue' ? ' btn-active-text' : '';
         common::printLink('user', 'issue', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
 
         $label  = "<span class='text'>{$lang->user->risk}</span>";
-        $active = ($methodName == 'risk' or $methodName == 'risk')? ' btn-active-text' : '';
+        $active = $methodName == 'risk' ? ' btn-active-text' : '';
         common::printLink('user', 'risk', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
     }
 
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index 004920da9e..28bbbb71fb 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -82,7 +82,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
         foreach($demoUsers as $demoAccount => $demoUser)
         {
             if($demoUser->password != $password) continue;
-            echo html::a($link . "account={$demoAccount}&password=" . md5($password . $this->session->rand), $demoUser->realname, 'hiddenwin');
+            echo html::a($link . "account={$demoAccount}&password=" . md5($password . $this->session->rand), $demoUser->realname);
         }
         ?>
       </footer>
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index cecfc2fac8..6968bf2550 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -13,6 +13,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
+<style>
+.table td.estimate {padding-right: 12px;}
+</style>
 <div id='mainContent'>
   <nav id='contentNav'>
     <ul class='nav nav-default'>
@@ -42,7 +45,9 @@
           <th class='w-pri'>  <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th class='w-200px'><?php common::printOrderLink('product', $orderBy, $vars, $lang->story->product);?></th>
           <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
+          <?php if($storyType != 'requirement'):?>
           <th class='w-150px'><?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->plan);?></th>
+          <?php endif;?>
           <th class='w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
           <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
@@ -57,9 +62,11 @@
           <td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
           <td><?php echo $story->productTitle;?></td>
           <td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
+          <?php if($storyType != 'requirement'):?>
           <td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
+          <?php endif;?>
           <td><?php echo zget($users, $story->openedBy);?></td>
-          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='estimate text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
           <td><?php echo $lang->story->stageList[$story->stage];?></td>
         </tr>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 24ef89e716..2e1c249c7a 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -63,9 +63,9 @@
             <?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
             <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', false, $task->project), $task->name, null, "style='color: $task->color'");?>
           </td>
-          <td class='hours' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
-          <td class='hours' title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . ' ' . $lang->execution->workHourUnit;?></td>
-          <td class='hours' title="<?php echo $task->left     . ' ' . $lang->execution->workHour;?>"><?php echo $task->left     . ' ' . $lang->execution->workHourUnit;?></td>
+          <td class='hours' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
+          <td class='hours' title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . $lang->execution->workHourUnit;?></td>
+          <td class='hours' title="<?php echo $task->left     . ' ' . $lang->execution->workHour;?>"><?php echo $task->left     . $lang->execution->workHourUnit;?></td>
           <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
           <td class='<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></td>
         </tr>
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index b5f7237456..edba7a9d1e 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -52,7 +52,7 @@
         <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
         <td><?php echo $lang->todo->typeList[$todo->type];?></td>
         <td><span class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?></span></td>
-        <td class='text-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id", '', true), $todo->name, '', "class='iframe'");?></td>
+        <td class='text-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=company", '', true), $todo->name, '', "class='iframe'");?></td>
         <td><?php echo $todo->begin;?></td>
         <td><?php echo $todo->end;?></td>
         <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
diff --git a/module/webhook/control.php b/module/webhook/control.php
index ff5d3fafac..0e4762b49c 100644
--- a/module/webhook/control.php
+++ b/module/webhook/control.php
@@ -41,7 +41,7 @@ class webhook extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Unset selectedDepts cookie. */
-        setcookie('selectedDepts', '', 0, $this->config->webRoot, '', false, true);
+        setcookie('selectedDepts', '', 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         $this->view->title      = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->list;
         $this->view->webhooks   = $this->webhook->getList($orderBy, $pager);
@@ -62,8 +62,9 @@ class webhook extends control
     {
         if($_POST)
         {
-            $this->webhook->create();
+            $webhookID = $this->webhook->create();
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $webhookID));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
@@ -137,17 +138,18 @@ class webhook extends control
     {
         /* Save session. */
         $uri   = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('executionList',   $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
-        $this->session->set('todoList',        $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('todoList',        $uri, 'my');
+        $this->session->set('docList',         $uri, 'doc');
 
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
@@ -195,7 +197,7 @@ class webhook extends control
         /* Get selected depts. */
         if($this->get->selectedDepts)
         {
-            setcookie('selectedDepts', $this->get->selectedDepts, 0, $this->config->webRoot, '', false, true);
+            setcookie('selectedDepts', $this->get->selectedDepts, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
             $_COOKIE['selectedDepts'] = $this->get->selectedDepts;
         }
         $selectedDepts = $this->cookie->selectedDepts ? $this->cookie->selectedDepts : '';
diff --git a/module/webhook/lang/de.php b/module/webhook/lang/de.php
index 5eea6ae5eb..256dfe8b96 100644
--- a/module/webhook/lang/de.php
+++ b/module/webhook/lang/de.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = 'Content Type';
 $lang->webhook->sendType    = 'Sendungs Typ';
 $lang->webhook->secret      = 'Secret';
 $lang->webhook->product     = "{$lang->productCommon}";
-$lang->webhook->execution   = "{$lang->executionCommon}";
+$lang->webhook->execution   = "{$lang->execution->common}";
 $lang->webhook->params      = 'Parameter';
 $lang->webhook->action      = 'Aktion';
 $lang->webhook->desc        = 'Beschreibung';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = 'Yes';
 $lang->webhook->paramsList['objectType'] = 'Objekt Typ';
 $lang->webhook->paramsList['objectID']   = 'Objekt ID';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
-$lang->webhook->paramsList['execution']  = "{$lang->executionCommon}";
+$lang->webhook->paramsList['execution']  = "{$lang->execution->common}";
 $lang->webhook->paramsList['action']     = 'Aktion';
 $lang->webhook->paramsList['actor']      = 'Actor';
 $lang->webhook->paramsList['date']       = 'Datum';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async     = 'Wenn der Sendungstyp asynchron ist, wird Cron benötigt.';
 $lang->webhook->note->bind      = 'Bind User is only required for Dingding Notifier.';
 $lang->webhook->note->product   = "Alle Aktionen triggern den Hook wenn das {$lang->productCommon} leer ist, andernsfalls werden nur Aktionen des {$lang->productCommon} ausgelöst.";
-$lang->webhook->note->execution = "Alle Aktionen triggern den Hook wenn das {$lang->executionCommon} leer ist, andernsfalls werden nur Aktionen des {$lang->executionCommon} ausgelöst.";
+$lang->webhook->note->execution = "Alle Aktionen triggern den Hook wenn das {$lang->execution->common} leer ist, andernsfalls werden nur Aktionen des {$lang->execution->common} ausgelöst.";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php
index f2a23ddba3..4feed17a3b 100644
--- a/module/webhook/lang/en.php
+++ b/module/webhook/lang/en.php
@@ -9,6 +9,8 @@ $lang->webhook->chooseDept = 'Choose department';
 $lang->webhook->assigned   = 'AssignedTo';
 $lang->webhook->setting    = 'Settings';
 
+$lang->webhook->logAction = 'Webhook Log';
+
 $lang->webhook->browse = 'Browse';
 $lang->webhook->create = 'Create';
 $lang->webhook->edit   = 'Edit';
@@ -23,7 +25,7 @@ $lang->webhook->contentType = 'Content Type';
 $lang->webhook->sendType    = 'Sending Type';
 $lang->webhook->secret      = 'Secret';
 $lang->webhook->product     = "{$lang->productCommon}";
-$lang->webhook->execution   = "{$lang->executionCommon}";
+$lang->webhook->execution   = "{$lang->execution->common}";
 $lang->webhook->params      = 'Parameters';
 $lang->webhook->action      = 'Trigger Action';
 $lang->webhook->desc        = 'Description';
@@ -40,6 +42,8 @@ $lang->webhook->typeList['dinggroup']   = 'Dingding Robot';
 $lang->webhook->typeList['dinguser']    = 'Dingding Notifier';
 $lang->webhook->typeList['wechatgroup'] = 'Enterprise WeChat Robot';
 $lang->webhook->typeList['wechatuser']  = 'Enterprise WeChat Notifier';
+$lang->webhook->typeList['feishugroup'] = 'Feishu Robot';
+$lang->webhook->typeList['feishuuser']  = 'Feishu Notifier';
 $lang->webhook->typeList['default']     = 'Others';
 
 $lang->webhook->sendTypeList['sync']  = 'Synchronous';
@@ -58,6 +62,11 @@ $lang->webhook->wechatAgentId    = 'Agent ID';
 $lang->webhook->wechatUserid     = 'Wechat Userid';
 $lang->webhook->wechatBindStatus = 'Bind Status';
 
+$lang->webhook->feishuAppId       = 'Feishu App ID';
+$lang->webhook->feishuAppSecret   = 'Feishu App Secret';
+$lang->webhook->feishuUserid      = 'Feishu Users';
+$lang->webhook->feishuBindStatus  = 'Feishu Bind Status';
+
 $lang->webhook->zentaoUser  = 'Zentao User';
 
 $lang->webhook->dingBindStatusList['0'] = 'No';
@@ -66,7 +75,7 @@ $lang->webhook->dingBindStatusList['1'] = 'Yes';
 $lang->webhook->paramsList['objectType'] = 'Object Type';
 $lang->webhook->paramsList['objectID']   = 'Object ID';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
-$lang->webhook->paramsList['execution']  = "{$lang->executionCommon}";
+$lang->webhook->paramsList['execution']  = "{$lang->execution->common}";
 $lang->webhook->paramsList['action']     = 'Action';
 $lang->webhook->paramsList['actor']      = 'ActedBy';
 $lang->webhook->paramsList['date']       = 'ActedDate';
@@ -81,7 +90,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async     = 'If it is asynchronous, you have to go to Admin-System to turn on the cron.';
 $lang->webhook->note->bind      = 'Bind User is only required for Dingding Notifier.';
 $lang->webhook->note->product   = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of selected {$lang->productCommon} will trigger it.";
-$lang->webhook->note->execution = "All actions will trigger the hook if {$lang->executionCommon} is empty, or only actions of selected {$lang->executionCommon} will trigger it.";
+$lang->webhook->note->execution = "All actions will trigger the hook if {$lang->execution->common} is empty, or only actions of selected {$lang->execution->common} will trigger it.";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/vi.php b/module/webhook/lang/vi.php
index 5e1d985b2d..b01b267fc1 100644
--- a/module/webhook/lang/vi.php
+++ b/module/webhook/lang/vi.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = 'Content loại';
 $lang->webhook->sendType    = 'Sending loại';
 $lang->webhook->secret      = 'Secret';
 $lang->webhook->product     = "{$lang->productCommon}";
-$lang->webhook->execution   = "{$lang->executionCommon}";
+$lang->webhook->execution   = "{$lang->execution->common}";
 $lang->webhook->params      = 'Thông số';
 $lang->webhook->action      = 'Trigger hành động';
 $lang->webhook->desc        = 'Mô tả';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = 'Có';
 $lang->webhook->paramsList['objectType'] = 'Loại đối tượng';
 $lang->webhook->paramsList['objectID']   = 'ID đối tượng';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
-$lang->webhook->paramsList['execution']  = "{$lang->executionCommon}";
+$lang->webhook->paramsList['execution']  = "{$lang->execution->common}";
 $lang->webhook->paramsList['action']     = 'Hành động';
 $lang->webhook->paramsList['actor']      = 'ActedBy';
 $lang->webhook->paramsList['date']       = 'ActedDate';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async     = 'If it is asynchronous, you have to go to Admin-System to bật CRON này.';
 $lang->webhook->note->bind      = 'Bind User is only required for Dingding Notifier.';
 $lang->webhook->note->product   = "Tất cả actions will trigger the hook if {$lang->productCommon} trống, or only actions of selected {$lang->productCommon} will trigger it.";
-$lang->webhook->note->execution = "Tất cả actions will trigger the hook if {$lang->executionCommon} trống, or only actions of selected {$lang->executionCommon} will trigger it.";
+$lang->webhook->note->execution = "Tất cả actions will trigger the hook if {$lang->execution->common} trống, or only actions of selected {$lang->execution->common} will trigger it.";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php
index 61dd3df00c..986e3e66dc 100644
--- a/module/webhook/lang/zh-cn.php
+++ b/module/webhook/lang/zh-cn.php
@@ -9,6 +9,8 @@ $lang->webhook->chooseDept = '选择同步部门';
 $lang->webhook->assigned   = '指派给';
 $lang->webhook->setting    = '设置';
 
+$lang->webhook->logAction = 'Webhook日志';
+
 $lang->webhook->browse = '浏览Webhook';
 $lang->webhook->create = '添加Webhook';
 $lang->webhook->edit   = '编辑Webhook';
@@ -23,7 +25,7 @@ $lang->webhook->contentType = '内容类型';
 $lang->webhook->sendType    = '发送方式';
 $lang->webhook->secret      = '密钥';
 $lang->webhook->product     = "关联{$lang->productCommon}";
-$lang->webhook->execution   = "关联{$lang->executionCommon}";
+$lang->webhook->execution   = "关联{$lang->execution->common}";
 $lang->webhook->params      = '参数';
 $lang->webhook->action      = '触发动作';
 $lang->webhook->desc        = '描述';
@@ -73,7 +75,7 @@ $lang->webhook->dingBindStatusList['1'] = '已绑定';
 $lang->webhook->paramsList['objectType'] = '对象类型';
 $lang->webhook->paramsList['objectID']   = '对象ID';
 $lang->webhook->paramsList['product']    = "所属{$lang->productCommon}";
-$lang->webhook->paramsList['execution']  = "所属{$lang->executionCommon}";
+$lang->webhook->paramsList['execution']  = "所属{$lang->execution->common}";
 $lang->webhook->paramsList['action']     = '动作';
 $lang->webhook->paramsList['actor']      = '操作者';
 $lang->webhook->paramsList['date']       = '操作日期';
@@ -88,7 +90,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async     = '异步需要打开计划任务。';
 $lang->webhook->note->bind      = '只有[钉钉/微信]工作通知类型才需要绑定用户。';
 $lang->webhook->note->product   = "此项为空时所有{$lang->productCommon}的动作都会触发钩子，否则只有关联{$lang->productCommon}的动作才会触发。";
-$lang->webhook->note->execution = "此项为空时所有{$lang->executionCommon}的动作都会触发钩子，否则只有关联{$lang->executionCommon}的动作才会触发。";
+$lang->webhook->note->execution = "此项为空时所有{$lang->execution->common}的动作都会触发钩子，否则只有关联{$lang->execution->common}的动作才会触发。";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/zh-tw.php b/module/webhook/lang/zh-tw.php
index 8521ea31ee..739603b945 100644
--- a/module/webhook/lang/zh-tw.php
+++ b/module/webhook/lang/zh-tw.php
@@ -9,6 +9,8 @@ $lang->webhook->chooseDept = '選擇同步部門';
 $lang->webhook->assigned   = '指派給';
 $lang->webhook->setting    = '設置';
 
+$lang->webhook->logAction = 'Webhook日誌';
+
 $lang->webhook->browse = '瀏覽Webhook';
 $lang->webhook->create = '添加Webhook';
 $lang->webhook->edit   = '編輯Webhook';
@@ -23,7 +25,7 @@ $lang->webhook->contentType = '內容類型';
 $lang->webhook->sendType    = '發送方式';
 $lang->webhook->secret      = '密鑰';
 $lang->webhook->product     = "關聯{$lang->productCommon}";
-$lang->webhook->execution   = "關聯{$lang->executionCommon}";
+$lang->webhook->execution   = "關聯{$lang->execution->common}";
 $lang->webhook->params      = '參數';
 $lang->webhook->action      = '觸發動作';
 $lang->webhook->desc        = '描述';
@@ -40,6 +42,8 @@ $lang->webhook->typeList['dinggroup']   = '釘釘群通知機器人';
 $lang->webhook->typeList['dinguser']    = '釘釘工作消息通知';
 $lang->webhook->typeList['wechatgroup'] = '企業微信群機器人';
 $lang->webhook->typeList['wechatuser']  = '企業微信應用消息';
+$lang->webhook->typeList['feishugroup'] = '飛書群通知機器人';
+$lang->webhook->typeList['feishuuser']  = '飛書工作消息通知';
 $lang->webhook->typeList['default']     = '其他';
 
 $lang->webhook->sendTypeList['sync']  = '同步';
@@ -58,6 +62,11 @@ $lang->webhook->wechatAgentId    = '企業應用的ID';
 $lang->webhook->wechatUserid     = '微信用戶';
 $lang->webhook->wechatBindStatus = '微信綁定狀態';
 
+$lang->webhook->feishuAppId       = '飛書App ID';
+$lang->webhook->feishuAppSecret   = '飛書App Secret';
+$lang->webhook->feishuUserid      = '飛書用戶';
+$lang->webhook->feishuBindStatus  = '飛書綁定狀態';
+
 $lang->webhook->zentaoUser  = '禪道用戶';
 
 $lang->webhook->dingBindStatusList['0'] = '未綁定';
@@ -66,7 +75,7 @@ $lang->webhook->dingBindStatusList['1'] = '已綁定';
 $lang->webhook->paramsList['objectType'] = '對象類型';
 $lang->webhook->paramsList['objectID']   = '對象ID';
 $lang->webhook->paramsList['product']    = "所屬{$lang->productCommon}";
-$lang->webhook->paramsList['execution']  = "所屬{$lang->executionCommon}";
+$lang->webhook->paramsList['execution']  = "所屬{$lang->execution->common}";
 $lang->webhook->paramsList['action']     = '動作';
 $lang->webhook->paramsList['actor']      = '操作者';
 $lang->webhook->paramsList['date']       = '操作日期';
@@ -81,7 +90,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async     = '非同步需要打開計劃任務。';
 $lang->webhook->note->bind      = '只有[釘釘/微信]工作通知類型才需要綁定用戶。';
 $lang->webhook->note->product   = "此項為空時所有{$lang->productCommon}的動作都會觸發鈎子，否則只有關聯{$lang->productCommon}的動作才會觸發。";
-$lang->webhook->note->execution = "此項為空時所有{$lang->executionCommon}的動作都會觸發鈎子，否則只有關聯{$lang->executionCommon}的動作才會觸發。";
+$lang->webhook->note->execution = "此項為空時所有{$lang->execution->common}的動作都會觸發鈎子，否則只有關聯{$lang->execution->common}的動作才會觸發。";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/model.php b/module/webhook/model.php
index 306d100d21..d68eae960f 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -211,7 +211,7 @@ class webhookModel extends model
             ->batchCheck($this->config->webhook->create->requiredFields, 'notempty')
             ->autoCheck()
             ->exec();
-        return !dao::isError();
+        return $this->dao->lastInsertId();
     }
 
     /**
diff --git a/module/webhook/view/header.html.php b/module/webhook/view/header.html.php
index bc65b4d4bd..9197f7e5c3 100644
--- a/module/webhook/view/header.html.php
+++ b/module/webhook/view/header.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 common::printAdminSubMenu('message');?></div>
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('message');?></div>
   <div class='btn-toolbar pull-right'>
     <div class='btn-group'>
       <div class='btn-group' id='createActionMenu'>
diff --git a/test/init.php b/test/init.php
index e3317732a0..292c107b64 100644
--- a/test/init.php
+++ b/test/init.php
@@ -1,26 +1,101 @@
 <?php
-/* Set error reporting level. */
-error_reporting(E_ALL ^ E_STRICT);
+/**
+ * 本文件创建一个 app 实例，并且通过执行 $app->loadCommon() 方法创建名为 tester 的commonModel对象。
+ * This file build a app instance and provide a instance of commonModel named as tester by $app->loadCommon().
+ *
+ * All request of entries should be routed by this router.
+ *
+ * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Guanxing <guanxiying@easycorp.ltd>
+ * @package     ZenTaoPMS
+ * @version     $Id: $
+ * @link        http://www.zentao.net
+ */
+/* Set the error reporting. */
+error_reporting(E_ALL & E_STRICT);
 
-/* Save current working directory and then change the directory of init.php. */
-$cwd = getcwd();
-chdir(dirname(__FILE__));
+$frameworkRoot = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'framework' . DIRECTORY_SEPARATOR;
 
 /* Load the framework. */
-include '../framework/router.class.php';
-include '../framework/control.class.php';
-include '../framework/model.class.php';
-include '../framework/helper.class.php';
+include $frameworkRoot . 'router.class.php';
+include $frameworkRoot . 'control.class.php';
+include $frameworkRoot . 'model.class.php';
+include $frameworkRoot . 'helper.class.php';
 
-/* Create the app. */
-$app = router::createApp('pms', dirname(dirname(__FILE__)));
+$app    = router::createApp('pms', dirname(dirname(__FILE__)), 'router');
+$tester = $app->loadCommon();
 
-/* Reconnect to the test database. */
-include '../config/test.php';
-$app->connectDB();
+$config->zendataRoot = dirname(__FILE__) . DS . 'zendata';
+$config->zdPath      = __DIR__ . "/runtime/zd/zd";
 
-/* Load the common module. */
-$common = $app->loadCommon();
+/**
+ * Save variable to $_result.
+ *
+ * @param  mix    $result
+ * @access public
+ * @return bool true
+ */
+function run($result)
+{
+    global $_result;
+    $_result = $result;
+    return true;
+}
 
-/* Change directory back again. */
-chdir($cwd);
+/**
+ * Print expect data.
+ *
+ * @param  string    $key
+ * @param  string    $delimiter
+ * @access public
+ * @return void
+ */
+function expect($key, $delimiter = ',')
+{
+    global $_result;
+    echo ">> ";
+    $result = "";
+
+    if(!is_array($_result) and !is_object($_result))
+    {
+        $result = (string) $_result;
+    }
+    else
+    {
+        $keyList =  explode(',', $key);
+        $dimension = 1;
+        foreach($_result as $value)
+        {
+            if(is_array($value) or is_object($value)) $dimension = 2;
+        }
+
+        if($dimension == 1) $_result = array($_result);
+        foreach($_result as $object)
+        {
+            foreach($keyList as $key) $result .= zget($object, $key, '') . $delimiter;
+        }
+        $result = trim($result, $delimiter);
+    }
+    echo $result . "\n";
+    echo "\n";
+}
+
+/**
+ * Import data create by zendata to one table.
+ *
+ * @param  string    $table
+ * @param  string    $yaml
+ * @param  int       $count
+ * @access public
+ * @return void
+ */
+function zdImport($table, $yaml, $count = 10)
+{
+    chdir(dirname(__FILE__));
+    global $app, $config;
+    $dns   = "mysql://{$config->db->user}:{$config->db->password}@{$config->db->host}:{$config->db->port}/{$config->db->name}#utf8";
+    $table = trim($table, '`');
+    $command = "$config->zdPath -c $yaml -t $table -T -dns $dns --clear -n $count";
+    system($command);
+}
diff --git a/test/model/branch/getbyid.php b/test/model/branch/getbyid.php
new file mode 100755
index 0000000000..b00216ecf6
--- /dev/null
+++ b/test/model/branch/getbyid.php
@@ -0,0 +1,26 @@
+#!/usr/bin/env php
+<?php
+/**
+title=测试 branchModel::getById();
+cid=1
+pid=1
+
+使用branchID获取一个存在的分支   >> A
+使用branchID和productID获取一个存在的分支 >> B
+使用branchID获取一个不存在的分支 >>
+*/
+
+include dirname(dirname(__DIR__)) . '/init.php';
+
+$branch = $tester->loadModel('branch');
+
+$app->dbh->query("truncate zt_product");
+$app->dbh->query("truncate zt_branch");
+
+zdImport(TABLE_PRODUCT, "zendata/product.yaml", 10);
+zdImport(TABLE_BRANCH, "zendata/branch.yaml", 10);
+
+/* Group 1. */
+run($branch->getByID(1))    and expect('name'); // Step 1.1.
+run($branch->getByID(2, 2)) and expect('name'); // Step 1.2.
+run($branch->getByID(null)) and expect('name'); // Step 1.3.
diff --git a/test/model/gapanalysis/getbyid.php b/test/model/gapanalysis/getbyid.php
new file mode 100755
index 0000000000..bd18dec82f
--- /dev/null
+++ b/test/model/gapanalysis/getbyid.php
@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/init.php';
+/**
+[case]
+title=测试 gapanalysisModel::getById();
+cid=1
+pid=1
+[group]
+  1. 使用ID获取一个存在的能力差距分析   >> `\d,\d+,\w+\d`
+  2. 使用ID获取一个不存在的能力差距分析 >> ``
+[esac]
+*/
+$gapanalysis = $tester->loadModel('gapanalysis');
+
+$app->dbh->query("truncate zt_gapanalysis");
+$id = rand(1,5);
+zdImport(TABLE_GAPANALYSIS, "zendata/gapanalysis.yaml", 5);
+
+$randGapAnalysis = $tester->dao->select('*,rand() as rand')->from(TABLE_GAPANALYSIS)->where('id')->eq($id)->orderBy('rand')->fetch();
+if(!$randGapAnalysis) exit("Prepair data error.");
+unset($randGapAnalysis->rand);
+
+/* Step 1.*/
+run($gapanalysis->getByID($randGapAnalysis->id, 'id')) and expect('id,project,account');
+
+/* Step 2.*/
+run($gapanalysis->getByID(null, 'id')) and expect('id');
diff --git a/test/model/trainplan/getbyid.php b/test/model/trainplan/getbyid.php
new file mode 100755
index 0000000000..0f20b2399b
--- /dev/null
+++ b/test/model/trainplan/getbyid.php
@@ -0,0 +1,22 @@
+#!/usr/bin/env php
+<?php
+/**
+title=测试 trainplanModel::getById();
+cid=1
+pid=1
+
+获取到的project是21,lecturer是hufangzhou  >> `21,hufangzhou`
+*/
+include dirname(dirname(dirname(__FILE__))) . '/init.php';
+
+$trainplan = $tester->loadModel('trainplan');
+
+$app->dbh->query("truncate zt_trainplan");
+zdImport(TABLE_TRAINPLAN, "zendata/trainplan.yaml", 10);
+
+$randTrainPlan = $tester->dao->select('*,rand() as rand')->from(TABLE_TRAINPLAN)->orderBy('rand')->fetch();
+if(!$randTrainPlan) exit("Prepair data error.");
+unset($randTrainPlan->rand);
+
+/* Step 1.*/
+run($trainplan->getById($randTrainPlan->id)) and expect('project,lecturer');
diff --git a/test/model/user/getbyid.php b/test/model/user/getbyid.php
new file mode 100755
index 0000000000..b1643434ab
--- /dev/null
+++ b/test/model/user/getbyid.php
@@ -0,0 +1,31 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/init.php';
+/**
+[case]
+title=测试 userModel::getById();
+cid=1
+pid=1
+[group]
+  1. 使用ID获取一个存在的用户   >> `\d,\w+`
+  2. 使用account获取一个存在的用户 >> `\d`
+  3. 使用account获取一个存在的用户 >> ``
+[esac]
+*/
+$user = $tester->loadModel('user');
+
+$app->dbh->query("truncate zt_user");
+zdImport(TABLE_USER, "zendata/user.yaml", 10);
+
+$randUser = $tester->dao->select('*,rand() as rand')->from(TABLE_USER)->orderBy('rand')->fetch();
+if(!$randUser) exit("Prepair data error.");
+unset($randUser->rand);
+
+/* Step 1.*/
+run($user->getByID($randUser->id, 'id')) and expect('id,account');
+
+/* Step 2.*/
+run($user->getByID($randUser->account, 'account')) and expect('id');
+
+/* Step 3.*/
+run($user->getByID(null, 'id')) and expect('id');
diff --git a/test/zendata/branch.yaml b/test/zendata/branch.yaml
new file mode 100644
index 0000000000..d1b5988585
--- /dev/null
+++ b/test/zendata/branch.yaml
@@ -0,0 +1,37 @@
+title: table zt_branch
+desc: "分支信息"
+author: liyuchun
+version: "1.0"
+fields:
+  - field: id
+    note: "ID"
+    range: 1-10
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: product
+    note: "所属产品"
+    range: 1-2{5}
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: name
+    note: "分支名称"
+    range: A-Z
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: order
+    note: "排序"
+    range: 1-10
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: deleted
+    note: "是否删除"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    format: ""
diff --git a/test/zendata/gapanalysis.yaml b/test/zendata/gapanalysis.yaml
new file mode 100644
index 0000000000..7b3832475e
--- /dev/null
+++ b/test/zendata/gapanalysis.yaml
@@ -0,0 +1,32 @@
+title: 'table zt_gapanalysis'
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: id
+      range: 1-6
+    - field: project
+      range: 13
+    - field: account
+      range: [admin,dev1,dev2,qa1,qa2]
+    - field: role
+      range: []{1},[研发]{2},[测试]{2}
+    - field: definition
+      range: a-z:R
+    - field: analysis
+      range: A-Z:R
+    - field: isTrain
+      range: 0-2:R
+    - field: createdBy
+      range: admin
+    - field: createdDate
+      range: "(-1M)-(+1w):60"
+      prefix: DateTime
+      type: timestamp
+      format: "YY/MM/DD hh:mm:ss"
+    - field: editedBy
+      range: ' '
+    - field: editedDate
+      range: [0000-00-00 00:00:00]
+    - field: deleted
+      range: 0
diff --git a/test/zendata/product.yaml b/test/zendata/product.yaml
new file mode 100644
index 0000000000..b884d78c25
--- /dev/null
+++ b/test/zendata/product.yaml
@@ -0,0 +1,130 @@
+title: table zt_product
+desc: "产品信息"
+author: liyuchun
+version: "1.0"
+fields:
+  - field: id
+    note: "ID"
+    range: 1-11
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: program
+    note: "所属项目集"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: name
+    note: "产品名称"
+    range: A-Z
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: code
+    note: "代号"
+    range: A-Z
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: bind
+    note: "是否绑定"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: line
+    note: "产品线"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: type
+    note: "类型"
+    range: [branch,normal]{5}
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: status
+    note: "状态"
+    range: "normal"
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: desc
+    note: "描述"
+    range: "批量创建产品"
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: PO
+    note: "产品负责人"
+    range: "admin"
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: QD
+    note: "测试负责人"
+    range: "admin"
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: RD
+    note: "发布负责人"
+    range: "admin"
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: feedback
+    range: ""
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: storyConcept
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: acl
+    note: "权限"
+    range: [open,private]{5}
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: storyConcept
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: whitelist
+    range: ""
+    prefix: ","
+    postfix: "\t"
+    format: ""
+  - field: createdBy
+    range: "admin"
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: createdDate
+    range: "(-1M)-(+1w):60"
+    prefix: DateTime
+    type: timestamp
+    format: "YY/MM/DD hh:mm:ss"
+  - field: createdVersion
+    range: "max2.0"
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: order
+    range: 1-10
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: deleted
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    format: ""
diff --git a/test/zendata/trainplan.yaml b/test/zendata/trainplan.yaml
new file mode 100644
index 0000000000..cc4ceae960
--- /dev/null
+++ b/test/zendata/trainplan.yaml
@@ -0,0 +1,48 @@
+title: 'table zt_trainplan '
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: id
+      range: 1-100000
+    - field: project
+      range: 1-100
+    - field: name
+      range: 1-100000
+      format: "培训计划_%d"
+    - field: begin
+      range: "(-1M)-(+1w):60"
+      prefix: DateTime
+      type: timestamp
+      format: "YY/MM/DD hh:mm:ss"
+    - field: end
+      range: "(-1M)-(+1w):60"
+      prefix: DateTime
+      type: timestamp
+      format: "YY/MM/DD hh:mm:ss"
+    - field: place
+      range: 1-10
+      format: "地点_%d"
+    - field: trainee
+      range: admin,jia,yiyi
+    - field: lecturer
+      range: hufangzhou
+    - field: type
+      range: outside,inside
+    - field: status
+      range: wait,done
+    - field: summary
+      range: ' '
+    - field: createdBy
+      range: admin
+    - field: createdDate
+      range: "(-1M)-(+1w):60"
+      prefix: DateTime
+      type: timestamp
+      format: "YY/MM/DD hh:mm:ss"
+    - field: editedBy
+      range: ' '
+    - field: editedDate
+      range: ' '
+    - field: deleted
+      range: 0
diff --git a/test/zendata/user.yaml b/test/zendata/user.yaml
new file mode 100644
index 0000000000..5acb5c1855
--- /dev/null
+++ b/test/zendata/user.yaml
@@ -0,0 +1,256 @@
+title: table zt_user
+desc: "用户信息"
+author: automated export
+version: "1.0"
+fields:
+  - field: id
+    note: "ID"
+    range: 1-10000
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: dept
+    note: "所属部门"
+    range: 1-10000
+    prefix: ""
+    postfix: "\t"
+    format: ""
+  - field: account
+    note: "用户名"
+    from: name.enaccount.v1.yaml
+    use: common_underline
+    postfix: "\t"           # 后缀，特殊字符加引号，否则无法解析。
+    format: ""
+  - field: password
+    note: "密码"
+    range: 123456
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: role
+    note: "职位"
+    range: qa,dev,pm,po,td,pd,qd,top,market,service,operation,support,others
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: realname
+    note: "真实姓名"
+    from: name.cnreal.v1.yaml
+    use: three
+    format: ""
+  - field: nickname
+    note: "昵称"
+    from: name.enaccount.v1.yaml
+    use: common
+    postfix: "\t"
+    loop: 0
+  - field: commiter
+    note: "源代码帐号"
+    from: name.enaccount.v1.yaml
+    use: common
+    postfix: "@zentao.net"
+    loop: 0
+    format: ""
+  - field: avatar
+    note: ""
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: birthday
+    note: "生日"
+    from: time.date.v1.yaml
+    use: date
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: gender
+    note: "性别"
+    range: f,m
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: email
+    note: "邮箱"
+    range: 1-10000
+    prefix: "这里是邮箱"
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: skype
+    note: "Skype"
+    range: Skype
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: qq
+    note: "QQ"
+    range: QQ
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: mobile
+    note: "手机"
+    range: mobile
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: phone
+    note: "电话"
+    range: phone
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: weixin
+    note: "微信"
+    range: weixin
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: dingding
+    note: "钉钉"
+    range: dingding
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: slack
+    note: "Slack"
+    range: slack
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: whatsapp
+    note: "WhatsApp"
+    range: whatsApp
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: address
+    note: "通讯地址"
+    range: 1-10000
+    prefix: "这是通讯地址"
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: zipcode
+    note: "邮编"
+    range: 1-10000
+    prefix: "这是邮编"
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: join
+    note: "入职日期"
+    from: time.date.v1.yaml
+    use: date
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: visits
+    note: "访问次数"
+    range: 0-10000:R
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: ip
+    note: "最后IP"
+    from: ip.v1.yaml
+    use: ipA,ipB
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: last
+    note: "最后登录"
+    range: 1-10000
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: fails
+    note: "失败次数"
+    range: 1-10000
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: locked
+    note: "锁定时间"
+    from: time.date.v1.yaml
+    use: date
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: feedback
+    note: "反馈[非研发]"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: ranzhi
+    note: "ZDOO账号"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: ldap
+    note: ""
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: score
+    note: "积分"
+    range: 1-10000:R
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: scoreLevel
+    note: "积分等级"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: deleted
+    note: "是否删除"
+    range: 0
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: clientStatus
+    note: "连接状态"
+    range: offline
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
+  - field: clientLang
+    note: "连接语言"
+    range: en
+    prefix: ""
+    postfix: "\t"
+    loop: 0
+    format: ""
diff --git a/tools/check.php b/tools/check.php
index 88d92e13f0..9c7a72d260 100755
--- a/tools/check.php
+++ b/tools/check.php
@@ -11,6 +11,9 @@ $config->programLink   = '-';
 $config->productLink   = '-';
 $config->projectLink   = '-';
 $config->executionLink = '-';
+$config->systemMode    = 'new';
+$config->URAndSR       = true;
+$config->systemScore   = true;
 
 /* set module root path and included the resource of group module. */
 $moduleRoot = '../module/';
@@ -48,8 +51,8 @@ $whiteList[] = 'help-field';
 $whiteList[] = 'index-testext';
 $whiteList[] = 'productplan-commonaction';
 $whiteList[] = 'project-managechilds';
-$whiteList[] = 'project-tips';
-$whiteList[] = 'project-commonaction';
+$whiteList[] = 'execution-tips';
+$whiteList[] = 'execution-commonaction';
 $whiteList[] = 'project-sendmail';
 $whiteList[] = 'release-commonaction';
 $whiteList[] = 'task-commonaction';
@@ -125,6 +128,7 @@ $whiteList[] = 'ci-initqueue';
 $whiteList[] = 'ci-exec';
 $whiteList[] = 'ci-checkcompilestatus';
 $whiteList[] = 'im-userlogin';
+$whiteList[] = 'user-refreshRandom';
 
 /* checking actions of every module. */
 echo '-------------action checking-----------------' . "\n";
@@ -293,7 +297,7 @@ foreach($demoSQL as $line => $sql)
 
     if(strpos($sql, $config->db->prefix . 'config')  !== false or
        strpos($sql, $config->db->prefix . 'company') !== false or
-       strpos($sql, $config->db->prefix . 'group')   !== false) 
+       strpos($sql, $config->db->prefix . 'group')   !== false)
     {
         die('line ' . ($line + 1) . " has error\n");
     }
diff --git a/www/index.php b/www/index.php
index 240d08b2f4..040483f53f 100644
--- a/www/index.php
+++ b/www/index.php
@@ -64,7 +64,7 @@ if(file_exists('install.php') or file_exists('upgrade.php'))
 }
 
 /* If client device is mobile and version is pro, set the default view as mthml. */
-if($app->clientDevice == 'mobile' and (strpos($config->version, 'pro') === 0 or strpos($config->version, 'biz') === 0) and $config->default->view == 'html') $config->default->view = 'mhtml';
+if($app->clientDevice == 'mobile' and (strpos($config->version, 'pro') === 0 or strpos($config->version, 'biz') === 0 or strpos($config->version, 'max') === 0) and $config->default->view == 'html') $config->default->view = 'mhtml';
 if(!empty($_GET['display']) && $_GET['display'] == 'card') $config->default->view = 'xhtml';
 
 $app->parseRequest();
diff --git a/www/init.php b/www/init.php
new file mode 100644
index 0000000000..23acb0c613
--- /dev/null
+++ b/www/init.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * 本文件创建一个 app 示例，并且通过执行 $app->loadCommon() 方法创建名为 tester 的commonModel对象。
+ * This file build a app instance and provide a instance of commonModel named as tester by $app->loadCommon().
+ *
+ * All request of entries should be routed by this router.
+ *
+ * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Guanxing <guanxiying@easycorp.ltd>
+ * @package     ZenTaoPMS
+ * @version     $Id: $
+ * @link        http://www.zentao.net
+ */
+/* Set the error reporting. */
+error_reporting(0);
+
+/* Load the framework. */
+include '../framework/router.class.php';
+include '../framework/control.class.php';
+include '../framework/model.class.php';
+include '../framework/helper.class.php';
+
+$app    = router::createApp('pms', dirname(dirname(__FILE__)), 'router');
+$tester = $app->loadCommon();
diff --git a/www/ioncube.php b/www/ioncube.php
deleted file mode 100755
index 7b1f4f6642..0000000000
--- a/www/ioncube.php
+++ /dev/null
@@ -1,3877 +0,0 @@
-<?php 
-$config = new stdclass();
-include '../config/config.php';
-session_name($config->sessionVar);
-session_start();
-if(!isset($_SESSION['user']) or $_SESSION['user']->account == 'guest' or $_SESSION['company']->supers != $_SESSION['user']->account) die(header('location:index.php'));
-
-/** 
- * ionCube Loader install Wizard
- *
- * ionCube is a registered trademark of ionCube Ltd. 
- *
- * Copyright (c) ionCube Ltd. 2002-2011
- */
-define ('ERROR_UNKNOWN_OS',1);
-define ('ERROR_UNSUPPORTED_OS',2);
-define ('ERROR_UNKNOWN_ARCH',3);
-define ('ERROR_UNSUPPORTED_ARCH',4);
-define ('ERROR_UNSUPPORTED_ARCH_OS',5);
-define ('ERROR_WINDOWS_64_BIT',6);
-define ('ERROR_PHP_UNSUPPORTED',7);
-define ('ERROR_PHP_DEBUG_BUILD',8);
-define ('ERROR_RUNTIME_EXT_DIR_NOT_FOUND',101);
-define ('ERROR_RUNTIME_LOADER_FILE_NOT_FOUND',102);
-define ('ERROR_INI_NOT_FIRST_ZE',201);
-define ('ERROR_INI_WRONG_ZE_START',202);
-define ('ERROR_INI_ZE_LINE_NOT_FOUND',203);
-define ('ERROR_INI_LOADER_FILE_NOT_FOUND',204);
-define ('ERROR_INI_NOT_FULL_PATH',205);
-define ('ERROR_INI_NO_PATH',206);
-define ('ERROR_INI_NOT_FOUND',207);
-define ('ERROR_INI_NOT_READABLE',208);
-define ('ERROR_INI_MULTIPLE_IC_LOADER_LINES',209);
-define ('ERROR_INI_USER_INI_NOT_FOUND',210);
-define ('ERROR_INI_USER_CANNOT_CREATE',211);
-define ('ERROR_LOADER_UNEXPECTED_NAME',301);
-define ('ERROR_LOADER_NOT_READABLE',302);
-define ('ERROR_LOADER_PHP_MISMATCH',303);
-define ('ERROR_LOADER_NONTS_PHP_TS',304);
-define ('ERROR_LOADER_TS_PHP_NONTS',305);
-define ('ERROR_LOADER_WRONG_OS',306);
-define ('ERROR_LOADER_WRONG_ARCH',307);
-define ('ERROR_LOADER_WRONG_GENERAL',308);
-define ('ERROR_LOADER_WIN_SERVER_NONWIN',321);
-define ('ERROR_LOADER_WIN_NONTS_PHP_TS',322);
-define ('ERROR_LOADER_WIN_TS_PHP_NONTS',323);
-define ('ERROR_LOADER_WIN_PHP_MISMATCH',324);
-define ('ERROR_LOADER_WIN_COMPILER_MISMATCH',325);
-define ('ERROR_LOADER_NOT_FOUND',380);
-define ('ERROR_LOADER_PHP_VERSION_UNKNOWN',390);
-
-
-define ('SERVER_UNKNOWN',0);
-define ('HAS_PHP_INI',1);
-define ('SERVER_SHARED',2); 
-define ('SERVER_VPS',5); 
-define ('SERVER_DEDICATED',7); 
-define ('SERVER_LOCAL',9);
-
-define ('LOADERS_PAGE',
-            'http://loaders.ioncube.com/');                                 
-define ('SUPPORT_SITE',
-            'http://support.ioncube.com/');                                 
-define ('LOADER_FORUM_URL',
-            'http://forum.ioncube.com/viewforum.php?f=4');                  
-define ('LOADERS_FAQ_URL',
-            'http://www.ioncube.com/faqs/loaders.php');                     
-define ('UNIX_ERRORS_URL',
-            'http://www.ioncube.com/loaders/unix_startup_errors.php');      
-define ('LOADER_WIZARD_URL',
-            LOADERS_PAGE);                                                  
-define ('ENCODER_URL',
-            'http://www.ioncube.com/sa_encoder.php');                       
-define ('LOADER_VERSION_URL',
-            'http://www.ioncube.com/feeds/product_info/versions.php');    
-define ('WIZARD_LATEST_VERSION_URL',
-            LOADER_VERSION_URL . '?item=loader-wizard'); 
-define ('PHP_COMPILERS_URL',
-            LOADER_VERSION_URL . '?item=php-compilers');
-define ('LOADER_PLATFORM_URL',
-            LOADER_VERSION_URL . '?item=loader-platforms');   
-define ('LOADER_LATEST_VERSIONS_URL',
-            LOADER_VERSION_URL . '?item=loader-versions'); 
-define ('WIZARD_STATS_URL',
-            'http://www.ioncube.com/feeds/stats/wizard.php');    
-define ('IONCUBE_DOWNLOADS_SERVER',
-            'http://downloads2.ioncube.com/loader_downloads');          
-define ('IONCUBE_CONNECT_TIMEOUT',4);
-
-define ('DEFAULT_SELF','/ioncube/loader-wizard.php');
-define ('LOADER_NAME_CHECK',true);
-define ('LOADER_EXTENSION_NAME','ionCube Loader');
-define ('LOADER_SUBDIR','ioncube');
-define ('WINDOWS_IIS_LOADER_DIR', 'system32');
-define ('ADDITIONAL_INI_FILE_NAME','20ioncube.ini');
-define ('UNIX_SYSTEM_LOADER_DIR','/usr/local/ioncube');
-define ('RECENT_LOADER_VERSION','3.1.24');
-define ('LATEST_LOADER_MAJOR_VERSION',4);
-define ('LOADERS_PACKAGE_PREFIX','ioncube_loaders_');
-define ('SESSION_LIFETIME_MINUTES',360);
-define ('WIZARD_EXPIRY_MINUTES',10080);
-define ('MIN_INITIALISE_TIME',4);
-
-    run();
-
-
-function php4_http_build_query($formdata, $numeric_prefix = null, $key = null ) {
-    $res = array();
-    foreach ((array)$formdata as $k=>$v) {
-        $tmp_key = urlencode(is_int($k) ? $numeric_prefix.$k : $k);
-        if ($key) $tmp_key = $key.'['.$tmp_key.']';
-        if ( is_array($v) || is_object($v) ) {
-            $res[] = php4_http_build_query($v, null , $tmp_key);
-        } else {
-            $res[] = $tmp_key."=".urlencode($v);
-        }
-   }
-   $separator = ini_get('arg_separator.output');
-   return implode($separator, $res);
-}
-
-
-function script_version()
-{
-    return "2.36";
-}
-
-function retrieve_latest_wizard_version()
-{
-    $v = false;
-
-    $s = trim(remote_file_contents(WIZARD_LATEST_VERSION_URL));
-    if (preg_match('/^\d+([.]\d+)*$/', $s)) {
-        $v = $s;
-    }
-
-    return $v;
-}
-
-function latest_wizard_version()
-{
-    if (!isset($_SESSION['latest_wizard_version'])) {
-        $_SESSION['latest_wizard_version'] = retrieve_latest_wizard_version();
-    } 
-    return $_SESSION['latest_wizard_version'];
-}
-
-function update_is_available($lv)
-{
-    if (is_numeric($lv)) {
-        $lv_parts = explode('.',$lv);
-        $script_parts = explode('.',script_version());
-        return ($lv_parts[0] > $script_parts[0] || ($lv_parts[0] == $script_parts[0] && $lv_parts[1] > $script_parts[1]));
-    } else {
-        return null;
-    }
-}
-
-function check_for_wizard_update($echo_message = false)
-{
-    $latest_version = latest_wizard_version();
-    $update_available = update_is_available($latest_version);
-
-    if ($update_available) {
-        if ($echo_message) {
-            echo '<p class="alert">该文件有一个新的版本，点击<a href="' . LOADER_WIZARD_URL . '">这里</a>查看.</p>';
-        }
-        return $latest_version;
-    } else {
-        return $update_available;
-    }
-}
-
-
-function remote_file_contents($url)
-{
-    $remote_file_opening = ini_get('allow_url_fopen');
-    $contents = false;
-    if (isset($_SESSION['timing_out']) && $_SESSION['timing_out']) {
-        return false;
-    }
-    @session_write_close();
-    $timing_out = 0;
-    if ($remote_file_opening) {
-        $fh = @fopen($url,'rb');
-        if ($fh) {
-            stream_set_blocking($fh,0);
-            stream_set_timeout($fh,IONCUBE_CONNECT_TIMEOUT);
-            while (!feof($fh)) {
-                $result = fgets($fh, 4096);
-                $info = stream_get_meta_data($fh);
-                $timing_out = $info['timed_out']?1:0;
-                if ($timing_out) {
-                    break;
-                }
-                if ($result !== false) {
-                    $contents .= $result;
-                } else {
-                    break;
-                }
-            }
-            fclose($fh);
-        } else {
-            $timing_out = 1;
-        }
-    } elseif (extension_loaded('curl')) {
-            $ch = curl_init();
-
-            curl_setopt($ch, CURLOPT_URL, $url);
-            curl_setopt($ch, CURLOPT_HEADER, 0);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT,IONCUBE_CONNECT_TIMEOUT);
-            $output = curl_exec($ch);
-            $info = curl_getinfo($ch);
-            $timing_out = ($info['http_code'] >= 400)?1:0;
-            curl_close($ch);
-
-            if (is_string($output)) {
-                $contents = $output;
-            }
-    } else {
-        $timing_out = 1;
-    }
-    @session_start();
-    $_SESSION['timing_out'] = $timing_out;
-    return $contents;
-}
-
-function php_version()
-{
-    $v = explode('.',PHP_VERSION);
-
-    return array(
-           'major'      =>  $v[0],
-           'minor'      =>  $v[1],
-           'release'    =>  $v[2]);
-}
-
-function php_version_maj_min()
-{
-    $vprts = php_version();
-    return ($vprts['major'] . '.' . $vprts['minor']);
-}
-
-function is_supported_php_version()
-{
-    $v = php_version(); 
-
-    return ((($v['major'] == 4) && ($v['minor'] >= 1)) ||
-      (($v['major'] == 5) && (($v['minor'] >= 1) || ($v['release'] >= 3))));
-}
-
-function is_php_version_or_greater($major,$minor,$release = 0)
-{
-    $version = php_version();
-    return ($version['major'] > $major || 
-            ($version['major'] == $major && $version['minor'] > $minor) ||
-            ($version['major'] == $major && $version['minor'] == $minor && $version['release'] >= $release));
-}
-
-function ini_file_name()
-{
-    $sysinfo = get_sysinfo();
-    return (!empty($sysinfo['PHP_INI'])?$sysinfo['PHP_INI_BASENAME']:'php.ini');
-}
-
-function get_remote_session_value($session_var,$remote_url,$default_function)
-{
-    if (!isset($_SESSION[$session_var])) {
-        $serialised_res = remote_file_contents($remote_url);
-        $unserialised_res = @unserialize($serialised_res);
-        if (empty($unserialised_res)) {
-            $unserialised_res = call_user_func($default_function);
-        }
-        if (false === $unserialised_res) {
-            $unserialised_res = '';
-        }
-        $_SESSION[$session_var] = $unserialised_res;
-    }
-    return $_SESSION[$session_var];
-}
-
-function get_file_contents($file)
-{
-    if (function_exists('file_get_contents')) {
-        $strs = @file_get_contents($file);
-    } else {
-        $lines = @file($file);
-        $strs = join(' ',$lines);
-    }
-    return $strs;
-}
-
-function default_platform_list()
-{
-    $platforms = array();
-
-
-    $platforms[] = array('os'=>'win', 'os_human'=>'Windows VC6',        'os_mod' => '_vc6',     'arch'=>'x86',  'dirname'=>'win32', 'us1-dir'=>'windows_vc6/x86' );
-    $platforms[] = array('os'=>'win', 'os_human'=>'Windows VC6 (Non-TS)',   'os_mod' => '_nonts_vc6',   'arch'=>'x86',  'dirname'=>'win32-nonts', 'us1-dir'=>'windows_vc6/x86-nonts' );
-
-    $platforms[] = array('os'=>'win', 'os_human'=>'Windows VC9',        'os_mod' => '_vc9',     'arch'=>'x86',  'dirname'=>'win32_vc9', 'us1-dir'=>'windows_vc9/x86' );
-    $platforms[] = array('os'=>'win', 'os_human'=>'Windows VC9 (Non-TS)',   'os_mod' => '_nonts_vc9',   'arch'=>'x86',  'dirname'=>'win32-nonts_vc9', 'us1-dir'=>'windows_vc9/x86-nonts' );
-
-    $platforms[] = array('os'=>'lin', 'os_human'=>'Linux',              'arch'=>'x86',      'dirname'=>'linux_i686-glibc2.1.3', 'us1-dir'=>'linux/x86');
-    $platforms[] = array('os'=>'lin', 'os_human'=>'Linux',              'arch'=>'x86-64',   'dirname'=>'linux_x86_64-glibc2.3.4', 'us1-dir'=>'linux/x86_64');
-$platforms[] = array('os'=>'lin','os_human'=>'Linux',               'arch'=>'ppc',      'dirname'=>'linux_ppc-glibc2.3.4','us1-dir'=>'linux/ppc');
-            $platforms[] = array('os'=>'lin','os_human'=>'Linux',               'arch'=>'ppc64',    'dirname'=>'linux_ppc64-glibc2.5','us1-dir'=>'linux/ppc64');
-    
-
-$platforms[] = array('os'=>'dra', 'os_human'=>'DragonFly', 
-    'arch'=>'x86',      'dirname'=>'dragonfly_i386-1.7', 'us1-dir'=>'Dragonfly/x86');
-
-$platforms[] = array('os'=>'fre', 'os_human'=>'FreeBSD 4', 'os_mod'=>'_4',  'arch'=>'x86',      'dirname'=>'freebsd_i386-4.8', 'us1-dir'=>'FreeBSD/v4');
-
-    $platforms[] = array('os'=>'fre', 'os_human'=>'FreeBSD 6', 'os_mod'=>'_6',  'arch'=>'x86',      'dirname'=>'freebsd_i386-6.2', 'us1-dir'=>'FreeBSD/v6/x86');
-
-    $platforms[] = array('os'=>'fre', 'os_human'=>'FreeBSD 6', 'os_mod'=>'_6',  'arch'=>'x86-64',   'dirname'=>'freebsd_amd64-6.2', 'us1-dir'=>'FreeBSD/v6/AMD64');
-
-
-    $platforms[] = array('os'=>'fre', 'os_human'=>'FreeBSD 7', 'os_mod'=>'_7',  'arch'=>'x86',      'dirname'=>'freebsd_i386-7.3', 'us1-dir'=>'FreeBSD/v7/x86');
-    $platforms[] = array('os'=>'fre', 'os_human'=>'FreeBSD 7', 'os_mod'=>'_7',  'arch'=>'x86-64',   'dirname'=>'freebsd_amd64-7.3', 'us1-dir'=>'FreeBSD/v7/AMD64');
-
-
-    $platforms[] = array('os'=>'fre', 'os_human'=>'FreeBSD 8', 'os_mod'=>'_8',  'arch'=>'x86',      'dirname'=>'freebsd_i386-8.0', 'us1-dir'=>'FreeBSD/v8/x86');
-    $platforms[] = array('os'=>'fre', 'os_human'=>'FreeBSD 8', 'os_mod'=>'_8',  'arch'=>'x86-64',   'dirname'=>'freebsd_amd64-8.0', 'us1-dir'=>'FreeBSD/v8/AMD64');
-    
-    $platforms[] = array('os'=>'bsd', 'os_human'=>'BSDi',               'arch'=>'x86',      'dirname'=>'bsdi_i386-4.3.1');
-    $platforms[] = array('os'=>'net', 'os_human'=>'NetBSD',             'arch'=>'x86',      'dirname'=>'netbsd_i386-2.1','us1-dir'=>'NetBSD/x86');
-    $platforms[] = array('os'=>'net', 'os_human'=>'NetBSD',             'arch'=>'x86-64',   'dirname'=>'netbsd_amd64-2.0','us1-dir'=>'NetBSD/x86_64');
-    $platforms[] = array('os'=>'ope', 'os_human'=>'OpenBSD 4.2', 'os_mod'=>'_4.2',  'arch'=>'x86',  'dirname'=>'openbsd_i386-4.2', 'us1-dir'=>'OpenBSD/x86');
-
-    $platforms[] = array('os'=>'ope', 'os_human'=>'OpenBSD 4.5', 'os_mod'=>'_4.5',  'arch'=>'x86',  'dirname'=>'openbsd_i386-4.5', 'us1-dir'=>'OpenBSD/x86');
-    $platforms[] = array('os'=>'ope', 'os_human'=>'OpenBSD 4.6', 'os_mod'=>'_4.6',  'arch'=>'x86',  'dirname'=>'openbsd_i386-4.6', 'us1-dir'=>'OpenBSD/x86');
-
-    $platforms[] = array('os'=>'ope', 'os_human'=>'OpenBSD 4.7', 'os_mod'=>'_4.7',  'arch'=>'x86-64', 'dirname'=>'openbsd_amd64-4.7', 'us1-dir' => 'OpenBSD/x86_64');
-
-    $platforms[] = array('os'=>'dar', 'os_human'=>'OS X',               'arch'=>'ppc',      'dirname'=>'osx_powerpc-8.5','us1-dir'=>'OSX/ppc');
-
-    $platforms[] = array('os'=>'dar', 'os_human'=>'OS X',               'arch'=>'x86',      'dirname'=>'osx_i386-8.11','us1-dir'=>'OSX/x86');
-
-    $platforms[] = array('os'=>'dar', 'os_human'=>'OS X',               'arch'=>'x86-64',       'dirname'=>'osx_x86-64-10.2','us1-dir'=>'OSX/x86_64');
-
-    $platforms[] = array('os'=>'sun', 'os_human'=>'Solaris',            'arch'=>'sparc',    'dirname'=>'solaris_sparc-5.9', 'us1-dir'=>'Solaris/sparc');
-
-    $platforms[] = array('os'=>'sun', 'os_human'=>'Solaris',            'arch'=>'x86',      'dirname'=>'solaris_i386-5.10','us1-dir'=>'Solaris/x86');
-
-    return $platforms;
-}
-
-function get_loader_platforms()
-{
-    return get_remote_session_value('loader_platform_info',LOADER_PLATFORM_URL,'default_platform_list');
-}
-
-function get_platforminfo()
-{
-    static $platforminfo;
-
-    if (empty($platforminfo)) {
-        $platforminfo = get_loader_platforms();
-    }
-    return $platforminfo;
-}
-
-function supported_os_variants($os_code,$arch_code)
-{
-    if (empty($os_code)) {
-        return ERROR_UNKNOWN_OS;
-    }
-    if (empty($arch_code)) {
-        return ERROR_UNKNOWN_ARCH;
-    }
-
-    $os_found = false;
-    $arch_found = false;
-    $os_arch_matches = array();
-    $pinfo = get_platforminfo();
-
-    foreach ($pinfo as $p) {
-        if ($p['os'] == $os_code && $p['arch'] == $arch_code) {
-            $os_arch_matches[$p['os_human']] = (isset($p['os_mod']))?(0 + str_replace('_','',$p['os_mod'])):'';
-        } 
-        if ($p['os'] == $os_code) {
-            $os_found = true;
-        } elseif ($p['arch'] == $arch_code) {
-            $arch_found = true;
-        }
-    }
-    if (!empty($os_arch_matches)) {
-        asort($os_arch_matches);
-        return $os_arch_matches;
-    } elseif (!$os_found) {
-        return ERROR_UNSUPPORTED_OS;
-    } elseif (!$arch_found) {
-        return ERROR_UNSUPPORTED_ARCH;
-    } else {
-        return ERROR_UNSUPPORTED_ARCH_OS;
-    }
-}
-
-function default_win_compilers()
-{
-    return array('VC6','VC9');
-}
-
-function supported_win_compilers()
-{
-    static $win_compilers;
-
-    if (empty($win_compilers)) {
-        $win_compilers = find_win_compilers();
-    }
-    return $win_compilers;
-}
-
-function find_win_compilers()
-{
-    return get_remote_session_value('php_compilers_info',PHP_COMPILERS_URL,'default_win_compilers');
-}
-
-function server_software_info()
-{
-    $ss = array('full' => '','short' => '');
-    $ss['full'] = $_SERVER['SERVER_SOFTWARE'];
-
-    if (preg_match('/apache/i', $ss['full'])) {
-        $ss['short'] = 'Apache';
-    } else if (preg_match('/IIS/',$ss['full'])) {
-        $ss['short'] = 'IIS';
-    } else {
-        $ss['short'] = '';
-    }
-    return $ss;
-}
-
-function match_arch_pattern($str)
-{
-    $arch = null;
-    $arch_patterns = array(
-             'i.?86'        => 'x86',
-             'x86[-_]64'    => 'x86',
-             'x86'          => 'x86',
-             'amd64'        => 'x86',
-             'ppc64'        => 'ppc',
-             'ppc'          => 'ppc',
-             'powerpc'      => 'ppc',
-             'sparc'        => 'sparc',
-             'sun'          => 'sparc'
-         );
-
-    foreach ($arch_patterns as $token => $a) {
-        if (preg_match("/$token/i", $str)) {
-          $arch = $a;
-          break;
-        }
-    }
-    return $arch;
-}
-
-function required_loader_arch($mach_info,$os_code,$wordsize)
-{
-    if ($os_code == 'win') {
-        $arch = ($wordsize == 32)?'x86':'x86-64';
-        if ($wordsize != 32) {
-            $arch = ERROR_WINDOWS_64_BIT;
-        }
-    } elseif (!empty($os_code)) {
-        $arch = match_arch_pattern($mach_info);
-        if ($wordsize == 64) {
-            if ($arch == 'x86') {
-                $arch = 'x86-64';
-            } elseif ($arch == 'ppc') {
-                $arch = 'ppc64';
-            }
-        }
-    } else {
-        $arch = ERROR_UNKNOWN_ARCH;
-    }
-    return $arch;
-}
-
-function uname($part = 'a')
-{
-    $result = '';
-    if (!function_is_disabled('php_uname')) {
-        $result = @php_uname($part);
-    } elseif (function_exists('posix_uname') && !function_is_disabled('posix_uname')) {
-        $posix_equivs = array(
-                     'm' => 'machine',
-                     'n' => 'nodename',
-                     'r' => 'release',
-                     's' => 'sysname'
-                 );
-        $puname = @posix_uname();
-        if ($part == 'a' || !array_key_exists($part,$posix_equivs)) {
-           $result = join(' ',$puname);
-        } else {
-           $result = $puname[$posix_equivs[$part]];
-        }
-    } else {
-        if (!function_is_disabled('phpinfo')) {
-            ob_start();
-            phpinfo(INFO_GENERAL);
-            $pinfo = ob_get_contents();
-            ob_end_clean();
-            if (preg_match('~System.*?(</B></td><TD ALIGN="left">| => |v">)([^<]*)~i',$pinfo,$match)) {
-                $uname = $match[2];
-                if ($part == 'r') {
-                    if (!empty($uname) && preg_match('/\S+\s+\S+\s+([0-9.]+)/',$uname,$matchver)) {
-                        $result = $matchver[1];
-                    } else {
-                        $result = '';
-                    }
-                } else {
-                    $result = $uname;
-                }
-            }
-        } else {
-            $result = '';
-        }
-    }
-    return $result;
-}
-
-function calc_word_size($os_code)
-{
-    $wordsize = null;
-    if ('win' === $os_code) {
-        ob_start();
-        phpinfo(INFO_GENERAL);
-        $pinfo = ob_get_contents();
-        ob_end_clean();
-        if (preg_match('~Compiler.*?(</B></td><TD ALIGN="left">| => |v">)([^<]*)~i',$pinfo,$compmatch)) {
-            if (preg_match("/(VC[0-9]+)/i",$compmatch[2],$vcmatch)) {
-                $compiler = strtoupper($vcmatch[1]);
-            } else {
-                $compiler = 'VC6';
-            }
-        } else {
-            $compiler = 'VC6';
-        }
-        if ($compiler === 'VC9') {
-            if (isset($_ENV['PROCESSOR_ARCHITECTURE']) && preg_match('~(amd64|x86-64|x86_64)~i',$_ENV['PROCESSOR_ARCHITECTURE'])) {
-                if (preg_match('~Configure Command.*?(</B></td><TD ALIGN="left">| => |v">)([^<]*)~i',$pinfo,$confmatch)) {
-                    if (preg_match('~(x64|lib64|system64)~i',$confmatch[2])) {
-                        $wordsize = 64;
-                    }
-                }
-            }
-        }
-    }
-    if (empty($wordsize)) {
-        $wordsize = ((-1^0xffffffff)?64:32);
-    }
-    return $wordsize;
-}
-
-function required_loader($unamestr = '')
-{
-    $un = empty($unamestr)?uname():$unamestr;
-
-    $php_major_version = substr(PHP_VERSION,0,3);
-
-    $os_name = substr($un,0,strpos($un,' '));
-    $os_code = empty($os_name)?'':strtolower(substr($os_name,0,3));
-
-    $wordsize = calc_word_size($os_code);
-
-    $arch = required_loader_arch($un,$os_code,$wordsize);
-    if (!is_string($arch)) {
-        return $arch;
-    }
-    $os_variants = supported_os_variants($os_code,$arch);
-    if (!is_array($os_variants)) {
-        return $os_variants;
-    }
-
-    $os_ver = '';
-    if (preg_match('/([0-9.]+)/',uname('r'),$match)) {
-        $os_ver = $match[1];
-    }
-    $os_ver_parts = preg_split('@\.@',$os_ver);
-
-    $loader_sfix = (($os_code == 'win') ? 'dll' : 'so');
-    $file = "ioncube_loader_${os_code}_${php_major_version}.${loader_sfix}";
-
-    if ($os_code == 'win') {
-        $os_name = 'Windows';
-        $file_ts = $file;
-        $os_name_qual = 'Windows';
-    } else {
-        $os_names = array_keys($os_variants);
-        if (count($os_variants) > 1) {
-            $parts = explode(" ",$os_names[0]); 
-            $os_name = $parts[0];
-            $os_name_qual = $os_name . ' ' . $os_ver_parts[0] . '.' . $os_ver_parts[1];
-        } else {
-            $os_name = $os_names[0];
-            $os_name_qual = $os_name;
-        }
-        $file_ts = "ioncube_loader_${os_code}_${php_major_version}_ts.${loader_sfix}";
-    }
-
-    return array(
-           'uname'      =>  $un,
-           'arch'       =>  $arch,
-           'oscode'     =>  $os_code,
-           'osname'     =>  $os_name,
-           'osnamequal' =>  $os_name_qual,
-           'osvariants' =>  $os_variants,
-           'osver'      =>  $os_ver,
-           'osver2'     =>  $os_ver_parts,
-           'file'       =>  $file,
-           'file_ts'    =>  $file_ts,
-           'wordsize'   =>  $wordsize
-       );
-}
-
-function ic_system_info()
-{
-    $thread_safe = null;
-    $debug_build = null;
-    $cgi_cli = false;
-    $is_cgi = false;
-    $is_cli = false;
-    $php_ini_path = '';
-    $php_ini_dir = '';
-    $php_ini_add = '';
-    $is_supported_compiler = true;
-    $php_compiler = is_ms_windows()?'VC6':'';
-
-    ob_start();
-    phpinfo(INFO_GENERAL);
-    $php_info = ob_get_contents();
-    ob_end_clean();
-
-    $breaker = (php_sapi_name() == 'cli')?'\n':'</tr>';
-    $lines = explode($breaker,$php_info);
-    foreach ($lines as $line) {
-        if (preg_match('/command/i',$line)) {
-          continue;
-        }
-
-        if (preg_match('/thread safety/i', $line)) {
-          $thread_safe = (preg_match('/(enabled|yes)/i', $line) != 0);
-        }
-
-        if (preg_match('/debug build/i', $line)) {
-          $debug_build = (preg_match('/(enabled|yes)/i', $line) != 0);
-        }
-
-        if (preg_match('~configuration file.*(</B></td><TD ALIGN="left">| => |v">)([^ <]*)~i',$line,$match)) {
-          $php_ini_path = $match[2];
-
-          if (!@file_exists($php_ini_path)) {
-                $php_ini_path = '';
-          }
-        }
-        if (preg_match('~dir for additional \.ini files.*(</B></td><TD ALIGN="left">| => |v">)([^ <]*)~i',$line,$match)) {
-            $php_ini_dir = $match[2];
-            if (!@file_exists($php_ini_dir)) {
-                $php_ini_dir = '';
-            }
-        }
-        if (preg_match('~additional \.ini files parsed.*(</B></td><TD ALIGN="left">| => |v">)([^ <]*)~i',$line,$match)) {
-            $php_ini_add = $match[2];
-        }
-        if (preg_match('/compiler/i',$line)) {
-            $supported_match = join('|',supported_win_compilers());
-            $is_supported_compiler = preg_match("/($supported_match)/i",$line);
-            if (preg_match("/(VC[0-9]+)/i",$line,$match)) {
-                $php_compiler = strtoupper($match[1]);
-            } else {
-                $php_compiler = '';
-            }
-        }
-    }
-    $is_cgi = strpos(php_sapi_name(),'cgi') !== false;
-    $is_cli = strpos(php_sapi_name(),'cli') !== false;
-    $cgi_cli = $is_cgi || $is_cli;
-
-    $ss = server_software_info();
-
-    if (!$php_ini_path && function_exists('php_ini_loaded_file')) {
-        $php_ini_path = php_ini_loaded_file();
-        if ($php_ini_path === false) {
-            $php_ini_path = '';
-        }
-    }
-    if (!empty($php_ini_path)) {
-        $real_path = @realpath($php_ini_path);
-        if (false !== $real_path) {
-            $php_ini_path = $real_path;
-        }
-    }
-
-    $php_ini_basename = basename($php_ini_path);
-
-    return array(
-           'THREAD_SAFE'        => $thread_safe,
-           'DEBUG_BUILD'        => $debug_build,
-           'PHP_INI'            => $php_ini_path,
-           'PHP_INI_BASENAME'   => $php_ini_basename,
-           'PHP_INI_DIR'        => $php_ini_dir,
-           'PHP_INI_ADDITIONAL' => $php_ini_add,
-           'PHPRC'              => getenv('PHPRC'),
-           'CGI_CLI'            => $cgi_cli,
-           'IS_CGI'             => $is_cgi,
-           'IS_CLI'             => $is_cli,
-           'PHP_COMPILER'       => $php_compiler,
-           'SUPPORTED_COMPILER' => $is_supported_compiler,
-           'FULL_SS'            => $ss['full'],
-           'SS'                 => $ss['short']);
-}
-
-function is_possibly_dedicated_or_local()
-{
-    $sys = get_sysinfo();
-
-    return (empty($sys['PHP_INI']) || !@file_exists($sys['PHP_INI']) || (is_readable($sys['PHP_INI']) && (0 !== strpos($sys['PHP_INI'],$_SERVER['DOCUMENT_ROOT']))));
-}
-
-function is_local()
-{
-    $ret = false;
-    if ($_SERVER["SERVER_NAME"] == 'localhost') {
-        $ret = true;
-    } else {
-        $ip_address = strtolower($_SERVER["REMOTE_ADDR"]);
-        if (strpos(':',$ip_address) === false) {
-            $ip_parts = explode('.',$ip_address);
-            $ret = (($ip_parts[0] == 10) || 
-                    ($ip_parts[0] == 172 && $ip_parts[1] >= 16 &&  $ip_parts[1] <= 31) ||
-                    ($ip_parts[0] == 192 && $ip_parts[1] == 168));
-        } else {
-            $ret = ($ip_address == '::1') || (($ip_address[0] == 'f') && ($ip_address[1] >= 'c' && $ip_address[1] <= 'f'));
-        }
-    }
-    return $ret;
-}
-
-function is_shared()
-{
-    return !is_local() && !is_possibly_dedicated_or_local();
-}
-
-function find_server_type($chosen_type = '',$type_must_be_chosen = false,$set_session = false)
-{
-    $server_type = SERVER_UNKNOWN;
-    if (empty($chosen_type)) {
-        if ($type_must_be_chosen) {
-            $server_type = SERVER_UNKNOWN;
-        } else {
-            if (isset($_SESSION['server_type']) && $_SESSION['server_type'] != SERVER_UNKNOWN) {
-                $server_type = $_SESSION['server_type'];
-            } elseif (is_local()) {
-                $server_type = SERVER_LOCAL;
-            } elseif (!is_possibly_dedicated_or_local()) {
-                $server_type = SERVER_SHARED;
-            } else {
-                $server_type = SERVER_UNKNOWN;
-            } 
-        }
-    } else {
-        switch ($chosen_type)  {
-            case 's':
-                $server_type = SERVER_SHARED;
-                break;
-            case 'd':
-                $server_type = SERVER_DEDICATED;
-                break;
-            case 'l':
-                $server_type = SERVER_LOCAL;
-                break;
-            default:
-                $server_type = SERVER_UNKNOWN;
-                break;
-        }
-    }
-    if ($set_session) {
-        $_SESSION['server_type'] = $server_type;
-    }
-    return $server_type;
-}
-
-function server_type_string()
-{
-    $server_code = find_server_type();
-    switch ($server_code) {
-        case SERVER_SHARED:
-            $server_string = 'SHARED';
-            break;
-        case SERVER_LOCAL:
-            $server_string = 'LOCAL';
-            break;
-        case SERVER_DEDICATED:
-            $server_string = 'DEDICATED';
-            break;
-        default:
-            $server_string = 'UNKNOWN';
-            break;
-    }
-    return $server_string;
-}
-
-function server_type_code()
-{
-    $server_code = find_server_type();
-    switch ($server_code) {
-        case SERVER_SHARED:
-            $server_char = 's';
-            break;
-        case SERVER_LOCAL:
-            $server_char = 'l';
-            break;
-        case SERVER_DEDICATED:
-            $server_char = 'd';
-            break;
-        default:
-            $server_char = '';
-            break;
-    }
-    return $server_char;
-}
-
-function get_sysinfo()
-{
-    static $sysinfo;
-
-    if (empty($sysinfo)) {
-        $sysinfo = ic_system_info();
-    }
-    return $sysinfo;
-}
-
-function get_loaderinfo()
-{
-    static $loader;
-
-    if (empty($loader)) {
-        $loader = required_loader();
-    }
-    return $loader;
-}
-
-function is_ms_windows()
-{
-    $loader_info = get_loaderinfo();
-    return ($loader_info['oscode'] == 'win');
-}
-
-function function_is_disabled($fn_name)
-{
-    $disabled_functions=explode(',',ini_get('disable_functions'));
-    return in_array($fn_name, $disabled_functions);
-}
-
-function selinux_is_enabled()
-{
-    $se_enabled = false;
-
-    if (!is_ms_windows()) {
-        $cmd = @shell_exec('sestatus');
-        $se_enabled = preg_match('/enabled/i',$cmd);
-    }
-
-    return $se_enabled;
-}
-
-function grsecurity_is_enabled()
-{
-    $gr_enabled = false;
-
-    if (!is_ms_windows()) {
-        $cmd = @shell_exec('gradm -S');
-        $gr_enabled = preg_match('/enabled/i',$cmd);
-    }
-
-    return $gr_enabled;
-}
-
-function threaded_and_not_cgi()
-{
-    $sys = get_sysinfo();
-    return($sys['THREAD_SAFE'] && !$sys['IS_CGI']);
-}
-
-function is_restricted_server($only_safe_mode = false)
-{
-    $disable_functions = ini_get('disable_functions');
-    $open_basedir = ini_get('open_basedir');
-    $php_restrictions = !empty($disable_functions) || !empty($open_basedir);
-    $system_restrictions = selinux_is_enabled() || grsecurity_is_enabled();
-    $non_safe_mode_restrictions = $php_restrictions || $system_restrictions;
-    return (ini_get('safe_mode') || (!$only_safe_mode && $non_safe_mode_restrictions));
-}
-
-function server_restriction_warnings()
-{
-    $warnings = array();
-
-    if (find_server_type() == SERVER_SHARED) {
-        if (is_restricted_server()) {
-            $warnings[] = "服务器的限制可能影响向导的进行和加密程序的安装。";
-        }
-    } else {
-        $warning_suffix = "这可能会对加密向导产生影响。";
-        if (ini_get('safe_mode')) {
-            $warnings[] = "服务器已经开启安全模式(php已设置safe_mode)，" . $warning_suffix;
-        } 
-        $disabled_functions = ini_get('disable_functions');
-        if (!empty($disabled_functions)) {
-            $warnings[] = "一些php方法不可用(php已设置disable_functions)，" . $warning_suffix;
-        }
-        $open_basedir = ini_get('open_basedir');
-        if (!empty($open_basedir)) {
-            $warnings[] = "php的open_basedir不为空，" . $warning_suffix;
-        }
-    }
-    return $warnings;
-}
-
-function own_php_ini_possible($only_safe_mode = false)
-{
-    $sysinfo = get_sysinfo();
-    return ($sysinfo['CGI_CLI'] && !is_ms_windows() && !is_restricted_server($only_safe_mode));
-}
-
-function extension_dir()
-{
-    $extdir = ini_get('extension_dir');
-    if ($extdir == './' || ($extdir == '.\\' && is_ms_windows())) {
-        $extdir = '.';
-    }
-    return $extdir;
-}
-
-function possibly_selinux()
-{
-    $loaderinfo = get_loaderinfo();
-    $se_env = (getenv("SELINUX_INIT"));
-    return (strtolower($loaderinfo['osname']) == 'linux' && $se_env && ($se_env == 'Yes' || $se_env == '1'));
-}
-
-function ini_same_dir_as_wizard()
-{
-    $sys = get_sysinfo();
-    return dirname($sys['PHP_INI']) == dirname(__FILE__); 
-}
-
-function extension_dir_path()
-{
-    $ext_dir = extension_dir();
-    if ($ext_dir == '.' || (dirname($ext_dir) == '.')) {
-        $ext_dir_path = @realpath($ext_dir);
-    } else {
-        $ext_dir_path = $ext_dir;
-    }
-    return $ext_dir_path;
-}
-
-function get_loader_name()
-{
-    $u = uname();
-    $sys = get_sysinfo();
-    $os = substr($u,0,strpos($u,' '));
-    $os_key = strtolower(substr($u,0,3));
-
-    $php_version = phpversion();
-    $php_family = substr($php_version,0,3);
-
-    $loader_sfix = (($os_key == 'win') ? '.dll' : (($sys['THREAD_SAFE'])?'_ts.so':'.so'));
-    $loader_name="ioncube_loader_${os_key}_${php_family}${loader_sfix}";
-
-    return $loader_name;
-}
-
-function get_reqd_version($variants)
-{
-    $exact_match = false;
-    $nearest_version = 0;
-    $loader_info = get_loaderinfo();
-    $os_version = $loader_info['osver2'][0] . '.' . $loader_info['osver2'][1];
-    $os_version_major = $loader_info['osver2'][0];
-    foreach ($variants as $v) {
-        if ($v == $os_version || (is_int($v) && $v == $os_version_major)) {
-            $exact_match = true;
-            $nearest_version = $v;
-            break;
-        } elseif ($v > $os_version) {
-            break;
-        } else {
-            $nearest_version = $v;
-        }
-    }
-    return (array($nearest_version,$exact_match));
-}
-
-function get_default_loader_dir_webspace()
-{
-    return ($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . LOADER_SUBDIR);
-}
-
-function get_loader_location($loader_dir = '')
-{
-    if (empty($loader_dir)) {
-        $loader_dir = get_default_loader_dir_webspace();
-    }
-    $loader_name = get_loader_name(); 
-    return ($loader_dir . DIRECTORY_SEPARATOR . $loader_name);
-}
-
-function get_loader_location_from_ini($php_ini = '')
-{
-    $errors = array();
-    if (empty($php_ini)) {
-        $sysinfo = get_sysinfo();
-        $php_ini = $sysinfo['PHP_INI'];
-    }
-    if (!@file_exists($php_ini)) {
-        if (empty($php_ini)) {
-            $errors[ERROR_INI_NOT_FOUND] = "配置文件没有找到。";
-        } else {
-            $errors[ERROR_INI_NOT_FOUND] = "$php_ini 没有找到。";
-        }
-    } elseif (!is_readable($php_ini)) {
-        $errors[ERROR_INI_NOT_READABLE] = "$php_ini 没有权限读取。";
-    }
-    if (!empty($errors)) {
-        return array('location' => '', 'errors' => $errors);
-    } 
-    $lines = file($php_ini);
-    $ext_start = zend_extension_line_start();
-    $wrong_ext_start = ($ext_start == 'zend_extension')?'zend_extension_ts':'zend_extension';
-    $loader_path = '';
-    $loader_name_match = "ioncube_loader";
-    foreach ($lines as $l) {
-        if (preg_match("/^\s*$ext_start\s*=\s*\"?([^\"]+)\"?/i",$l,$corr_matches)) {
-            if (preg_match("/$loader_name_match/i",$corr_matches[1])) {
-                if (!empty($loader_path)) {
-                    $errors[ERROR_INI_MULTIPLE_IC_LOADER_LINES] = "配置文件($php_ini)中可能有多行存在$ext_start。";
-                }
-                $loader_path = $corr_matches[1];
-            } else {
-                if (empty($loader_path)) {
-                    $errors[ERROR_INI_NOT_FIRST_ZE] = "$php_ini 中的ionCube加密程序配置必须放在Zend扩展之前";
-                }
-            }
-        }
-        if (empty($loader_path)) {
-            if (preg_match("/^\s*$wrong_ext_start\s*=\s*\"?([^\"]+)\"?/i",$l,$bad_start_matches)) {
-                if (preg_match("/$loader_name_match/i",$bad_start_matches[1])) {
-                    $bad_zend_ext_msg = "配置文件$php_ini中的ionCube加密程序所在的行，应该以 $ext_start 开头，<b>而不是</b> $wrong_ext_start.";
-                    $errors[ERROR_INI_WRONG_ZE_START] = $bad_zend_ext_msg;
-                    $loader_path = $bad_start_matches[1];
-                }
-            }
-        }
-    }
-    $loader_path = trim($loader_path);
-    if ($loader_path === '') {
-        $errors[ERROR_INI_ZE_LINE_NOT_FOUND] = "配置文件($php_ini)没有Zend扩展。";
-    } elseif (!@file_exists($loader_path)) {
-        $errors[ERROR_INI_LOADER_FILE_NOT_FOUND] = "配置文件($php_ini)中的加密程序路径($loader_path)错误或不能访问。";
-    } elseif (basename($loader_path) == $loader_path) {
-        $errors[ERROR_INI_NOT_FULL_PATH] = "配置文件($php_ini)中的加密程序路径必须是完整路径。";
-    }
-    return array('location' => $loader_path, 'errors' => $errors);
-}
-
-function zend_extension_line_missing($ini_path)
-{
-    $loader_loc = get_loader_location_from_ini($ini_path);
-    return (!empty($loader_loc['errors']) && array_key_exists(ERROR_INI_ZE_LINE_NOT_FOUND,$loader_loc['errors']));
-}
-
-function find_additional_ioncube_ini()
-{
-    $sys = get_sysinfo();
-    $ioncube_ini = '';
-
-    if (!empty($sys['PHP_INI_ADDITIONAL']) && !preg_match('/(none)/i',$sys['PHP_INI_ADDITIONAL'])) {
-        $ini_files = explode(',',$sys['PHP_INI_ADDITIONAL']);
-        foreach ($ini_files as $f) {
-            $fn = trim($f);
-            $bfn = basename($fn);
-            if (preg_match('/ioncube/i',$bfn)) {
-                $ioncube_ini = $fn;
-                break;
-            }
-        }
-    }
-    return $ioncube_ini;
-}
-
-function get_additional_ini_files()
-{
-    $sys = get_sysinfo();
-    $ini_files = array();
-    if (!empty($sys['PHP_INI_ADDITIONAL']) && !preg_match('/(none)/i',$sys['PHP_INI_ADDITIONAL'])) {
-        $ini_files = explode(',',$sys['PHP_INI_ADDITIONAL']);
-    }
-    return (array_map('trim',$ini_files));
-}
-
-function all_ini_contents()
-{
-    $sys = get_sysinfo();
-    $output = '';
-
-    $output .= ";;; *MAIN INI FILE AT ${sys['PHP_INI']}* ;;;" . PHP_EOL;
-    $output .= get_file_contents($sys['PHP_INI']);
-    $other_inis = get_additional_ini_files();
-    foreach ($other_inis as $inif) {
-        $output .= ";;; *Additional ini file at $inif* ;;;" . PHP_EOL;
-        $output .= get_file_contents($inif);
-    }
-    $here = unix_path_dir();
-    $unrec_ini_files = unrecognised_inis_webspace($here);
-    foreach ($unrec_ini_files as $urinif) {
-        $output .= ";;; *UNRECOGNISED INI FILE at $urinif* ;;;" . PHP_EOL;
-        $output .= get_file_contents($urinif);
-    }
-    return $output;
-}
-
-function scan_inis_for_loader()
-{
-    $ldloc = '';
-    $sysinfo = get_sysinfo();
-    if (empty($sysinfo['PHP_INI'])) {
-        $ini_files_not_found = array("Main ini file");
-        $ini_file_list = get_additional_ini_files();
-    } else {
-        $ini_files_not_found = array();
-        $ini_file_list = array_merge(array($sysinfo['PHP_INI']),get_additional_ini_files());
-    }
-    $server_type = find_server_type();
-    $shared_server = SERVER_SHARED == $server_type;
-    foreach ($ini_file_list as $f) {
-        $ldloc = get_loader_location_from_ini($f);
-        if (array_key_exists(ERROR_INI_ZE_LINE_NOT_FOUND,$ldloc['errors'])) {
-            unset($ldloc['errors'][ERROR_INI_ZE_LINE_NOT_FOUND]);
-        } 
-        if ($shared_server && array_key_exists(ERROR_INI_NOT_FOUND,$ldloc['errors'])) {
-            if (false == user_ini_space_path($f)) {
-                $ldloc['errors'][ERROR_INI_NOT_FOUND] = "安装向导不能找到或读取系统的ini文件，在该共享服务器上不能继续进行安装。";
-            } else {
-                $ldloc['errors'][ERROR_INI_USER_INI_NOT_FOUND] = $ldloc['errors'][ERROR_INI_NOT_FOUND];
-            }
-        } elseif (array_key_exists(ERROR_INI_NOT_FOUND,$ldloc['errors'])) {
-            $ini_files_not_found[] = $f;
-        }
-        if (!empty($ldloc['location'])) {
-            break;
-        }
-    }
-    if (!empty($ini_files_not_found)) {
-        $plural = (count($ini_files_not_found) > 1)?"s":"";
-        $ldloc['errors'][ERROR_INI_NOT_FOUND] = "向导没有找到以下配置文件: " . join(',',$ini_files_not_found);
-        if (is_restricted_server()) {
-            $ldloc['errors'][ERROR_INI_NOT_FOUND] .= "<br>可能是服务器进行了限制。";
-        }
-    }
-    if (empty($ldloc['location'])) {
-        $ldloc['errors'][ERROR_INI_ZE_LINE_NOT_FOUND] = "配置文件没有找到Zend扩展。";
-    }
-    return $ldloc;
-}
-
-function find_loader_filesystem()
-{
-    $ld_inst_dir = loader_install_dir(find_server_type());
-    $loader_name = get_loader_name();
-    $suggested_loader_path = $ld_inst_dir . DIRECTORY_SEPARATOR . $loader_name;
-    if (@file_exists($suggested_loader_path)) {
-        $location = $suggested_loader_path;
-    } elseif (@file_exists($loader_name)) {
-        $location = @realpath($loader_name);
-    } else {
-        $ld_loc = get_loader_location();
-        if (@file_exists($ld_loc)) {
-            $location = $ld_loc;
-        } else {
-            $location = '';
-        }
-    }
-    return $location;
-}
-
-function find_loader($search_directories_if_not_ini = false)
-{
-    $sysinfo = get_sysinfo();
-    $php_ini = $sysinfo['PHP_INI'];
-    $rtl_path = get_runtime_loading_path_if_applicable();
-    $location = '';
-    $errors = array();
-
-    if (!empty($rtl_path)) {
-        $location = $rtl_path;
-    } else {
-        $loader_ini = scan_inis_for_loader();
-        $location = $loader_ini['location'];
-        $errors = $loader_ini['errors'];
-    }
-    if (empty($location) && (empty($errors) || $search_directories_if_not_ini)) {
-        $errors = array(); 
-        $location = find_loader_filesystem();
-        if (empty($location)) {
-            $errors[ERROR_LOADER_NOT_FOUND] = '加密程序不在php扩展的默认路径。';
-        }
-    }
-    if (!empty($errors)) {
-        return $errors;
-    } else {
-        return $location;
-    }
-}
-
-function zend_extension_line_start()
-{
-    $sysinfo = get_sysinfo();
-    $is_53_or_later = is_php_version_or_greater(5,3);
-    return (is_bool($sysinfo['THREAD_SAFE']) && $sysinfo['THREAD_SAFE'] && !$is_53_or_later ? 'zend_extension_ts' : 'zend_extension');
-}
-
-function ioncube_loader_version_information()
-{
-    $old_version = true;
-    $liv = "";
-    $lv = "";
-    $mv = 0;
-    if (function_exists('ioncube_loader_iversion')) {
-        $liv = ioncube_loader_iversion();
-        $lv = sprintf("%d.%d.%d", $liv / 10000, ($liv / 100) % 100, $liv % 100);
-
-        $latest_version =  get_latestversion();
-
-        $lat_parts = explode('.',$latest_version);
-        $cur_parts = explode('.',$lv);
-
-        if (($cur_parts[0] > $lat_parts[0]) || 
-            ($cur_parts[0] == $lat_parts[0] && $cur_parts[1] > $lat_parts[1]) ||
-             ($cur_parts[0] == $lat_parts[0] && $cur_parts[1] == $lat_parts[1] && $cur_parts[2] >= $lat_parts[2])) {
-            $old_version = false;
-        } else {
-            $old_version = $latest_version;
-        }
-        $mv = $cur_parts[0];
-    }
-    return array($lv,$mv,$old_version);
-}
-
-function default_loader_version_info()
-{
-    return array();
-}
-
-function get_loader_version_info()
-{
-    return get_remote_session_value('loader_version_info',LOADER_LATEST_VERSIONS_URL,'default_loader_version_info');
-}
-
-function calc_dirname()
-{
-    $platform_info = get_platforminfo();
-    $loader = get_loaderinfo();
-    $multiple_os_versions = false;
-    if (is_array($loader) && array_key_exists('osvariants',$loader) && is_array($loader['osvariants'])) {
-        $versions = array_values($loader['osvariants']);
-        $multiple_os_versions = !empty($versions[0]);
-    }
-    if ($multiple_os_versions) {
-        list($osvar,$exact_match) = get_reqd_version($loader['osvariants']);
-    } else {
-        $osvar = null;
-    }
-    $dirname = '';
-    foreach ($platform_info as $p) {
-        if ($p['os'] == $loader['oscode'] && $p['arch'] == $loader['arch'] && (empty($osvar) || $p['os_mod'] == "_" . $osvar)) {
-            $dirname = $p['dirname'];
-            break;
-        }
-    }
-    return $dirname;
-}
-
-function calc_loader_latest_version()
-{
-    $lv_info = get_loader_version_info();
-    $latest_version = RECENT_LOADER_VERSION;
-    if (!empty($lv_info)) {
-        $dirname = calc_dirname();
-      
-        if (!empty($dirname)) {
-            $compiler_specific_version = false;
-            if (is_ms_windows()) {
-                $sys = get_sysinfo();
-                $phpc = strtolower($sys['PHP_COMPILER']);
-                if (!empty($phpc)) {
-                    $dirname_comp = $dirname . "_" . $phpc;
-                    if (array_key_exists($dirname_comp,$lv_info)) {
-                        $latest_version = $lv_info[$dirname_comp];
-                        $compiler_specific_version = true;
-                    }
-                }
-            }
-            if (!$compiler_specific_version && array_key_exists($dirname,$lv_info)) {
-                $latest_version = $lv_info[$dirname];
-            }
-        } 
-    }
-    return $latest_version;
-}
-
-function get_latestversion()
-{
-    static $latest_version;
-
-    if (empty($latest_version)) {
-        $latest_version = calc_loader_latest_version();
-    }
-    return $latest_version;
-}
-
-
-function runtime_loader_location()
-{
-    $loader_path = false;
-    $ext_path = extension_dir_path();
-    if ($ext_path !== false) {
-        $id = $ext_path;
-        $here = dirname(__FILE__);
-        if (isset($id[1]) && $id[1] == ':') {
-            $id = str_replace('\\','/',substr($id,2));
-            $here = str_replace('\\','/',substr($here,2));
-        }
-        $rd=str_repeat('/..',substr_count($id,'/')).$here.'/';
-        $i=strlen($rd);
-
-        $loader_loc = DIRECTORY_SEPARATOR . basename($here) . DIRECTORY_SEPARATOR . get_loader_name();
-        while($i--) {
-            if($rd[$i]=='/') {
-                $loader_path = runtime_location_exists($ext_path,$rd,$i,$loader_loc);
-                if ($loader_path !== false) {
-                    break;
-                }
-            }
-        }
-
-        if (!$loader_path && !empty($loader_loc) && @file_exists($loader_loc)) {
-            $loader_path = basename($loader_loc);
-        }
-    }
-    return $loader_path;
-}
-
-function runtime_location_exists($ext_dir,$path_str,$sep_pos,$loc_name)
-{
-    $sub_path = substr($path_str,0,$sep_pos);
-    $lp = $sub_path . $loc_name;
-    $fqlp = $ext_dir.$lp;
-
-    if(@file_exists($fqlp)) {
-        return $lp;
-    } else {
-        return false;
-    }
-}
-
-function runtime_loading_is_possible() {
-    return !((is_php_version_or_greater(5,2,5)) || is_restricted_server() || !ini_get('enable_dl') || !function_exists('dl') || function_is_disabled('dl') || threaded_and_not_cgi());
-}
-
-function shared_and_runtime_loading()
-{
-    return (find_server_type() == SERVER_SHARED && empty($_SESSION['use_ini_method']) && runtime_loading_is_possible());
-}
-
-function get_valid_runtime_loading_path($ignore_loading_check = false)
-{
-    if ($ignore_loading_check || runtime_loading_is_possible()) {
-        return runtime_loader_location();
-    } else {
-        return false;
-    }
-}
-
-function runtime_loading($rtl_path = null)
-{
-    if (empty($rtl_path)) {
-        $rtl_path = get_valid_runtime_loading_path();
-    }
-    if (!empty($rtl_path) && @dl($rtl_path)) {
-        return $rtl_path;
-    } else {
-        return false;
-    }
-}
-
-function get_runtime_loading_path_if_applicable()
-{
-    $rtl = null;
-    if (shared_and_runtime_loading()) {
-        $rtl = get_valid_runtime_loading_path();
-    }
-    return $rtl;
-}
-
-function try_runtime_loading_if_applicable()
-{
-    $rtl_path = get_runtime_loading_path_if_applicable();
-    if (!empty($rtl_path)) {
-        return runtime_loading($rtl_path);
-    } else {
-        return $rtl_path;
-    }
-}
-
-function runtime_loading_instructions()
-{
-    $default = get_default_address();
-    echo '<h4>”运行时加载程序“说明</h4>';
-    echo '<div class=panel>';
-    echo '<p>在共享服务器上，加密程序可以通过“运行时加载技术”安装，';
-    echo " (<a href=\"{$default}&amp;manual=1\">如果您的程序<strong>不是</strong>运行在共享服务器，请单击这里</a>.)</p>";
-
-    if ('.' == extension_dir()) {
-        $dirphrase = is_ms_windows()?'folder':'directory';
-        echo "注意：加密程序<em>必须</em>与第一个加密文件在同一个目录下。";
-    }
-    echo '<ol>';
-    loader_download_instructions(); 
-    $loader_dir = loader_install_instructions(SERVER_SHARED,dirname(__FILE__));
-    shared_test_instructions();
-    echo '</ol>';
-    echo '</div>';
-}
-
-function runtime_loading_errors()
-{
-    $errors = array();
-    $ext_path = extension_dir_path();
-    if (false === $ext_path) {
-        $errors[ERROR_RUNTIME_EXT_DIR_NOT_FOUND] = "扩展所在的目录没有找到。";
-    } else {
-        $expected_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . get_loader_name();
-        if (!@file_exists($expected_file)) {
-            $errors[ERROR_RUNTIME_LOADER_FILE_NOT_FOUND] = "加密程序应该放在$expected_file，但是没有发现。";
-        } else {
-            $errors = loader_compatibility_test($expected_file);
-        }
-    }
-    return $errors;
-}
-
-
-function windows_package_name()
-{
-    $sys = get_sysinfo();
-    return (LOADERS_PACKAGE_PREFIX . 'win' . '_' . ($sys['THREAD_SAFE']?'':'nonts_') . strtolower($sys['PHP_COMPILER']) .  '_' . 'x86');
-}
-
-function unix_package_name()
-{
-    $sysinfo = get_sysinfo();
-    $loader = get_loaderinfo();
-    $multiple_os_versions = false;
-    if (is_array($loader) && array_key_exists('osvariants',$loader) && is_array($loader['osvariants'])) {
-        $versions = array_values($loader['osvariants']);
-        $multiple_os_versions = !empty($versions[0]);
-    }
-    if ($multiple_os_versions) {
-        list($reqd_version,$exact_match) = get_reqd_version($loader['osvariants']);
-        if ($reqd_version) {
-            $basename = LOADERS_PACKAGE_PREFIX . $loader['oscode'] . '_' . $reqd_version . '_' . $loader['arch'];
-        } else {
-            $basename = "";
-        }
-    } else {
-        $basename = LOADERS_PACKAGE_PREFIX . $loader['oscode'] . '_' . $loader['arch'];
-    }
-    return array($basename,$multiple_os_versions);
-}
-
-function loader_download_instructions()
-{
-    $sysinfo = get_sysinfo();
-    $loader = get_loaderinfo();
-    $multiple_os_versions = false;
-
-    if (is_ms_windows()) {
-        if (is_bool($sysinfo['THREAD_SAFE'])) {
-            $download_str = '<li>下载下列Windows ' . $sysinfo['PHP_COMPILER'];
-            if (!$sysinfo['THREAD_SAFE']) {
-                $download_str .= ' non-TS';
-            }
-            $download_str .= ' x86 Loaders的一个压缩包:';
-            echo $download_str;
-            $basename = windows_package_name();
-            echo make_archive_list($basename,array('zip','ipf.zip'));
-            echo "<p>请注意：无论是从本地PC直接安装在Windows机器上，或上传到您的服务器，该MS Windows Installer都是通用的。<br>";
-            echo '也可以从<a href="' . LOADERS_PAGE . '" target="loaders">' . LOADERS_PAGE . '</a>下载一个Loader包。';
-        } else {
-            echo '<li>从<a href="' . LOADERS_PAGE  . '" target=loaders>这里</a>下载一个Windows Loaders包。 如果PHP禁用线程安全模式，使用Windows non-TS Loaders。';
-        }
-    } else {
-        list($basename,$multiple_os_versions) = unix_package_name(); 
-        if ($basename == "") {
-            echo '<li>从<a href="' . LOADERS_PAGE . '" target="loaders">这里</a>下载一个 ' . $loader['osname'] . ' ' . $loader['arch'] . ' Loaders包.';
-            echo "<br>您的系统可能是${loader['wordsize']}位${loader['osnamequal']}。如果该程序在${loader['osname']}不可用，更早的版本的Loaders应该能够运行。注意：您需要重新安装兼容库。";
-            echo '<br>如果你不能找到一个合适的Loaders，请联系我们 <a href="'. SUPPORT_SITE . '">获得支持和帮助</a>.';
-        } else {
-            echo '<li>下载一个' . $loader['osnamequal'] . ' ' . $loader['arch'] . '的Loaders包：'; 
-            if (SERVER_SHARED == find_server_type()) {
-                $archives = array('zip','tar.gz','tar.bz2','ipf.zip');
-            } else {
-                $archives = array('tar.gz','tar.bz2','ipf.zip');
-            }
-            echo make_archive_list($basename,$archives);
-            echo "<p>注意：确保Windows installer在远程${loader['osname']}服务器上可用。<br>";
-            echo "</p>";
-            if ($multiple_os_versions && !$exact_match) {
-                echo "<p>注意：您可能需要重新安装${loader['osname']}兼容库。</p>";
-            }
-        }
-    }
-
-    echo '</li>';
-}
-
-function ini_dir()
-{
-    $sysinfo = get_sysinfo();
-    $parent_dir = '';
-    if (!empty($sysinfo['PHP_INI'])) {
-        $parent_dir = dirname($sysinfo['PHP_INI']);
-    } else {
-        $parent_dir = $_SERVER["PHPRC"];
-        if (@is_file($parent_dir)) {
-            $parent_dir = dirname($parent_dir);
-        }
-    }
-    return $parent_dir;
-}
-
-function unix_install_dir()
-{
-    $ext_dir = extension_dir_path();
-    $cur_dir = @realpath('.');
-    if (empty($ext_dir) || $ext_dir == $cur_dir) {
-        $loader_dir = UNIX_SYSTEM_LOADER_DIR;
-    } else {
-        $loader_dir = $ext_dir;
-    }
-    return $loader_dir;
-}
-
-function windows_install_dir()
-{
-    $sysinfo = get_sysinfo();
-    if ($sysinfo['SS'] == 'IIS') {
-        if (false === ($ext_dir = extension_dir_path())) {
-            $parent_dir = ini_dir();
-            $ext_dir = $parent_dir . '\\ext';
-            if (!empty($parent_dir) && @file_exists($ext_dir)) {
-                $loader_dir = $ext_dir;
-            } else {
-                $loader_dir = $_SERVER['windir'] . '\\' . WINDOWS_IIS_LOADER_DIR;
-            }
-        } else {
-            $loader_dir = $ext_dir;
-        }
-    } else {
-        $parent_dir = ini_dir();
-        $loader_dir = $parent_dir . '\\' . 'ioncube';
-    }
-    return $loader_dir;
-}
-
-function loader_install_dir($server_type)
-{
-    if (SERVER_SHARED == $server_type && own_php_ini_possible()) {
-        $loader_dir = get_default_loader_dir_webspace();
-    } elseif (is_ms_windows()) {
-        $loader_dir = windows_install_dir();
-    } else {
-        $loader_dir = unix_install_dir();
-    }
-    return $loader_dir;
-}
-
-function writeable_directories()
-{
-    $root_path = @realpath($_SERVER['DOCUMENT_ROOT']);
-    $above_root_path = @realpath($_SERVER['DOCUMENT_ROOT'] . "/..");
-    $root_path_cgi_bin = @realpath($_SERVER['DOCUMENT_ROOT'] . "/cgi-bin");
-    $above_root_cgi_bin = @realpath($_SERVER['DOCUMENT_ROOT'] . "/../cgi-bin");
-
-    $paths = array();
-    foreach (array($root_path,$above_root_path,$root_path_cgi_bin,$above_root_cgi_bin) as $p) {
-        if (@is_writeable($p)) {
-            $paths[] = $p;
-        }
-    }
-    return $paths;
-}
-
-function loader_install_instructions($server_type,$loader_dir = '')
-{
-    if (empty($loader_dir)) {
-        $loader_dir = loader_install_dir($server_type);
-    }
-    if (SERVER_LOCAL == $server_type) {
-        echo "<li>将Loader文件放到<code>$loader_dir</code></li>";
-    } else {
-        echo "<li>将Loaders上传到服务器，并在<code>$loader_dir</code>安装</li>";
-    }
-    return $loader_dir;
-}
-
-function zend_extension_lines($loader_dir)
-{
-    $zend_extension_lines = array();
-    $sysinfo = get_sysinfo();
-    $qt = (is_ms_windows()?'"':'');
-    $loader = get_loaderinfo();
-
-    if (!is_bool($sysinfo['THREAD_SAFE']) || !$sysinfo['THREAD_SAFE']) {
-        $path = $qt . $loader_dir . DIRECTORY_SEPARATOR . $loader['file'] . $qt;
-        $zend_extension_lines[] = "zend_extension = " . $path;
-    }
-    if ((!is_bool($sysinfo['THREAD_SAFE']) && !is_php_version_or_greater(5,3)) || $sysinfo['THREAD_SAFE']) {
-        $line_start = is_php_version_or_greater(5,3)?'zend_extension':'zend_extension_ts';
-        $path = $qt . $loader_dir . DIRECTORY_SEPARATOR . $loader['file_ts'] . $qt;
-        $zend_extension_lines[] = $line_start . " = " . $path;
-    }
-    return $zend_extension_lines;
-}
-
-function user_ini_base()
-{
-    $doc_root_path = realpath($_SERVER['DOCUMENT_ROOT']);
-    $above_root_path = @realpath($_SERVER['DOCUMENT_ROOT'] . "/..");
-    if (!empty($above_root_path) && @is_writeable($above_root_path)) {
-        $start_path = $above_root_path;
-    } else {
-        $start_path = $doc_root_path;
-    }
-    return $start_path;
-}
-
-function user_ini_space_path($file)
-{
-    $user_base = user_ini_base();
-    $fpath = @realpath($file);
-    if (!empty($fpath) && (0 === strpos($fpath,$user_base))) {
-        return $fpath;
-    } else {
-        return false;
-    }
-}
-
-function default_ini_path()
-{
-    return (realpath($_SERVER['DOCUMENT_ROOT']));
-}
-
-function shared_ini_location()
-{
-    $phprc = getenv('PHPRC');
-    if (!empty($phprc)) {
-        $phprc_path = user_ini_space_path($phprc);
-        if (false !== $phprc_path) {
-            return $phprc_path;
-        } else {
-            return default_ini_path();
-        }
-    } else {
-        return default_ini_path();
-    }
-}
-
-
-function zend_extension_instructions($server_type,$loader_dir)
-{
-    $sysinfo = get_sysinfo();
-    $base = get_base_address();
-    $editing_ini = true;
-
-    $php_ini_name = ini_file_name();
-
-    if (isset($sysinfo['PHP_INI']) && @file_exists($sysinfo['PHP_INI'])) {
-        $php_ini_path = $sysinfo['PHP_INI'];
-    } else {
-        $php_ini_path = '';
-    }
-
-    if (is_bool($sysinfo['THREAD_SAFE'])) {
-        $kwd = zend_extension_line_start();
-    } else {
-        $kwd = 'zend_extension/zend_extension_ts';
-    }
-
-    $server_type_code = server_type_code();
-
-    $zend_extension_lines = zend_extension_lines($loader_dir);
-
-    if (SERVER_SHARED == $server_type && own_php_ini_possible()) {
-        $ini_dir = shared_ini_location();
-        $php_ini_path = $ini_dir . DIRECTORY_SEPARATOR . $php_ini_name;
-        if (@file_exists($php_ini_path)) {
-            $edit_line = "<li>Edit the <code>$php_ini_name</code> in the <code>$ini_dir</code> directory";
-            if (zend_extension_line_missing($php_ini_path) && @is_writeable($php_ini_path) && @is_writeable($ini_dir)) {
-                if (function_exists('file_get_contents')) {
-                    $ini_strs = @file_get_contents($php_ini_path);
-                } else {
-                    $lines = @file($php_ini_path);
-                    $ini_strs = join(' ',$lines);
-                }
-                $fh = @fopen($php_ini_path,"wb");
-                if ($fh !== false) {
-                    foreach ($zend_extension_lines as $zl) {
-                        fwrite($fh,$zl . PHP_EOL);
-                    }
-                    fwrite($fh,$ini_strs);
-                    fclose($fh);
-                    $editing_ini = false;
-                    echo "<li>$php_ini_path下的php.ini已经修改，包含了对ionCube loader的引用。";
-                } else {
-                    echo $edit_line;
-                }
-            } else {
-               echo $edit_line;
-            }
-        } else {
-            $download_ini_file = "<li><a href=\"$base&amp;page=phpconfig&amp;ininame=$php_ini_name&amp;stype=$server_type_code&amp;download=1&amp;prepend=1\">保存<code>$php_ini_name</code></a>，并上传到<code>$ini_dir</code> (服务器的完整路径)。";
-            if (@is_writeable($ini_dir)) {
-                $fh = @fopen($php_ini_path,"wb");
-                if ($fh !== false) {
-                    foreach ($zend_extension_lines as $zl) {
-                       fwrite($fh,$zl . PHP_EOL);
-                    }
-                    if (!empty($sysinfo['PHP_INI']) && is_readable($sysinfo['PHP_INI'])) {
-                        if (function_exists('file_get_contents')) {
-                           $ini_strs = @file_get_contents($sysinfo['PHP_INI']);
-                        } else {
-                           $lines = @file($sysinfo['PHP_INI']);
-                           $ini_strs = join(' ',$lines);
-                        }
-                        fwrite($fh,$ini_strs);
-                    }
-                    fclose($fh); 
-                    echo "<li><code>$php_ini_name</code>已经在<code>$ini_dir</code>创建。";
-                } else {
-                    echo $download_ini_file;
-                }
-            } else {
-                echo $download_ini_file;
-            }
-            $editing_ini = false;
-        }
-    } elseif (!empty($sysinfo['PHP_INI'])) {
-        if (empty($sysinfo['PHP_INI_DIR'])) {
-            echo "<li>Edit the file <code>${sysinfo['PHP_INI']}</code>";
-        } else {
-            $php_ini_path = find_additional_ioncube_ini();
-            if (empty($php_ini_path)) {
-                $php_ini_name = ADDITIONAL_INI_FILE_NAME;
-                echo "<li><a href=\"$base&amp;page=phpconfig&amp;download=1&amp;newlinesonly=1&amp;ininame=$php_ini_name&amp;stype=$server_type_code\">保存 $php_ini_name</a>，拷贝到ini目录, <code>${sysinfo['PHP_INI_DIR']}</code>";
-                $editing_ini = false;
-            } else {
-                $php_ini_name = basename($php_ini_path);
-                echo "<li>编辑文件<code>$php_ini_path</code>";
-            }
-        }
-    } else {
-        echo "<li>编辑系统文件<code>$php_ini_name</code>";
-    }
-    if ($editing_ini) {
-        echo " 并且在其它$kwd行<b>之前</b>，确保下面的内容被包含：<br>";
-        foreach ($zend_extension_lines as $zl) {
-            echo "<code>$zl</code><br>";
-        }
-        if (!empty($php_ini_path)) {
-            if (zend_extension_line_missing($php_ini_path)) {
-                echo "<a>另外，下载<a href=\"$base&amp;page=phpconfig&amp;ininame=$php_ini_name&amp;stype=$server_type_code&amp;download=1&amp;prepend=1\">新的 $php_ini_name 文件</a>，替换当前的<code>$php_ini_path</code> 文件。"; 
-            }
-        }
-    }
-    echo '</li>';
-}
-
-function server_restart_instructions()
-{
-    $sysinfo = get_sysinfo();
-    $base = get_base_address();
-
-    if ($sysinfo['SS']) {
-        echo "<li>重启${sysinfo['SS']} 服务器程序.</li>";
-    } else {
-        echo "<li>重启服务器程序。</li>";
-    }
-
-    echo "<li>服务器程序重启完毕后，<a href=\"$base&amp;page=loader_check\" onclick=\"showOverlay();\">点击这里测试Loader</a>。</li>";
-
-    if ($sysinfo['SS'] == 'Apache' && !is_ms_windows()) {
-        echo '<li>如果Loader安装失败，检查Apache错误日志，查看<a target="unix_errors" href="'. UNIX_ERRORS_URL . '">Unix相关错误</a>。</li>';
-    }
-}
-
-function shared_test_instructions()
-{
-    $base = get_base_address();
-    echo "<li><a href=\"$base&amp;page=loader_check\" onclick=\"showOverlay();\">点击这里测试Loader</a>。</li>";
-}
-
-function link_to_php_ini_instructions()
-{
-    $default = get_default_address();
-    echo "<p><a href=\"{$default}&amp;stype=s&amp;ini=1\">请点击这里查看使用php.ini方式的介绍</a>。</p>";
-}
-
-function php_ini_instruction_list($server_type)
-{
-    echo '<h4>安装说明</h4>';
-    echo '<div class=panel>';
-    echo '<ol>';
-
-    loader_download_instructions(); 
-    $loader_dir = loader_install_instructions($server_type);
-    zend_extension_instructions($server_type,$loader_dir);
-    if ($server_type != SERVER_SHARED || !own_php_ini_possible()) {
-        server_restart_instructions();
-    } else {
-        shared_test_instructions();
-    } 
-    echo '</ol>';
-    echo '</div>';
-}
-
-function php_ini_install_shared($give_preamble = true)
-{
-    $php_ini_name = ini_file_name();
-    $default = get_default_address();
-    if ($give_preamble) {
-        echo "<p>在您的<strong>共享</strong>服务器上, 建议使用<code>$php_ini_name</code>配置文件安装Loader。";
-        echo " (<a href=\"{$default}&amp;manual=1\">如果服务器<strong>不是</strong>共享服务器，请单击这里</a>.)</p>";
-    }
-
-    if (own_php_ini_possible()) {
-        echo '<p>您可能可以使用自己账号专有的PHP配置文件，进行配置。</p>';
-    } else {
-        echo "<p>可能您不能使用<code>$php_ini_name</code>文件安装ioncube loader。您的服务器提供商或者系统管理员应该能够为您安装。请将下面的介绍告诉他们。</p>";
-    }
-
-    php_ini_instruction_list(SERVER_SHARED);
-}
-
-function php_ini_install($server_type_desc = null, $server_type = SERVER_DEDICATED, $required = true)
-{
-    $php_ini_name = ini_file_name();
-    $default = get_default_address();
-
-    echo '<p>';
-    if ($server_type_desc) {
-        echo "在一个<strong> $server_type_desc </strong>服务器";
-    } else {
-        echo "在本地服务器";
-    }
-
-    if ($required) {
-        echo "你应该使用配置文件<code>$php_ini_name</code>，来安装Ioncube Loader。";
-    } else {
-        echo "推荐使用配置文件<code>$php_ini_name</code>安装Ioncube Loader。";
-    }
-    if ($server_type_desc) {
-        echo " (<a href=\"{$default}&amp;manual=1\">如果不是一个 $server_type_desc 服务器，点击此链接</a>.)";
-    }
-    echo '</p>';
-      
-    php_ini_instruction_list($server_type);
-}
-
-function help_resources($error_list = array())
-{
-    $base = get_base_address();
-    $server_type_code = server_type_code();
-    $server_type = find_server_type();
-    $sysinfo = get_sysinfo();
-    $resources = array(
-            '<a target="_blank" href="' . LOADERS_FAQ_URL . '">ionCube Loaders FAQ</a>',
-            '<a target="_blank" href="' . LOADER_FORUM_URL . '">ionCube Loader论坛</a>'
-        );
-    if (SERVER_SHARED != $server_type || own_php_ini_possible(true)) {
-        $resources[2] = '<a target="_blank" href="' . SUPPORT_SITE . htmlentities('index.php?department=3&subject=ionCube+Loader+installation+problem&message='. support_ticket_information($error_list)) . '">通过提高我们的服务台支持票</a>';
-    } 
-    if (SERVER_LOCAL == $server_type) {
-        $resources[2] .= "<br><span id=\"download-archive\">支持工单创建以后，请";
-        $resources[2] .= " <a href=\"$base&amp;page=system_info_archive&amp;stype=$server_type_code\">单击这里获得系统信息包</a>。<br>";
-        $resources[2] .= "请将系统信息包和创建的支持工单绑定在一起。</span>";
-    }
-    if (SERVER_SHARED == $server_type && own_php_ini_possible(true) && !user_ini_space_path($sysinfo['PHP_INI'])) {
-        $resources[3] = '<strong>请检查您是否可以创建一个php.ini，来覆盖系统默认的php.ini。</strong>';
-    }
-    return $resources;
-}
-
-function system_info_temporary_files()
-{
-    $tmpfname_ini = tempnam("/tmp", "INI");
-    $tmpfname_ini .= ".ini";
-    $fh_ini = @fopen($tmpfname_ini,'wb');
-    if ($fh_ini) {
-        $config = all_ini_contents();
-        fwrite($fh_ini,$config);
-        fclose($fh_ini);
-    } else {
-        $tmpfname_ini = '';
-    }
-
-    $tmpfname_pinf = tempnam("/tmp", "PIN");
-    $tmpfname_pinf .= ".html";
-    $fh_pinfo = @fopen($tmpfname_pinf,'wb');
-    if ($fh_pinfo) {
-        ob_start();
-        @phpinfo();
-        $pinfo = ob_get_contents();
-        ob_end_clean();
-        fwrite($fh_pinfo,$pinfo);
-        fclose($fh_pinfo);
-    } else {
-        $tmpfname_pinf = '';
-    }
-
-    $tmpfname_add = tempnam("/tmp", "ADD");
-    $tmpfname_add .= ".html";
-    $fh_add = @fopen($tmpfname_add,'wb');
-    if ($fh_add) {
-        ob_start();
-        extra_page();
-        $extra = ob_get_contents();
-        ob_end_clean();
-        fwrite($fh_add,$extra);
-        fclose($fh_add);
-    } else {
-        $tmpfname_add = '';
-    }
-
-    if (empty($tmpfname_ini) || empty($tmpfname_pinf) || empty($tmpfname_add)) {
-        return (array());
-    } else {
-        return (array('ini'           =>   $tmpfname_ini,
-                      'phpinfo'       =>   $tmpfname_pinf,
-                      'additional'    =>   $tmpfname_add));
-    }
-}
-
-function system_info_archive_page()
-{
-    info_disabled_check();
-    $loader = find_loader(true);
-    if (is_string($loader)) {
-        $loader_file = $loader;
-    } else {
-        $loader_file = '';
-    }
-    $all_files = system_info_temporary_files();
-    if (!empty($all_files)) {
-        if (!empty($loader_file)) {
-            $all_files['loader'] = $loader_file;
-        }
-        $archive_name =  tempnam('/tmp',"ARC");
-        if (extension_loaded('zip')) {
-            $archive_name .= '.zip';
-            $zip = @new ZipArchive();
-            $mode = @constant("ZIPARCHIVE::OVERWRITE");
-            if (!$zip || $zip->open($archive_name, $mode)!==TRUE) {
-                $archive_name = '';
-            } else {
-                foreach($all_files as $f) {
-                    $zip->addFile($f,basename($f));
-                }
-                $zip->close();
-            }
-        } elseif (extension_loaded('zlib') && !is_ms_windows()) {
-            $tar_name = $archive_name . ".tar";
-            $all_files_str = join(' ',$all_files);
-            $script = "tar -chf $tar_name $all_files_str";
-            $result = @system($script,$retval);
-            if ($result !== false) {
-                $archive_name = $tar_name . '.gz';
-                $zp = gzopen($archive_name,"w9");
-                $tar_contents = get_file_contents($tar_name);
-                gzwrite($zp,$tar_contents);
-                gzclose($zp);
-            } else {
-                $archive_name = '';
-            }
-        } else {
-            $archive_name = '';
-        }
-    } else {
-        $archive_name = '';
-    }
-    if ($archive_name) {
-        header('Content-Type: application/octet-stream');
-        header('Content-Disposition: attachment; filename='. $archive_name);
-        @readfile($archive_name);
-    } else {
-        $self = get_self();
-        $base = get_base_address();
-        $server_type_code = server_type_code();
-        heading();
-        echo "<p>没有创建可下载的系统信息包。<br> 
-            <strong>请保存下面的这些，然后将它们绑定到支持工单：</strong></p>"; 
-        echo "<ul>";
-        echo "<li><a href=\"$base&amp;page=phpinfo\" target=\"phpinfo\">phpinfo()</a></li>";
-        echo "<li><a href=\"$base&amp;page=phpconfig\" target=\"phpconfig\">config</a></li>";
-        echo "<li><a href=\"$base&amp;page=extra&amp;stype=$server_type_code\" target=\"extra\">附加信息</a></li>";
-        echo "<li><a href=\"$self?page=loaderbin\">loader file</a></li>";
-        echo "</ul>";
-        footer(true);
-    }
-}
-
-function support_ticket_information($error_list = array())
-{
-    $sys = get_sysinfo();
-    $ld = get_loaderinfo();
-
-    $ticket_strs = array();
-    $ticket_strs[] = "PLEASE DO NOT REMOVE THE FOLLOWING INFORMATION\r\n";
-    $ticket_strs[] = "==============\r\n";
-    if (!empty($error_list)) {
-        $ticket_strs[] = "[hr]";
-        $ticket_strs[] = "ERRORS";
-        $ticket_strs[] = "[table]";
-        $ticket_strs[] = '[tr][td]' . join('[/td][/tr][tr][td]',$error_list) . '[/td][/tr]';
-        $ticket_strs[] = "[/table]";
-    }
-    $ticket_strs[] = "[hr]";
-    $ticket_strs[] = "SYSTEM INFORMATION";
-    $info_lines = array();
-    $info_lines["Wizard version"] = script_version();
-    $info_lines["PHP uname"] = $ld['uname'];
-    $info_lines["Machine architecture"] = $ld['arch'];
-    $info_lines["Word size"] = $ld['wordsize'];
-    $info_lines["Operating system"] = $ld['osname'] . ' ' . $ld['osver'];
-    if (selinux_is_enabled() || possibly_selinux()) {
-        $info_lines["Security enhancements"] = "SELinux";
-    } elseif (grsecurity_is_enabled()) {
-        $info_lines["Security enhancements"] = "Grsecurity";
-    } else {
-        $info_lines["Security enhancements"] = "None";
-    }
-    $info_lines["PHP version"] = PHP_VERSION; 
-    if ($sys['DEBUG_BUILD']) {
-        $info_lines["DEBUG BUILD"] = "DEBUG BUILD OF PHP";
-    }
-    if (!$sys['SUPPORTED_COMPILER']) {
-        $info_lines["SUPPORTED PHP COMPILER"] = "FALSE";
-        $info_lines["PHP COMPILER"] = $sys['PHP_COMPILER'];
-    }
-    $info_lines["Is CLI?"] = ($sys['IS_CLI']?"Yes":"No");
-    $info_lines["Is CGI?"] = ($sys['IS_CGI']?"Yes":"No");
-    $info_lines["Is thread-safe?"] = ($sys['THREAD_SAFE']?"Yes":"No");
-    $info_lines["Web server"] = $sys['FULL_SS'];
-    $info_lines["Server type"] = server_type_string();
-    $info_lines["PHP ini file"] = $sys['PHP_INI'];
-    if (!@file_exists($sys['PHP_INI'])) {
-        $info_lines["Ini file found"] = "INI FILE NOT FOUND";
-    } else {
-        if (is_readable($sys['PHP_INI'])) {
-            $info_lines["Ini file found"] = "INI FILE READABLE";
-        } else {
-            $fh = @fopen($sys['PHP_INI'],"rb");
-            if ($fh === false) {
-                $info_lines["Ini file found"] = "INI FILE FOUND BUT POSSIBLY NOT READABLE";
-            } else {
-                $info_lines["Ini file found"] = "INI FILE READABLE";
-            }
-        }
-    }
-    $info_lines["PHPRC"] = $sys['PHPRC'];
-    $loader_path = find_loader();
-    if (is_string($loader_path)) {
-        $info_lines["Loader path"] =  $loader_path;
-        $info_lines["Loader file size"] = filesize($loader_path) . " bytes.";
-        $info_lines["Loader MD5 sum"] =  md5_file($loader_path);
-    } else {
-        $info_lines["Loader path"] =  "LOADER PATH NOT FOUND";
-    }
-    $server_type_code = server_type_code();
-    if (!empty($_SESSION['hostprovider'])) {
-      $info_lines['Hosting provider'] = $_SESSION['hostprovider'];
-      $info_lines['Provider URL'] = $_SESSION['hosturl'];
-    }
-    $info_lines["Wizard script path"] = '[url]http://' . $_SERVER["HTTP_HOST"] . get_self() . '?stype='. $server_type_code . '[/url]';
-    $ticket_strs[] = "[table]";
-    foreach ($info_lines as $h => $i) {
-        $value = (empty($i))?'EMPTY':$i;
-        $ticket_strs[] = '[tr][td]' . $h . '[/td]' . '[td]' . $value . '[/td][/tr]';
-    }
-    $ticket_strs[] = '[/table]';
-    $ticket_strs[] = '[hr]';
-    $ticket_strs[] = "\r\n==============\r\n";
-    $ticket_strs[] = "PLEASE ENTER ANY ADDITIONAL INFORMATION BELOW\r\n";
-
-    $support_ticket_str = join('',$ticket_strs);
-    return urlencode($support_ticket_str);
-}
-
-function wizard_stats_data($page_id)
-{
-    $data = array();
-
-    try_runtime_loading_if_applicable();
-    $sysinfo = get_sysinfo();
-    $ldinfo = get_loaderinfo();
-
-    $data['sessionid'] = session_id();
-    $data['wizard_version'] = script_version();
-    $data['server_type'] = server_type_code();
-    $data['hostprovider'] = (isset($_SESSION['hostprovider']))?$_SESSION['hostprovider']:'';
-    $data['hosturl'] = (isset($_SESSION['hosturl']))?$_SESSION['hosturl']:'';
-    $data['page_id'] = $page_id;
-    $data['loader_state'] = (extension_loaded(LOADER_EXTENSION_NAME))?'installed':'failure';
-    $data['ini_location'] = $sysinfo['PHP_INI'];
-    $data['is_cgi'] = ($sysinfo['IS_CGI'])?"yes":"no";
-    $data['is_ts'] = ($sysinfo['THREAD_SAFE'])?"yes":"no";
-    $data['arch'] = $ldinfo['arch'];
-    $data['php_version'] = PHP_VERSION;
-    $data['os'] = $ldinfo['osname'];
-    $data['word_size'] = $ldinfo['wordsize'];
-    $data['referrer'] =  $_SERVER["HTTP_HOST"] . get_self();
-
-    return $data;
-}
-
-function send_stats($page_id = 'default')
-{
-    $server_type = find_server_type();
-    $res = false;
-
-    if (SERVER_LOCAL != $server_type) {
-        $stats_data = wizard_stats_data($page_id);
-
-        if (!isset($_SESSION['stats_sent'][$page_id][$stats_data['loader_state']])) {
-            $url = WIZARD_STATS_URL;
-
-            if (!empty($stats_data)) {
-                if(function_exists('http_build_query')) {
-                    $qparams = http_build_query($stats_data);
-                } else {
-                    $qparams = php4_http_build_query($stats_data);
-                }
-                $url .= '?' . $qparams;
-                $res = remote_file_contents($url);
-            }
-            $_SESSION['stats_sent'][$page_id][$stats_data['loader_state']] = 1;
-        } else {
-            $res = true;
-        }
-    } else {
-        $res = 'LOCAL';
-    }
-    return $res;
-}
-
-function os_arch_string_check($loader_str)
-{
-    $errors = array();
-    if (preg_match("/target os:\s*(([^_]+)_([^-]*)-([[:graph:]]*))/i",$loader_str,$os_matches)) {
-        $loader_info = get_loaderinfo();
-        $dirname = calc_dirname();
-        $packed_osname = preg_replace('/\s/','',strtolower($loader_info['osname']));
-        if (strtolower($dirname) != $os_matches[1] && $packed_osname != $os_matches[2]) {
-            $errors[ERROR_LOADER_WRONG_OS] = "您服务器操作系统" . $loader_info['osname'] . "安装了错误的loader。";
-        } else {
-            $loader_wordsize = (strpos($os_matches[3],'64') === false)?32:64;
-            if ($loader_info['arch'] != ($ap = required_loader_arch($os_matches[3],$loader_info['oscode'],$loader_wordsize))) {
-                $err_str = "您服务器上安装了错误的loader。";
-                $err_str .= " 您得系统是 " . $loader_info['arch'];
-                $err_str .= " 但是该loader是用于 " . $ap . ".";
-                $errors[ERROR_LOADER_WRONG_ARCH] = $err_str;
-            }
-        }
-    }
-    return $errors;
-}
-
-function get_loader_strings($loader_location)
-{
-    if (function_exists('file_get_contents')) {
-        $loader_strs = @file_get_contents($loader_location);
-    } else {
-        $lines = @file($loader_location);
-        $loader_strs = join(' ',$lines);
-    }
-    return $loader_strs;
-}
-
-function loader_system($loader_location)
-{
-    $loader_system = array();
-    $loader_strs = get_loader_strings($loader_location);
-
-    if (!empty($loader_strs)) {
-
-        if (preg_match("/ioncube_loader_.\.._(.)\.(.)\.(..?)(_nonts)?\.dll/i",$loader_strs,$version_matches)) {
-            $loader_system['oscode'] = 'win';
-            $loader_system['thread_safe'] = (isset($version_matches[4]) && $version_matches[4] == '_nonts')?0:1;
-            $loader_system['wordsize'] = 32;
-            $loader_system['arch'] = 'x86';
-            $loader_system['php_version_major'] = $version_matches[1];
-            $loader_system['php_version_minor'] = $version_matches[2];
-            if (preg_match("/assemblyIdentity.*version=\"([^.]+)\./",$loader_strs,$compiler_matches)) {
-                $loader_system['compiler'] = "VC" . strtoupper($compiler_matches[1]);
-            } else {
-                $loader_system['compiler'] = 'VC6';
-            }
-        } elseif (preg_match("/php version:\s*(.)\.(.)\.(..?)(-ts)?/i",$loader_strs,$version_matches)) {
-            $loader_system['thread_safe'] = (isset($version_matches[4]) && $version_matches[4] == '-ts')?1:0;
-            $loader_system['php_version_major'] = $version_matches[1];
-            $loader_system['php_version_minor'] = $version_matches[2];
-            if (preg_match("/target os:\s*(([^_]+)_([^-]*)-([[:graph:]]*))/i",$loader_strs,$os_matches)) {
-                $loader_system['oscode'] = strtolower(substr($os_matches[2],0,3));
-                $loader_system['wordsize'] = (strpos($os_matches[3],'64') === false)?32:64;
-                $loader_system['arch'] = required_loader_arch($os_matches[3],$loader_system['oscode'],$loader_system['wordsize']);
-                $loader_system['compiler'] = $os_matches[4];
-            }
-        }
-        if (preg_match("/ionCube Loader Version\s+(\S+)/",$loader_strs,$loader_version)) {
-            $loader_system['loader_version'] = $loader_version[1];
-        } else {
-            $loader_system['loader_version'] = 'UNKNOWN';
-        }
-        if (isset($loader_system['php_version_major'])) {
-            $loader_system['php_version'] = $loader_system['php_version_major'] . '.' . $loader_system['php_version_minor'];
-        }
-    }
-    return $loader_system;
-}
-
-function loader_compatibility_test($loader_location)
-{
-    $errors = array();
-
-    $sysinfo = get_sysinfo();
-    if (LOADER_NAME_CHECK) {
-        $installed_loader_name = basename($loader_location);
-        $expected_loader_name = get_loader_name();
-        if ($installed_loader_name != $expected_loader_name) {
-            $errors[ERROR_LOADER_UNEXPECTED_NAME] = "安装的loader (<code>$installed_loader_name</code>) 不是系统支持的loader (<code>$expected_loader_name</code>) 。 请检查loader与系统是否兼容。";
-        }
-    }
-    if (empty($errors) && !is_readable($loader_location)) {
-        $execute_error = "$loader_location下的loader不可读。";
-        $execute_error .= "<br>请检查它是否存在或可读。";
-        $execute_error .= "<br>请检查目录权限 ";
-        $execute_error .= (is_ms_windows()?'folder':'directory') . '.';
-        if (($sysinfo['SS'] == 'IIS') || !($sysinfo['IS_CGI'] || $sysinfo['IS_CLI'])) {
-            $execute_error .= "<br>请检查服务器是否已经重启了。";
-        }
-        $execute_error .= ".";
-        $errors[ERROR_LOADER_NOT_READABLE] = $execute_error;
-    }
-    $loader_strs = get_loader_strings($loader_location);
-    $phpv = php_version(); 
-    if (preg_match("/php version:\s*(.)\.(.)\.(..?)(-ts)?/i",$loader_strs,$version_matches)) {
-        if ($version_matches[1] != $phpv['major'] || $version_matches[2]  != $phpv['minor']) {
-            $loader_php = $version_matches[1] . "." . $version_matches[2];
-            $server_php =  $phpv['major'] . "." .  $phpv['minor'];
-            $errors[ERROR_LOADER_PHP_MISMATCH] = "安装的loader用于 PHP $loader_php，但服务器是 PHP $server_php.";
-        }
-        if (is_bool($sysinfo['THREAD_SAFE']) &&  $sysinfo['THREAD_SAFE'] && !is_ms_windows() && !(isset($version_matches[4]) && $version_matches[4] == '-ts')) {
-            $errors[ERROR_LOADER_NONTS_PHP_TS] = "服务器运行的PHP是线程安全的，但是该loader不是线程安全的。";
-        } elseif (isset($version_matches[4]) && $version_matches[4] == '-ts' && !(is_bool($sysinfo['THREAD_SAFE']) &&  $sysinfo['THREAD_SAFE'])) {
-            $errors[ERROR_LOADER_TS_PHP_NONTS] = "服务器运行的PHP版本是非线程安全的，但该版本的loader是线程安全的。";
-        }
-    } elseif (preg_match("/ioncube_loader_.\.._(.)\.(.)\.(..?)(_nonts)?\.dll/i",$loader_strs,$version_matches)) {
-        if (!is_ms_windows()) {
-            $errors[ERROR_LOADER_WIN_SERVER_NONWIN] = "这是一个Windows版本的loader，但服务器好像不是Windows系统。";
-        } else {
-            if (isset($version_matches[4]) && $version_matches[4] == '_nonts' && is_bool($sysinfo['THREAD_SAFE']) &&  $sysinfo['THREAD_SAFE']) {
-                $errors[ERROR_LOADER_WIN_NONTS_PHP_TS] = "该loader版本是非线程安全的，这里需要一个线程安全的版本。";
-            } elseif (!(is_bool($sysinfo['THREAD_SAFE']) &&  $sysinfo['THREAD_SAFE']) && !(isset($version_matches[4]) && $version_matches[4] == '_nonts')) {
-                $errors[ERROR_LOADER_WIN_TS_PHP_NONTS] = "该loader版本是线程安全的，这里需要一个非线程安全的版本。"; 
-            }
-            if ($version_matches[1] != $phpv['major'] || $version_matches[2]  != $phpv['minor']) {
-                $loader_php = $version_matches[1] . "." . $version_matches[2];
-                $server_php =  $phpv['major'] . "." .  $phpv['minor'];
-                $errors[ERROR_LOADER_WIN_PHP_MISMATCH] = "已安装的loader用于 PHP $loader_php ，但服务器的PHP版本是 $server_php.";
-            }
-            if (preg_match("/assemblyIdentity.*version=\"([^.]+)\./",$loader_strs,$compiler_matches)) {
-                $loader_compiler = "VC" . strtoupper($compiler_matches[1]);
-            } else {
-                $loader_compiler = 'VC6';
-            }
-            if ($loader_compiler != $sysinfo['PHP_COMPILER']) {
-                $errors[ERROR_LOADER_WIN_COMPILER_MISMATCH] = "该loader用 $loader_compiler 编译，这里需要用 ${sysinfo['PHP_COMPILER']}编译。";
-            }
-        }
-    } else {
-            $errors[ERROR_LOADER_PHP_VERSION_UNKNOWN] = "未能检测服务器的PHP版本 - 请自行安装可用的loader。";
-    } 
-    $errors += os_arch_string_check($loader_strs);
-
-    return $errors;
-}
-
-
-function shared_server()
-{
-    if (!$rtl_path = runtime_loading()) {
-        if (empty($_SESSION['use_ini_method']) && runtime_loading_is_possible()) {
-            runtime_loading_instructions();
-        } else {
-            php_ini_install_shared();
-        }
-    } else {
-        list($lv,$mv,$newer_version) = ioncube_loader_version_information();
-        $phpv = php_version_maj_min();
-        echo "<p>适用于 PHP $phpv 的ionCube Loader $lv 已经成功安装。</p>";
-        $is_legacy_loader = loader_major_version_instructions($mv);
-        if ($is_legacy_loader) {
-            loader_upgrade_instructions($lv,$newer_version);
-        }
-        successful_install_end_instructions($rtl_path);
-    }
-}
-
-function dedicated_server()
-{
-    php_ini_install('dedicated or VPS', SERVER_DEDICATED, true);
-}
-
-function local_install()
-{
-    php_ini_install('local',SERVER_LOCAL, true);
-}
-
-
-function unregister_globals()
-{
-    if (!ini_get('register_globals')) {
-        return;
-    }
-
-    if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
-        die('GLOBALS overwrite attempt detected');
-    }
-
-    $noUnset = array('GLOBALS',  '_GET',
-                     '_POST',    '_COOKIE',
-                     '_REQUEST', '_SERVER',
-                     '_ENV',     '_FILES');
-
-    $input = array_merge($_GET,    $_POST,
-                         $_COOKIE, $_SERVER,
-                         $_ENV,    $_FILES,
-                         isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
-
-    foreach ($input as $k => $v) {
-        if (!in_array($k, $noUnset) && isset($GLOBALS[$k])) {
-            unset($GLOBALS[$k]);
-        }
-    }
-}
-
-function clear_session($persist = array())
-{
-    $persist['not_go_daddy'] = empty($_SESSION['not_go_daddy'])?0:1;
-    $persist['use_ini_method'] = empty($_SESSION['use_ini_method'])?0:1;
-    $persist['server_type'] = empty($_SESSION['server_type'])?SERVER_UNKNOWN:$_SESSION['server_type'];
-    @session_destroy();
-    $_SESSION = array();
-    $_SESSION['CREATED'] = time();
-    $_SESSION = $persist;
-}
-
-function info_should_be_disabled()
-{
-    $elapsed = time() - max(filemtime(__FILE__),filectime(__FILE__));
-
-    return (extension_loaded(LOADER_EXTENSION_NAME) && ($elapsed > WIZARD_EXPIRY_MINUTES * 60));
-}
-
-function info_disabled_text()
-{
-    return "Loader安装成功后，您访问的方法不可用。";
-}
-
-function info_disabled_check()
-{
-    if (info_should_be_disabled()) {
-        heading();
-        echo info_disabled_text();
-        footer(true);
-        exit;
-    }
-}
-
-function run()
-{
-    unregister_globals();
-    if (is_php_version_or_greater(4,3,0)) {
-        ini_set('session.use_only_cookies',1);
-    }
-    $session_ok = @session_start();
-
-    if (!defined('PHP_EOL')) {
-        if (is_ms_windows()) {
-            define('PHP_EOL',"\r\n");
-        } else {
-            define('PHP_EOL',"\n");
-        }
-    }
-
-    if (!isset($_SESSION['CREATED'])) {
-        $_SESSION['CREATED'] = time();
-    } elseif (time() - $_SESSION['CREATED'] > SESSION_LIFETIME_MINUTES * 60 ) {
-        clear_session(); 
-    }
-    if (!isset($_SERVER)) $_SERVER =& $HTTP_SERVER_VARS;
-
-    (php_sapi_name() == 'cli') && die("该脚本只能运行在网站服务器上。\n");
-
-    $page = get_request_parameter('page');
-    $host = get_request_parameter('host');
-    $clear = get_request_parameter('clear');
-    $ini = get_request_parameter('ini');
-    $timeout = get_request_parameter('timeout');
-
-    if ($timeout) {
-        $_SESSION['timing_out'] = 1;
-        $_SESSION['initial_run'] = 0;
-    }
-
-    if (!empty($host)) {
-        if ($host == 'ngd') {
-            $_SESSION['not_go_daddy'] = 1;
-        }
-    }
-    if (!empty($ini)) {
-        $_SESSION['use_ini_method'] = 1;
-    }
-
-    if (!empty($clear)) {
-        clear_session();
-        unset($_SESSION['not_go_daddy']);
-        unset($_SESSION['use_ini_method']);
-        unset($_SESSION['server_type']);
-    } else {
-        $stype = get_request_parameter('stype');
-        $hostprovider = get_request_parameter('hostprovider');
-        $hosturl = get_request_parameter('hosturl');
-        if (!empty($hostprovider)) {
-            $_SESSION['hostprovider'] = $hostprovider;
-            $_SESSION['hosturl'] = $hosturl;
-        }
-        $server_type = find_server_type($stype,false,true);
-    }
-    if ($session_ok && !$timeout && !isset($_SESSION['initial_run']) && empty($page)) {
-        $_SESSION['initial_run'] = 1;
-        initial_page();
-        @session_write_close();
-        exit;
-    } else {
-        $_SESSION['initial_run'] = 0;
-    }
-
-    if (empty($_SESSION['server_type'])) {
-        $_SESSION['server_type'] = SERVER_UNKNOWN;
-    }
-
-    if (empty($page) || !function_exists($page . "_page")) {
-        $page = get_default_page();
-    } 
-
-    $fn = "${page}_page";
-    $fn();
-
-    @session_write_close();
-    exit(0);
-}
-
-function wizardversion_page()
-{
-    $start_time = time();
-    $wizard_version_only = get_request_parameter('wizard_only');
-    $clear_session_info = get_request_parameter('clear_info');
-    if ($clear_session_info) {
-        unset($_SESSION['timing_out']);
-        unset($_SESSION['latest_wizard_version']);
-    }
-    $wizard_version = latest_wizard_version();
-    $message = '';
-    if (false === $wizard_version) {
-        $message = "0";
-    } elseif (update_is_available($wizard_version)) {
-        $message = "$wizard_version";
-    } else {
-        $message = "1";
-    }
-    echo $message;
-    @session_write_close();
-    exit(0);
-}
-
-function platforminfo_page()
-{
-    $message = '';
-    $platforms = get_loader_platforms();
-    $message = empty($platforms)?0:1;
-    echo $message;
-    @session_write_close();
-    exit(0);
-}
-
-function loaderversion_page()
-{
-    $message = '';
-    $loader_versions = get_loader_version_info();
-    $message = empty($loader_versions)?0:1;
-    echo $message;
-    @session_write_close();
-    exit(0);
-}
-
-function compilerversion_page()
-{
-    $message = '';
-    $compiler_versions = find_win_compilers();
-    $message = empty($compiler_versions)?0:1;
-    echo $message;
-    @session_write_close();
-    exit(0);
-}
-
-function initial_page()
-{
-    $self = get_self();
-    $start_page = get_default_address(false);
-    $stage_timeout = 7000;
-    $step_lag = 500;
-
-    echo <<<EOT
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN "http://www.w3.org/TR/html4/loose.dtd">
-    <html>
-    <head>
-        <title>ionCube Loader Wizard</title>
-        <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-        <link rel="stylesheet" type="text/css" href="$self?page=css">
-        <style type="text/css">
-        body {
-            height: 100%;
-            width: 100%;
-        }
-        </style>
-        <script type="text/javascript">
-        var timingOut = 0;
-        var xmlHttpTimeout;
-        var ajax;
-        var statusPar;
-        var stage_timeout = $stage_timeout;
-        var step_lag = $step_lag;
-
-        function checkNextStep(ajax,expected,continuation) {
-            if (ajax.readyState==4 && ajax.status==200)
-            {
-                clearTimeout(xmlHttpTimeout);
-                if (ajax.responseText == expected) {
-                   setTimeout('',step_lag);
-                   continuation();
-                } else {
-                   statusPar.innerHTML = 'Unable to check for update<br>script continuing';
-                   setTimeout("window.location.href = '$start_page&timeout=1'",1000);
-                }
-            }
-        }
-
-        function getXmlHttp() {
-            if (window.XMLHttpRequest) {
-                xmlhttp=new XMLHttpRequest();
-            } else {
-                xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
-            }
-            return xmlhttp;
-        }
-        var startMainLoaderWizard = function() {
-            window.location.href = '$start_page';
-        }
-        var loaderVersionCheck = function() {
-            statusPar.innerHTML = 'Stage 4/4: 获取Loader最新版本';
-            var xmlHttp = getXmlHttp();
-            xmlHttp.onreadystatechange=function() {
-                checkNextStep(xmlHttp,"1",startMainLoaderWizard);
-            }
-            xmlHttp.open("GET","$self?page=loaderversion",true);
-            xmlHttp.send("");
-            ajax = xmlHttp;
-            xmlHttpTimeout=setTimeout('ajaxTimeout()',stage_timeout);
-        }
-        var platformCheck = function() {
-            statusPar.innerHTML = 'Stage 3/4: 获取平台信息';
-            var xmlHttp = getXmlHttp();
-            xmlHttp.onreadystatechange=function() {
-                checkNextStep(xmlHttp,"1",loaderVersionCheck);
-            }
-            xmlHttp.open("GET","$self?page=platforminfo",true);
-            xmlHttp.send("");
-            ajax = xmlHttp;
-            xmlHttpTimeout=setTimeout('ajaxTimeout()',stage_timeout);
-        }
-        var compilerVersionCheck = function() {
-            statusPar.innerHTML = 'Stage 2/4: 获取编译器版本';
-            var xmlHttp = getXmlHttp();
-            xmlHttp.onreadystatechange=function() {
-                checkNextStep(xmlHttp,"1",platformCheck);
-            }
-            xmlHttp.open("GET","$self?page=compilerversion",true);
-            xmlHttp.send("");
-            ajax = xmlHttp;
-            xmlHttpTimeout=setTimeout('ajaxTimeout()',stage_timeout);
-        }
-        var startChecks = function() {
-            statusPar = document.getElementById('status');
-            statusPar.innerHTML = 'Stage 1/4: 获取Loader安装向导版本';
-            var xmlHttp = getXmlHttp();
-            xmlHttp.onreadystatechange=function() {
-                checkNextStep(xmlHttp,"1",compilerVersionCheck);
-            }
-            xmlHttp.open("GET","$self?page=wizardversion",true);
-            xmlHttp.send("");
-            ajax = xmlHttp;
-            xmlHttpTimeout=setTimeout('ajaxTimeout()',stage_timeout);
-        }
-        function ajaxTimeout(){
-           ajax.abort();
-           statusPar.innerHTML = 'Cannot reach server<br>script continuing';
-           setTimeout("window.location.href = '$start_page&timeout=1'",1000);
-        }
-        </script>
-    </head>
-    <body>
-
-    <div id="loading"><script type="text/javascript">document.write('<p>ionCube Loader初始化<br>ionCube Loader 安装向导<br><span id="status"></span></p>');</script><p id="noscript">Your browser does not support JavaScript so the ionCube Loader Wizard initialisation cannot be made now. This script can get the latest loader version information from the ionCube server when you go to the next page.<br>Please choose one of the following. <br>If the script appears to hang please restart the script and choose the "NO" option.<br><br><br><a href="$start_page">YES - my server DOES have internet access</a><br><br><a href="$start_page&timeout=1">NO - my server does NOT have internet access</a></p></div>
-    <script type="text/javascript">
-        document.getElementById('noscript').style.display = 'none';
-        window.onload = startChecks;
-    </script>
-    </body>
-    </html>
-EOT;
-}
-
-function default_page($loader_extension = LOADER_EXTENSION_NAME)
-{
-    $self = get_self();
-    foreach (array('self') as $vn) {
-        if (empty($$vn)) {
-            error("Unable to initialise ($vn).");
-        }
-    }
-
-    heading();
-
-    $wizard_update = check_for_wizard_update(true);
-
-    $rtl = try_runtime_loading_if_applicable();
-
-    $server_type = find_server_type();
-
-    if (extension_loaded($loader_extension) && $server_type != SERVER_UNKNOWN) {
-        loader_already_installed($rtl);
-    } else {
-        loader_not_installed();
-    }
-    send_stats('default');
-
-    footer($wizard_update);
-}
-
-function uninstall_wizard_instructions()
-{
-    echo '<p><strong>For security reasons we advise that you remove this Wizard script from your server now that the ionCube Loader is installed.</strong></p>';
-}
-
-function contact_script_provider_instructions()
-{
-    echo '<p>Please contact the script provider if you do experience any problems running encoded files.</p>';
-}
-
-function may_need_to_copy_ini()
-{
-    $sys = get_sysinfo();
-    if (ini_same_dir_as_wizard() && $sys['IS_CGI']) {
-        $dirphrase = is_ms_windows()?'folder':'directory';
-        $ini = ini_file_name();
-        echo "<p>注意：如果在不同的目录加密的文件解密失败，请将 $ini 文件复制到每个加密文件的目录下。</p>";
-    }
-}
-
-function successful_install_end_instructions($rtl_path = null)
-{
-    if (empty($rtl_path)) {
-        may_need_to_copy_ini();
-    } elseif (is_string($rtl_path)) {
-        echo "<p>”运行时加载方式“已在<code>$rtl_path</code>下使用。</p>";
-    }
-    contact_script_provider_instructions();
-    uninstall_wizard_instructions();
-}
-
-function loader_major_version_instructions($mv)
-{
-    if ($mv < LATEST_LOADER_MAJOR_VERSION) {
-        echo "<p><strong>已安装的Loader版本不能运行最新版本encoder加密的文件，</strong>";
-        echo " 您需要一个版本为 " . LATEST_LOADER_MAJOR_VERSION . " 的loader运行这些文件。</p>";
-    }
-    return ($mv < LATEST_LOADER_MAJOR_VERSION);
-}
-
-function loader_already_installed($rtl = null)
-{
-    list($lv,$mv,$newer_version) = ioncube_loader_version_information();
-    $phpv = php_version_maj_min();
-    $php_str = ' for PHP ' . $phpv;
-    echo '<div class="success">';
-    echo '<h4>Loader已经安装</h4>';
-    if ($newer_version) {
-        echo '<p>版本为' . $lv . $php_str . '的ionCube loader<strong>已经安装</strong> 但该版本不是最新版本。';
-        echo ' 请及时升级到最新版本。</p>';
-        $know_latest_version = is_string($newer_version);
-        $is_legacy_loader = loader_major_version_instructions($mv);
-        echo '</div>';
-        loader_upgrade_instructions($lv,$newer_version);
-    } else {
-        echo '<p>版本为' . $lv . $php_str . '的 ionCube loader已经安装，并能够正确运行加密文件。</p>'; 
-        echo '</div>';
-        $is_legacy_loader = loader_major_version_instructions($mv,true);
-        if ($is_legacy_loader) {
-            loader_upgrade_instructions($lv,true);
-        }
-    }
-
-    successful_install_end_instructions($rtl);
-}
-
-function loader_upgrade_instructions($installed_version,$newer_version)
-{
-    if ($newer_version) {
-        echo '<div class="panel">';
-        echo '<h4>Loader升级说明</h4>';
-        $restart_needed = true;
-        $server_type = find_server_type();
-        if ($server_type == SERVER_SHARED || $server_type == SERVER_UNKNOWN) {
-            $loader_path = find_loader(true);
-            if (!is_string($loader_path) || false === user_ini_space_path($loader_path)) {
-                $verb_case = ($server_type == SERVER_UNKNOWN)?"may":"will";
-                echo "<p>注意：你可能需要管理员权限进行升级。升级完成后服务器需要重启。</p>";
-            }
-            $restart_needed = false;
-        }
-        if (is_string($newer_version)) {
-            $version_str = "version $newer_version";
-        } else {
-            $version_str = "a newer version";
-        }
-        $loader_name =  get_loader_name();
-        echo "<p>为了从$installed_version 升级到 $version_str，请将下面安装包的$loader_name替换掉已经存在的同名文件：</p>";
-        if (is_ms_windows()) {
-            $basename = windows_package_name();
-        } else {
-            list($basename,$multiple_os_versions) = unix_package_name();
-        }
-        echo make_archive_list($basename,array('zip','tar.gz'));
-        if ($restart_needed) {
-            echo "<p>替换掉loader文件后，请重启服务器。</p>";
-        }
-        echo '</div>';
-    }
-}
-
-function loader_not_installed()
-{
-    $loader = get_loaderinfo();
-    $sysinfo = get_sysinfo();
-
-    $stype = get_request_parameter('stype');
-    $manual_select = get_request_parameter('manual');
-    $host_type = find_server_type($stype,$manual_select,true);
-
-    if ($host_type != SERVER_UNKNOWN && is_array($loader) && !$sysinfo['DEBUG_BUILD']) {
-        $warnings = server_restriction_warnings();
-        if (empty($_SESSION['use_ini_method']) && $host_type == SERVER_SHARED && runtime_loading_is_possible()) {
-            $errors = runtime_loading_errors();
-        } else {
-            $errors = ini_loader_errors();
-            $warnings = array_merge($warnings,ini_loader_warnings());
-        }
-        if (!empty($errors)) {
-            echo '<div class="alert">' . '请注意，Ioncube Loader的安装目前存在以下问题：';
-            echo make_list($errors,"ul"); 
-            echo '</div>';
-        }
-        if (!empty($warnings)) {
-            $addword = empty($errors)?'':'also';
-            $plural = (count($warnings)>1)?'s':'';
-            echo '<div class="warning">';
-            echo "注意以下问题:";
-            echo make_list($warnings,"ul"); 
-            echo '</div>';
-        }
-    }
-    if (!isset($stype)) {
-        echo '<p>文件已经被 <a href="' . ENCODER_URL . '" target=encoder>ionCube PHP Encoder</a>加密保护, 必须安装ionCube Loader组件。</p>';
-    }
-
-    if (!is_supported_php_version()) {
-        echo '<p>服务器目前运行的PHP版本为 ' . PHP_VERSION . ' ，ionCube Loaders支持该版本，同时还支持PHP4系列 PHP 4.2或更高版本， PHP5系列PHP 5.1 或更高版本。</p>';
-    } elseif ($sysinfo['DEBUG_BUILD']) {
-         echo '<p>服务器运行的PHP是Debug版本， Loader 不支持Debug版本。请确保使用非debug版本重新配置。</p>'; 
-    } elseif (!is_array($loader)) {
-        if ($loader == ERROR_WINDOWS_64_BIT) {
-            echo '<p>Windows 64位的Loaders是可用的。但是如果你<b>安装并运行32位的PHP</b>，请使用相应32位的loader</p>';
-            if ($sysinfo['THREAD_SAFE']) {
-                echo '<li>下载下面的32位x86 Windows loader包：';
-            } else {
-                echo '<li>下载下面的一个32位x86 Windows非线程安全版本的Windows loader包：';
-            }
-            echo make_archive_list(windows_package_name());
-        } else {
-            echo '<p>ionCube Loader可能没有符合您操作系统的版本，但是，如果你创建了一个<a href="'  . SUPPORT_SITE . '">支持服务单</a>， 可能会需要更多的帮助， 请在工单中包含该向导的URL。</p>';
-        }
-    } elseif (!$sysinfo['SUPPORTED_COMPILER']) {
-        $supported_compilers = supported_win_compilers();
-        $supported_compiler_string = join('/',$supported_compilers);
-        echo '<p>目前，ionCube Loader 需要使用' . $supported_compiler_string . '编译的PHP。你服务器的PHP是使用 ' . $sysinfo['PHP_COMPILER'] . '.编译的， 可以从<a href="http://windows.php.net/download/">PHP.net</a>下载合适的编译版本。';
-    } else {
-        switch ($host_type) {
-            case SERVER_SHARED:
-                shared_server();
-                break;
-            case SERVER_DEDICATED:
-                dedicated_server();
-                break;
-            case SERVER_LOCAL:
-                local_install();
-                break;
-            default:
-                echo server_selection_form();
-                break;
-        }
-    }
-}
-
-function server_selection_form()
-{
-    $self = get_self();
-    $timeout = (isset($_SESSION['timing_out']) && $_SESSION['timing_out'])?1:0;
-    $hostprovider = (!empty($_SESSION['hostprovider']))?$_SESSION['hostprovider']:'';
-    $hostprovider = htmlspecialchars($hostprovider, ENT_QUOTES, 'UTF-8');
-    $hosturl = (!empty($_SESSION['hosturl']))?$_SESSION['hosturl']:'';
-    $hosturl =  htmlspecialchars($hosturl, ENT_QUOTES, 'UTF-8');
-    $form = <<<EOT
-    <p>本向导会教你如何安装Ioncube Loader</p>
-    <p>请选择你的Web服务器的类型，然后单击“下一步”。</p>
-    <script type=text/javascript>
-        function trim(s) {
-            return s.replace(/^\s+|\s+$/g,"");
-        }
-        function input_ok() {
-            var l = document.getElementById('local');
-            if (l.checked) {
-                return true;
-            } 
-
-            var s = document.getElementById('shared');
-            var d = document.getElementById('dedi');
-
-            if (!s.checked && !d.checked) {
-                alert("Please select one of the server types.");
-                return false;
-            } else {
-                var hn = document.getElementById('hostprovider');
-                var hu = document.getElementById('hosturl');
-                var hostprovider = trim(hn.value);
-                var hosturl = trim(hu.value);
-
-                if (!hostprovider || !hosturl) {
-                    alert("Please enter both a hosting provider name and their URL.");
-                    return false;
-                }
-                if (hostprovider.length < 4) {
-                    alert("The hosting provider name should be at least 4 characters in length.");
-                    return false;
-                }
-                if (!hosturl.match(/[A-Za-z0-9-_]+\.[A-Za-z0-9-_%&\?\/.=]+/)) {
-                    alert("The hosting provider URL is invalid.");
-                    return false;
-                }
-                if (hosturl.length < 5) {
-                    alert("The hosting provider URL should be at least 5 characters in length.");
-                    return false;
-                }
-            }
-            return true;
-        }
-    </script>
-    <form method=GET action=$self>
-        <input type="hidden" name="page" value="default">
-        <input type="hidden" name="timeout" value="$timeout">
-        <input type=radio id=shared name=stype value=s onclick="document.getElementById('hostinginfo').style.display = 'block';"><label for=shared>共享 <small>(例如, FTP访问服务器，并没有为php.ini)</small></label><br>
-        <input type=radio id=dedi name=stype value=d onclick="document.getElementById('hostinginfo').style.display = 'block';"><label for=dedi>专用或VPS <small>(全根SSH访问服务器)</small></label><br>
-        <div id="hostinginfo" style="display: none">如果你有一个共享或专用的服务器，请填入您的托管服务提供商名字和他们的URL:
-            <table>
-                <tr><td><label for=hostprovider>服务器提供商名字</label></td><td><input type=text id="hostprovider" name=hostprovider value="$hostprovider"></td></tr>
-                <tr><td><label for=hosturl>服务器提供商URL</label></td><td><input type=text id="hosturl" name=hosturl value="$hosturl"></td></tr>
-            </table>
-        </div>
-        <input type=radio id=local name=stype value=l onclick="document.getElementById('hostinginfo').style.display = 'none';"><label for=local>本地安装</label>
-        <p><input type=submit value='下一步' onclick="return (input_ok(this) && showOverlay());"></p>
-    </form>
-EOT;
-    return $form;
-}
-
-function phpinfo_page()
-{
-    info_disabled_check();
-    if (function_is_disabled('phpinfo')) {
-        echo "phpinfo is disabled on this server";
-    } else {
-        @phpinfo();
-    }
-}
-
-function loader_check_page($ext_name = LOADER_EXTENSION_NAME)
-{
-    heading();
-
-    $rtl_path = try_runtime_loading_if_applicable();
-
-    if (extension_loaded($ext_name)) {
-        list($lv,$mv,$newer_version) = ioncube_loader_version_information();
-        $phpv = php_version_maj_min();
-        $php_str = ' for PHP ' . $phpv;
-        echo '<div class="success">';
-        echo '<h4>Loader 安装成功</h4>';
-        echo '<p>ionCube Loader ' . $lv . $php_str . ' <strong>已经安装</strong>，加密文件可以正确运行。';
-        if ($newer_version) {
-            echo ' 注意：您的ionCube loader是旧的版本。</p>';
-            $is_legacy_loader = loader_major_version_instructions($mv);
-            echo '</div>';
-            loader_upgrade_instructions($lv,$newer_version);
-        } else {
-            echo '</p>';
-            $is_legacy_loader = loader_major_version_instructions($mv);
-            echo '</div>';
-            if ($is_legacy_loader) {
-                loader_upgrade_instructions($lv,true);
-            }
-        }
-        successful_install_end_instructions($rtl_path);
-    } else {
-        echo '<div class="failure">';
-        echo '<h4>Loader安装失败</h4>';
-        echo '<p>ionCube Loader<b>没有</b>安装成功。</p>';
-        if (!is_null($rtl_path)) {
-            echo '<p>运行时加载失败。</p>';
-            echo '</div>';
-            $rt_errors = runtime_loading_errors();
-            if (!empty($rt_errors)) {
-                list_loader_errors($rt_errors);
-            } 
-            link_to_php_ini_instructions();
-        } else {
-            echo '</div>';
-            list_loader_errors();
-        }
-    }
-    send_stats('check');
-
-    footer(true);
-}
-
-function ini_loader_errors()
-{
-    $errors = array();
-    if (SERVER_SHARED == find_server_type() && !own_php_ini_possible(true)) {
-        $errors[ERROR_INI_USER_CANNOT_CREATE] = "好像您没有权限在共享服务器上创建您自己的ini配置文件，<br><strong>请联系管理员安装ionCube loader。</strong>";
-    }
-    $loader_loc = find_loader(false);
-    if (is_string($loader_loc)) {
-        if (!shared_and_runtime_loading()) {
-            $sys = get_sysinfo();
-            if (empty($sys['PHP_INI'])) {
-                $errors[ERROR_INI_NO_PATH] = '找不到配置文件(php.ini)的路径。';
-            } elseif (!@file_exists($sys['PHP_INI'])) {
-                $errors[ERROR_INI_NOT_FOUND] = 'PHP配置文件(' . $sys['PHP_INI'] .')没有找到。';
-            }
-        }
-        $errors = $errors + loader_compatibility_test($loader_loc);
-    } else {
-        $errors = $errors + $loader_loc;
-        $fs_location = find_loader_filesystem();
-        if (!empty($fs_location)) {
-            $fs_loader_errors = loader_compatibility_test($fs_location);
-            if (!empty($fs_loader_errors)) {
-                $errors[ERROR_LOADER_WRONG_GENERAL] = "在$fs_location 下的loader文件与您的系统不兼容。";
-            }
-            $errors = $errors + $fs_loader_errors;
-        }
-    } 
-    return $errors;
-}
-
-function unix_path_dir($dir = '')
-{
-    if (empty($dir)) {
-        $dir = dirname(__FILE__);
-    }
-    if (is_ms_windows()) {
-        $dir = str_replace('\\','/',substr($dir,2));
-    }
-    return $dir;
-}
-
-function unrecognised_inis_webspace($startdir)
-{
-    $ini_list = array();
-
-    $ini_name = ini_file_name();
-    $sys = get_sysinfo();
-    $depth = substr_count($startdir,'/');
-
-    $rel_path = '';
-    $rootpath = realpath($_SERVER['DOCUMENT_ROOT']);
-    for ($seps = 0; $seps < $depth; $seps++) {
-        $full_ini_loc = @realpath($startdir . '/' . $rel_path) . DIRECTORY_SEPARATOR . $ini_name;
-        if (@file_exists($full_ini_loc) && $sys['PHP_INI'] != $full_ini_loc) {
-            $ini_list[] = @realpath($full_ini_loc);
-        }
-
-        if (dirname($full_ini_loc) == $rootpath) {
-            break;
-        }
-        $rel_path .= '../';
-    }
-    return $ini_list;
-}
-
-function correct_loader_wrong_location()
-{
-    $loader_location_pair = array();
-    $loader_location = find_loader_filesystem();
-    if (is_string($loader_location)) {
-        $loader_errors = loader_compatibility_test($loader_location);
-        if (empty($loader_errors)) {
-            $ini_loader = scan_inis_for_loader();
-            if (!empty($ini_loader['location'])) {
-                $ini_loader_errors = loader_compatibility_test($ini_loader['location']);
-                if (!empty($ini_loader_errors)) {
-                    $loader_location_pair['loader'] = $loader_location;
-                    $loader_location_pair['newloc'] = dirname($ini_loader['location']);
-                }
-            } else {
-                $std_dir = loader_install_dir(find_server_type());
-                $std_ld_path = $std_dir . DIRECTORY_SEPARATOR . get_loader_name();
-                if (@file_exists($std_ld_path)) {
-                    $stdloc_loader_errors = loader_compatibility_test($std_ld_path);
-                } else {
-                    $stdloc_loader_errors = array("Loader文件不存在。");
-                }
-                if (!empty($stdloc_loader_errors)) {
-                    $loader_location_pair['loader'] = $loader_location;
-                    $loader_location_pair['newloc'] = $std_dir;
-                }
-            }
-        }
-    }
-    return $loader_location_pair;
-}
-
-function ini_loader_warnings()
-{
-    $warnings = array();
-    if (find_server_type() == SERVER_SHARED)
-    {
-        if (own_php_ini_possible()) {
-            $sys = get_sysinfo();
-            $ini_name = ini_file_name();
-            $rootpath = realpath($_SERVER['DOCUMENT_ROOT']);
-            $root_ini_file = $rootpath . DIRECTORY_SEPARATOR . $ini_name;
-            $cgibinpath = @realpath($_SERVER['DOCUMENT_ROOT'] . "/cgi-bin");
-            $cgibin_ini_file = (empty($cgibinpath))?'':$cgibinpath . DIRECTORY_SEPARATOR . $ini_name;
-            $here = unix_path_dir();
-            $ini_files = unrecognised_inis_webspace($here);
-            $shared_ini_loc = shared_ini_location();
-            $shared_ini_file = $shared_ini_loc . DIRECTORY_SEPARATOR . $ini_name;
-            $ini_dir = dirname($sys['PHP_INI']);
-            $all_ini_locations_used = !empty($ini_files);
-            foreach ($ini_files as $full_ini_loc) {
-                $advice = "文件 $full_ini_loc 没有被PHP认可。";
-                $advice .= " 请检查文件名、路径是正确的。";
-                if (!ini_same_dir_as_wizard()) {
-                    $ini_loc_dir = dirname($full_ini_loc);
-                    if (!@file_exists($shared_ini_file) && !empty($shared_ini_loc) && $ini_loc_dir != $shared_ini_loc && $ini_dir != $shared_ini_loc) {
-                        $all_ini_locations_used = false;
-                        $advice .= " 请将<code>$full_ini_loc</code> 复制到<code>" . $shared_ini_loc . "</code>。";
-                    } else {
-                        if (!@file_exists($root_ini_file) && $rootpath != $shared_ini_loc && $full_ini_loc != $rootpath) {
-                            $all_ini_locations_used = false;
-                            $advice .= " 请将文件 <code>$full_ini_loc</code> 复制到 <code>" . $rootpath . "</code>.";
-                        } 
-                        if (!empty($cgibin_ini_file) && !@file_exists($cgibin_ini_file) && $cgibinpath != $shared_ini_loc && $full_ini_loc != $cgibinpath && $cgibinpath != $rootpath) {
-                            $all_ini_locations_used = false;
-                            $advice .= "  请将文件 <code>$full_ini_loc</code> 复制到 <code>" . $cgibinpath . "</code>。";
-                        }
-                        $herepath = realpath($here);
-                        $here_ini_file = $herepath . DIRECTORY_SEPARATOR . $ini_name;
-                        if (!@file_exists($here_ini_file) && $herepath != $rootpath && $herepath != $cgibinpath) {
-                            $all_ini_locations_used = false;
-                            $advice .= " 需要将文件 <code>$full_ini_loc</code> 复制到 <code>$herepath</code> 和所有加密文件所在的路径。";
-                        }
-                    }
-                } else {
-                    $all_ini_locations_used = false;
-                }
-                $warnings[] = $advice;
-            }
-            if ($all_ini_locations_used) {
-                $warnings[] = "<strong>好像ini配置文件不在默认的位置，请联系服务器提供商，询问是否能够创建自己的PHP ini文件和创建位置。</strong>";
-            }
-        } else {
-            if (own_php_ini_possible(true)) {
-                $warnings[] = "你可能没有权限在共享服务器上创建自己的ini文件。 <br><strong>请联系管理员安装ionCube loader。</strong>";
-            }
-        }
-    } else {
-        $loader_dir_pair = correct_loader_wrong_location();
-        if (!empty($loader_dir_pair)) {
-            $advice = "在<code>${loader_dir_pair['loader']}</code>已经找到可用的loader。"; 
-            if ($loader_dir_pair['loader'] != $loader_dir_pair['newloc']) {
-                $advice .= " 你可能想将loader文件 <code>${loader_dir_pair['loader']}</code> 复制到 <code>${loader_dir_pair['newloc']}</code>。";
-            }
-            $warnings[] = $advice;
-        }
-    }
-    return $warnings;
-}
-
-function list_loader_errors($errors = array(),$warnings = array(),$suggest_restart = true)
-{
-    $default = get_default_address();
-    $retry_message = '';
-
-    if (empty($errors)) {
-        $errors = ini_loader_errors();
-        if (empty($warnings)) {
-            $warnings = ini_loader_warnings();
-        }
-    }
-    if (!empty($errors)) {
-        $try_again = '<a href="#" onClick="window.location.href=window.location.href">重试</a>';
-        echo '<div class="alert">';
-        if (count($errors) > 1) {
-            echo '安装过程中出现以下问题：';
-            $retry_message = "请解决这些问题并$try_again。";
-        } else {
-            echo '安装过程中出现以下问题：';
-            $retry_message = "请解决这些问题并$try_again。";
-        }
-        if (array_key_exists(ERROR_INI_USER_CANNOT_CREATE,$errors)) {
-            $retry_message = '';
-        }
-        echo make_list($errors,"ul");
-        echo '</div>';
-        if (!empty($warnings)) {
-            echo '<div class="warning">';
-            echo '同时请注意：';
-            echo make_list($warnings,"ul");
-            echo '</div>';
-        }
-    } elseif (!empty($warnings)) {
-        echo '<div class="warning">';
-        echo '注意下面潜在的问题：';
-        echo make_list($warnings,"ul");
-        echo '</div>';
-    } elseif ($suggest_restart) {
-        if (SERVER_SHARED == find_server_type()) {
-            echo "<p>请联系管理员安装ionCube Loader。</p>";
-        } else {
-            if (selinux_is_enabled()) {
-                echo "<p>好像服务器上的SElinux已经开启。 使用root 运行命令 <code>restorecon [full path to loader file]</code>能够解决该问题。如果没有解决，请参照 <a target=\"_blank\" href=\"http://www.cuteshift.com/57/install-ioncube-loader-while-selinux-enabled/\">http://www.cuteshift.com/57/install-ioncube-loader-while-selinux-enabled/</a> ，安装 ionCube Loader。</p>";
-            } elseif (grsecurity_is_enabled()) {
-                echo "<p>好像服务器上的 grsecurity 已经开启。 运行命令 <code>execstack -c [full path to loader file]</code> ，并重启服务器。</p>";
-            } else {
-                $sysinfo = get_sysinfo();
-                $ss = $sysinfo['SS'];
-                if (!$sysinfo['CGI_CLI'] || is_ms_windows()) {
-                    echo "<p>请检查 $ss 服务器已经重启。</p>";
-                } 
-            }
-        }
-    }
-    echo '<div>';
-    echo $retry_message;
-    echo " 你可能需要下面的帮助：";
-    echo make_list(help_resources($errors),"ul");
-    echo '<a href="' . $default . '">点击这里重新开始向导</a>。</div>';
-}
-
-function phpconfig_page()
-{
-    info_disabled_check();
-    $sys = get_sysinfo();
-    $download = get_request_parameter('download');
-    $ini_file_name = '';
-    if (!empty($download)) {
-        $ini_file_name = get_request_parameter('ininame');
-        if (empty($ini_file_name)) {
-            $ini_file_name = ini_file_name();
-        }
-        header('Content-Type: text/plain');
-        header('Content-Disposition: attachment; filename=' . $ini_file_name);
-    } else {
-        header('Content-Type: text/plain');
-    }
-    $exclude_original = get_request_parameter('newlinesonly');
-    $prepend = get_request_parameter('prepend');
-    $stype = get_request_parameter('stype');
-    $server_type = find_server_type($stype);
-    if (!empty($exclude_original) || !empty($prepend)) {
-        $loader_dir = loader_install_dir($server_type);
-        $zend_lines = zend_extension_lines($loader_dir);
-        echo join(PHP_EOL,$zend_lines);
-        echo PHP_EOL;
-    }
-    if (empty($ini_file_name) || empty($sys['PHP_INI_DIR']) || ($sys['PHP_INI_BASENAME'] == $ini_file_name)) {
-        $original_ini_file = isset($sys['PHP_INI'])?$sys['PHP_INI']:'';
-    } else {
-        $original_ini_file = $sys['PHP_INI_DIR'] . DIRECTORY_SEPARATOR . $ini_file_name;
-    }
-    if (empty($exclude_original) && !empty($original_ini_file) && @file_exists($original_ini_file)) {
-        if (!empty($download)) {
-            @readfile($original_ini_file);
-        } else {
-            echo all_ini_contents();
-        } 
-    }
-}
-
-function extra_page()
-{
-    info_disabled_check();
-    heading();
-    $sys = get_sysinfo();
-    $ini_loader = scan_inis_for_loader();
-    $ini_loader_path = $ini_loader['location'];
-    $loader_path = find_loader(true);
-    $ldinf = get_loaderinfo();
-    $self = get_self();
-    echo "<h4>附加信息</h4>";
-    echo "<table>";
-    $lines = array();
-    if (is_string($loader_path)) {
-        $lines['Loader is at'] = $loader_path;
-        $loader_system = loader_system($loader_path);
-        if (!empty($loader_system)) {
-            $lines['Loader OS code'] = $loader_system['oscode'];
-            $lines['Loader architecture'] = $loader_system['arch'];
-            $lines['Loader word size'] = $loader_system['wordsize'];
-            $lines['Loader PHP version'] = $loader_system['php_version'];
-            $lines['Loader thread safety'] = $loader_system['thread_safe']?'Yes':'No';
-            $lines['Loader compiler'] = $loader_system['compiler'];
-            $lines['Loader version'] = $loader_system['loader_version'];
-            $lines['File size is'] = filesize($loader_path) . " bytes.";
-            $lines['MD5 sum is'] = md5_file($loader_path);
-        }
-        $lines['Loader file'] = "<a href=\"$self?page=loaderbin\">Download loader file</a>";
-    } else {
-        $lines['Loader file'] = "Loader cannot be found.";
-    }
-    $lines['Loader found in ini file'] = empty($ini_loader_path)?"No":"Yes";
-    if (!empty($ini_loader_path) && (!is_string($loader_path) || $ini_loader_path != $loader_path)) {
-        $lines['Loader location found in ini file'] =  $ini_loader_path;
-        $loader_system = loader_system($ini_loader_path);
-        if (!empty($loader_system)) {
-            $lines['Ini Loader OS code'] = $loader_system['oscode'];
-            $lines['Ini Loader architecture'] = $loader_system['arch'];
-            $lines['Ini Loader word size'] = $loader_system['wordsize'];
-            $lines['Ini Loader PHP version'] = $loader_system['php_version'];
-            $lines['Ini Loader thread safety'] = $loader_system['thread_safe']?'Yes':'No';
-            $lines['Ini Loader compiler'] = $loader_system['compiler'];
-            $lines['Ini Loader version'] = $loader_system['loader_version'];
-        }
-    }
-    $lines["OS extra security"] = (selinux_is_enabled() || possibly_selinux())?"SELinux":(grsecurity_is_enabled()?"Grsecurity":"None");
-    $lines['PHPRC is'] = $sys['PHPRC'];
-    $lines['INI DIR is'] = $sys['PHP_INI_DIR'];
-    $lines['Additional INI files'] = $sys['PHP_INI_ADDITIONAL'];
-    $stype = get_request_parameter('stype');
-    $server_type = find_server_type($stype);
-    $lines['Server type is'] = server_type_string();
-    $lines["PHP uname"] = $ldinf['uname'];
-    $lines['Server word size is'] = $ldinf['wordsize'];
-    $lines['Disabled functions'] = ini_get('disable_functions');
-    $writeable_dirs = writeable_directories();
-    $lines['Writeable loader locations'] = (empty($writeable_dirs))?"<em>None</em>":join(", ",$writeable_dirs);
-    if (!empty($_SESSION['hostprovider'])) {
-        $lines['Hosting provider'] = $_SESSION['hostprovider'];
-        $lines['Provider URL'] = $_SESSION['hosturl'];
-    }
-    foreach ($lines as $h => $i) {
-        $v = (empty($i))?'<em>EMPTY</em>':$i;
-        echo '<tr><th>'. $h . ':</th>' . '<td>' . $v . '</td></tr>';
-    }
-    echo "</table>";
-    footer(true);
-}
-
-function loaderbin_page()
-{
-    info_disabled_check();
-    $loader_path = find_loader(true);
-    if (is_string($loader_path)) {
-        header('Content-Type: application/octet-stream');
-        header('Content-Disposition: attachment; filename='. basename($loader_path));
-        @readfile($loader_path);
-    }
-}
-
-
-
-function GoDaddy_root($html_root = '')
-{
-    if (empty($_SESSION['not_go_daddy']) && empty($_SESSION['godaddy_root'])) {
-        $godaddy_pattern = "[\\/]home[\\/]content[\\/][0-9a-z][\\/][0-9a-z][\\/][0-9a-z][\\/][0-9a-z]+[\\/]html";
-
-        if (empty($html_root)) {
-            $html_root =  $_SERVER['DOCUMENT_ROOT'];
-        }
-        if (preg_match("@$godaddy_pattern@i",$html_root,$matches)) {
-            $_SESSION['godaddy_root'] = $matches[0];
-        } else {
-            $_SESSION['not_go_daddy'] = 1;
-            $_SESSION['godaddy_root'] = '';
-        } 
-    } elseif (!empty($_SESSION['not_go_daddy'])) {
-        $_SESSION['godaddy_root'] = '';
-    }
-    if (!empty($_SESSION['godaddy_root'])) {
-        $_SESSION['hostprovider'] = 'GoDaddy';
-        $_SESSION['hosturl'] = 'www.godaddy.com';
-    }
-    return $_SESSION['godaddy_root'];
-}
-
-function GoDaddy_windows_instructions()
-{
-    $instr = "It appears that you are hosted on a Windows server at GoDaddy.<br/>";
-    $instr .= "Please change to a Linux hosting plan at GoDaddy.<br />";
-    $instr .=  "If you <a href=\"http://help.godaddy.com/\">contact their support team</a> they should be able to switch you to a Linux server.";
-
-    echo $instr;
-}
-
-function GoDaddy_linux_instructions($html_dir)
-{
-    $base = get_base_address();
-    $loader_name = get_loader_name();
-    $zend_extension_line="<code>zend_extension = $html_dir/ioncube/$loader_name</code>";
-    $php_ini_name = is_php_version_or_greater(5,0)?'php5.ini':'php.ini';
-    $ini_path = $html_dir . '/' . $php_ini_name;
-
-    $instr = array();
-    $instr[] = 'In your html directory, ' . $html_dir . ', create a sub-directory called <b>ioncube</b>.';
-    if (@file_exists($ini_path)) {
-       $instr[] = "Edit the $php_ini_name in your  $html_dir and add the following line to the <b>top</b> of the file:<br>" . $zend_extension_line ;
-    } else {
-        $instr[] = "<a href=\"$base&amp;page=phpconfig&amp;ininame=$php_ini_name&amp;stype=s&amp;download=1&amp;prepend=1\">Save this $php_ini_name file</a> and upload it to your html directory, $html_dir";
-    }
-    $instr[] = 'Download the <a target="_blank" href="http://downloads2.ioncube.com/loader_downloads/ioncube_loaders_lin_x86.zip">Linux ionCube Loaders</a>.';
-    $instr[] = 'Unzip the loaders and upload them into the ioncube directory you created previously.';
-    $instr[] = 'The encoded files should now be working.';
-
-    echo '<div class=panel>';
-    echo (make_list($instr));
-    echo '</div>';
-}
-
-function GoDaddy_page()
-{
-    $base = get_base_address();
-
-    heading();
-
-        $inst_str = '<h4>GoDaddy Installation Instructions</h4>';
-        $inst_str .= '<p>It appears that you are hosted with GoDaddy (<a target="_blank" href="http://www.godaddy.com/">www.godaddy.com</a>). ';
-        $inst_str .= "If that is <b>not</b> the case then please <a href=\"$base&amp;page=default&amp;host=ngd\">click here to go to the main page of this installation wizard</a>.</p>";
-        $inst_str .= "<p>If you have already installed the loader then please <a href=\"$base&amp;page=loader_check\" onclick=\"showOverlay();\">click here to test the loader</a>.</p>";
-
-        echo $inst_str;
-
-        if (is_ms_windows()) {
-            GoDaddy_windows_instructions();
-        } else {
-            GoDaddy_linux_instructions($_SESSION['godaddy_root']);
-        }
-
-    send_stats('gd_default');
-
-    footer(true);
-}
-
-
-
-function get_request_parameter($param_name)
-{
-    static $request_array;
-
-    if (!isset($request_array)) {
-        if (isset($_GET)) {
-            $request_array = $_GET;
-        } elseif (isset($HTTP_GET_VARS)) {
-            $request_array = $HTTP_GET_VARS;
-        }
-    }
-
-    if (isset($request_array[$param_name])) {
-        $return_value = strip_tags($request_array[$param_name]);
-    } else {
-        $return_value = null;
-    }
-    return $return_value;
-}
-
-function make_list($list_items,$list_type='ol')
-{
-    $html = '';
-    if (!empty($list_items)) {
-        $html .= "<$list_type>";
-        $html .= '<li>';
-        $html .= join('</li><li>',$list_items);
-        $html .= '</li>';
-        $html .= "</$list_type>";
-    }
-    return $html;
-} 
-
-function make_archive_list($basename,$archives_list = array(),$download_server = IONCUBE_DOWNLOADS_SERVER)
-{
-    if (empty($archives_list)) {
-        $archives_list = array('tar.gz','tar.bz2','zip','ipf.zip');
-    }
-
-    foreach ($archives_list as $a) {
-        $link_text = ($a == 'ipf.zip')?'MS Windows installer':$a;
-        $ext_sep = ($a == 'ipf.zip')?'_':'.';
-        $archive_list[] = "<a href=\"$download_server/$basename$ext_sep$a\">$link_text</a>";
-    }
-
-    return make_list($archive_list,"ul");
-}
-
-function error($m)
-{
-    die("<b>错误:</b> <span class=\"error\">$m</span><p>你可以<a href=\"". SUPPORT_SITE . "\">反馈该错误</a>来完善文档。最好包含出错的URL，这样我们可以测试一下。");
-}
-
-function failsafe_get_self()
-{
-    $result = '';
-    $sfn = $_SERVER['SCRIPT_FILENAME'];
-    $dr = $_SERVER['DOCUMENT_ROOT'];
-    if (!empty($sfn) && !empty($dr)) {
-        if ($dr == '/' || $dr == '\\') {
-            $result = $sfn;
-        } else {
-            $drpos = strpos($sfn,$dr);
-            if ($drpos === 0) {
-                $drlen = strlen($dr);
-                $result = substr($sfn,$drlen);
-            }
-        }
-        $result = str_replace('\\','/',$result);
-    }
-    if (empty($result)) {
-        $result = DEFAULT_SELF;
-    }
-    return $result;
-}
-
-function get_self()
-{ 
-    if (empty($_SERVER['PHP_SELF'])) {
-        if (empty($_SERVER['SCRIPT_NAME'])) {
-            if (empty($_SERVER['REQUEST_URI'])) {
-                return failsafe_get_self();
-            } else {
-                return $_SERVER['REQUEST_URI'];
-            }
-        } else {
-            return $_SERVER['SCRIPT_NAME'];
-        }
-    } else {
-        return $_SERVER['PHP_SELF'];
-    }
-}
-
-function get_default_page()
-{
-    $godaddy_root = GoDaddy_root();
-    if (empty($godaddy_root)) {
-         $page = 'default';
-    } else {
-         $page = 'GoDaddy';
-    }
-    return $page;
-}
-
-function get_base_address()
-{
-    $self = get_self();
-    $remote_timeout = (isset($_SESSION['timing_out']) && $_SESSION['timing_out'])?'timeout=1':'timeout=0';
-    $using_ini = (isset($_SESSION['use_ini_method']) && $_SESSION['use_ini_method'])?'ini=1':'ini=0';
-    return $self . '?' . $remote_timeout . '&' . $using_ini;
-}
-
-function get_default_address($include_timeout = true)
-{
-    if ($include_timeout) {
-        $base =  get_base_address();
-        $base .= "&amp;";
-    } else {
-        $base = get_self();
-        $base .= "?";
-    }
-    $page = get_default_page();
-
-    return $base . 'page=' . $page;
-}
-
-function heading()
-{
-    $self = get_self();
-
-    echo <<<EOT
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN "http://www.w3.org/TR/html4/loose.dtd">
-    <html>
-    <head>
-        <title>ionCube Loader Wizard</title>
-        <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-        <link rel="stylesheet" type="text/css" href="$self?page=css">
-        <script type="text/javascript">
-            function showOverlay()
-            {
-                document.getElementById('overlay').style.display = 'block';
-                return true;
-            }
-
-            function hideOverlay()
-            {
-                document.getElementById('overlay').style.display = 'none';
-                return true;
-            }
-        </script>
-    </head>
-    <body onload="hideOverlay()">
-    <div id="overlay">
-        <div id="inner_overlay">检查服务器配置<br>请稍等</div>
-    </div>
-    <div id=header>
-        <img src="?page=logo" alt="ionCube logo">
-    </div>
-    <div id=main>
-    <h2>ionCube Loader 安装向导</h2>
-EOT;
-}
-
-function footer($update_info = null)
-{
-    $self = get_self();
-    $base = get_base_address();
-    $default = get_default_address(false);
-    $year = gmdate("Y");
-
-    echo "</div>";
-    echo "<div id=\"footer\">" .
-    "Copyright ionCube Ltd. 2002-$year | " .
-    "Loader Wizard version " . script_version() . " ";
-
-    if ($update_info === true) {
-        $update_info = check_for_wizard_update(false);  
-    }
-    $loader_wizard_loc = LOADER_WIZARD_URL;
-    $wizard_version_string =<<<EOT
-    <script type="text/javascript">
-    var xmlhttp;
-    function version_check()
-    { 
-        var body = document.getElementsByTagName('body')[0];
-        var ldel = document.getElementById('loading');
-        if (!ldel) {
-            body.innerHTML += '<div id="loading"></div>';
-            ldel = document.getElementById('loading');
-        }
-        ldel.innerHTML = '<p>向导版本信息检索<br>请稍等</p>';
-        ldel.style.display = 'block';
-        ldel.style.height = '300px';
-        ldel.style.left = '200px';
-        ldel.style.border = '4px #660000 solid';
-        if (window.XMLHttpRequest) {
-            xmlhttp=new XMLHttpRequest();
-        } else {
-            xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
-        }
-        xmlhttp.onreadystatechange=function()
-        {
-            var loadedOkay = 0;
-            if (xmlhttp.readyState==4 && xmlhttp.status==200)
-            {
-                var wizardversion = xmlhttp.responseText;
-                var msg;
-                clearTimeout(xmlHttpTimeout);
-                buttons = '';
-                if (wizardversion == '1') {
-                    msg = '你的当前版本<br>ionCube Loader安装向导'; 
-                } else if (wizardversion != '0') {
-                    msg = 'loader安装向导有新版本：' + wizardversion;
-                    buttons = '<button onclick="document.getElementById(\'loading\').style.display=\'none\'; window.open(\'$loader_wizard_loc\'); return false">获取新版本</button> &nbsp;'; 
-                } else {
-                    msg = '不能从Ioncube服务器获取向导版本信息';
-                }
-                buttons += '<button onclick="document.getElementById(\'loading\').style.display=\'none\'; return false">关闭</button>'; 
-                ldel.innerHTML = '<p>' + msg +  '<br>' + buttons + '</p>';
-            }
-        }
-        xmlhttp.open("GET",'$self?page=wizardversion&wizard_only=1&clear_info=1',true);
-        xmlhttp.send();
-        var xmlHttpTimeout=setTimeout(ajaxTimeout,7000);
-    }
-    function ajaxTimeout(){
-       xmlhttp.abort();
-       msg = '不能从Ioncube服务器获取向导版本信息';
-       button = '<button onclick="document.getElementById(\'loading\').style.display=\'none\'; return false">关闭</button>';
-       var ldel = document.getElementById('loading');
-       ldel.innerHTML = '<p>' + msg +  '<br>' + button + '</p>';
-    }
-    </script>
-EOT;
-
-    $wizard_version_string .= '('; 
-    if ($update_info === null) {
-        $wizard_version_string .= '<a target="_blank" href="' . $loader_wizard_loc . '" onclick="version_check();return false;">check for new version</a>';
-    } else if ($update_info !== false) {
-        $wizard_version_string .= '<a href="' . LOADERS_PAGE .'" target="_blank">download version ' . $update_info . '</a>';
-    } else {
-        $wizard_version_string .=  "current";
-    }
-    $wizard_version_string .= ')'; 
-    echo $wizard_version_string;
-
-    $server_type_code = server_type_code();
-
-    if (!info_should_be_disabled()) {
-        echo " | <a href=\"$base&amp;page=phpinfo\" target=\"phpinfo\">phpinfo</a>";
-        echo " | <a href=\"$base&amp;page=phpconfig\" target=\"phpconfig\">config</a>";
-        echo " | <a href=\"$base&amp;page=extra&amp;stype=$server_type_code\" target=\"extra\">additional</a>";
-        echo " | <a href=\"$base&amp;page=system_info_archive&amp;stype=$server_type_code\">info archive</a>";
-    }
-    echo " | <a href=\"$default\" onclick=\"showOverlay();\">wizard start</a>";
-    echo " | <a href=\"$base&amp;page=loader_check\" onclick=\"showOverlay();\">loader test</a>";
-    echo ' | <a href="' . LOADERS_PAGE . '" target="loaders">loaders</a>';
-
-    echo "</div>\n";
-    echo "\n</body></html>\n";
-}
-
-function css_page()
-{
-    header('Content-Type: text/css');
-    echo <<<EOT
-    BODY {
-        font-family: verdana, helvetica, arial, sans-serif;
-        font-size: 10pt;
-        line-height: 150%;
-        margin: 0px;
-        min-height: 400px;
-        position: relative;
-    }
-
-    CODE {
-        color: #c00080;
-    }
-
-    LI {
-        margin-top: 10px;
-    }
-    #overlay {
-        display: block;
-        z-index: 100;
-        position: absolute;
-        top: 0;
-        left: 0;
-        padding: 0;
-        margin: 0;
-        width: 100%;
-        height: 100%;
-        background-color: white;
-    }
-    #inner_overlay {
-        display: block;
-        z-index: 100;
-        position: absolute;
-        font-size: 200%;
-        color: #660000;
-        top: 50%;
-        left: 25%;
-        width: 460px;
-        height: 460px;
-        line-height: 200%;
-        text-align: center;
-        vertical-align: middle;
-    }
-
-    #loading {
-        display: block;
-        position: absolute;
-        top: 33%;
-        left: 25%;
-        margin: auto;
-        height: 320px;
-        width: 460px;
-        padding: 4px;
-        color: #660000;
-        background-color: white;
-        z-index: 100;
-    }
-
-    #loading p {
-        position: absolute;
-        margin-top: 10px;
-        text-align: center;
-        vertical-align: middle;
-        padding-left: 40px;
-        padding-right: 30px;
-        font-size: 200%;
-        line-height: 200%;
-    }
-
-    #loading p span#status{
-        font-size: 60%;
-        line-height: 120%;
-    }
-    #loading p#noscript {
-        font-size: 120%;
-        line-height: 120%;
-        position: absolute;
-        text-align: left;
-        padding-top: 10px;
-        bottom: 0;
-    }
-    #loading p#noscript a {
-        text-align: center;
-    }
-
-    #loading button {
-        margin-top: 20px;
-        line-height: 100%;
-        padding-top: 4px;
-        padding-bottom: 4px;
-    }
-
-
-    h4 {
-        margin-bottom: 0;
-        padding-bottom: 4px;
-    }
-
-    p,#main div {
-        max-width: 1000px;
-        width: 75%;
-    }
-
-    #hostinginfo {
-        margin-top: 10px;
-        margin-left: 20px;
-    }
-    #hostinginfo table {
-        font-size: 1.00em;
-    }
-    #hostinginfo table td {
-        padding-right: 4px;
-    }
-    #hostinginfo input {
-        margin-top: 6px;
-    }
-
-    #hostinginfo label {
-        margin-left: 6px;
-    }
-
-    th {
-        text-align: left;
-    }
-
-    .alert {
-        margin: 2ex 0;
-        border: 1px solid #660000;
-        padding: 1ex 1em;
-        background-color: #ffeeee;
-        color: #660000; 
-        width: 75%;
-    }
-
-    .warning {
-        margin: 2ex 0;
-        border: 1px solid #FFBF00;
-        padding: 1ex 1em;
-        background-color: #FDF5E6;
-        color: #000000; 
-        width: 75%;
-    }
-
-    .success {
-        margin: 2ex 0;
-        border: 1px solid #006600;
-        padding: 1ex 1em;
-        background-color: #EEFFEE;
-        color: #000000; 
-        width: 75%;
-    }
-
-    .error {
-        color: #FF0000;
-    }
-
-    .panel {
-        border: 1px solid #c0c0c0;
-        background-color: #f0f0f0;
-        width: 75%;
-        padding: 1ex 1em;
-    }
-
-    #header {
-        background: #3f0f0f;
-    }
-
-    #footer {
-        border-top: 1px solid #404040;
-        margin-top: 20px;
-        padding-top: 10px;
-        padding-left: 20px;
-        font-size: 75%;
-        text-align: left;
-    }
-
-    #main {
-        margin: 20px;
-    }
-EOT;
-}
-
-function logo_page()
-{
-$img_encoded = 'iVBORw0KGgoAAAANSUhEUgAAAU4AAABQCAMAAABBJmwEAAADAFBMVEVBLA49Dg44Dg5FDg46DAxLIBIwCgoyCgpBDQ00FAtLLhA0DAwuCwuBYhwtEwltTxhmSBY2CgoSBARNOBErCQkqCgo4Cws4DAwsCgo0JAtFMQ9VPxNJMxBlQhYNAwMmCAh6XBs+Ig5VOhNhQhVmTRYsCAgXBQUgBwcwDAwVBARRNRIhBwdbMhUtHQlRORIcBgZFKRB4WxpGGhFXQBMWBQVVLBRUNRJoThdwVRkeBgYxHgtBFBBcQRR0VRk5FQwkCAgdEQYiBwdNNBEuCQk+Fw1fRxVPMBJXOxMnCgphRxUQAwMjEQc8Kw0aCgVADg5fQhUlFgg/HQ5ZPBRaQBRyVRleQRVCDQ05Gw1DIg4aBgYTCQRrThcjBwc6HA1YPxM2Dg45IAwZBQU+Dg4uDAw3JQwqGAlFJBAqDgpZQBMKAgIxGQsuDwpFKA8xDwtHMxB9XBslCwlIKA8wCQljSBYYBgYeCAhTPhIqHQlcNxRDJw4OAwM0GAw8JQ0WBgY8Gw0cBQUOCAM3Gw0GAQHv6+F/XRxDDw9JDw/OAAD0AADtAADNAAD+AAD/AADPAADRAAD4AADTAADXAAD8AAD9AADg18PAr4eRcy339fBHDg46Dg5GDg7eAAA9DAyokVrQw6XYzbRIDw91URqZfTwpCAjqAADmAADaAADcAAD1AADZAADrAADxAADsAADWAADSAADQAADMAAD2AADyAADwAADuAADoAADkAADlAADdAADYAADUAADVAADbAADvAADnAAD3AADpAAD5AADzAABDDg64pXjIuZahh0s1Cws7Dg4/DQ3n4dI8Dw8+DQ02DQ1qRBg8DAywm2lgOBYyDAxwSxk0DQ0oCAhrRRhgORaEYx3jAADfAADhAADiAADgAAA0CgpmPxc1CgqZmZk3DQ00Cwt6VxtQJhNCDg4+DAw3DAwzDAxlPhcqCQlGDw82DAwoCQlHDw8/DAw8DQ1BDw8yDQ06Dw5EDQ09DQ1sThc1Dg5dPBQ0HwtLOBCJaR5KDw////89Dw9KsskKAAAAAWJLR0QAiAUdSAAAF3VJREFUeNrtnAl4E9e1gIk0jBQiAhWScIFa0KRaEKAANkZAaowehShhaVrUmKg0SkJTB5K+UNI2TlvSyPXbd83IdrXY8tv3fd+1WcK2hFfeBvlssAMOJKTLey+Vxz333hntsi2Pg/P1y/kSjXTnLuf+99xz77kzZtnMh7KIsmypFfjJkg9xLqp8iHNR5UOciyof4lxUuRs4a7sup9OXB6+XuHWpJd1VW7LQ9cGWS7PWCkX782vvT+Mi6EZhk/D78sjynNJ83oIay+giGucvipdsZV1uD8d5AtH+omb6Uy7O3VVSg8GAi907m+YtLi6dX3uac7XwNwqa7Pe5PR5/bn183lzZy7rK6PLBwgn9Yxg/x/kKx77WxyWY8JZytII75oMzW3sOzvwmt/g4V8TvSuW0n49z+cjlmzM7gsWIFwnnL4iX/I6PjviK7bDLzQVHS9OcucQG+2dmkxycfO35OHOavJbg2KsjebM7H+eI33MZbDjIzu5fPjg4+V52If+0d7QljTxZfxqSwAFuuUbcHNhI+toW/kJc446rLemWqzuQW0O5bu7lky7l4ySfBTizWbLshKZxEvGf8Mkrgn9ncvSnR6BJlAMltcwPdBmcvyFeCnFe9nguu9wp8E9djIsDT3YpyCEJjoQT4ObYS9dZv4dLRPkLLrSFjbhgnrK1LS63D3Ix/eDhUJKvvwAnqr0IJ0rkrTOFl6VaoWmMk+SHTx9WxId+5+bwpxKcK9U/0w9JrjI+aYlwjg6muECLy8UlIjDF3UyAc7Es4wEPx/q5QJjxuNjBAOdn3EH+ggrtYBNcALK6u1pcHs4d8HDhLTuCHj8AjS7Pm+yo9kHAkUYiTHaciLJsiXq4QBRMLtP0jjycQaxIEP3Oy8EFoEnfljBSQhTOXxcveTgZUNGDEEWuXQ1zka7RQfi8ijvt45jBLTfhM80lro121fIXdO9qhAsPjg5GOAZ+hbsGo3Br5ublkatRzj+StxSh2q+nOUHS2USswc2om4MiW7JN5+FswYpgxLk5ON8gjIgbCLOjg/OiebdwcpzLH7wJX9gdaP3Zke3FiJ9jwiBYbX+0q5a/ZKcsrLjuHF+4fIT1hbHBZnCS2qFKjx+JB5fkE4nUdoGvYHKaLsZJvuXnIN8Yzp0S5zsXVfAy0QJzDWvNYxBwQReJuLvYAHyyteSSs7agSwYnuFaSO3ey49pxvpGREaFmkijIFpYD351puhzO/Bz8kgW+wBWcF8+7hTP7BZnI8pm9Qi/AVbLY43XVXh8MRmBKkosAZe/M8jzrhPzIy+XjJO0ULUUZWc4nZ5sm/6OVqsg6c3KQtL032fA8t6R3H+cow/nBPTG876xNcf5rV0evdtVeahkZxZzwhfedzOBol58L5++GrgYrw9kfbRkBx+vuyjaN8sKCHx3sChOc7MhyMrFzc5A6B0EHd97wVIrz38RLOZx7+cUzwe4QrDURYSJoesOKjsjxF7Syw+IKPwR2vHNAK3slOPey4EbRGl2bbRrlhZXJE3BzHnARfs7tZ3NWdj4HqTMQgACL7BEWiPNXxEs5nDO1/GZyC/kNO70Eiq+DLPTYxfTzF3zvEtqDuhiyMJHytawbNoOJxLVKcKIW3BDAZ5vGeZFTTPjcrpblUKkH4yzIgT8jeCd6fWYecjdwCmc/whch1OF/7x29hk9/rg9eTreM7uUv5B6KkOAHnxN/1nZBiHJNCJtyas89UcomYp6oBXxalGmaREA3UfzVBd+g0ss3cVp+Dvx5lY+TFo7zX8TLvJr/SZMyOP9MvCx1z5ZEyuD8XfGy1D1bEimD82fFy1L3bEnkQ5yLKmVw/rt4WeqeLYmUwfnn4mWpe7YkUgbnH4iXpe5ZWbl4sae9vb3n4sW7h/MvxMtSUytLs13Sh0TS/j7wLIPzn8RLbg+IvB9siKm1E3ObTwtAc8igqFIYht4PnmVw/qV4yelyu0TSNyaR9Cyy+qTivqGhGzduDA2BvQGgOZu4KBn6GD4Q/NiQ5K7h/Dnxku20pG/AoDAstjlc7JGMDUHFVWr14cOH1WowuIF5zOCePgN5CJJ+pq99Ie1OgywlTkmf4YnV6S/vemFI0rOYMPtuGNRnNm1etQob26pVmx86o5h7yNr7qnicasNY5Q6IoCwLtAzOPxQvQlU9YwOPRwOciznxwqJNL2TxNxTqTatZH+MmT0fcbibFrv7inE20D6l5nA1VC9BnegYbZ4U4f1+8ZPV/gfUg/Zldir7vLwpPMM0hg3rzRl+Ay5dA9NN9c5inZOAwj9OsNVTsfgAjKluWZxmcvylehK5LbnwqjPV3bVR/T7IY6ztanBWbVvtcXJGEPzXXDM7iPK9XV2ye0xyHrBM+K8L5r+Ili3MXwz/9rlcsxnQHmgPqQ2yAKyHsc1U3Zh+yLE6l+fZA5ThnsHFWiPOvxEtG/6FPR8lM/IrlcOXTq5hmD6IZ9fAAXX4m5QNh/C7UxMuHDWPt88PZfF5rGKtwceRy/qsA5z+LF6Gq9j7FA+jRuCe6p7Fe0SfaPGHjqD7k42n6o9t3vvjsVpAXd24PMuFl5rlmQBZndU29oa9SnGiiw8d0ZTh/S7zkdP9bx3wMw66xnTdV7q1K0FQIthkI7jze3NxsQwLX/S8uq2msVw/ME2eTEUa3Ypxous9MV4jzb8RLpv9gnrc3HdhwpFl53pSzNxHiw4LgEFJBcBrJUXAftuGbyE6BYw5uRSiVSmMNEiV80Znr1QaIjgqOOHJOPQpwSnrKB6glFOR4ohVO9r8WLxmlkK+rN39TqazJzkQSHw4hQcFhpu8X+QMKSXtPj5AjL3iElU29mqxC4VMngabSeL7RbH5Zr9e//DJcTYcVA0OFRxy5px45OJUmteG+Pl6H9oIQGGkyxmuYoyBHHGcZmuVw/sdsMt+ZIfRlzKCutzSeP2/WHzbgbSHswlHgCeEhEoUBFOY7Qw4oULg41ifkwMGj0NmePsVm8joms766GcE0m+oPk4pwsFlFGwwFRxx5px65OC1adVaHsdwdAdJwCAewBQpyXPZz/jj/ezapEKdw5nDCdPsZHGfi7lWdWXHsYUhduerxz6sVAAx35qLkezjzAxDjQ47VkOPh1SvOKG7wyzUyzo14v+muO1ndDAZv0iLeA2BEAwMA0vC9AUPhEUfeqUcOTluj/uzjOERFOuSeKRANX921eiPcfPjYQ+qc6JVs4yvD+V+zSWU4s2cO9bCNB6XAmQ5Ufe4YG/Yn0ILvjkQ3bkadQePf3vdFbHu+TdrnTrDhAORIBMLsITUxayBj2ESMM/pRoPlNcJUwFGMSXsb6xr5wQ1F4xJF36pHF+Xr1ho2pCA5RQYdVZ6sGBGQwoZCGQSaARi7hTyEF57UnKYPzf2aTynBmzxzqq+5DTkjSZ1AfCvpzNt+u8Kqzasyzve9V/Iq3770NLJO570kd+xzhCZUdwyUDB5uqbd+0aKsGsNvjBRaxsaGiI468Uw+JQcC5f30qJ65yB7Nj1l6ooQsUeGau8HUWnP85m1SIM3PmYFLfAGSg6+ePhT1cnrjBAFEECnMZZ/atieaFkP59zyn+r30GTdWVuGjqo03NNWYtnoQXSzeXOeLIS+rL4GT9eSp4wvsOK77Qwzv7EwUa+vd9ez575jI4vzubVIYz/8xBArq+eiy/I7gz0QNowyhkDkcLeDP7biNjy8z1dFO1srG+aqjoTLrEEUde0hAt/HAX6gA8DTCkaCdyghwzcAm3O5Ed0L7vz4nzOyXlu+JFqOrom4JtnK+nJffcs1ZxIkIIMlFw9EGGmKGLfUVBPX0PnzmCX8ZmIHiM8Fbqe6Vq7Ol378jIAYC7rsl2vr7q1j1HCzXPb+7pdwuTbo3zPyLYywRBhSjDj110c9Xa3nePSmieJsPurqvbHSTqMh9X3/rhu9+ZXcrg/FvxUtw/pUV1i5LIdqXwzwC75jRswvev4yed+0mtjLrnFsmM/gSQ2b5hz549a3Ju3+mV0KuwUTHrmpTmqXGqiGZ+c2/e825h0rhMnfmTBGjhUdj9H1/Dn6e4NqIBv3PfS/iQweM7dQRCA9v+9Riuh31OMfb0wnD+jngp7p+t8fZ9b8ZeYF1kLdkD8QxS9/h6Aix8YCpG3RI664muOVJTY4TbB0lfg/er77szphBwVhtNVYRWOZyouTtHC5Nk9JSAM7z+iFGnQ21sPcirsG54fOxWFWnDt82IRdm8Hs8IZpt2/M4c5rlsuqT8o3gRqurw0kJnnJ94k/oIma0udg+KCRudTqfxOAHs2uiQURo+M5daYzPCTadOuZU/fT6gjXmT/G3f12zOqVi8o7VI87zmKHtbYVIsZuVbYL5ardRduGC+YAYVtmMVErsdtCb2BHbPkVPGGp3TbLaYdUewBp6VJtorbZ2eTcrg/G3xUty/Zmf3ldg5sgsPr7Mpa5wWh3ZY2+BcR1yV7ylVLMbvGt0PNtmMZoupocFi3IlNJ/CInqYoAedWm8UKsGbDCc1p5G2FSW8IOF3sazZjox40uI1U4Hezzw/TNAlig4+iIwCTdnjY0bgtQvQb1ky0zcqzDM7fEy8l+yeTkcNP13YIEJ0mrVUWG6e1F4htRLY5aBnf2fBjTTadXquy0qqGb6TI6gP2uNYq4FQC3FBnsebzxsmse91WY9Gq6FwVmA3622dYvJLvbIbpgTSwduvf85GbDbLejoXg/DvxUqp/wzKazPXItmqbztQt0yTjvUmZ9uMRMtXMU7SKZGZfg7VGa41RVMz6Kjl+Thu1slgWZ5mZN2+c0eOvkxa88TiocIAhHt1pWhHmx7NZCTi7Vaph/RGWDKhZRUk7p2eRMjh/TbyUxElbiZtPPdusNA/LKLlU2hFK0q+QxT6tq1d1Z0JAncOq8con4jGtsC6b6HEr2cWHH1M6ZJOicKZfb6oxWWNeu7SjI+Sln/IRYkbzITy20QcfrKt78slVSJ6sS5ObOq3GPutsv8s4z1kfxtvi4H6bzkFT8o7O1tbOo7F7yR8PR0/rh4eFA4pm81RsMtTWGaJUwkJiscoyGyUlTDyROJvN3Ve8obZWUGEiRqY4NKJ7koTx+cLPj3qZvGMBOP9IvJTqn9YqoGmyAa24tBN0aw1RvEn69pi1gik2gS3itUaaFM40bGaVjF8nAgfhtkicTTa9lZJjY2uVUlNCFuNn+TioWGB+lJ4Sc+H8B/EyO85qpYXmV2boi0rAqXMIOKuN2nHMS5oLY5z3va7tNsu5H86Os3ounEaHzMu7wowKoFiaK4/TQidndZ5lcP69eJnDOnFfMI4cnFt1DfVCt3TDMTyx8mCMX3mC39EcN1upOXDqeJzS0jhhwISda+u8cLq2Ky2KktuJuXD+qngpg5MsJcH9NY7xOI8zRH2S+E72pM7kyOIsbVukAv9OgDUx60YpizNpLYlTaCFHhcTuaht/u1i2rzPC7sz+wcEJSxG/sn8U5jLv1dvksZf4lb26Ri/gbNaVmqoxDY2fMkME/ahj/J2OEjgn6QJcYHpz4ewUVHDXVdt2Y9/JvvZ6UzMJg0ks3FxdjZfPhVjnH4uXkjhp+nG8DYmsUdZfiXeQiTZJk72J+8Hqmox1ll5IYhQfAnKR9bAJLGEpHb0yYr/gOQiuTrtGWLZzcbInYbITnK1QiOjFrKtWPhIgA/56tQ1CekEgdjfq9MPj3oX4zl8WLyVxymTECmAp0ZOVubXNrhHeCVvXrGuYHafGS/H2zfm2mc4lQ5057hN2PK3TbXEZyRB+jOBCrM6minGi+2/gFpAKKhL7QvBqJBv6yI+amo0X9FmxWPSOYVoj/wDhhJidRxdecwEZV2trW4iiD5HnGLAZdTrmwDn5TuwsMU9PdFs97FylbZ2daOfY1tYBIUFbJ7iOzF6qAVa7Nqlco/pfdzFO94MwokkpKgqBxCFyCLeyWql7nhzPsfttZscUxJggKixW+oqmN7SQbfyfiJeSON/QyATft6eBpo5KQ3KKXhHkV5dqZXbfWQan3H6H3scfP/s+85w1lozL7aGQ3S6P9072ykMdHXYN/4pZcOsFlcYb92qsh1JcZu+UwQkj6hyOTU6E7KDCWX5+rGk2mvVkHx/5qs2srZJdQSJD8sablBca6FwAzl8SLyVxxijNt8gqHjj4nvacBoXkK9gEv/eBlWh4Lpw/mNDcyxfgGPbAvQpZTIMkJpP91Ne//q5dGqKEV8wOntarZOP0mcz7Yfk4wbx/ulu2ltKMW1d81k3G+KRN16DlQ97wztMOFX0lFothnBcp7zsTMBcWcgTyfuHUeJOyE8R4Auy2+4dVU587FCRwmPXVtkaHangOnB3SSdkKln/i4WKCDx/a9QTIS7se2BhkmK8nJ6S9MhLIcv7tG57atGnzRvTswiPgvMLjxOf9Gw98u1t179kTggpr0PxQDfOvmfjZfa+cUaGp/q2X/v/L7PJJ+1vgV6YXgPNnxEtpnHG55oWvEG09DH5QEyGm4995stlo6bZ2z4ETBfGKA2wmEExE0BMlXwq/kJh4WDMZkmtWpATa6E1F/NgpUogz5cEZoul0MOXneHM+aasxqWTnNvHVe/wp8s++RFMRV2CQmnh7dph3H6fcLr+yiS2Oiv07j1crnfVW4YCuPM7Wt+2aqocKnuoKwkoouZ3iA/useKJMIU5ftLBsgt3aDMYp02joFdFiDT0rY5M/6GxdEM6fFy8ZnL2yDI4p2GdIk/SKz0YKdGV2HrcpdXrVlRidm7mtuHzbdCes1d3Pf6nUu9xc6qWPeOXx2BP5A+aKrvFlcZ4jOL/qK3iSzj5ms+lMVk1vnFKsKPFyc/TT+ARsiXHCziXzpAZwdLxtp6z3n/LlPuX2B08dsSlrzMMyDXUlN3NbcXm0L5fGYyrLhu2pwi57/MF7afAnXvCuOQPGsBv2YJzB/c6pNzTfx3t639d+lPueh9v3peM2G1LBO4G2Vk894nMX1v3JWK+0bUE4/1S8ZHDaKQHHhSlhsjZ8oy7KoH8BFr2CFPzSaSXYpllLU/HJtXmZS5Sfxjw1qgbdswfZFMO/VuB2R5joyn3PO1Sx3gnY+dz/mSCu3xUIs6eOGAlO3x6E8zr+zp5sOr4ziIu73Ey07lkboqlFZ7BvI576b9QFmQCu3OMOML6V+16dQtvcBeFcRIG5Sd5fO2U0o6dl051vySmro/H0i3UrIXX3I8seRS+8Oi1aMKyJUDw/c4nyKPyRvqOhtWbjkWfX1e3GN+vqtm04raxxNkyNT4ak4D4b7t+A6t9+cNkRY41Od4qvQaVJJnF1p9B7to9uQMW310FR/K6t1qpBZ7BouKwO56MvHsSVr6x7ZMN7SEEFurvEOFvbpN4rKofTaHTiA2EUIh+l6GG906gk7w4bITQ2m7qBprSjozBzifKQ1ik9moREs04JdeC3uREPANKgik1KO2DAzgFtWzN+BVTnvGAxX3BC2O1sUFDvyKFk/QUIw1GqzojON4y4rB4GlEQ9ZLgsRENUd02N7gOCE3iEcNdBXVkSn8e0dkzc+YhVqzc78elCo9li0qpkVBw8U3HmEuURz7ZQfK3sE1qTGWEy4iFpbLQ0kKgaGqBkiDZKbzSjp7/dWofFYhqGSMwuvxOzak2QONU97LBgJZyQCVQQYkgYronkG0TDGnQO4nSa9fVT6NnWkuOcbn0rlIxVTWmnaH50AZo0TsXoKW29CcSh7bbKNEk59vNFmUsm4SrsvWvHaZW2voGcUTSQeiZDHRDDt030vgn3HEL1sRhknVIh83v7rQlvTKGa4hOhPIh2WEXH0AkA2afj4eI1hKpNfN1zROx3Byeyr16IAmMZdTCMOIR3NG21Wmm4k8xEw0WZSybhHkvlvRSk40qgGlQPFbejelADci+6x1cfj6OsMY0Xbnd22CfRd6o33pvk89DjqKhAM0dDmVA5yhBa4EZpkXF2doTi3qQ3Rx0Ewy7vTVJIkr3yUKYnJTMXJeEeQx0hedxLCeLtldulJAvg6Ajx9SfjUL1UKo/39hJinahp9F0qzeRBRfMC8jwN+Qxz0Zz+MVlFohLr6XtqAAAAR3RFWHRTb2Z0d2FyZQBAKCMpSW1hZ2VNYWdpY2sgNS4xLjAgMDAvMDEvMDEgUTo4IGNyaXN0eUBteXN0aWMuZXMuZHVwb250LmNvbYZbzesAAAAqdEVYdFNpZ25hdHVyZQAzOWY4N2UxZWUxYTI1ZjhjZmYwZjkzYjAwMGY3OWE5NLBiqVIAAAAASUVORK5CYII=';
-
-    header('Content-Type: image/png');
-    header('Cache-Control: public');
-    echo base64_decode($img_encoded);
-}
diff --git a/www/js/jquery/lib.js b/www/js/jquery/lib.js
index 81269b0c55..ac72ed89f3 100644
--- a/www/js/jquery/lib.js
+++ b/www/js/jquery/lib.js
@@ -2,5 +2,4 @@
 */(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="3.5.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.defaultPrevented&&e.defaultPrevented()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
 return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
 }b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
-/*! jQuery Migrate v1.2.1 | (c) 2005, 2013 jQuery Foundation, Inc. and other contributors | jquery.org/license */
 jQuery.migrateMute===void 0&&(jQuery.migrateMute=!0),function(e,t,n){function r(n){var r=t.console;i[n]||(i[n]=!0,e.migrateWarnings.push(n),r&&r.warn&&!e.migrateMute&&(r.warn("JQMIGRATE: "+n),e.migrateTrace&&r.trace&&r.trace()))}function a(t,a,i,o){if(Object.defineProperty)try{return Object.defineProperty(t,a,{configurable:!0,enumerable:!0,get:function(){return r(o),i},set:function(e){r(o),i=e}}),n}catch(s){}e._definePropertyBroken=!0,t[a]=i}var i={};e.migrateWarnings=[],!e.migrateMute&&t.console&&t.console.log&&t.console.log("JQMIGRATE: Logging is active"),e.migrateTrace===n&&(e.migrateTrace=!0),e.migrateReset=function(){i={},e.migrateWarnings.length=0},"BackCompat"===document.compatMode&&r("jQuery is not compatible with Quirks Mode");var o=e("<input/>",{size:1}).attr("size")&&e.attrFn,s=e.attr,u=e.attrHooks.value&&e.attrHooks.value.get||function(){return null},c=e.attrHooks.value&&e.attrHooks.value.set||function(){return n},l=/^(?:input|button)$/i,d=/^[238]$/,p=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,f=/^(?:checked|selected)$/i;a(e,"attrFn",o||{},"jQuery.attrFn is deprecated"),e.attr=function(t,a,i,u){var c=a.toLowerCase(),g=t&&t.nodeType;return u&&(4>s.length&&r("jQuery.fn.attr( props, pass ) is deprecated"),t&&!d.test(g)&&(o?a in o:e.isFunction(e.fn[a])))?e(t)[a](i):("type"===a&&i!==n&&l.test(t.nodeName)&&t.parentNode&&r("Can't change the 'type' of an input or button in IE 6/7/8"),!e.attrHooks[c]&&p.test(c)&&(e.attrHooks[c]={get:function(t,r){var a,i=e.prop(t,r);return i===!0||"boolean"!=typeof i&&(a=t.getAttributeNode(r))&&a.nodeValue!==!1?r.toLowerCase():n},set:function(t,n,r){var a;return n===!1?e.removeAttr(t,r):(a=e.propFix[r]||r,a in t&&(t[a]=!0),t.setAttribute(r,r.toLowerCase())),r}},f.test(c)&&r("jQuery.fn.attr('"+c+"') may use property instead of attribute")),s.call(e,t,a,i))},e.attrHooks.value={get:function(e,t){var n=(e.nodeName||"").toLowerCase();return"button"===n?u.apply(this,arguments):("input"!==n&&"option"!==n&&r("jQuery.fn.attr('value') no longer gets properties"),t in e?e.value:null)},set:function(e,t){var a=(e.nodeName||"").toLowerCase();return"button"===a?c.apply(this,arguments):("input"!==a&&"option"!==a&&r("jQuery.fn.attr('value', val) no longer sets properties"),e.value=t,n)}};var g,h,v=e.fn.init,m=e.parseJSON,y=/^([^<]*)(<[\w\W]+>)([^>]*)$/;e.fn.init=function(t,n,a){var i;return t&&"string"==typeof t&&!e.isPlainObject(n)&&(i=y.exec(e.trim(t)))&&i[0]&&("<"!==t.charAt(0)&&r("$(html) HTML strings must start with '<' character"),i[3]&&r("$(html) HTML text after last tag is ignored"),"#"===i[0].charAt(0)&&(r("HTML string cannot start with a '#' character"),e.error("JQMIGRATE: Invalid selector string (XSS)")),n&&n.context&&(n=n.context),e.parseHTML)?v.call(this,e.parseHTML(i[2],n,!0),n,a):v.apply(this,arguments)},e.fn.init.prototype=e.fn,e.parseJSON=function(e){return e||null===e?m.apply(this,arguments):(r("jQuery.parseJSON requires a valid JSON string"),null)},e.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e.browser||(g=e.uaMatch(navigator.userAgent),h={},g.browser&&(h[g.browser]=!0,h.version=g.version),h.chrome?h.webkit=!0:h.webkit&&(h.safari=!0),e.browser=h),a(e,"browser",e.browser,"jQuery.browser is deprecated"),e.sub=function(){function t(e,n){return new t.fn.init(e,n)}e.extend(!0,t,this),t.superclass=this,t.fn=t.prototype=this(),t.fn.constructor=t,t.sub=this.sub,t.fn.init=function(r,a){return a&&a instanceof e&&!(a instanceof t)&&(a=t(a)),e.fn.init.call(this,r,a,n)},t.fn.init.prototype=t.fn;var n=t(document);return r("jQuery.sub() is deprecated"),t},e.ajaxSetup({converters:{"text json":e.parseJSON}});var b=e.fn.data;e.fn.data=function(t){var a,i,o=this[0];return!o||"events"!==t||1!==arguments.length||(a=e.data(o,t),i=e._data(o,t),a!==n&&a!==i||i===n)?b.apply(this,arguments):(r("Use of jQuery.fn.data('events') is deprecated"),i)};var j=/\/(java|ecma)script/i,w=e.fn.andSelf||e.fn.addBack;e.fn.andSelf=function(){return r("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)},e.clean||(e.clean=function(t,a,i,o){a=a||document,a=!a.nodeType&&a[0]||a,a=a.ownerDocument||a,r("jQuery.clean() is deprecated");var s,u,c,l,d=[];if(e.merge(d,e.buildFragment(t,a).childNodes),i)for(c=function(e){return!e.type||j.test(e.type)?o?o.push(e.parentNode?e.parentNode.removeChild(e):e):i.appendChild(e):n},s=0;null!=(u=d[s]);s++)e.nodeName(u,"script")&&c(u)||(i.appendChild(u),u.getElementsByTagName!==n&&(l=e.grep(e.merge([],u.getElementsByTagName("script")),c),d.splice.apply(d,[s+1,0].concat(l)),s+=l.length));return d});var Q=e.event.add,x=e.event.remove,k=e.event.trigger,N=e.fn.toggle,T=e.fn.live,M=e.fn.die,S="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",C=RegExp("\\b(?:"+S+")\\b"),H=/(?:^|\s)hover(\.\S+|)\b/,A=function(t){return"string"!=typeof t||e.event.special.hover?t:(H.test(t)&&r("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),t&&t.replace(H,"mouseenter$1 mouseleave$1"))};e.event.props&&"attrChange"!==e.event.props[0]&&e.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),e.event.dispatch&&a(e.event,"handle",e.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),e.event.add=function(e,t,n,a,i){e!==document&&C.test(t)&&r("AJAX events should be attached to document: "+t),Q.call(this,e,A(t||""),n,a,i)},e.event.remove=function(e,t,n,r,a){x.call(this,e,A(t)||"",n,r,a)},e.fn.error=function(){var e=Array.prototype.slice.call(arguments,0);return r("jQuery.fn.error() is deprecated"),e.splice(0,0,"error"),arguments.length?this.bind.apply(this,e):(this.triggerHandler.apply(this,e),this)},e.fn.toggle=function(t,n){if(!e.isFunction(t)||!e.isFunction(n))return N.apply(this,arguments);r("jQuery.fn.toggle(handler, handler...) is deprecated");var a=arguments,i=t.guid||e.guid++,o=0,s=function(n){var r=(e._data(this,"lastToggle"+t.guid)||0)%o;return e._data(this,"lastToggle"+t.guid,r+1),n.preventDefault(),a[r].apply(this,arguments)||!1};for(s.guid=i;a.length>o;)a[o++].guid=i;return this.click(s)},e.fn.live=function(t,n,a){return r("jQuery.fn.live() is deprecated"),T?T.apply(this,arguments):(e(this.context).on(t,this.selector,n,a),this)},e.fn.die=function(t,n){return r("jQuery.fn.die() is deprecated"),M?M.apply(this,arguments):(e(this.context).off(t,this.selector||"**",n),this)},e.event.trigger=function(e,t,n,a){return n||C.test(e)||r("Global events are undocumented and deprecated"),k.call(this,e,t,n||document,a)},e.each(S.split("|"),function(t,n){e.event.special[n]={setup:function(){var t=this;return t!==document&&(e.event.add(document,n+"."+e.guid,function(){e.event.trigger(n,null,t,!0)}),e._data(this,n,e.guid++)),!1},teardown:function(){return this!==document&&e.event.remove(document,n+"."+e._data(this,n)),!1}}})}(jQuery,window);
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 5f7d5586ea..3726bfb444 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -832,6 +832,28 @@ function adjustMenuWidth()
     }
 }
 
+/**
+ * Scroll to selected item in drop menu.
+ *
+ * @param  string $id
+ * @access public
+ * @return void
+ */
+function scrollToSelected(id)
+{
+    if(typeof(id) == 'undefined') id = '#dropMenu .table-col .list-group'
+
+    $id = $(id);
+    $selected = $id.find('.selected');
+
+    $id.mouseout(function(){$(this).find('.active').removeClass('active')});
+    if($selected.length > 0)
+    {
+        var offsetHeight = 75;
+        $id.scrollTop($selected.position().top - offsetHeight);
+    }
+}
+
 /* Ping the server every some minutes to keep the session. */
 needPing = true;
 
diff --git a/www/js/zui/min.js b/www/js/zui/min.js
index 7587fb671e..3a3019a795 100644
--- a/www/js/zui/min.js
+++ b/www/js/zui/min.js
@@ -1,7 +1,7 @@
 /*!
- * ZUI: ZUI for Zentao - v1.9.2 - 2021-04-23
+ * ZUI: ZUI for Zentao - v1.9.2 - 2021-05-24
  * http://openzui.com
- * GitHub: https://github.com/easysoft/zui.git 
+ * GitHub: https://github.com/easysoft/zui.git
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
  */
 !function(t,e,i){"use strict";if("undefined"==typeof t)throw new Error("ZUI requires jQuery");t.zui||(t.zui=function(e){t.isPlainObject(e)&&t.extend(t.zui,e)});var n={all:-1,left:0,middle:1,right:2},o=0;t.zui({uuid:function(t){var e=1e5*(Date.now()-1580890015292)+10*Math.floor(1e4*Math.random())+o++%10;return t?e:e.toString(36)},callEvent:function(t,e,n){if("function"==typeof t){n!==i&&(t=t.bind(n));var o=t(e);return e&&(e.result=o),!(o!==i&&!o)}return 1},strCode:function(t){var e=0;if("string"!=typeof t&&(t=String(t)),t&&t.length)for(var i=0;i<t.length;++i)e+=i*t.charCodeAt(i);return e},getMouseButtonCode:function(t){return"number"!=typeof t&&(t=n[t]),t!==i&&null!==t||(t=-1),t},defaultLang:"en",clientLang:function(){var i,n=e.config;if("undefined"!=typeof n&&n.clientLang&&(i=n.clientLang),!i){var o=t("html").attr("lang");i=o?o:navigator.userLanguage||navigator.userLanguage||t.zui.defaultLang}return i.replace("-","_").toLowerCase()},langDataMap:{},addLangData:function(e,i,n){var o={};n&&i&&e?(o[i]={},o[i][e]=n):e&&i&&!n?(n=i,t.each(n,function(t){o[t]={},o[t][e]=n[t]})):!e||i||n||t.each(n,function(e){var i=n[e];t.each(i,function(t){o[t]||(o[t]={}),o[t][e]=i[t]})}),t.extend(!0,t.zui.langDataMap,o)},getLangData:function(e,i,n){if(!arguments.length)return t.extend({},t.zui.langDataMap);if(1===arguments.length)return t.extend({},t.zui.langDataMap[e]);if(2===arguments.length){var o=t.zui.langDataMap[e];return o?i?o[i]:o:{}}if(3===arguments.length){i=i||t.zui.clientLang();var o=t.zui.langDataMap[e],a=o?o[i]:{};return t.extend(!0,{},n[i]||n.en||n.zh_cn,a)}return null},lang:function(){return arguments.length&&t.isPlainObject(arguments[arguments.length-1])?t.zui.addLangData.apply(null,arguments):t.zui.getLangData.apply(null,arguments)},_scrollbarWidth:0,checkBodyScrollbar:function(){if(document.body.clientWidth>=e.innerWidth)return 0;if(!t.zui._scrollbarWidth){var i=document.createElement("div");i.className="scrollbar-measure",document.body.appendChild(i),t.zui._scrollbarWidth=i.offsetWidth-i.clientWidth,document.body.removeChild(i)}return t.zui._scrollbarWidth},fixBodyScrollbar:function(){if(t.zui.checkBodyScrollbar()){var e=t("body"),i=parseInt(e.css("padding-right")||0,10);return t.zui._scrollbarWidth&&e.css({paddingRight:i+t.zui._scrollbarWidth,overflowY:"hidden"}),!0}},resetBodyScrollbar:function(){t("body").css({paddingRight:"",overflowY:""})}}),t.fn.callEvent=function(e,n,o){var a=t(this),s=e.indexOf(".zui."),r=s<0?e:e.substring(0,s),l=t.Event(r,n);if(o===i&&s>0&&(o=a.data(e.substring(s+1))),o&&o.options){var h=o.options[r];"function"==typeof h&&(l.result=t.zui.callEvent(h,l,o))}return a.trigger(l),l},t.fn.callComEvent=function(t,e,n){n===i||Array.isArray(n)||(n=[n]);var o,a=this;a.trigger(e,n);var s=t.options[e];return s&&(o=s.apply(t,n)),o}}(jQuery,window,void 0),function(t){"use strict";t.fn.fixOlPd=function(e){return e=e||10,this.each(function(){var i=t(this);i.css("paddingLeft",Math.ceil(Math.log10(i.children().length))*e+10)})},t(function(){t(".ol-pd-fix,.article ol").fixOlPd()})}(jQuery),+function(t){"use strict";var e='[data-dismiss="alert"]',i="zui.alert",n=function(i){t(i).on("click",e,this.close)};n.prototype.close=function(e){function n(){s.trigger("closed."+i).remove()}var o=t(this),a=o.attr("data-target");a||(a=o.attr("href"),a=a&&a.replace(/.*(?=#[^\s]*$)/,""));var s=t(a);e&&e.preventDefault(),s.length||(s=o.hasClass("alert")?o:o.parent()),s.trigger(e=t.Event("close."+i)),e.isDefaultPrevented()||(s.removeClass("in"),t.support.transition&&s.hasClass("fade")?s.one(t.support.transition.end,n).emulateTransitionEnd(150):n())};var o=t.fn.alert;t.fn.alert=function(e){return this.each(function(){var o=t(this),a=o.data(i);a||o.data(i,a=new n(this)),"string"==typeof e&&a[e].call(o)})},t.fn.alert.Constructor=n,t.fn.alert.noConflict=function(){return t.fn.alert=o,this},t(document).on("click."+i+".data-api",e,n.prototype.close)}(window.jQuery),function(t,e){"use strict";var i="zui.pager",n={page:1,recTotal:0,recPerPage:10},o={zh_cn:{pageOfText:"第 {0} 页",prev:"上一页",next:"下一页",first:"第一页",last:"最后一页","goto":"跳转",pageOf:"第 <strong>{page}</strong> 页",totalPage:"共 <strong>{totalPage}</strong> 页",totalCount:"共 <strong>{recTotal}</strong> 项",pageSize:"每页 <strong>{recPerPage}</strong> 项",itemsRange:"第 <strong>{start}</strong> ~ <strong>{end}</strong> 项",pageOfTotal:"第 <strong>{page}</strong>/<strong>{totalPage}</strong> 页"},zh_tw:{pageOfText:"第 {0} 頁",prev:"上一頁",next:"下一頁",first:"第一頁",last:"最後一頁","goto":"跳轉",pageOf:"第 <strong>{page}</strong> 頁",totalPage:"共 <strong>{totalPage}</strong> 頁",totalCount:"共 <strong>{recTotal}</strong> 項",pageSize:"每頁 <strong>{recPerPage}</strong> 項",itemsRange:"第 <strong>{start}</strong> ~ <strong>{end}</strong> 項",pageOfTotal:"第 <strong>{page}</strong>/<strong>{totalPage}</strong> 頁"},en:{pageOfText:"Page {0}",prev:"Prev",next:"Next",first:"First",last:"Last","goto":"Goto",pageOf:"Page <strong>{page}</strong>",totalPage:"<strong>{totalPage}</strong> pages",totalCount:"Total: <strong>{recTotal}</strong> items",pageSize:"<strong>{recPerPage}</strong> per page",itemsRange:"From <strong>{start}</strong> to <strong>{end}</strong>",pageOfTotal:"Page <strong>{page}</strong> of <strong>{totalPage}</strong>"}},a=function(e,n){var s=this;s.name=i,s.$=t(e),n=s.options=t.extend({},a.DEFAULTS,this.$.data(),n),s.langName=n.lang||t.zui.clientLang(),s.lang=t.zui.getLangData(i,s.langName,o),s.state={},s.set(n.page,n.recTotal,n.recPerPage,!0),s.$.on("click",".pager-goto-btn",function(){var e=t(this).closest(".pager-goto"),i=parseInt(e.find(".pager-goto-input").val());NaN!==i&&s.set(i)}).on("click",".pager-item",function(){var e=t(this).data("page");"number"==typeof e&&e>0&&s.set(e)}).on("click",".pager-size-menu [data-size]",function(){var e=t(this).data("size");"number"==typeof e&&e>0&&s.set(-1,-1,e)})};a.prototype.set=function(e,i,o,a){var s=this;"object"==typeof e&&null!==e&&(o=e.recPerPage,i=e.recTotal,e=e.page);var r=s.state;r||(r=t.extend({},n));var l=t.extend({},r);return"number"==typeof o&&o>0&&(r.recPerPage=o),"number"==typeof i&&i>=0&&(r.recTotal=i),"number"==typeof e&&e>=0&&(r.page=e),r.totalPage=r.recTotal&&r.recPerPage?Math.ceil(r.recTotal/r.recPerPage):1,r.page=Math.max(0,Math.min(r.page,r.totalPage)),r.pageRecCount=r.recTotal,r.page&&r.recTotal&&(r.page<r.totalPage?r.pageRecCount=r.recPerPage:r.page>1&&(r.pageRecCount=r.recTotal-r.recPerPage*(r.page-1))),r.skip=r.page>1?(r.page-1)*r.recPerPage:0,r.start=r.skip+1,r.end=r.skip+r.pageRecCount,r.prev=r.page>1?r.page-1:0,r.next=r.page<r.totalPage?r.page+1:0,s.state=r,a||l.page===r.page&&l.recTotal===r.recTotal&&l.recPerPage===r.recPerPage||s.$.callComEvent(s,"onPageChange",[r,l]),s.render()},a.prototype.createLinkItem=function(i,n,o){var a=this;n===e&&(n=i);var s=t('<a title="'+a.lang.pageOfText.format(i)+'" class="pager-item" data-page="'+i+'"/>').attr("href",i?a.createLink(i,a.state):"###").html(n);return o||(s=t("<li />").append(s).toggleClass("active",i===a.state.page).toggleClass("disabled",!i||i===a.state.page)),s},a.prototype.createNavItems=function(t){var i=this,n=i.$,o=i.state,a=o.totalPage,s=o.page,r=function(t,o){if(t===!1)return void n.append(i.createLinkItem(0,o||i.options.navEllipsisItem));o===e&&(o=t);for(var a=t;a<=o;++a)n.append(i.createLinkItem(a))};t===e&&(t=i.options.maxNavCount||10),r(1),a>1&&(a<=t?r(2,a):s<t-2?(r(2,t-2),r(!1),r(a)):s>a-t+2?(r(!1),r(a-t+2,a)):(r(!1),r(s-Math.ceil((t-4)/2),s+Math.floor((t-4)/2)),r(!1),r(a)))},a.prototype.createGoto=function(){var e=this,i=this.state,n=t('<div class="input-group pager-goto" style="width: '+(35+9*(i.page+"").length+25+12*e.lang["goto"].length)+'px"><input value="'+i.page+'" type="number" min="1" max="'+i.totalPage+'" placeholder="'+i.page+'" class="form-control pager-goto-input"><span class="input-group-btn"><button class="btn pager-goto-btn" type="button">'+e.lang["goto"]+"</button></span></div>");return n},a.prototype.createSizeMenu=function(){var e=this,i=this.state,n=t('<ul class="dropdown-menu"></ul>'),o=e.options.pageSizeOptions;"string"==typeof o&&(o=o.split(","));for(var a=0;a<o.length;++a){var s=o[a];"string"==typeof s&&(s=parseInt(s));var r=t('<li><a href="###" data-size="'+s+'">'+s+"</a></li>").toggleClass("active",s===i.recPerPage);n.append(r)}return t('<div class="btn-group pager-size-menu"><button type="button" class="btn dropdown-toggle" data-toggle="dropdown">'+e.lang.pageSize.format(i)+' <span class="caret"></span></button></div>').addClass(e.options.menuDirection).append(n)},a.prototype.createElement=function(e,i,n){var o=this,a=o.createLinkItem.bind(o),s=o.lang;switch(e){case"prev":return a(n.prev,s.prev);case"prev_icon":return a(n.prev,'<i class="icon '+o.options.prevIcon+'"></i>');case"next":return a(n.next,s.next);case"next_icon":return a(n.next,'<i class="icon '+o.options.nextIcon+'"></i>');case"first":return a(1,s.first);case"first_icon":return a(1,'<i class="icon '+o.options.firstIcon+'"></i>');case"last":return a(n.totalPage,s.last);case"last_icon":return a(n.totalPage,'<i class="icon '+o.options.lastIcon+'"></i>');case"space":case"|":return t('<li class="space" />');case"nav":case"pages":return void o.createNavItems();case"total_text":return t(('<div class="pager-label">'+s.totalCount+"</div>").format(n));case"page_text":return t(('<div class="pager-label">'+s.pageOf+"</div>").format(n));case"total_page_text":return t(('<div class="pager-label">'+s.totalPage+"</div>").format(n));case"page_of_total_text":return t(('<div class="pager-label">'+s.pageOfTotal+"</div>").format(n));case"page_size_text":return t(('<div class="pager-label">'+s.pageSize+"</div>").format(n));case"items_range_text":return t(('<div class="pager-label">'+s.itemsRange+"</div>").format(n));case"goto":return o.createGoto();case"size_menu":return o.createSizeMenu();default:return t("<li/>").html(e.format(n))}},a.prototype.createLink=function(i,n){i===e&&(i=this.state.page),n===e&&(n=this.state);var o=this.options.linkCreator;return"string"==typeof o?o.format(t.extend({},n,{page:i})):"function"==typeof o?o(i,n):"#page="+i},a.prototype.render=function(e){var i=this,n=i.state,o=i.options.elementCreator||i.createElement,a=t.isPlainObject(o);e=e||i.elements||i.options.elements,"string"==typeof e&&(e=e.split(",")),i.elements=e,i.$.empty();for(var s=0;s<e.length;++s){var r=t.trim(e[s]),l=a?o[r]||o:o,h=l.call(i,r,i.$,n);h===!1&&(h=i.createElement(r,i.$,n)),h instanceof t&&("LI"!==h[0].tagName&&(h=t("<li/>").append(h)),i.$.append(h))}var c=null;return i.$.children("li").each(function(){var e=t(this),i=!!e.children(".pager-item").length;c?c.toggleClass("pager-item-right",!i):i&&e.addClass("pager-item-left"),c=i?e:null}),c&&c.addClass("pager-item-right"),i.$.callComEvent(i,"onRender",[n]),i},a.DEFAULTS=t.extend({elements:["first_icon","prev_icon","pages","next_icon","last_icon","page_of_total_text","items_range_text","total_text"],prevIcon:"icon-double-angle-left",nextIcon:"icon-double-angle-right",firstIcon:"icon-step-backward",lastIcon:"icon-step-forward",navEllipsisItem:'<i class="icon icon-ellipsis-h"></i>',maxNavCount:10,menuDirection:"dropdown",pageSizeOptions:[10,20,30,50,100]},n),t.fn.pager=function(e){return this.each(function(){var n=t(this),o=n.data(i),s="object"==typeof e&&e;o||n.data(i,o=new a(this,s)),"string"==typeof e&&o[e]()})},a.NAME=i,a.LANG=o,t.fn.pager.Constructor=a,t(function(){t('[data-ride="pager"]').pager()})}(jQuery,void 0),+function(t){"use strict";var e="zui.tab",i=function(e){this.element=t(e)};i.prototype.show=function(){var i=this.element,n=i.closest("ul:not(.dropdown-menu)"),o=i.attr("data-target")||i.attr("data-tab");if(o||(o=i.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!i.parent("li").hasClass("active")){var a=n.find(".active:last a")[0],s=t.Event("show."+e,{relatedTarget:a});if(i.trigger(s),!s.isDefaultPrevented()){var r=t(o);this.activate(i.parent("li"),n),this.activate(r,r.parent(),function(){i.trigger({type:"shown."+e,relatedTarget:a})})}}},i.prototype.activate=function(e,i,n){function o(){a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),e.addClass("active"),s?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu")&&e.closest("li.dropdown").addClass("active"),n&&n()}var a=i.find("> .active"),s=n&&t.support.transition&&a.hasClass("fade");s?a.one(t.support.transition.end,o).emulateTransitionEnd(150):o(),a.removeClass("in")};var n=t.fn.tab;t.fn.tab=function(n){return this.each(function(){var o=t(this),a=o.data(e);a||o.data(e,a=new i(this)),"string"==typeof n&&a[n]()})},t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=n,this},t(document).on("click.zui.tab.data-api",'[data-toggle="tab"], [data-tab]',function(e){e.preventDefault(),t(this).tab("show")})}(window.jQuery),+function(t){"use strict";function e(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(void 0!==t.style[i])return{end:e[i]};return!1}t.fn.emulateTransitionEnd=function(e){var i=!1,n=this;t(this).one("bsTransitionEnd",function(){i=!0});var o=function(){i||t(n).trigger(t.support.transition.end)};return setTimeout(o,e),this},t(function(){t.support.transition=e(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){if(t(e.target).is(this))return e.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(t){"use strict";var e="zui.collapse",i=function(e,n){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,n),this.transitioning=null,this.options.parent&&(this.$parent=t(this.options.parent)),this.options.toggle&&this.toggle()};i.DEFAULTS={toggle:!0},i.prototype.dimension=function(){var t=this.$element.hasClass("width");return t?"width":"height"},i.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var i=t.Event("show."+e);if(this.$element.trigger(i),!i.isDefaultPrevented()){var n=this.$parent&&this.$parent.find(".in");if(n&&n.length){var o=n.data(e);if(o&&o.transitioning)return;n.collapse("hide"),o||n.data(e,null)}var a=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[a](0),this.transitioning=1;var s=function(){this.$element.removeClass("collapsing").addClass("in")[a]("auto"),this.transitioning=0,this.$element.trigger("shown."+e)};if(!t.support.transition)return s.call(this);var r=t.camelCase(["scroll",a].join("-"));this.$element.one(t.support.transition.end,s.bind(this)).emulateTransitionEnd(350)[a](this.$element[0][r])}}},i.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var i=t.Event("hide."+e);if(this.$element.trigger(i),!i.isDefaultPrevented()){var n=this.dimension();this.$element[n](this.$element[n]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var o=function(){this.transitioning=0,this.$element.trigger("hidden."+e).removeClass("collapsing").addClass("collapse")};return t.support.transition?void this.$element[n](0).one(t.support.transition.end,o.bind(this)).emulateTransitionEnd(350):o.call(this)}}},i.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var n=t.fn.collapse;t.fn.collapse=function(n){return this.each(function(){var o=t(this),a=o.data(e),s=t.extend({},i.DEFAULTS,o.data(),"object"==typeof n&&n);a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},t.fn.collapse.Constructor=i,t.fn.collapse.noConflict=function(){return t.fn.collapse=n,this},t(document).on("click."+e+".data-api","[data-toggle=collapse]",function(i){var n,o=t(this),a=o.attr("data-target")||i.preventDefault()||(n=o.attr("href"))&&n.replace(/.*(?=#[^\s]+$)/,""),s=t(a),r=s.data(e),l=r?"toggle":o.data(),h=o.attr("data-parent"),c=h&&t(h);r&&r.transitioning||(c&&c.find('[data-toggle=collapse][data-parent="'+h+'"]').not(o).addClass("collapsed"),o[s.hasClass("in")?"addClass":"removeClass"]("collapsed")),s.collapse(l)})}(window.jQuery),function(t,e){"use strict";var i=1200,n=992,o=768,a=e(t),s=function(){var t=a.width();e("html").toggleClass("screen-desktop",t>=n&&t<i).toggleClass("screen-desktop-wide",t>=i).toggleClass("screen-tablet",t>=o&&t<n).toggleClass("screen-phone",t<o).toggleClass("device-mobile",t<n).toggleClass("device-desktop",t>=n)},r="",l=navigator.userAgent;l.match(/(iPad|iPhone|iPod)/i)?r+=" os-ios":l.match(/android/i)?r+=" os-android":l.match(/Win/i)?r+=" os-windows":l.match(/Mac/i)?r+=" os-mac":l.match(/Linux/i)?r+=" os-linux":l.match(/X11/i)&&(r+=" os-unix"),"ontouchstart"in document.documentElement&&(r+=" is-touchable"),e("html").addClass(r),a.resize(s),s()}(window,jQuery),function(t){"use strict";var e={zh_cn:'您的浏览器版本过低，无法体验所有功能，建议升级或者更换浏览器。 <a href="https://browsehappy.com/" target="_blank" class="alert-link">了解更多...</a>',zh_tw:'您的瀏覽器版本過低，無法體驗所有功能，建議升級或者更换瀏覽器。<a href="https://browsehappy.com/" target="_blank" class="alert-link">了解更多...</a>',en:'Your browser is too old, it has been unable to experience the colorful internet. We strongly recommend that you upgrade a better one. <a href="https://browsehappy.com/" target="_blank" class="alert-link">Learn more...</a>'},i=function(){for(var t=!1,e=11;e>5;e--)if(this.isIE(e)){t=e;break}this.ie=t,this.cssHelper()};i.prototype.cssHelper=function(){var e=this.ie,i=t("html");i.toggleClass("ie",e).removeClass("ie-6 ie-7 ie-8 ie-9 ie-10"),e&&i.addClass("ie-"+e).toggleClass("gt-ie-7 gte-ie-8 support-ie",e>=8).toggleClass("lte-ie-7 lt-ie-8 outdated-ie",e<8).toggleClass("gt-ie-8 gte-ie-9",e>=9).toggleClass("lte-ie-8 lt-ie-9",e<9).toggleClass("gt-ie-9 gte-ie-10",e>=10).toggleClass("lte-ie-9 lt-ie-10",e<10).toggleClass("gt-ie-10 gte-ie-11",e>=11).toggleClass("lte-ie-10 lt-ie-11",e<11)},i.prototype.tip=function(i){var n=t("#browseHappyTip");n.length||(n=t('<div id="browseHappyTip" class="alert alert-dismissable alert-danger-inverse alert-block" style="position: relative; z-index: 99999"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><div class="container"><div class="content text-center"></div></div></div>'),n.prependTo("body")),i||(i=t.zui.getLangData("zui.browser",t.zui.clientLang(),e),"object"==typeof i&&(i=i.tip)),n.find(".content").html(i)},i.prototype.isIE=function(t){if(11===t)return this.isIE11();if(10===t)return this.isIE10();if(!t&&(this.isIE11()||this.isIE10()))return!0;var e=document.createElement("b");return e.innerHTML="<!--[if IE "+(t||"")+"]><i></i><![endif]-->",1===e.getElementsByTagName("i").length},i.prototype.isIE10=function(){return navigator.appVersion.indexOf("MSIE 10")!==-1},i.prototype.isIE11=function(){var t=navigator.userAgent;return t.indexOf("Trident")!==-1&&t.indexOf("rv:11")!==-1},t.zui({browser:new i}),t(function(){t("body").hasClass("disabled-browser-tip")||t.zui.browser.ie&&t.zui.browser.ie<8&&t.zui.browser.tip()})}(jQuery),function(t){"use strict";const e=864e5,i=function(t){return t instanceof Date||("number"==typeof t&&t<1e10&&(t*=1e3),t=new Date(t)),t},n=function(t){return i(t).getTime()},o=function(t,e){t=i(t),void 0===e&&(e="yyyy-MM-dd hh:mm:ss");var n={"M+":t.getMonth()+1,"d+":t.getDate(),"h+":t.getHours(),"m+":t.getMinutes(),"s+":t.getSeconds(),"q+":Math.floor((t.getMonth()+3)/3),"S+":t.getMilliseconds()};/(y+)/i.test(e)&&(e=e.replace(RegExp.$1,(t.getFullYear()+"").substr(4-RegExp.$1.length)));for(var o in n)new RegExp("("+o+")").test(e)&&(e=e.replace(RegExp.$1,1==RegExp.$1.length?n[o]:("00"+n[o]).substr((""+n[o]).length)));return e},a=function(t,e){return t.setTime(t.getTime()+e),t},s=function(t,i){return a(t,i*e)},r=function(t){return new Date(i(t).getTime())},l=function(t){return t%4===0&&t%100!==0||t%400===0},h=function(t,e){return[31,l(t)?29:28,31,30,31,30,31,31,30,31,30,31][e]},c=function(t){return h(t.getFullYear(),t.getMonth())},d=function(t){return t.setHours(0),t.setMinutes(0),t.setSeconds(0),t.setMilliseconds(0),t},u=function(t,e){var i=t.getDate();return t.setDate(1),t.setMonth(t.getMonth()+e),t.setDate(Math.min(i,c(t))),t},f=function(t,e){e=e||1;for(var i=new Date(t.getTime());i.getDay()!=e;)i=s(i,-1);return d(i)},p=function(t,e){return t.toDateString()===e.toDateString()},g=function(t,e){var i=f(t),n=s(r(i),7);return e>=i&&e<n},m=function(t,e){return t.getFullYear()===e.getFullYear()},v={formatDate:o,createDate:i,date:{ONEDAY_TICKS:e,create:i,getTimestamp:n,format:o,addMilliseconds:a,addDays:s,cloneDate:r,isLeapYear:l,getDaysInMonth:h,getDaysOfThisMonth:c,clearTime:d,addMonths:u,getLastWeekday:f,isSameDay:p,isSameWeek:g,isSameYear:m}};t.$&&t.$.zui?$.zui(v):t.dateHelper=v.date,t.noDatePrototypeHelper||(Date.ONEDAY_TICKS=e,Date.prototype.format||(Date.prototype.format=function(t){return o(this,t)}),Date.prototype.addMilliseconds||(Date.prototype.addMilliseconds=function(t){return a(this,t)}),Date.prototype.addDays||(Date.prototype.addDays=function(t){return s(this,t)}),Date.prototype.clone||(Date.prototype.clone=function(){return r(this)}),Date.isLeapYear||(Date.isLeapYear=function(t){return l(t)}),Date.getDaysInMonth||(Date.getDaysInMonth=function(t,e){return h(t,e)}),Date.prototype.isLeapYear||(Date.prototype.isLeapYear=function(){return l(this.getFullYear())}),Date.prototype.clearTime||(Date.prototype.clearTime=function(){return d(this)}),Date.prototype.getDaysInMonth||(Date.prototype.getDaysInMonth=function(){return c(this)}),Date.prototype.addMonths||(Date.prototype.addMonths=function(t){return u(this,t)}),Date.prototype.getLastWeekday||(Date.prototype.getLastWeekday=function(t){return f(this,t)}),Date.prototype.isSameDay||(Date.prototype.isSameDay=function(t){return p(t,this)}),Date.prototype.isSameWeek||(Date.prototype.isSameWeek=function(t){return g(t,this)}),Date.prototype.isSameYear||(Date.prototype.isSameYear=function(t){return m(this,t)}),Date.create||(Date.create=function(t){return i(t)}),Date.timestamp||(Date.timestamp=function(t){return n(t)}))}(window),function(){"use strict";const t=function(t,e){if(arguments.length>1){var i;if(2==arguments.length&&"object"==typeof e)for(var n in e)void 0!==e[n]&&(i=new RegExp("({"+n+"})","g"),t=t.replace(i,e[n]));else for(var o=1;o<arguments.length;o++)void 0!==arguments[o]&&(i=new RegExp("({["+(o-1)+"]})","g"),t=t.replace(i,arguments[o]))}return t},e=function(t){if(null!==t){var e,i;return i=/\d*/i,e=t.match(i),e==t}return!1},i={formatString:t,string:{format:t,isNum:e}};window.$&&window.$.zui?$.zui(i):window.stringHelper=i.string,window.noStringPrototypeHelper||(String.prototype.format||(String.prototype.format=function(){var e=[].slice.call(arguments);return e.unshift(this),t.apply(this,e)}),String.prototype.isNum||(String.prototype.isNum=function(){return e(this)}),String.prototype.endsWith||(String.prototype.endsWith=function(t,e){return(void 0===e||e>this.length)&&(e=this.length),this.substring(e-t.length,e)===t}),String.prototype.startsWith||Object.defineProperty(String.prototype,"startsWith",{value:function(t,e){return e=!e||e<0?0:+e,this.substring(e,e+t.length)===t}}),String.prototype.includes||(String.prototype.includes=function(){return String.prototype.indexOf.apply(this,arguments)!==-1}))}(),/*!
@@ -16,14 +16,14 @@ function(t,e,i){"$:nomunge";function n(){o=e[r](function(){a.each(function(){var
  * Copyright 2006, 2014 Klaus Hartl
  * Released under the MIT license
  */
-function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t("object"==typeof exports?require("jquery"):jQuery)}(function(t){function e(t){return r.raw?t:encodeURIComponent(t)}function i(t){return r.raw?t:decodeURIComponent(t)}function n(t){return e(r.json?JSON.stringify(t):String(t))}function o(t){0===t.indexOf('"')&&(t=t.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return t=decodeURIComponent(t.replace(s," ")),r.json?JSON.parse(t):t}catch(e){}}function a(t,e){var i=r.raw?t:o(t);return"function"==typeof e?e(i):i}var s=/\+/g,r=t.cookie=function(o,s,l){if(void 0!==s&&"function"!=typeof s){if(l=t.extend({},r.defaults,l),"number"==typeof l.expires){var h=l.expires,c=l.expires=new Date;c.setTime(+c+864e5*h)}return document.cookie=[e(o),"=",n(s),l.expires?"; expires="+l.expires.toUTCString():"",l.path?"; path="+l.path:"",l.domain?"; domain="+l.domain:"",l.secure?"; secure":""].join("")}for(var d=o?void 0:{},u=document.cookie?document.cookie.split("; "):[],f=0,p=u.length;f<p;f++){var g=u[f].split("="),m=i(g.shift()),v=g.join("=");if(o&&o===m){d=a(v,s);break}o||void 0===(v=a(v))||(d[m]=v)}return d};r.defaults={},t.removeCookie=function(e,i){return void 0!==t.cookie(e)&&(t.cookie(e,"",t.extend({},i,{expires:-1})),!t.cookie(e))}}),function(t,e){"use strict";var i,n,o="localStorage",a="page_"+t.location.pathname+t.location.search,s=function(){this.silence=!0;try{o in t&&t[o]&&t[o].setItem&&(this.enable=!0,i=t[o])}catch(s){}this.enable||(n={},i={getLength:function(){var t=0;return e.each(n,function(){t++}),t},key:function(t){var i,o=0;return e.each(n,function(e){return o===t?(i=e,!1):void o++}),i},removeItem:function(t){delete n[t]},getItem:function(t){return n[t]},setItem:function(t,e){n[t]=e},clear:function(){n={}}}),this.storage=i,this.page=this.get(a,{})};s.prototype.pageSave=function(){if(e.isEmptyObject(this.page))this.remove(a);else{var t,i=[];for(t in this.page){var n=this.page[t];null===n&&i.push(t)}for(t=i.length-1;t>=0;t--)delete this.page[i[t]];this.set(a,this.page)}},s.prototype.pageRemove=function(t){"undefined"!=typeof this.page[t]&&(this.page[t]=null,this.pageSave())},s.prototype.pageClear=function(){this.page={},this.pageSave()},s.prototype.pageGet=function(t,e){var i=this.page[t];return void 0===e||null!==i&&void 0!==i?i:e},s.prototype.pageSet=function(t,i){e.isPlainObject(t)?e.extend(!0,this.page,t):this.page[this.serialize(t)]=i,this.pageSave()},s.prototype.check=function(){if(!this.enable&&!this.silence)throw new Error("Browser not support localStorage or enable status been set true.");return this.enable},s.prototype.length=function(){return this.check()?i.getLength?i.getLength():i.length:0},s.prototype.removeItem=function(t){return i.removeItem(t),this},s.prototype.remove=function(t){return this.removeItem(t)},s.prototype.getItem=function(t){return i.getItem(t)},s.prototype.get=function(t,e){var i=this.deserialize(this.getItem(t));return"undefined"!=typeof i&&null!==i||"undefined"==typeof e?i:e},s.prototype.key=function(t){return i.key(t)},s.prototype.setItem=function(t,e){return i.setItem(t,e),this},s.prototype.set=function(t,e){return void 0===e?this.remove(t):(this.setItem(t,this.serialize(e)),this)},s.prototype.clear=function(){return i.clear(),this},s.prototype.forEach=function(t){for(var e=this.length(),n=e-1;n>=0;n--){var o=i.key(n);t(o,this.get(o))}return this},s.prototype.getAll=function(){var t={};return this.forEach(function(e,i){t[e]=i}),t},s.prototype.serialize=function(t){return"string"==typeof t?t:JSON.stringify(t)},s.prototype.deserialize=function(t){if("string"==typeof t)try{return JSON.parse(t)}catch(e){return t||void 0}},e.zui({store:new s})}(window,jQuery),function(t){"use strict";var e="zui.searchBox",i=function(e,n){var o=this;o.name=name,o.$=t(e),o.options=n=t.extend({},i.DEFAULTS,o.$.data(),n);var a=o.$.is(n.inputSelector)?o.$:o.$.find(n.inputSelector);if(a.length){var s=function(){o.changeTimer&&(clearTimeout(o.changeTimer),o.changeTimer=null)},r=function(){s();var t=o.getSearch();if(t!==o.lastValue){var e=""===t;a.toggleClass("empty",e),o.$.callComEvent(o,"onSearchChange",[t,e]),o.lastValue=t}};o.$input=a=a.first(),a.on(n.listenEvent,function(t){o.changeTimer=setTimeout(function(){r()},n.changeDelay)}).on("focus",function(t){a.addClass("focus"),o.$.callComEvent(o,"onFocus",[t])}).on("blur",function(t){a.removeClass("focus"),o.$.callComEvent(o,"onBlur",[t])}).on("keydown",function(t){var e=0,i=t.which;27===i&&n.escToClear?(this.setSearch("",!0),r(),e=1):13===i&&n.onPressEnter&&(r(),o.$.callComEvent(o,"onPressEnter",[t]));var a=o.$.callComEvent(o,"onKeyDown",[t]);a===!1&&(e=1),e&&t.preventDefault()}),o.$.on("click",".search-clear-btn",function(t){o.setSearch("",!0),r(),o.focus(),t.preventDefault()}),r()}else console.error("ZUI: search box init error, cannot find search box input element.")};i.DEFAULTS={inputSelector:'input[type="search"],input[type="text"]',listenEvent:"change input paste",changeDelay:500},i.prototype.getSearch=function(){return this.$input&&t.trim(this.$input.val())},i.prototype.setSearch=function(t,e){var i=this.$input;i&&(i.val(t),e||i.trigger("change"))},i.prototype.focus=function(){this.$input&&this.$input.focus()},t.fn.searchBox=function(n){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof n&&n;a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},i.NAME=e,t.fn.searchBox.Constructor=i}(jQuery),function(t,e){"use strict";var i="zui.draggable",n={container:"body",move:!0},o=0,a=function(e,i){var a=this;a.$=t(e),a.id=o++,a.options=t.extend({},n,a.$.data(),i),a.init()};a.DEFAULTS=n,a.NAME=i,a.prototype.init=function(){var n,o,a,s,r,l=this,h=l.$,c="before",d="drag",u="finish",f="."+i+"."+l.id,p="mousedown"+f,g="mouseup"+f,m="mousemove"+f,v=l.options,y=v.selector,b=v.handle,w=h,x="function"==typeof v.move,C=function(t){var e=t.pageX,i=t.pageY;r=!0;var o={left:e-a.x,top:i-a.y};w.removeClass("drag-ready").addClass("dragging"),v.move&&(x?v.move(o,w):w.css(o)),v[d]&&v[d]({event:t,element:w,startOffset:a,pos:o,offset:{x:e-n.x,y:i-n.y},smallOffset:{x:e-s.x,y:i-s.y}}),s.x=e,s.y=i,v.stopPropagation&&t.stopPropagation()},_=function(i){if(t(e).off(f),!r)return void w.removeClass("drag-ready");var o={left:i.pageX-a.x,top:i.pageY-a.y};w.removeClass("drag-ready dragging"),v.move&&(x?v.move(o,w):w.css(o)),v[u]&&v[u]({event:i,element:w,startOffset:a,pos:o,offset:{x:i.pageX-n.x,y:i.pageY-n.y},smallOffset:{x:i.pageX-s.x,y:i.pageY-s.y}}),i.preventDefault(),v.stopPropagation&&i.stopPropagation()},k=function(i){var l=t.zui.getMouseButtonCode(v.mouseButton);if(!(l>-1&&i.button!==l)){var h=t(this);if(y&&(w=b?h.closest(y):h),v[c]){var d=v[c]({event:i,element:w});if(d===!1)return}var u=t(v.container),f=w.offset();o=u.offset(),n={x:i.pageX,y:i.pageY},a={x:i.pageX-f.left+o.left,y:i.pageY-f.top+o.top},s=t.extend({},n),r=!1,w.addClass("drag-ready"),i.preventDefault(),v.stopPropagation&&i.stopPropagation(),t(e).on(m,C).on(g,_)}};b?h.on(p,b,k):y?h.on(p,y,k):h.on(p,k)},a.prototype.destroy=function(){var n="."+i+"."+this.id;this.$.off(n),t(e).off(n),this.$.data(i,null)},t.fn.draggable=function(e){return this.each(function(){var n=t(this),o=n.data(i),s="object"==typeof e&&e;o||n.data(i,o=new a(this,s)),"string"==typeof e&&o[e]()})},t.fn.draggable.Constructor=a}(jQuery,document),function(t,e,i){"use strict";var n="zui.droppable",o={target:".droppable-target",deviation:5,sensorOffsetX:0,sensorOffsetY:0,dropToClass:"drop-to"},a=0,s=function(e,i){var n=this;n.id=a++,n.$=t(e),n.options=t.extend({},o,n.$.data(),i),n.init()};s.DEFAULTS=o,s.NAME=n,s.prototype.trigger=function(e,i){return t.zui.callEvent(this.options[e],i,this)},s.prototype.init=function(){var o,a,s,r,l,h,c,d,u,f,p,g,m,v=this,y=v.$,b=v.options,w=b.deviation,x="."+n+"."+v.id,C="mousedown"+x,_="mouseup"+x,k="mousemove"+x,T=b.selector,S=b.handle,D=b.flex,M=b.container,P=b.canMoveHere,z=b.dropToClass,L=y,F=!1,I=M?t(b.container).first():T?y:t("body"),A=function(e){if(F&&(p={left:e.pageX,top:e.pageY},!(i.abs(p.left-d.left)<w&&i.abs(p.top-d.top)<w))){if(null===s){var n=I.css("position");"absolute"!=n&&"relative"!=n&&"fixed"!=n&&(h=n,I.css("position","relative")),s=L.clone().removeClass("drag-from").addClass("drag-shadow").css({position:"absolute",width:L.outerWidth(),transition:"none"}).appendTo(I),L.addClass("dragging"),v.trigger("start",{event:e,element:L,shadowElement:s,targets:o})}var c={left:p.left-f.left,top:p.top-f.top},m={left:c.left-u.left,top:c.top-u.top};s.css(m),t.extend(g,p);var y=!1;r=!1,D||o.removeClass(z);var x=null;if(o.each(function(){var e=t(this),i=e.offset(),n=e.outerWidth(),o=e.outerHeight(),a=i.left+b.sensorOffsetX,s=i.top+b.sensorOffsetY;if(p.left>a&&p.top>s&&p.left<a+n&&p.top<s+o&&(x&&x.removeClass(z),x=e,!b.nested))return!1}),x){r=!0;var C=x.data("id");L.data("id")!=C&&(l=!1),(null===a||a.data("id")!==C&&!l)&&(y=!0),a=x,D&&o.removeClass(z),a.addClass(z)}D?null!==a&&a.length&&(r=!0):(L.toggleClass("drop-in",r),s.toggleClass("drop-in",r)),P&&P(L,a)===!1||v.trigger("drag",{event:e,isIn:r,target:a,element:L,isNew:y,selfTarget:l,clickOffset:f,offset:c,position:{left:c.left-u.left,top:c.top-u.top},mouseOffset:p}),e.preventDefault()}},$=function(i){if(t(e).off(x),clearTimeout(m),F){if(F=!1,h&&I.css("position",h),null===s)return L.removeClass("drag-from"),void v.trigger("always",{event:i,cancel:!0});r||(a=null);var n=!0;p=i?{left:i.pageX,top:i.pageY}:g;var c={left:p.left-f.left,top:p.top-f.top},d={left:p.left-g.left,top:p.top-g.top};g.left=p.left,g.top=p.top;var y={event:i,isIn:r,target:a,element:L,isNew:!l&&null!==a,selfTarget:l,offset:c,mouseOffset:p,position:{left:c.left-u.left,top:c.top-u.top},lastMouseOffset:g,moveOffset:d};n=v.trigger("beforeDrop",y),n&&r&&v.trigger("drop",y),o.removeClass(z),L.removeClass("dragging").removeClass("drag-from"),s.remove(),s=null,v.trigger("finish",y),v.trigger("always",y),i&&i.preventDefault()}},E=function(i){var n=t.zui.getMouseButtonCode(b.mouseButton);if(!(n>-1&&i.button!==n)){var p=t(this);T&&(L=S?p.closest(T):p),L.hasClass("drag-shadow")||b.before&&b.before({event:i,element:L})===!1||(F=!0,o="function"==typeof b.target?b.target(L,y):I.find(b.target),a=null,s=null,r=!1,l=!0,h=null,c=L.offset(),u=I.offset(),u.top=u.top-I.scrollTop(),u.left=u.left-I.scrollLeft(),d={left:i.pageX,top:i.pageY},g=t.extend({},d),f={left:d.left-c.left,top:d.top-c.top},L.addClass("drag-from"),t(e).on(k,A).on(_,$),m=setTimeout(function(){t(e).on(C,$)},10),i.preventDefault(),b.stopPropagation&&i.stopPropagation())}};S?y.on(C,S,E):T?y.on(C,T,E):y.on(C,E)},s.prototype.destroy=function(){var i="."+n+"."+this.id;this.$.off(i),t(e).off(i),this.$.data(n,null)},s.prototype.reset=function(){this.destroy(),this.init()},t.fn.droppable=function(e){return this.each(function(){var i=t(this),o=i.data(n),a="object"==typeof e&&e;o||i.data(n,o=new s(this,a)),"string"==typeof e&&o[e]()})},t.fn.droppable.Constructor=s}(jQuery,document,Math),+function(t,e){"use strict";function i(e,i,a){return this.each(function(){var s=t(this),r=s.data(n),l=t.extend({},o.DEFAULTS,s.data(),"object"==typeof e&&e);r||s.data(n,r=new o(this,l)),"string"==typeof e?r[e](i,a):l.show&&r.show(i,a)})}var n="zui.modal",o=function(i,o){var a=this;a.options=o,a.$body=t(document.body),a.$element=t(i),a.$backdrop=a.isShown=null,a.scrollbarWidth=0,o.moveable===e&&(a.options.moveable=a.$element.hasClass("modal-moveable")),o.remote&&a.$element.find(".modal-content").load(o.remote,function(){a.$element.trigger("loaded."+n)}),o.scrollInside&&t(window).on("resize."+n,function(){a.isShown&&a.adjustPosition(e,100)})};o.VERSION="3.2.0",o.TRANSITION_DURATION=300,o.BACKDROP_TRANSITION_DURATION=150,o.DEFAULTS={backdrop:!0,keyboard:!0,show:!0,position:"fit"};var a=function(e,i){var n=t(window);i.left=Math.max(0,Math.min(i.left,n.width()-e.outerWidth())),i.top=Math.max(0,Math.min(i.top,n.height()-e.outerHeight())),e.css(i)};o.prototype.toggle=function(t,e){return this.isShown?this.hide():this.show(t,e)},o.prototype.adjustPosition=function(i,o){var s=this;if(clearTimeout(s.reposTask),o)return void(s.reposTask=setTimeout(s.adjustPosition.bind(s,i,0),o));var r=s.options;if(i===e&&(i=r.position),i!==e&&null!==i){"function"==typeof i&&(i=i(s));var l=s.$element.find(".modal-dialog"),h=t(window).height(),c={maxHeight:"initial",overflow:"visible"},d=l.find(".modal-body").css(c);if(r.scrollInside&&d.length){var u=r.headerHeight,f=r.footerHeight,p=l.find(".modal-header"),g=l.find(".modal-footer");"number"!=typeof u&&(u=p.length?p.outerHeight():"function"==typeof u?u(p):0),"number"!=typeof f&&(f=g.length?g.outerHeight():"function"==typeof f?f(g):0),c.maxHeight=h-u-f,c.overflow=d[0].scrollHeight>c.maxHeight?"auto":"visible",d.css(c)}var m=Math.max(0,(h-l.outerHeight())/2);if("fit"===i?i={top:m>50?Math.floor(2*m/3):m}:"center"===i?i={top:m}:t.isPlainObject(i)||(i={top:i}),l.hasClass("modal-moveable")){var v=null,y=r.rememberPos;y&&(y===!0?v=s.$element.data("modal-pos"):t.zui.store&&(v=t.zui.store.pageGet(n+".rememberPos."+y))),i=t.extend(i,{left:Math.max(0,(t(window).width()-l.outerWidth())/2)},v),"inside"===r.moveable?a(l,i):l.css(i)}else l.css(i)}},o.prototype.setMoveable=function(){t.fn.draggable||console.error("Moveable modal requires draggable.js.");var e=this,i=e.options,o=e.$element.find(".modal-dialog").removeClass("modal-dragged");o.toggleClass("modal-moveable",!!i.moveable),e.$element.data("modal-moveable-setup")||o.draggable({container:e.$element,handle:".modal-header",before:function(){var t=o.css("margin-top");t&&"0px"!==t&&o.css("top",t).css("margin-top","").addClass("modal-dragged")},finish:function(o){var a=i.rememberPos;a&&(e.$element.data("modal-pos",o.pos),t.zui.store&&a!==!0&&t.zui.store.pageSet(n+".rememberPos."+a,o.pos))},move:"inside"!==i.moveable||function(t){a(o,t)}})},o.prototype.show=function(e,i){var a=this,s=t.Event("show."+n,{relatedTarget:e});a.$element.trigger(s),a.$element.toggleClass("modal-scroll-inside",!!a.options.scrollInside),a.isShown||s.isDefaultPrevented()||(a.isShown=!0,a.options.moveable&&a.setMoveable(),a.options.backdrop!==!1&&(a.setScrollbar(),a.$body.addClass("modal-open")),a.escape(),a.$element.on("click.dismiss."+n,'[data-dismiss="modal"]',function(t){a.hide(),t.stopPropagation()}),a.backdrop(function(){var s=t.support.transition&&a.$element.hasClass("fade");a.$element.parent().length||a.$element.appendTo(a.$body),a.$element.show().scrollTop(0),s&&a.$element[0].offsetWidth,a.$element.addClass("in").attr("aria-hidden",!1),a.adjustPosition(i),a.enforceFocus();var r=t.Event("shown."+n,{relatedTarget:e});s?a.$element.find(".modal-dialog").one("bsTransitionEnd",function(){a.$element.trigger("focus").trigger(r)}).emulateTransitionEnd(o.TRANSITION_DURATION):a.$element.trigger("focus").trigger(r)}))},o.prototype.hide=function(e){e&&e.preventDefault&&e.preventDefault();var i=this;e=t.Event("hide."+n),i.$element.trigger(e),i.isShown&&!e.isDefaultPrevented()&&(i.isShown=!1,i.options.backdrop!==!1&&(i.$body.removeClass("modal-open"),i.resetScrollbar()),i.escape(),t(document).off("focusin."+n),i.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss."+n),t.support.transition&&i.$element.hasClass("fade")?i.$element.one("bsTransitionEnd",i.hideModal.bind(i)).emulateTransitionEnd(o.TRANSITION_DURATION):i.hideModal())},o.prototype.enforceFocus=function(){t(document).off("focusin."+n).on("focusin."+n,function(t){this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")}.bind(this))},o.prototype.escape=function(){this.isShown&&this.options.keyboard?t(document).on("keydown.dismiss."+n,function(i){if(27==i.which){var o=t.Event("escaping."+n),a=this.$element.triggerHandler(o,"esc");if(a!=e&&!a)return;this.hide()}}.bind(this)):this.isShown||t(document).off("keydown.dismiss."+n)},o.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$element.trigger("hidden."+n)})},o.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},o.prototype.backdrop=function(e){var i=this,a=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var s=t.support.transition&&a;if(this.$backdrop=t('<div class="modal-backdrop '+a+'" />').appendTo(this.$body),this.$element.on("mousedown.dismiss."+n,function(t){t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))}.bind(this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return;s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(o.BACKDROP_TRANSITION_DURATION):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var r=function(){i.removeBackdrop(),e&&e()};t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",r).emulateTransitionEnd(o.BACKDROP_TRANSITION_DURATION):r()}else e&&e()},o.prototype.setScrollbar=function(){t.zui.fixBodyScrollbar()&&this.options.onSetScrollbar&&this.options.onSetScrollbar()},o.prototype.resetScrollbar=function(){t.zui.resetBodyScrollbar(),this.options.onSetScrollbar&&this.options.onSetScrollbar("")},o.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var s=t.fn.modal;t.fn.modal=i,t.fn.modal.Constructor=o,t.fn.modal.noConflict=function(){return t.fn.modal=s,this},t(document).on("click."+n+".data-api",'[data-toggle="modal"]',function(e){var o=t(this),a=o.attr("href"),s=null;try{s=t(o.attr("data-target")||a&&a.replace(/.*(?=#[^\s]+$)/,""))}catch(r){return}if(s.length){var l=s.data(n)?"toggle":t.extend({remote:!/#/.test(a)&&a},s.data(),o.data());o.is("a")&&e.preventDefault(),s.one("show."+n,function(t){t.isDefaultPrevented()||s.one("hidden."+n,function(){o.is(":visible")&&o.trigger("focus")})}),i.call(s,l,this,o.data("position"))}})}(jQuery,void 0),function(t,e,i){"use strict";if(!t.fn.modal)throw new Error("Modal trigger requires modal.js");var n="zui.modaltrigger",o="ajax",a=".zui.modal",s="string",r=function(e,i){e=t.extend({},r.DEFAULTS,t.ModalTriggerDefaults,i?i.data():null,e),this.isShown,this.$trigger=i,this.options=e,this.id=t.zui.uuid(),e.show&&this.show()};r.DEFAULTS={type:"custom",height:"auto",name:"triggerModal",fade:!0,position:"fit",showHeader:!0,delay:0,backdrop:!0,keyboard:!0,waittime:0,loadingIcon:"icon-spinner-indicator",scrollInside:!1},r.prototype.initOptions=function(i){if(i.url&&(!i.type||i.type!=o&&"iframe"!=i.type)&&(i.type=o),i.remote)i.type=o,typeof i.remote===s&&(i.url=i.remote);else if(i.iframe)i.type="iframe",typeof i.iframe===s&&(i.url=i.iframe);else if(i.custom&&(i.type="custom",typeof i.custom===s)){var n;try{n=t(i.custom)}catch(a){}n&&n.length?i.custom=n:"function"==typeof e[i.custom]&&(i.custom=e[i.custom])}return i},r.prototype.init=function(e){var i=this,o=t("#"+e.name);o.length&&(i.isShown||o.off(a),o.remove()),o=t('<div id="'+e.name+'" class="modal modal-trigger '+(e.className||"")+'">'+("string"==typeof e.loadingIcon&&0===e.loadingIcon.indexOf("icon-")?'<div class="icon icon-spin loader '+e.loadingIcon+'"></div>':e.loadingIcon)+'<div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button class="close" data-dismiss="modal">×</button><h4 class="modal-title"><i class="modal-icon"></i> <span class="modal-title-name"></span></h4></div><div class="modal-body"></div></div></div></div>').appendTo("body").data(n,i);var s=function(t,i){var n=e[t];"function"==typeof n&&o.on(i+a,n)};s("onShow","show"),s("shown","shown"),s("onHide","hide"),s("hidden","hidden"),s("loaded","loaded"),o.on("shown"+a,function(){i.isShown=!0}).on("hidden"+a,function(){i.isShown=!1}),this.$modal=o,this.$dialog=o.find(".modal-dialog"),e.mergeOptions&&(this.options=e)},r.prototype.show=function(i){var a=this,l=t.extend({},r.DEFAULTS,a.options,{url:a.$trigger?a.$trigger.attr("href")||a.$trigger.attr("data-url")||a.$trigger.data("url"):a.options.url},i),h=a.isShown;l=a.initOptions(l),h||a.init(l);var c=a.$modal,d=c.find(".modal-dialog"),u=l.custom,f=d.find(".modal-body").css("padding","").toggleClass("load-indicator loading",!!h),p=d.find(".modal-header"),g=d.find(".modal-content");c.toggleClass("fade",l.fade).addClass(l.className).toggleClass("modal-loading",!h).toggleClass("modal-scroll-inside",!!l.scrollInside),d.toggleClass("modal-md","md"===l.size).toggleClass("modal-sm","sm"===l.size).toggleClass("modal-lg","lg"===l.size).toggleClass("modal-fullscreen","fullscreen"===l.size),p.toggle(l.showHeader),p.find(".modal-icon").attr("class","modal-icon icon-"+l.icon),p.find(".modal-title-name").text(l.title||""),l.size&&"fullscreen"===l.size&&(l.width="",l.height="");var m=function(){clearTimeout(this.resizeTask),this.resizeTask=setTimeout(function(){a.adjustPosition(l.position)},100)},v=function(t,e){return"undefined"==typeof t&&(t=l.delay),setTimeout(function(){d=c.find(".modal-dialog"),l.width&&"auto"!=l.width&&d.css("width",l.width),l.height&&"auto"!=l.height&&(d.css("height",l.height),"iframe"===l.type&&f.css("height",d.height()-p.outerHeight())),a.adjustPosition(l.position),c.removeClass("modal-loading").removeClass("modal-updating"),h&&f.removeClass("loading"),"iframe"!=l.type&&(f=d.off("resize."+n).find(".modal-body").off("resize."+n),l.scrollInside&&(f=f.children().off("resize."+n)),(f.length?f:d).on("resize."+n,m)),e&&e()},t)};if("custom"===l.type&&u)if("function"==typeof u){var y=u({modal:c,options:l,modalTrigger:a,ready:v});typeof y===s&&(f.html(y),v())}else u instanceof t?(f.html(t("<div>").append(u.clone()).html()),v()):(f.html(u),v());else if(l.url){var b=function(){var t=c.callComEvent(a,"broken");"string"==typeof t&&f.html(t),v()};if(c.attr("ref",l.url),"iframe"===l.type){c.addClass("modal-iframe"),this.firstLoad=!0;var w="iframe-"+l.name;p.detach(),f.detach(),g.empty().append(p).append(f),f.css("padding",0).html('<iframe id="'+w+'" name="'+w+'" src="'+l.url+'" frameborder="no"  allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"  allowtransparency="true" scrolling="auto" style="width: 100%; height: 100%; left: 0px;"></iframe>'),l.waittime>0&&(a.waitTimeout=v(l.waittime,b));var x=document.getElementById(w);x.onload=x.onreadystatechange=function(i){var o=!!l.scrollInside;if(a.firstLoad&&c.addClass("modal-loading"),!this.readyState||"complete"==this.readyState){a.firstLoad=!1,l.waittime>0&&clearTimeout(a.waitTimeout);try{c.attr("ref",x.contentWindow.location.href);var s=e.frames[w].$;if(s&&"auto"===l.height&&"fullscreen"!=l.size){var r=s("body").addClass("body-modal").toggleClass("body-modal-scroll-inside",o);l.iframeBodyClass&&r.addClass(l.iframeBodyClass);var h=[],d=function(i){c.removeClass("fade");var n=r.outerHeight();if(i===!0&&l.onlyIncreaseHeight&&(n=Math.max(n,f.data("minModalHeight")||0),f.data("minModalHeight",n)),o){var a=l.headerHeight;"number"!=typeof a?a=p.outerHeight():"function"==typeof a&&(a=a(p));var s=t(e).height();n=Math.min(n,s-a)}for(h.length>1&&n===h[0]&&(n=Math.max(n,h[1])),h.push(n);h.length>2;)h.shift();f.css("height",n),l.fade&&c.addClass("fade"),v()};c.callComEvent(a,"loaded",{modalType:"iframe",jQuery:s}),setTimeout(d,100),r.off("resize."+n).on("resize."+n,d),o&&t(e).off("resize."+n).on("resize."+n,d)}else v();var u=l.handleLinkInIframe;u&&s("body").on("click","string"==typeof u?u:"a[href]",function(){t(this).is('[data-toggle="modal"]')||c.addClass("modal-updating")}),l.iframeStyle&&s("head").append("<style>"+l.iframeStyle+"</style>")}catch(i){v()}}}}else t.ajax(t.extend({url:l.url,success:function(i){try{var s=t(i);s.filter(".modal-dialog").length?d.parent().empty().append(s):s.filter(".modal-content").length?d.find(".modal-content").replaceWith(s):f.wrapInner(s)}catch(r){e.console&&e.console.warn&&console.warn("ZUI: Cannot recogernize remote content.",{error:r,data:i}),c.html(i)}c.callComEvent(a,"loaded",{modalType:o}),v(),l.scrollInside&&t(e).off("resize."+n).on("resize."+n,m)},error:b},l.ajaxOptions))}h||c.modal({show:"show",backdrop:l.backdrop,moveable:l.moveable,rememberPos:l.rememberPos,keyboard:l.keyboard,scrollInside:l.scrollInside})},r.prototype.close=function(t,i){var n=this;(t||i)&&n.$modal.on("hidden"+a,function(){"function"==typeof t&&t(),typeof i===s&&i.length&&!n.$modal.data("cancel-reload")&&("this"===i?e.location.reload():e.location=i)}),n.$modal.modal("hide")},r.prototype.toggle=function(t){this.isShown?this.close():this.show(t)},r.prototype.adjustPosition=function(t){t=t===i?this.options.position:t,"function"==typeof t&&(t=t(this)),this.$modal.modal("adjustPosition",t)},t.zui({ModalTrigger:r,modalTrigger:new r}),t.fn.modalTrigger=function(e,i){return t(this).each(function(){var o=t(this),a=o.data(n),l=t.extend({title:o.attr("title")||o.text(),url:o.attr("href"),type:o.hasClass("iframe")?"iframe":""},o.data(),t.isPlainObject(e)&&e);return a?void(typeof e==s?a[e](i):l.show&&a.show(i)):(o.data(n,a=new r(l,o)),void o.on((l.trigger||"click")+".toggle."+n,function(e){l=t.extend(l,{url:o.attr("href")||o.attr("data-url")||o.data("url")||l.url}),a.toggle(l),o.is("a")&&e.preventDefault()}))})};var l=t.fn.modal;t.fn.modal=function(e,i){return t(this).each(function(){var n=t(this);n.hasClass("modal")?l.call(n,e,i):n.modalTrigger(e,i)})},t.fn.modal.bs=l;var h=function(e){return e?e=t(e):(e=t(".modal.modal-trigger"),!e.length),e&&e instanceof t?e:null},c=function(i,o,a){var s=i;if("function"==typeof i){var r=a;a=o,o=i,i=r}i=h(i),i&&i.length?i.each(function(){t(this).data(n).close(o,a)}):t("body").hasClass("modal-open")||t(".modal.in").length||t("body").hasClass("body-modal")&&e.parent.$.zui.closeModal(s,o,a)},d=function(t,e){e=h(e),e&&e.length&&e.modal("adjustPosition",t)},u=function(e,i){"string"==typeof e&&(e={url:e});var o=h(i);o&&o.length&&o.each(function(){t(this).data(n).show(e)})};t.zui({reloadModal:u,closeModal:c,ajustModalPosition:d,adjustModalPosition:d}),t(document).on("click."+n+".data-api",'[data-toggle="modal"]',function(e){var i=t(this),o=i.attr("href"),a=null;try{a=t(i.attr("data-target")||o&&o.replace(/.*(?=#[^\s]+$)/,""))}catch(s){}a&&a.length||(i.data(n)?i.trigger(".toggle."+n):i.modalTrigger({show:!0})),i.is("a")&&e.preventDefault()}).on("click."+n+".data-api",'[data-dismiss="modal"]',function(){t.zui.closeModal()})}(window.jQuery,window,void 0),+function(t){"use strict";var e=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.init("tooltip",t,e)};e.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.prototype.init=function(e,i,n){this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(n);for(var o=this.options.trigger.split(" "),a=o.length;a--;){var s=o[a];if("click"==s)this.$element.on("click."+this.type,this.options.selector,this.toggle.bind(this));else if("manual"!=s){var r="hover"==s?"mouseenter":"focus",l="hover"==s?"mouseleave":"blur";this.$element.on(r+"."+this.type,this.options.selector,this.enter.bind(this)),this.$element.on(l+"."+this.type,this.options.selector,this.leave.bind(this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},e.prototype.getDefaults=function(){return e.DEFAULTS},e.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},e.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults();return this._options&&t.each(this._options,function(t,n){i[t]!=n&&(e[t]=n)}),e},e.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type);return clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show()},e.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type);return clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide()},e.prototype.show=function(e){var i=t.Event("show.zui."+this.type);if((e||this.hasContent())&&this.enabled){var n=this;if(n.$element.trigger(i),i.isDefaultPrevented())return;var o=n.tip();n.setContent(e),n.options.animation&&o.addClass("fade");var a="function"==typeof n.options.placement?n.options.placement.call(n,o[0],n.$element[0]):n.options.placement,s=/\s?auto?\s?/i,r=s.test(a);r&&(a=a.replace(s,"")||"top"),o.detach().css({top:0,left:0,display:"block"}).addClass(a),n.options.container?o.appendTo(n.options.container):o.insertAfter(n.$element);var l=n.getPosition(),h=o[0].offsetWidth,c=o[0].offsetHeight;if(r){var d=n.$element.parent(),u=a,f=document.documentElement.scrollTop||document.body.scrollTop,p="body"==n.options.container?window.innerWidth:d.outerWidth(),g="body"==n.options.container?window.innerHeight:d.outerHeight(),m="body"==n.options.container?0:d.offset().left;a="bottom"==a&&l.top+l.height+c-f>g?"top":"top"==a&&l.top-f-c<0?"bottom":"right"==a&&l.right+h>p?"left":"left"==a&&l.left-h<m?"right":a,o.removeClass(u).addClass(a)}var v=n.getCalculatedOffset(a,l,h,c);n.applyPlacement(v,a);var y=function(){var t=n.hoverState;n.$element.trigger("shown.zui."+n.type),n.hoverState=null,"out"==t&&n.leave(n)};t.support.transition&&n.$tip.hasClass("fade")?o.one("bsTransitionEnd",y).emulateTransitionEnd(150):y()}},e.prototype.applyPlacement=function(t,e){var i,n=this.tip(),o=n[0].offsetWidth,a=n[0].offsetHeight,s=parseInt(n.css("margin-top"),10),r=parseInt(n.css("margin-left"),10);isNaN(s)&&(s=0),isNaN(r)&&(r=0),t.top=t.top+s,t.left=t.left+r,n.offset(t).addClass("in");var l=n[0].offsetWidth,h=n[0].offsetHeight;if("top"==e&&h!=a&&(i=!0,t.top=t.top+a-h),/bottom|top/.test(e)){var c=0;t.left<0&&(c=t.left*-2,t.left=0,n.offset(t),l=n[0].offsetWidth,h=n[0].offsetHeight),this.replaceArrow(c-o+l,l,"left")}else this.replaceArrow(h-a,h,"top");i&&n.offset(t)},e.prototype.replaceArrow=function(t,e,i){this.arrow().css(i,t?50*(1-t/e)+"%":"")},e.prototype.setContent=function(t){var e=this.tip(),i=t||this.getTitle();this.options.tipId&&e.attr("id",this.options.tipId),this.options.tipClass&&e.addClass(this.options.tipClass),e.find(".tooltip-inner")[this.options.html?"html":"text"](i),e.removeClass("fade in top bottom left right")},e.prototype.hide=function(){function e(){"in"!=i.hoverState&&n.detach()}var i=this,n=this.tip(),o=t.Event("hide.zui."+this.type);if(this.$element.trigger(o),!o.isDefaultPrevented())return n.removeClass("in"),t.support.transition&&this.$tip.hasClass("fade")?n.one(t.support.transition.end,e).emulateTransitionEnd(150):e(),this.$element.trigger("hidden.zui."+this.type),this},e.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},e.prototype.hasContent=function(){return this.getTitle()},e.prototype.getPosition=function(){var e=this.$element[0];return t.extend({},"function"==typeof e.getBoundingClientRect?e.getBoundingClientRect():{width:e.offsetWidth,height:e.offsetHeight},this.$element.offset())},e.prototype.getCalculatedOffset=function(t,e,i,n){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-n,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-n/2,left:e.left-i}:{top:e.top+e.height/2-n/2,left:e.left+e.width}},e.prototype.getTitle=function(){var t,e=this.$element,i=this.options;return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},e.prototype.tip=function(){return this.$tip=this.$tip||t(this.options.template)},e.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow");
-},e.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},e.prototype.enable=function(){this.enabled=!0},e.prototype.disable=function(){this.enabled=!1},e.prototype.toggleEnabled=function(){this.enabled=!this.enabled},e.prototype.toggle=function(e){var i=e?t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type):this;i.tip().hasClass("in")?i.leave(i):i.enter(i)},e.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("zui."+this.type)};var i=t.fn.tooltip;t.fn.tooltip=function(i,n){return this.each(function(){var o=t(this),a=o.data("zui.tooltip"),s="object"==typeof i&&i;a||o.data("zui.tooltip",a=new e(this,s)),"string"==typeof i&&a[i](n)})},t.fn.tooltip.Constructor=e,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=i,this}}(window.jQuery),+function(t){"use strict";var e=function(t,e){this.init("popover",t,e)};if(!t.fn.tooltip)throw new Error("Popover requires tooltip.js");e.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),e.prototype.constructor=e,e.prototype.getDefaults=function(){return e.DEFAULTS},e.prototype.setContent=function(){var t=this.tip(),e=this.getTarget();if(e)return e.find(".arrow").length<1&&t.addClass("no-arrow"),void t.html(e.html());var i=this.getTitle(),n=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](i),t.find(".popover-content")[this.options.html?"html":"text"](n),t.removeClass("fade top bottom left right in"),this.options.tipId&&t.attr("id",this.options.tipId),this.options.tipClass&&t.addClass(this.options.tipClass),t.find(".popover-title").html()||t.find(".popover-title").hide()},e.prototype.hasContent=function(){return this.getTarget()||this.getTitle()||this.getContent()},e.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},e.prototype.getTarget=function(){var e=this.$element,i=this.options,n=e.attr("data-target")||("function"==typeof i.target?i.target.call(e[0]):i.target);return!!n&&("$next"==n?e.next(".popover"):t(n))},e.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},e.prototype.tip=function(){return this.$tip||(this.$tip=t(this.options.template)),this.$tip};var i=t.fn.popover;t.fn.popover=function(i){return this.each(function(){var n=t(this),o=n.data("zui.popover"),a="object"==typeof i&&i;o||n.data("zui.popover",o=new e(this,a)),"string"==typeof i&&o[i]()})},t.fn.popover.Constructor=e,t.fn.popover.noConflict=function(){return t.fn.popover=i,this}}(window.jQuery),+function(t){"use strict";function e(){t(o).remove(),t(a).each(function(e){var o=i(t(this));o.hasClass("open")&&(o.trigger(e=t.Event("hide."+n)),e.isDefaultPrevented()||o.removeClass("open").trigger("hidden."+n))})}function i(e){var i=e.attr("data-target");i||(i=e.attr("href"),i=i&&/#/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""));var n;try{n=i&&t(i)}catch(o){}return n&&n.length?n:e.parent()}var n="zui.dropdown",o=".dropdown-backdrop",a="[data-toggle=dropdown]",s=function(e){t(e).on("click."+n,this.toggle)};s.prototype.toggle=function(o){var a=t(this);if(!a.is(".disabled, :disabled")){var s=i(a),r=s.hasClass("open");if(e(),!r){if("ontouchstart"in document.documentElement&&!s.closest(".navbar-nav").length&&t('<div class="dropdown-backdrop"/>').insertAfter(t(this)).on("click",e),s.trigger(o=t.Event("show."+n)),o.isDefaultPrevented())return;s.toggleClass("open").trigger("shown."+n),a.focus()}return!1}},s.prototype.keydown=function(e){if(/(38|40|27)/.test(e.keyCode)){var n=t(this);if(e.preventDefault(),e.stopPropagation(),!n.is(".disabled, :disabled")){var o=i(n),s=o.hasClass("open");if(!s||s&&27==e.keyCode)return 27==e.which&&o.find(a).focus(),n.click();var r=t("[role=menu] li:not(.divider):visible a",o);if(r.length){var l=r.index(r.filter(":focus"));38==e.keyCode&&l>0&&l--,40==e.keyCode&&l<r.length-1&&l++,~l||(l=0),r.eq(l).focus()}}}};var r=t.fn.dropdown;t.fn.dropdown=function(e){return this.each(function(){var i=t(this),n=i.data("dropdown");n||i.data("dropdown",n=new s(this)),"string"==typeof e&&n[e].call(i)})},t.fn.dropdown.Constructor=s,t.fn.dropdown.noConflict=function(){return t.fn.dropdown=r,this};var l=n+".data-api";t(document).on("click."+l,e).on("click."+l,".dropdown form",function(t){t.stopPropagation()}).on("click."+l,a,s.prototype.toggle).on("keydown."+l,a+", [role=menu]",s.prototype.keydown)}(window.jQuery),function(t,e,i){"use strict";var n=0,o='<div class="messager messager-{type} {placement}" style="display: none"><div class="messager-content"></div><div class="messager-actions"></div></div>',a={icons:{},type:"default",placement:"top",time:4e3,parent:"body",close:!0,fade:!0,scale:!0},s={},r=function(e,r){t.isPlainObject(e)?r=t.extend({},r,e):e&&(r?r.content=e:r={content:e});var l=this;r=l.options=t.extend({},a,r),l.id=r.id||n++;var h=s[l.id];h&&h.destroy(),s[l.id]=l,l.$=t(o.format(r)).toggleClass("fade",r.fade).toggleClass("scale",r.scale).attr("id","messager-"+l.id),r.cssClass&&l.$.addClass(r.cssClass);var c=!1,d=l.$.find(".messager-actions"),u=function(e){var n=t('<button type="button" class="action action-'+e.name+'"/>');"close"===e.name&&n.addClass("close"),e.html!==i&&n.html(e.html),e.icon!==i&&n.append('<i class="action-icon icon-'+e.icon+'"/>'),e.text!==i&&n.append('<span class="action-text">'+e.text+"</span>"),e.tooltip!==i&&n.attr("title",e.tooltip).tooltip(),n.data("action",e),d.append(n)};r.actions&&t.each(r.actions,function(t,e){e.name===i&&(e.name=t),"close"==e.name&&(c=!0),u(e)}),!c&&r.close&&u({name:"close",html:"&times;"}),l.$.on("click",".action",function(e){var i,n=t(this).data("action");r.onAction&&(i=r.onAction.call(this,n.name,n,l),i===!1)||"function"==typeof n.action&&(i=n.action.call(this,l),i===!1)||(l.hide(),e.stopPropagation())}),l.$.on("click",function(t){if(r.onAction){var e=r.onAction.call(this,"content",null,l);e===!0&&l.hide()}}),l.$.data("zui.messager",l),r.show&&l.message!==i&&l.show()};r.prototype.update=function(e,i){t.isPlainObject(e)?i=e:e&&(i?i.content=e:i={content:e});var n=this,o=n.options;n.$.removeClass("messager-"+o.type);var a=n.$.find(".messager-content");o.contentClass&&a.removeClass(o.contentClass),i&&(o=t.extend(o,i)),n.$.addClass("messager-"+o.type).toggleClass("messager-notification",!!o.notification),o.contentClass&&a.addClass(o.contentClass);var s=o.title,r=o.icon;if(e=o.content,a.empty(),s){var l=t('<div class="messager-title"></div>');l[o.html?"html":"text"](s),a.append(l)}if(e){var h=t('<div class="messager-text"></div>');h[o.html?"html":"text"](e),a.append(h)}var c=n.$.find(".messager-icon");if(r){var d=t.isPlainObject(r)?r.html:'<i class="icon-'+r+' icon"></i>';c.length?c.html(d):a.before('<div class="messager-icon">'+d+"<div>")}else c.remove();n.$.toggleClass("messager-has-icon",!!r),n.updateTime||o.onUpdate&&o.onUpdate.call(n,o),n.updateTime=Date.now()},r.prototype.show=function(n,o){var a=this,s=this.options;if("function"==typeof n){var r=o;o=n,r!==i&&(n=r)}if(a.isShow)return void a.hide(function(){a.show(n,o)});a.hiding&&(clearTimeout(a.hiding),a.hiding=null),a.update(n);var l=s.placement,h=t(s.parent),c=h.children(".messagers-holder."+l);if(c.length||(c=t("<div/>").attr("class","messagers-holder "+l).appendTo(h)),c.append(a.$),"center"===l){var d=t(e).height()-c.height();c.css("top",Math.max(-d,d/2))}return a.$.show().addClass("in"),s.time&&(a.hiding=setTimeout(function(){a.hide()},s.time)),a.isShow=!0,o&&o(),s.onShow&&s.onShow.call(a,s),a},r.prototype.hide=function(t,e){t===!0&&(e=!0,t=null);var i=this,n=i.options;if(i.$.hasClass("in")){i.$.removeClass("in");var o=function(){var o=i.$.parent();i.$.detach(),o.children().length||o.remove(),t&&t(!0),n.onHide&&n.onHide.call(i,e)};e?o():setTimeout(o,200)}else t&&t(!1),n.onHide&&n.onHide.call(i,e);i.isShow=!1},r.prototype.destroy=function(){var t=this;t.hide(function(){t.$.remove(),t.$=null},!0),delete s[t.id]};var l=function(e){if(e===i)t(".messager").each(function(){var e=t(this).data("zui.messager");e&&e.hide&&e.hide(!0)});else{var n=t("#messager-"+e).data("zui.messager");n&&n.hide&&n.hide()}},h=function(e,n){"string"==typeof n&&(n={type:n}),t.isPlainObject(e)&&(n=t.extend({},n,e),e=null),n=t.extend({},n),n.id===i&&l();var o=s[n.id]||new r(e,n);return o.show(),o},c={notification:!0,placement:"bottom-right",time:0,icon:"bell icon-2x"},d=function(e,i,n){var o=t.extend({id:t.zui.uuid()},c),a="string"==typeof e,s="string"==typeof i;return a&&s?n=t.extend(o,n,{title:e,content:i}):a&&t.isPlainObject(i)?n=t.extend(o,n,i,{title:e}):t.isPlainObject(e)?n=t.extend(o,n,i,e):a&&(n=t.extend(o,n,{title:e})),h(n)},u=function(t){return"string"==typeof t?{placement:t}:t},f={show:h,hide:l};r.all=s,r.DEFAULTS=a,r.NOTIFICATION_DEFAULTS=c,t.each({primary:0,success:"ok-sign",info:"info-sign",warning:"warning-sign",danger:"exclamation-sign",important:0,special:0},function(e,i){f[e]=function(n,o){return h(n,t.extend({type:e,icon:r.DEFAULTS.icons[e]||i||null},u(o)))}}),t.zui({Messager:r,showMessager:h,showNotification:d,messager:f})}(jQuery,window,void 0),function(t,e,i,n){"use strict";function o(t){if(t=t.toLowerCase(),t&&c.test(t)){var e;if(4===t.length){var i="#";for(e=1;e<4;e+=1)i+=t.slice(e,e+1).concat(t.slice(e,e+1));t=i}var n=[];for(e=1;e<7;e+=2)n.push(b("0x"+t.slice(e,e+2)));return{r:n[0],g:n[1],b:n[2],a:1}}throw new Error("Wrong hex string! (hex: "+t+")")}function a(e){return typeof e===p&&("transparent"===e.toLowerCase()||m[e.toLowerCase()]||c.test(t.trim(e.toLowerCase())))}function s(t){function e(t){return t=t<0?t+1:t>1?t-1:t,6*t<1?r+(s-r)*t*6:2*t<1?s:3*t<2?r+(s-r)*(2/3-t)*6:r}var i=t.h,n=t.s,o=t.l,a=t.a;i=h(i)%u/u,n=l(h(n)),o=l(h(o)),a=l(h(a));var s=o<=.5?o*(n+1):o+n-o*n,r=2*o-s,c={r:e(i+1/3)*d,g:e(i)*d,b:e(i-1/3)*d,a:a};return c}function r(t,i,n){return v(n)&&(n=0),v(i)&&(i=d),e.min(e.max(t,n),i)}function l(t,e){return r(t,e)}function h(t){return"number"==typeof t?t:parseFloat(t)}var c=/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/,d=255,u=360,f=100,p="string",g="object",m={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370db",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#db7093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"},v=function(t){return t===n},y=function(t){return!v(t)},b=function(t){return parseInt(t)},w=function(t){return b(l(h(t),d))},x=function(t,e,i,n){var a=this;if(a.r=a.g=a.b=0,a.a=1,y(n)&&(a.a=l(h(n),1)),y(t)&&y(e)&&y(i))a.r=w(t),a.g=w(e),a.b=w(i);else if(y(t)){var r=typeof t;if(r==p)if(t=t.toLowerCase(),"transparent"===t)a.a=0;else if(m[t])a.rgb(o(m[t]));else if(0===t.indexOf("rgb")){var c=t.substring(t.indexOf("(")+1,t.lastIndexOf(")")).split(",",4);a.rgb({r:c[0],g:c[1],b:c[2],a:c[3]})}else a.rgb(o(t));else if("number"==r&&v(e))a.r=a.g=a.b=w(t);else if(r==g&&y(t.r))a.r=w(t.r),y(t.g)&&(a.g=w(t.g)),y(t.b)&&(a.b=w(t.b)),y(t.a)&&(a.a=l(h(t.a),1));else if(r==g&&y(t.h)){var d={h:l(h(t.h),u),s:1,l:1,a:1};y(t.s)&&(d.s=l(h(t.s),1)),y(t.l)&&(d.l=l(h(t.l),1)),y(t.a)&&(d.a=l(h(t.a),1)),a.rgb(s(d))}}};x.prototype.rgb=function(t){var e=this;if(y(t)){if(typeof t==g)y(t.r)&&(e.r=w(t.r)),y(t.g)&&(e.g=w(t.g)),y(t.b)&&(e.b=w(t.b)),y(t.a)&&(e.a=l(h(t.a),1));else{var i=b(h(t));e.r=i,e.g=i,e.b=i}return e}return{r:e.r,g:e.g,b:e.b,a:e.a}},x.prototype.hue=function(t){var e=this,i=e.toHsl();return v(t)?i.h:(i.h=l(h(t),u),e.rgb(s(i)),e)},x.prototype.darken=function(t){var e=this,i=e.toHsl();return i.l-=t/f,i.l=l(i.l,1),e.rgb(s(i)),e},x.prototype.clone=function(){var t=this;return new x(t.r,t.g,t.b,t.a)},x.prototype.lighten=function(t){return this.darken(-t)},x.prototype.fade=function(t){return this.a=l(t/f,1),this},x.prototype.spin=function(t){var e=this.toHsl(),i=(e.h+t)%u;return e.h=i<0?u+i:i,this.rgb(s(e))},x.prototype.toHsl=function(){var t,i,n=this,o=n.r/d,a=n.g/d,s=n.b/d,r=n.a,l=e.max(o,a,s),h=e.min(o,a,s),c=(l+h)/2,f=l-h;if(l===h)t=i=0;else{switch(i=c>.5?f/(2-l-h):f/(l+h),l){case o:t=(a-s)/f+(a<s?6:0);break;case a:t=(s-o)/f+2;break;case s:t=(o-a)/f+4}t/=6}return{h:t*u,s:i,l:c,a:r}},x.prototype.luma=function(){var t=this.r/d,i=this.g/d,n=this.b/d;return t=t<=.03928?t/12.92:e.pow((t+.055)/1.055,2.4),i=i<=.03928?i/12.92:e.pow((i+.055)/1.055,2.4),n=n<=.03928?n/12.92:e.pow((n+.055)/1.055,2.4),.2126*t+.7152*i+.0722*n},x.prototype.saturate=function(t){var e=this.toHsl();return e.s+=t/f,e.s=l(e.s),this.rgb(s(e))},x.prototype.desaturate=function(t){return this.saturate(-t)},x.prototype.contrast=function(t,e,i){if(e=v(e)?new x(d,d,d,1):new x(e),t=v(t)?new x(0,0,0,1):new x(t),t.luma()>e.luma()){var n=e;e=t,t=n}return this.a<.5?t:(i=v(i)?.43:h(i),this.luma()<i?e:t)},x.prototype.hexStr=function(){var t=this.r.toString(16),e=this.g.toString(16),i=this.b.toString(16);return 1==t.length&&(t="0"+t),1==e.length&&(e="0"+e),1==i.length&&(i="0"+i),"#"+t+e+i},x.prototype.toCssStr=function(){var t=this;return t.a>0?t.a<1?"rgba("+t.r+","+t.g+","+t.b+","+t.a+")":t.hexStr():"transparent"},x.isColor=a,x.names=m,x.get=function(t){return new x(t)},t.zui({Color:x})}(jQuery,Math,window,void 0),/*!
+function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t("object"==typeof exports?require("jquery"):jQuery)}(function(t){function e(t){return r.raw?t:encodeURIComponent(t)}function i(t){return r.raw?t:decodeURIComponent(t)}function n(t){return e(r.json?JSON.stringify(t):String(t))}function o(t){0===t.indexOf('"')&&(t=t.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return t=decodeURIComponent(t.replace(s," ")),r.json?JSON.parse(t):t}catch(e){}}function a(t,e){var i=r.raw?t:o(t);return"function"==typeof e?e(i):i}var s=/\+/g,r=t.cookie=function(o,s,l){if(void 0!==s&&"function"!=typeof s){if(l=t.extend({},r.defaults,l),"number"==typeof l.expires){var h=l.expires,c=l.expires=new Date;c.setTime(+c+864e5*h)}return document.cookie=[e(o),"=",n(s),l.expires?"; expires="+l.expires.toUTCString():"",l.path?"; path="+l.path:"",l.domain?"; domain="+l.domain:"",l.secure?"; secure":""].join("")}for(var d=o?void 0:{},u=document.cookie?document.cookie.split("; "):[],f=0,p=u.length;f<p;f++){var g=u[f].split("="),m=i(g.shift()),v=g.join("=");if(o&&o===m){d=a(v,s);break}o||void 0===(v=a(v))||(d[m]=v)}return d};r.defaults={},t.removeCookie=function(e,i){return void 0!==t.cookie(e)&&(t.cookie(e,"",t.extend({},i,{expires:-1})),!t.cookie(e))}}),function(t,e){"use strict";var i,n,o="localStorage",a="page_"+t.location.pathname+t.location.search,s=function(){this.silence=!0;try{o in t&&t[o]&&t[o].setItem&&(this.enable=!0,i=t[o])}catch(s){}this.enable||(n={},i={getLength:function(){var t=0;return e.each(n,function(){t++}),t},key:function(t){var i,o=0;return e.each(n,function(e){return o===t?(i=e,!1):void o++}),i},removeItem:function(t){delete n[t]},getItem:function(t){return n[t]},setItem:function(t,e){n[t]=e},clear:function(){n={}}}),this.storage=i,this.page=this.get(a,{})};s.prototype.pageSave=function(){if(e.isEmptyObject(this.page))this.remove(a);else{var t,i=[];for(t in this.page){var n=this.page[t];null===n&&i.push(t)}for(t=i.length-1;t>=0;t--)delete this.page[i[t]];this.set(a,this.page)}},s.prototype.pageRemove=function(t){"undefined"!=typeof this.page[t]&&(this.page[t]=null,this.pageSave())},s.prototype.pageClear=function(){this.page={},this.pageSave()},s.prototype.pageGet=function(t,e){var i=this.page[t];return void 0===e||null!==i&&void 0!==i?i:e},s.prototype.pageSet=function(t,i){e.isPlainObject(t)?e.extend(!0,this.page,t):this.page[this.serialize(t)]=i,this.pageSave()},s.prototype.check=function(){if(!this.enable&&!this.silence)throw new Error("Browser not support localStorage or enable status been set true.");return this.enable},s.prototype.length=function(){return this.check()?i.getLength?i.getLength():i.length:0},s.prototype.removeItem=function(t){return i.removeItem(t),this},s.prototype.remove=function(t){return this.removeItem(t)},s.prototype.getItem=function(t){return i.getItem(t)},s.prototype.get=function(t,e){var i=this.deserialize(this.getItem(t));return"undefined"!=typeof i&&null!==i||"undefined"==typeof e?i:e},s.prototype.key=function(t){return i.key(t)},s.prototype.setItem=function(t,e){return i.setItem(t,e),this},s.prototype.set=function(t,e){return void 0===e?this.remove(t):(this.setItem(t,this.serialize(e)),this)},s.prototype.clear=function(){return i.clear(),this},s.prototype.forEach=function(t){for(var e=this.length(),n=e-1;n>=0;n--){var o=i.key(n);t(o,this.get(o))}return this},s.prototype.getAll=function(){var t={};return this.forEach(function(e,i){t[e]=i}),t},s.prototype.serialize=function(t){return"string"==typeof t?t:JSON.stringify(t)},s.prototype.deserialize=function(t){if("string"==typeof t)try{return JSON.parse(t)}catch(e){return t||void 0}},e.zui({store:new s})}(window,jQuery),function(t){"use strict";var e="zui.searchBox",i=function(e,n){var o=this;o.name=name,o.$=t(e),o.options=n=t.extend({},i.DEFAULTS,o.$.data(),n);var a=o.$.is(n.inputSelector)?o.$:o.$.find(n.inputSelector);if(a.length){var s=function(){o.changeTimer&&(clearTimeout(o.changeTimer),o.changeTimer=null)},r=function(){s();var t=o.getSearch();if(t!==o.lastValue){var e=""===t;a.toggleClass("empty",e),o.$.callComEvent(o,"onSearchChange",[t,e]),o.lastValue=t}};o.$input=a=a.first(),a.on(n.listenEvent,function(t){o.changeTimer=setTimeout(function(){r()},n.changeDelay)}).on("focus",function(t){a.addClass("focus"),o.$.callComEvent(o,"onFocus",[t])}).on("blur",function(t){a.removeClass("focus"),o.$.callComEvent(o,"onBlur",[t])}).on("keydown",function(t){var e=0,i=t.which;27===i&&n.escToClear?(this.setSearch("",!0),r(),e=1):13===i&&n.onPressEnter&&(r(),o.$.callComEvent(o,"onPressEnter",[t]));var a=o.$.callComEvent(o,"onKeyDown",[t]);a===!1&&(e=1),e&&t.preventDefault()}),o.$.on("click",".search-clear-btn",function(t){o.setSearch("",!0),r(),o.focus(),t.preventDefault()}),r()}else console.error("ZUI: search box init error, cannot find search box input element.")};i.DEFAULTS={inputSelector:'input[type="search"],input[type="text"]',listenEvent:"change input paste",changeDelay:500},i.prototype.getSearch=function(){return this.$input&&t.trim(this.$input.val())},i.prototype.setSearch=function(t,e){var i=this.$input;i&&(i.val(t),e||i.trigger("change"))},i.prototype.focus=function(){this.$input&&this.$input.focus()},t.fn.searchBox=function(n){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof n&&n;a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},i.NAME=e,t.fn.searchBox.Constructor=i}(jQuery),function(t,e){"use strict";var i="zui.draggable",n={container:"body",move:!0},o=0,a=function(e,i){var a=this;a.$=t(e),a.id=o++,a.options=t.extend({},n,a.$.data(),i),a.init()};a.DEFAULTS=n,a.NAME=i,a.prototype.init=function(){var n,o,a,s,r,l=this,h=l.$,c="before",d="drag",u="finish",f="."+i+"."+l.id,p="mousedown"+f,g="mouseup"+f,m="mousemove"+f,v=l.options,y=v.selector,b=v.handle,w=h,x="function"==typeof v.move,C=function(t){var e=t.pageX,i=t.pageY;r=!0;var o={left:e-a.x,top:i-a.y};w.removeClass("drag-ready").addClass("dragging"),v.move&&(x?v.move(o,w):w.css(o)),v[d]&&v[d]({event:t,element:w,startOffset:a,pos:o,offset:{x:e-n.x,y:i-n.y},smallOffset:{x:e-s.x,y:i-s.y}}),s.x=e,s.y=i,v.stopPropagation&&t.stopPropagation()},_=function(i){if(t(e).off(f),!r)return void w.removeClass("drag-ready");var o={left:i.pageX-a.x,top:i.pageY-a.y};w.removeClass("drag-ready dragging"),v.move&&(x?v.move(o,w):w.css(o)),v[u]&&v[u]({event:i,element:w,startOffset:a,pos:o,offset:{x:i.pageX-n.x,y:i.pageY-n.y},smallOffset:{x:i.pageX-s.x,y:i.pageY-s.y}}),i.preventDefault(),v.stopPropagation&&i.stopPropagation()},k=function(i){var l=t.zui.getMouseButtonCode(v.mouseButton);if(!(l>-1&&i.button!==l)){var h=t(this);if(y&&(w=b?h.closest(y):h),v[c]){var d=v[c]({event:i,element:w});if(d===!1)return}var u=t(v.container),f=w.offset();o=u.offset(),n={x:i.pageX,y:i.pageY},a={x:i.pageX-f.left+o.left,y:i.pageY-f.top+o.top},s=t.extend({},n),r=!1,w.addClass("drag-ready"),i.preventDefault(),v.stopPropagation&&i.stopPropagation(),t(e).on(m,C).on(g,_)}};b?h.on(p,b,k):y?h.on(p,y,k):h.on(p,k)},a.prototype.destroy=function(){var n="."+i+"."+this.id;this.$.off(n),t(e).off(n),this.$.data(i,null)},t.fn.draggable=function(e){return this.each(function(){var n=t(this),o=n.data(i),s="object"==typeof e&&e;o||n.data(i,o=new a(this,s)),"string"==typeof e&&o[e]()})},t.fn.draggable.Constructor=a}(jQuery,document),function(t,e,i){"use strict";var n="zui.droppable",o={target:".droppable-target",deviation:5,sensorOffsetX:0,sensorOffsetY:0,dropToClass:"drop-to"},a=0,s=function(e,i){var n=this;n.id=a++,n.$=t(e),n.options=t.extend({},o,n.$.data(),i),n.init()};s.DEFAULTS=o,s.NAME=n,s.prototype.trigger=function(e,i){return t.zui.callEvent(this.options[e],i,this)},s.prototype.init=function(){var o,a,s,r,l,h,c,d,u,f,p,g,m,v=this,y=v.$,b=v.options,w=b.deviation,x="."+n+"."+v.id,C="mousedown"+x,_="mouseup"+x,k="mousemove"+x,T=b.selector,S=b.handle,D=b.flex,M=b.container,P=b.canMoveHere,z=b.dropToClass,L=y,F=!1,I=M?t(b.container).first():T?y:t("body"),$=function(e){if(F&&(p={left:e.pageX,top:e.pageY},!(i.abs(p.left-d.left)<w&&i.abs(p.top-d.top)<w))){if(null===s){var n=I.css("position");"absolute"!=n&&"relative"!=n&&"fixed"!=n&&(h=n,I.css("position","relative")),s=L.clone().removeClass("drag-from").addClass("drag-shadow").css({position:"absolute",width:L.outerWidth(),transition:"none"}).appendTo(I),L.addClass("dragging"),v.trigger("start",{event:e,element:L,shadowElement:s,targets:o})}var c={left:p.left-f.left,top:p.top-f.top},m={left:c.left-u.left,top:c.top-u.top};s.css(m),t.extend(g,p);var y=!1;r=!1,D||o.removeClass(z);var x=null;if(o.each(function(){var e=t(this),i=e.offset(),n=e.outerWidth(),o=e.outerHeight(),a=i.left+b.sensorOffsetX,s=i.top+b.sensorOffsetY;if(p.left>a&&p.top>s&&p.left<a+n&&p.top<s+o&&(x&&x.removeClass(z),x=e,!b.nested))return!1}),x){r=!0;var C=x.data("id");L.data("id")!=C&&(l=!1),(null===a||a.data("id")!==C&&!l)&&(y=!0),a=x,D&&o.removeClass(z),a.addClass(z)}D?null!==a&&a.length&&(r=!0):(L.toggleClass("drop-in",r),s.toggleClass("drop-in",r)),P&&P(L,a)===!1||v.trigger("drag",{event:e,isIn:r,target:a,element:L,isNew:y,selfTarget:l,clickOffset:f,offset:c,position:{left:c.left-u.left,top:c.top-u.top},mouseOffset:p}),e.preventDefault()}},A=function(i){if(t(e).off(x),clearTimeout(m),F){if(F=!1,h&&I.css("position",h),null===s)return L.removeClass("drag-from"),void v.trigger("always",{event:i,cancel:!0});r||(a=null);var n=!0;p=i?{left:i.pageX,top:i.pageY}:g;var c={left:p.left-f.left,top:p.top-f.top},d={left:p.left-g.left,top:p.top-g.top};g.left=p.left,g.top=p.top;var y={event:i,isIn:r,target:a,element:L,isNew:!l&&null!==a,selfTarget:l,offset:c,mouseOffset:p,position:{left:c.left-u.left,top:c.top-u.top},lastMouseOffset:g,moveOffset:d};n=v.trigger("beforeDrop",y),n&&r&&v.trigger("drop",y),o.removeClass(z),L.removeClass("dragging").removeClass("drag-from"),s.remove(),s=null,v.trigger("finish",y),v.trigger("always",y),i&&i.preventDefault()}},E=function(i){var n=t.zui.getMouseButtonCode(b.mouseButton);if(!(n>-1&&i.button!==n)){var p=t(this);T&&(L=S?p.closest(T):p),L.hasClass("drag-shadow")||b.before&&b.before({event:i,element:L})===!1||(F=!0,o="function"==typeof b.target?b.target(L,y):I.find(b.target),a=null,s=null,r=!1,l=!0,h=null,c=L.offset(),u=I.offset(),u.top=u.top-I.scrollTop(),u.left=u.left-I.scrollLeft(),d={left:i.pageX,top:i.pageY},g=t.extend({},d),f={left:d.left-c.left,top:d.top-c.top},L.addClass("drag-from"),t(e).on(k,$).on(_,A),m=setTimeout(function(){t(e).on(C,A)},10),i.preventDefault(),b.stopPropagation&&i.stopPropagation())}};S?y.on(C,S,E):T?y.on(C,T,E):y.on(C,E)},s.prototype.destroy=function(){var i="."+n+"."+this.id;this.$.off(i),t(e).off(i),this.$.data(n,null)},s.prototype.reset=function(){this.destroy(),this.init()},t.fn.droppable=function(e){return this.each(function(){var i=t(this),o=i.data(n),a="object"==typeof e&&e;o||i.data(n,o=new s(this,a)),"string"==typeof e&&o[e]()})},t.fn.droppable.Constructor=s}(jQuery,document,Math),+function(t,e){"use strict";function i(e,i,a){return this.each(function(){var s=t(this),r=s.data(n),l=t.extend({},o.DEFAULTS,s.data(),"object"==typeof e&&e);r||s.data(n,r=new o(this,l)),"string"==typeof e?r[e](i,a):l.show&&r.show(i,a)})}var n="zui.modal",o=function(i,o){var a=this;a.options=o,a.$body=t(document.body),a.$element=t(i),a.$backdrop=a.isShown=null,a.scrollbarWidth=0,o.moveable===e&&(a.options.moveable=a.$element.hasClass("modal-moveable")),o.remote&&a.$element.find(".modal-content").load(o.remote,function(){a.$element.trigger("loaded."+n)}),o.scrollInside&&t(window).on("resize."+n,function(){a.isShown&&a.adjustPosition(e,100)})};o.VERSION="3.2.0",o.TRANSITION_DURATION=300,o.BACKDROP_TRANSITION_DURATION=150,o.DEFAULTS={backdrop:!0,keyboard:!0,show:!0,position:"fit"};var a=function(e,i){var n=t(window);i.left=Math.max(0,Math.min(i.left,n.width()-e.outerWidth())),i.top=Math.max(0,Math.min(i.top,n.height()-e.outerHeight())),e.css(i)};o.prototype.toggle=function(t,e){return this.isShown?this.hide():this.show(t,e)},o.prototype.adjustPosition=function(i,o){var s=this;if(clearTimeout(s.reposTask),o)return void(s.reposTask=setTimeout(s.adjustPosition.bind(s,i,0),o));var r=s.options;if(i===e&&(i=r.position),i!==e&&null!==i){"function"==typeof i&&(i=i(s));var l=s.$element.find(".modal-dialog"),h=t(window).height(),c={maxHeight:"initial",overflow:"visible"},d=l.find(".modal-body").css(c);if(r.scrollInside&&d.length){var u=r.headerHeight,f=r.footerHeight,p=l.find(".modal-header"),g=l.find(".modal-footer");"number"!=typeof u&&(u=p.length?p.outerHeight():"function"==typeof u?u(p):0),"number"!=typeof f&&(f=g.length?g.outerHeight():"function"==typeof f?f(g):0),c.maxHeight=h-u-f,c.overflow=d[0].scrollHeight>c.maxHeight?"auto":"visible",d.css(c)}var m=Math.max(0,(h-l.outerHeight())/2);if("fit"===i?i={top:m>50?Math.floor(2*m/3):m}:"center"===i?i={top:m}:t.isPlainObject(i)||(i={top:i}),l.hasClass("modal-moveable")){var v=null,y=r.rememberPos;y&&(y===!0?v=s.$element.data("modal-pos"):t.zui.store&&(v=t.zui.store.pageGet(n+".rememberPos."+y))),i=t.extend(i,{left:Math.max(0,(t(window).width()-l.outerWidth())/2)},v),"inside"===r.moveable?a(l,i):l.css(i)}else l.css(i)}},o.prototype.setMoveable=function(){t.fn.draggable||console.error("Moveable modal requires draggable.js.");var e=this,i=e.options,o=e.$element.find(".modal-dialog").removeClass("modal-dragged");o.toggleClass("modal-moveable",!!i.moveable),e.$element.data("modal-moveable-setup")||o.draggable({container:e.$element,handle:".modal-header",before:function(){var t=o.css("margin-top");t&&"0px"!==t&&o.css("top",t).css("margin-top","").addClass("modal-dragged")},finish:function(o){var a=i.rememberPos;a&&(e.$element.data("modal-pos",o.pos),t.zui.store&&a!==!0&&t.zui.store.pageSet(n+".rememberPos."+a,o.pos))},move:"inside"!==i.moveable||function(t){a(o,t)}})},o.prototype.show=function(e,i){var a=this,s=t.Event("show."+n,{relatedTarget:e});a.$element.trigger(s),a.$element.toggleClass("modal-scroll-inside",!!a.options.scrollInside),a.isShown||s.isDefaultPrevented()||(a.isShown=!0,a.options.moveable&&a.setMoveable(),a.options.backdrop!==!1&&(a.setScrollbar(),a.$body.addClass("modal-open")),a.escape(),a.$element.on("click.dismiss."+n,'[data-dismiss="modal"]',function(t){a.hide(),t.stopPropagation()}),a.backdrop(function(){var s=t.support.transition&&a.$element.hasClass("fade");a.$element.parent().length||a.$element.appendTo(a.$body),a.$element.show().scrollTop(0),s&&a.$element[0].offsetWidth,a.$element.addClass("in").attr("aria-hidden",!1),a.adjustPosition(i),a.enforceFocus();var r=t.Event("shown."+n,{relatedTarget:e});s?a.$element.find(".modal-dialog").one("bsTransitionEnd",function(){a.$element.trigger("focus").trigger(r)}).emulateTransitionEnd(o.TRANSITION_DURATION):a.$element.trigger("focus").trigger(r)}))},o.prototype.hide=function(e){e&&e.preventDefault&&e.preventDefault();var i=this;e=t.Event("hide."+n),i.$element.trigger(e),i.isShown&&!e.isDefaultPrevented()&&(i.isShown=!1,i.options.backdrop!==!1&&(i.$body.removeClass("modal-open"),i.resetScrollbar()),i.escape(),t(document).off("focusin."+n),i.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss."+n),t.support.transition&&i.$element.hasClass("fade")?i.$element.one("bsTransitionEnd",i.hideModal.bind(i)).emulateTransitionEnd(o.TRANSITION_DURATION):i.hideModal())},o.prototype.enforceFocus=function(){t(document).off("focusin."+n).on("focusin."+n,function(t){this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")}.bind(this))},o.prototype.escape=function(){this.isShown&&this.options.keyboard?t(document).on("keydown.dismiss."+n,function(i){if(27==i.which){var o=t.Event("escaping."+n),a=this.$element.triggerHandler(o,"esc");if(a!=e&&!a)return;this.hide()}}.bind(this)):this.isShown||t(document).off("keydown.dismiss."+n)},o.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$element.trigger("hidden."+n)})},o.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},o.prototype.backdrop=function(e){var i=this,a=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var s=t.support.transition&&a;if(this.$backdrop=t('<div class="modal-backdrop '+a+'" />').appendTo(this.$body),this.$element.on("mousedown.dismiss."+n,function(t){t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))}.bind(this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return;s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(o.BACKDROP_TRANSITION_DURATION):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var r=function(){i.removeBackdrop(),e&&e()};t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",r).emulateTransitionEnd(o.BACKDROP_TRANSITION_DURATION):r()}else e&&e()},o.prototype.setScrollbar=function(){t.zui.fixBodyScrollbar()&&this.options.onSetScrollbar&&this.options.onSetScrollbar()},o.prototype.resetScrollbar=function(){t.zui.resetBodyScrollbar(),this.options.onSetScrollbar&&this.options.onSetScrollbar("")},o.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var s=t.fn.modal;t.fn.modal=i,t.fn.modal.Constructor=o,t.fn.modal.noConflict=function(){return t.fn.modal=s,this},t(document).on("click."+n+".data-api",'[data-toggle="modal"]',function(e){var o=t(this),a=o.attr("href"),s=null;try{s=t(o.attr("data-target")||a&&a.replace(/.*(?=#[^\s]+$)/,""))}catch(r){return}if(s.length){var l=s.data(n)?"toggle":t.extend({remote:!/#/.test(a)&&a},s.data(),o.data());o.is("a")&&e.preventDefault(),s.one("show."+n,function(t){t.isDefaultPrevented()||s.one("hidden."+n,function(){o.is(":visible")&&o.trigger("focus")})}),i.call(s,l,this,o.data("position"))}})}(jQuery,void 0),function(t,e,i){"use strict";if(!t.fn.modal)throw new Error("Modal trigger requires modal.js");var n="zui.modaltrigger",o="ajax",a=".zui.modal",s="string",r=function(e,i){e=t.extend({},r.DEFAULTS,t.ModalTriggerDefaults,i?i.data():null,e),this.isShown,this.$trigger=i,this.options=e,this.id=t.zui.uuid(),e.show&&this.show()};r.DEFAULTS={type:"custom",height:"auto",name:"triggerModal",fade:!0,position:"fit",showHeader:!0,delay:0,backdrop:!0,keyboard:!0,waittime:0,loadingIcon:"icon-spinner-indicator",scrollInside:!1},r.prototype.initOptions=function(i){if(i.url&&(!i.type||i.type!=o&&"iframe"!=i.type)&&(i.type=o),i.remote)i.type=o,typeof i.remote===s&&(i.url=i.remote);else if(i.iframe)i.type="iframe",typeof i.iframe===s&&(i.url=i.iframe);else if(i.custom&&(i.type="custom",typeof i.custom===s)){var n;try{n=t(i.custom)}catch(a){}n&&n.length?i.custom=n:"function"==typeof e[i.custom]&&(i.custom=e[i.custom])}return i},r.prototype.init=function(e){var i=this,o=t("#"+e.name);o.length&&(i.isShown||o.off(a),o.remove()),o=t('<div id="'+e.name+'" class="modal modal-trigger '+(e.className||"")+'">'+("string"==typeof e.loadingIcon&&0===e.loadingIcon.indexOf("icon-")?'<div class="icon icon-spin loader '+e.loadingIcon+'"></div>':e.loadingIcon)+'<div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button class="close" data-dismiss="modal">×</button><h4 class="modal-title"><i class="modal-icon"></i> <span class="modal-title-name"></span></h4></div><div class="modal-body"></div></div></div></div>').appendTo("body").data(n,i);var s=function(t,i,n){n=n||e[t],"function"==typeof n&&o.on(i+a,n)};s("onShow","show"),s("shown","shown"),s("onHide","hide",function(t){if("iframe"===e.type&&i.$iframeBody){var n=i.$iframeBody.triggerHandler("modalhide"+a,[i]);n===!1&&t.preventDefault()}var o=e.onHide;if(o)return o(t)}),s("hidden","hidden"),s("loaded","loaded"),o.on("shown"+a,function(){i.isShown=!0}).on("hidden"+a,function(){i.isShown=!1}),this.$modal=o,this.$dialog=o.find(".modal-dialog"),e.mergeOptions&&(this.options=e)},r.prototype.show=function(i){var a=this,l=t.extend({},r.DEFAULTS,a.options,{url:a.$trigger?a.$trigger.attr("href")||a.$trigger.attr("data-url")||a.$trigger.data("url"):a.options.url},i),h=a.isShown;l=a.initOptions(l),h||a.init(l);var c=a.$modal,d=c.find(".modal-dialog"),u=l.custom,f=d.find(".modal-body").css("padding","").toggleClass("load-indicator loading",!!h),p=d.find(".modal-header"),g=d.find(".modal-content");c.toggleClass("fade",l.fade).addClass(l.className).toggleClass("modal-loading",!h).toggleClass("modal-scroll-inside",!!l.scrollInside),d.toggleClass("modal-md","md"===l.size).toggleClass("modal-sm","sm"===l.size).toggleClass("modal-lg","lg"===l.size).toggleClass("modal-fullscreen","fullscreen"===l.size),p.toggle(l.showHeader),p.find(".modal-icon").attr("class","modal-icon icon-"+l.icon),p.find(".modal-title-name").text(l.title||""),l.size&&"fullscreen"===l.size&&(l.width="",l.height="");var m=function(){clearTimeout(this.resizeTask),this.resizeTask=setTimeout(function(){a.adjustPosition(l.position)},100)},v=function(t,e){return"undefined"==typeof t&&(t=l.delay),setTimeout(function(){d=c.find(".modal-dialog"),l.width&&"auto"!=l.width&&d.css("width",l.width),l.height&&"auto"!=l.height&&(d.css("height",l.height),"iframe"===l.type&&f.css("height",d.height()-p.outerHeight())),a.adjustPosition(l.position),c.removeClass("modal-loading").removeClass("modal-updating"),h&&f.removeClass("loading"),"iframe"!=l.type&&(f=d.off("resize."+n).find(".modal-body").off("resize."+n),l.scrollInside&&(f=f.children().off("resize."+n)),(f.length?f:d).on("resize."+n,m)),e&&e()},t)};if("custom"===l.type&&u)if("function"==typeof u){var y=u({modal:c,options:l,modalTrigger:a,ready:v});typeof y===s&&(f.html(y),v())}else u instanceof t?(f.html(t("<div>").append(u.clone()).html()),v()):(f.html(u),v());else if(l.url){var b=function(){var t=c.callComEvent(a,"broken");"string"==typeof t&&f.html(t),v()};if(c.attr("ref",l.url),"iframe"===l.type){c.addClass("modal-iframe"),this.firstLoad=!0;var w="iframe-"+l.name;p.detach(),f.detach(),g.empty().append(p).append(f),f.css("padding",0).html('<iframe id="'+w+'" name="'+w+'" src="'+l.url+'" frameborder="no"  allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"  allowtransparency="true" scrolling="auto" style="width: 100%; height: 100%; left: 0px;"></iframe>'),l.waittime>0&&(a.waitTimeout=v(l.waittime,b));var x=document.getElementById(w);x.onload=x.onreadystatechange=function(i){var o=!!l.scrollInside;if(a.firstLoad&&c.addClass("modal-loading"),!this.readyState||"complete"==this.readyState){a.firstLoad=!1,l.waittime>0&&clearTimeout(a.waitTimeout);try{c.attr("ref",x.contentWindow.location.href);var s=e.frames[w].$;if(s&&"auto"===l.height&&"fullscreen"!=l.size){var r=s("body").addClass("body-modal").toggleClass("body-modal-scroll-inside",o);a.$iframeBody=r,l.iframeBodyClass&&r.addClass(l.iframeBodyClass);var h=[],d=function(i){c.removeClass("fade");var n=r.outerHeight();if(i===!0&&l.onlyIncreaseHeight&&(n=Math.max(n,f.data("minModalHeight")||0),f.data("minModalHeight",n)),o){var a=l.headerHeight;"number"!=typeof a?a=p.outerHeight():"function"==typeof a&&(a=a(p));var s=t(e).height();n=Math.min(n,s-a)}for(h.length>1&&n===h[0]&&(n=Math.max(n,h[1])),h.push(n);h.length>2;)h.shift();f.css("height",n),l.fade&&c.addClass("fade"),v()};c.callComEvent(a,"loaded",{modalType:"iframe",jQuery:s}),setTimeout(d,100),r.off("resize."+n).on("resize."+n,d),o&&t(e).off("resize."+n).on("resize."+n,d)}else v();var u=l.handleLinkInIframe;u&&s("body").on("click","string"==typeof u?u:"a[href]",function(){t(this).is('[data-toggle="modal"]')||c.addClass("modal-updating")}),l.iframeStyle&&s("head").append("<style>"+l.iframeStyle+"</style>")}catch(i){v()}}}}else t.ajax(t.extend({url:l.url,success:function(i){try{var s=t(i);s.filter(".modal-dialog").length?d.parent().empty().append(s):s.filter(".modal-content").length?d.find(".modal-content").replaceWith(s):f.wrapInner(s)}catch(r){e.console&&e.console.warn&&console.warn("ZUI: Cannot recogernize remote content.",{error:r,data:i}),c.html(i)}c.callComEvent(a,"loaded",{modalType:o}),v(),l.scrollInside&&t(e).off("resize."+n).on("resize."+n,m)},error:b},l.ajaxOptions))}h||c.modal({show:"show",backdrop:l.backdrop,moveable:l.moveable,rememberPos:l.rememberPos,keyboard:l.keyboard,scrollInside:l.scrollInside})},r.prototype.close=function(t,i){var n=this;(t||i)&&n.$modal.on("hidden"+a,function(){"function"==typeof t&&t(),typeof i===s&&i.length&&!n.$modal.data("cancel-reload")&&("this"===i?e.location.reload():e.location=i)}),n.$modal.modal("hide")},r.prototype.toggle=function(t){this.isShown?this.close():this.show(t)},r.prototype.adjustPosition=function(t){t=t===i?this.options.position:t,"function"==typeof t&&(t=t(this)),this.$modal.modal("adjustPosition",t)},t.zui({ModalTrigger:r,modalTrigger:new r}),t.fn.modalTrigger=function(e,i){return t(this).each(function(){var o=t(this),a=o.data(n),l=t.extend({title:o.attr("title")||o.text(),url:o.attr("href"),type:o.hasClass("iframe")?"iframe":""},o.data(),t.isPlainObject(e)&&e);return a?void(typeof e==s?a[e](i):l.show&&a.show(i)):(o.data(n,a=new r(l,o)),void o.on((l.trigger||"click")+".toggle."+n,function(e){l=t.extend(l,{url:o.attr("href")||o.attr("data-url")||o.data("url")||l.url}),a.toggle(l),o.is("a")&&e.preventDefault()}))})};var l=t.fn.modal;t.fn.modal=function(e,i){return t(this).each(function(){var n=t(this);n.hasClass("modal")?l.call(n,e,i):n.modalTrigger(e,i)})},t.fn.modal.bs=l;var h=function(e){return e?e=t(e):(e=t(".modal.modal-trigger"),!e.length),e&&e instanceof t?e:null},c=function(i,o,a){var s=i;if("function"==typeof i){var r=a;a=o,o=i,i=r}i=h(i),i&&i.length?i.each(function(){t(this).data(n).close(o,a)}):t("body").hasClass("modal-open")||t(".modal.in").length||t("body").hasClass("body-modal")&&e.parent.$.zui.closeModal(s,o,a)},d=function(t,e){e=h(e),e&&e.length&&e.modal("adjustPosition",t)},u=function(e,i){"string"==typeof e&&(e={url:e});var o=h(i);o&&o.length&&o.each(function(){t(this).data(n).show(e)})};t.zui({reloadModal:u,closeModal:c,ajustModalPosition:d,adjustModalPosition:d}),t(document).on("click."+n+".data-api",'[data-toggle="modal"]',function(e){var i=t(this),o=i.attr("href"),a=null;try{a=t(i.attr("data-target")||o&&o.replace(/.*(?=#[^\s]+$)/,""))}catch(s){}a&&a.length||(i.data(n)?i.trigger(".toggle."+n):i.modalTrigger({show:!0})),i.is("a")&&e.preventDefault()}).on("click."+n+".data-api",'[data-dismiss="modal"]',function(){t.zui.closeModal()})}(window.jQuery,window,void 0),+function(t){"use strict";var e=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.init("tooltip",t,e)};e.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.prototype.init=function(e,i,n){this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(n);for(var o=this.options.trigger.split(" "),a=o.length;a--;){var s=o[a];if("click"==s)this.$element.on("click."+this.type,this.options.selector,this.toggle.bind(this));else if("manual"!=s){var r="hover"==s?"mouseenter":"focus",l="hover"==s?"mouseleave":"blur";this.$element.on(r+"."+this.type,this.options.selector,this.enter.bind(this)),this.$element.on(l+"."+this.type,this.options.selector,this.leave.bind(this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},e.prototype.getDefaults=function(){return e.DEFAULTS},e.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},e.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults();return this._options&&t.each(this._options,function(t,n){i[t]!=n&&(e[t]=n)}),e},e.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type);return clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show()},e.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type);return clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide()},e.prototype.show=function(e){var i=t.Event("show.zui."+this.type);if((e||this.hasContent())&&this.enabled){var n=this;if(n.$element.trigger(i),i.isDefaultPrevented())return;var o=n.tip();n.setContent(e),n.options.animation&&o.addClass("fade");var a="function"==typeof n.options.placement?n.options.placement.call(n,o[0],n.$element[0]):n.options.placement,s=/\s?auto?\s?/i,r=s.test(a);r&&(a=a.replace(s,"")||"top"),o.detach().css({top:0,left:0,display:"block"}).addClass(a),n.options.container?o.appendTo(n.options.container):o.insertAfter(n.$element);var l=n.getPosition(),h=o[0].offsetWidth,c=o[0].offsetHeight;if(r){var d=n.$element.parent(),u=a,f=document.documentElement.scrollTop||document.body.scrollTop,p="body"==n.options.container?window.innerWidth:d.outerWidth(),g="body"==n.options.container?window.innerHeight:d.outerHeight(),m="body"==n.options.container?0:d.offset().left;a="bottom"==a&&l.top+l.height+c-f>g?"top":"top"==a&&l.top-f-c<0?"bottom":"right"==a&&l.right+h>p?"left":"left"==a&&l.left-h<m?"right":a,o.removeClass(u).addClass(a)}var v=n.getCalculatedOffset(a,l,h,c);n.applyPlacement(v,a);var y=function(){var t=n.hoverState;n.$element.trigger("shown.zui."+n.type),n.hoverState=null,"out"==t&&n.leave(n)};t.support.transition&&n.$tip.hasClass("fade")?o.one("bsTransitionEnd",y).emulateTransitionEnd(150):y()}},e.prototype.applyPlacement=function(t,e){var i,n=this.tip(),o=n[0].offsetWidth,a=n[0].offsetHeight,s=parseInt(n.css("margin-top"),10),r=parseInt(n.css("margin-left"),10);isNaN(s)&&(s=0),isNaN(r)&&(r=0),t.top=t.top+s,t.left=t.left+r,n.offset(t).addClass("in");var l=n[0].offsetWidth,h=n[0].offsetHeight;if("top"==e&&h!=a&&(i=!0,t.top=t.top+a-h),/bottom|top/.test(e)){var c=0;t.left<0&&(c=t.left*-2,t.left=0,n.offset(t),l=n[0].offsetWidth,h=n[0].offsetHeight),this.replaceArrow(c-o+l,l,"left")}else this.replaceArrow(h-a,h,"top");i&&n.offset(t)},e.prototype.replaceArrow=function(t,e,i){this.arrow().css(i,t?50*(1-t/e)+"%":"")},e.prototype.setContent=function(t){var e=this.tip(),i=t||this.getTitle();this.options.tipId&&e.attr("id",this.options.tipId),this.options.tipClass&&e.addClass(this.options.tipClass),e.find(".tooltip-inner")[this.options.html?"html":"text"](i),e.removeClass("fade in top bottom left right")},e.prototype.hide=function(){function e(){"in"!=i.hoverState&&n.detach()}var i=this,n=this.tip(),o=t.Event("hide.zui."+this.type);if(this.$element.trigger(o),!o.isDefaultPrevented())return n.removeClass("in"),t.support.transition&&this.$tip.hasClass("fade")?n.one(t.support.transition.end,e).emulateTransitionEnd(150):e(),this.$element.trigger("hidden.zui."+this.type),this},e.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},e.prototype.hasContent=function(){return this.getTitle()},e.prototype.getPosition=function(){var e=this.$element[0];return t.extend({},"function"==typeof e.getBoundingClientRect?e.getBoundingClientRect():{width:e.offsetWidth,height:e.offsetHeight},this.$element.offset())},e.prototype.getCalculatedOffset=function(t,e,i,n){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-n,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-n/2,left:e.left-i}:{top:e.top+e.height/2-n/2,left:e.left+e.width}},e.prototype.getTitle=function(){var t,e=this.$element,i=this.options;return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title);
+},e.prototype.tip=function(){return this.$tip=this.$tip||t(this.options.template)},e.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},e.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},e.prototype.enable=function(){this.enabled=!0},e.prototype.disable=function(){this.enabled=!1},e.prototype.toggleEnabled=function(){this.enabled=!this.enabled},e.prototype.toggle=function(e){var i=e?t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type):this;i.tip().hasClass("in")?i.leave(i):i.enter(i)},e.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("zui."+this.type)};var i=t.fn.tooltip;t.fn.tooltip=function(i,n){return this.each(function(){var o=t(this),a=o.data("zui.tooltip"),s="object"==typeof i&&i;a||o.data("zui.tooltip",a=new e(this,s)),"string"==typeof i&&a[i](n)})},t.fn.tooltip.Constructor=e,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=i,this}}(window.jQuery),+function(t){"use strict";var e=function(t,e){this.init("popover",t,e)};if(!t.fn.tooltip)throw new Error("Popover requires tooltip.js");e.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),e.prototype.constructor=e,e.prototype.getDefaults=function(){return e.DEFAULTS},e.prototype.setContent=function(){var t=this.tip(),e=this.getTarget();if(e)return e.find(".arrow").length<1&&t.addClass("no-arrow"),void t.html(e.html());var i=this.getTitle(),n=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](i),t.find(".popover-content")[this.options.html?"html":"text"](n),t.removeClass("fade top bottom left right in"),this.options.tipId&&t.attr("id",this.options.tipId),this.options.tipClass&&t.addClass(this.options.tipClass),t.find(".popover-title").html()||t.find(".popover-title").hide()},e.prototype.hasContent=function(){return this.getTarget()||this.getTitle()||this.getContent()},e.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},e.prototype.getTarget=function(){var e=this.$element,i=this.options,n=e.attr("data-target")||("function"==typeof i.target?i.target.call(e[0]):i.target);return!!n&&("$next"==n?e.next(".popover"):t(n))},e.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},e.prototype.tip=function(){return this.$tip||(this.$tip=t(this.options.template)),this.$tip};var i=t.fn.popover;t.fn.popover=function(i){return this.each(function(){var n=t(this),o=n.data("zui.popover"),a="object"==typeof i&&i;o||n.data("zui.popover",o=new e(this,a)),"string"==typeof i&&o[i]()})},t.fn.popover.Constructor=e,t.fn.popover.noConflict=function(){return t.fn.popover=i,this}}(window.jQuery),+function(t){"use strict";function e(){t(o).remove(),t(a).each(function(e){var o=i(t(this));o.hasClass("open")&&(o.trigger(e=t.Event("hide."+n)),e.isDefaultPrevented()||o.removeClass("open").trigger("hidden."+n))})}function i(e){var i=e.attr("data-target");i||(i=e.attr("href"),i=i&&/#/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""));var n;try{n=i&&t(i)}catch(o){}return n&&n.length?n:e.parent()}var n="zui.dropdown",o=".dropdown-backdrop",a="[data-toggle=dropdown]",s=function(e){t(e).on("click."+n,this.toggle)};s.prototype.toggle=function(o){var a=t(this);if(!a.is(".disabled, :disabled")){var s=i(a),r=s.hasClass("open");if(e(),!r){if("ontouchstart"in document.documentElement&&!s.closest(".navbar-nav").length&&t('<div class="dropdown-backdrop"/>').insertAfter(t(this)).on("click",e),s.trigger(o=t.Event("show."+n)),o.isDefaultPrevented())return;s.toggleClass("open").trigger("shown."+n),a.focus()}return!1}},s.prototype.keydown=function(e){if(/(38|40|27)/.test(e.keyCode)){var n=t(this);if(e.preventDefault(),e.stopPropagation(),!n.is(".disabled, :disabled")){var o=i(n),s=o.hasClass("open");if(!s||s&&27==e.keyCode)return 27==e.which&&o.find(a).focus(),n.click();var r=t("[role=menu] li:not(.divider):visible a",o);if(r.length){var l=r.index(r.filter(":focus"));38==e.keyCode&&l>0&&l--,40==e.keyCode&&l<r.length-1&&l++,~l||(l=0),r.eq(l).focus()}}}};var r=t.fn.dropdown;t.fn.dropdown=function(e){return this.each(function(){var i=t(this),n=i.data("dropdown");n||i.data("dropdown",n=new s(this)),"string"==typeof e&&n[e].call(i)})},t.fn.dropdown.Constructor=s,t.fn.dropdown.noConflict=function(){return t.fn.dropdown=r,this};var l=n+".data-api";t(document).on("click."+l,e).on("click."+l,".dropdown form",function(t){t.stopPropagation()}).on("click."+l,a,s.prototype.toggle).on("keydown."+l,a+", [role=menu]",s.prototype.keydown)}(window.jQuery),function(t,e,i){"use strict";var n=0,o='<div class="messager messager-{type} {placement}" style="display: none"><div class="messager-content"></div><div class="messager-actions"></div></div>',a={icons:{},type:"default",placement:"top",time:4e3,parent:"body",close:!0,fade:!0,scale:!0},s={},r=function(e,r){t.isPlainObject(e)?r=t.extend({},r,e):e&&(r?r.content=e:r={content:e});var l=this;r=l.options=t.extend({},a,r),l.id=r.id||n++;var h=s[l.id];h&&h.destroy(),s[l.id]=l,l.$=t(o.format(r)).toggleClass("fade",r.fade).toggleClass("scale",r.scale).attr("id","messager-"+l.id),r.cssClass&&l.$.addClass(r.cssClass);var c=!1,d=l.$.find(".messager-actions"),u=function(e){var n=t('<button type="button" class="action action-'+e.name+'"/>');"close"===e.name&&n.addClass("close"),e.html!==i&&n.html(e.html),e.icon!==i&&n.append('<i class="action-icon icon-'+e.icon+'"/>'),e.text!==i&&n.append('<span class="action-text">'+e.text+"</span>"),e.tooltip!==i&&n.attr("title",e.tooltip).tooltip(),n.data("action",e),d.append(n)};r.actions&&t.each(r.actions,function(t,e){e.name===i&&(e.name=t),"close"==e.name&&(c=!0),u(e)}),!c&&r.close&&u({name:"close",html:"&times;"}),l.$.on("click",".action",function(e){var i,n=t(this).data("action");r.onAction&&(i=r.onAction.call(this,n.name,n,l),i===!1)||"function"==typeof n.action&&(i=n.action.call(this,l),i===!1)||(l.hide(),e.stopPropagation())}),l.$.on("click",function(t){if(r.onAction){var e=r.onAction.call(this,"content",null,l);e===!0&&l.hide()}}),l.$.data("zui.messager",l),r.show&&l.message!==i&&l.show()};r.prototype.update=function(e,i){t.isPlainObject(e)?i=e:e&&(i?i.content=e:i={content:e});var n=this,o=n.options;n.$.removeClass("messager-"+o.type);var a=n.$.find(".messager-content");o.contentClass&&a.removeClass(o.contentClass),i&&(o=t.extend(o,i)),n.$.addClass("messager-"+o.type).toggleClass("messager-notification",!!o.notification),o.contentClass&&a.addClass(o.contentClass);var s=o.title,r=o.icon;if(e=o.content,a.empty(),s){var l=t('<div class="messager-title"></div>');l[o.html?"html":"text"](s),a.append(l)}if(e){var h=t('<div class="messager-text"></div>');h[o.html?"html":"text"](e),a.append(h)}var c=n.$.find(".messager-icon");if(r){var d=t.isPlainObject(r)?r.html:'<i class="icon-'+r+' icon"></i>';c.length?c.html(d):a.before('<div class="messager-icon">'+d+"<div>")}else c.remove();n.$.toggleClass("messager-has-icon",!!r),n.updateTime||o.onUpdate&&o.onUpdate.call(n,o),n.updateTime=Date.now()},r.prototype.show=function(n,o){var a=this,s=this.options;if("function"==typeof n){var r=o;o=n,r!==i&&(n=r)}if(a.isShow)return void a.hide(function(){a.show(n,o)});a.hiding&&(clearTimeout(a.hiding),a.hiding=null),a.update(n);var l=s.placement,h=t(s.parent),c=h.children(".messagers-holder."+l);if(c.length||(c=t("<div/>").attr("class","messagers-holder "+l).appendTo(h)),c.append(a.$),"center"===l){var d=t(e).height()-c.height();c.css("top",Math.max(-d,d/2))}return a.$.show().addClass("in"),s.time&&(a.hiding=setTimeout(function(){a.hide()},s.time)),a.isShow=!0,o&&o(),s.onShow&&s.onShow.call(a,s),a},r.prototype.hide=function(t,e){t===!0&&(e=!0,t=null);var i=this,n=i.options;if(i.$.hasClass("in")){i.$.removeClass("in");var o=function(){var o=i.$.parent();i.$.detach(),o.children().length||o.remove(),t&&t(!0),n.onHide&&n.onHide.call(i,e)};e?o():setTimeout(o,200)}else t&&t(!1),n.onHide&&n.onHide.call(i,e);i.isShow=!1},r.prototype.destroy=function(){var t=this;t.hide(function(){t.$.remove(),t.$=null},!0),delete s[t.id]};var l=function(e){if(e===i)t(".messager").each(function(){var e=t(this).data("zui.messager");e&&e.hide&&e.hide(!0)});else{var n=t("#messager-"+e).data("zui.messager");n&&n.hide&&n.hide()}},h=function(e,n){"string"==typeof n&&(n={type:n}),t.isPlainObject(e)&&(n=t.extend({},n,e),e=null),n=t.extend({},n),n.id===i&&l();var o=s[n.id]||new r(e,n);return o.show(),o},c={notification:!0,placement:"bottom-right",time:0,icon:"bell icon-2x"},d=function(e,i,n){var o=t.extend({id:t.zui.uuid()},c),a="string"==typeof e,s="string"==typeof i;return a&&s?n=t.extend(o,n,{title:e,content:i}):a&&t.isPlainObject(i)?n=t.extend(o,n,i,{title:e}):t.isPlainObject(e)?n=t.extend(o,n,i,e):a&&(n=t.extend(o,n,{title:e})),h(n)},u=function(t){return"string"==typeof t?{placement:t}:t},f={show:h,hide:l};r.all=s,r.DEFAULTS=a,r.NOTIFICATION_DEFAULTS=c,t.each({primary:0,success:"ok-sign",info:"info-sign",warning:"warning-sign",danger:"exclamation-sign",important:0,special:0},function(e,i){f[e]=function(n,o){return h(n,t.extend({type:e,icon:r.DEFAULTS.icons[e]||i||null},u(o)))}}),t.zui({Messager:r,showMessager:h,showNotification:d,messager:f})}(jQuery,window,void 0),function(t,e,i,n){"use strict";function o(t){if(t=t.toLowerCase(),t&&c.test(t)){var e;if(4===t.length){var i="#";for(e=1;e<4;e+=1)i+=t.slice(e,e+1).concat(t.slice(e,e+1));t=i}var n=[];for(e=1;e<7;e+=2)n.push(b("0x"+t.slice(e,e+2)));return{r:n[0],g:n[1],b:n[2],a:1}}throw new Error("Wrong hex string! (hex: "+t+")")}function a(e){return typeof e===p&&("transparent"===e.toLowerCase()||m[e.toLowerCase()]||c.test(t.trim(e.toLowerCase())))}function s(t){function e(t){return t=t<0?t+1:t>1?t-1:t,6*t<1?r+(s-r)*t*6:2*t<1?s:3*t<2?r+(s-r)*(2/3-t)*6:r}var i=t.h,n=t.s,o=t.l,a=t.a;i=h(i)%u/u,n=l(h(n)),o=l(h(o)),a=l(h(a));var s=o<=.5?o*(n+1):o+n-o*n,r=2*o-s,c={r:e(i+1/3)*d,g:e(i)*d,b:e(i-1/3)*d,a:a};return c}function r(t,i,n){return v(n)&&(n=0),v(i)&&(i=d),e.min(e.max(t,n),i)}function l(t,e){return r(t,e)}function h(t){return"number"==typeof t?t:parseFloat(t)}var c=/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/,d=255,u=360,f=100,p="string",g="object",m={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370db",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#db7093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"},v=function(t){return t===n},y=function(t){return!v(t)},b=function(t){return parseInt(t)},w=function(t){return b(l(h(t),d))},x=function(t,e,i,n){var a=this;if(a.r=a.g=a.b=0,a.a=1,y(n)&&(a.a=l(h(n),1)),y(t)&&y(e)&&y(i))a.r=w(t),a.g=w(e),a.b=w(i);else if(y(t)){var r=typeof t;if(r==p)if(t=t.toLowerCase(),"transparent"===t)a.a=0;else if(m[t])a.rgb(o(m[t]));else if(0===t.indexOf("rgb")){var c=t.substring(t.indexOf("(")+1,t.lastIndexOf(")")).split(",",4);a.rgb({r:c[0],g:c[1],b:c[2],a:c[3]})}else a.rgb(o(t));else if("number"==r&&v(e))a.r=a.g=a.b=w(t);else if(r==g&&y(t.r))a.r=w(t.r),y(t.g)&&(a.g=w(t.g)),y(t.b)&&(a.b=w(t.b)),y(t.a)&&(a.a=l(h(t.a),1));else if(r==g&&y(t.h)){var d={h:l(h(t.h),u),s:1,l:1,a:1};y(t.s)&&(d.s=l(h(t.s),1)),y(t.l)&&(d.l=l(h(t.l),1)),y(t.a)&&(d.a=l(h(t.a),1)),a.rgb(s(d))}}};x.prototype.rgb=function(t){var e=this;if(y(t)){if(typeof t==g)y(t.r)&&(e.r=w(t.r)),y(t.g)&&(e.g=w(t.g)),y(t.b)&&(e.b=w(t.b)),y(t.a)&&(e.a=l(h(t.a),1));else{var i=b(h(t));e.r=i,e.g=i,e.b=i}return e}return{r:e.r,g:e.g,b:e.b,a:e.a}},x.prototype.hue=function(t){var e=this,i=e.toHsl();return v(t)?i.h:(i.h=l(h(t),u),e.rgb(s(i)),e)},x.prototype.darken=function(t){var e=this,i=e.toHsl();return i.l-=t/f,i.l=l(i.l,1),e.rgb(s(i)),e},x.prototype.clone=function(){var t=this;return new x(t.r,t.g,t.b,t.a)},x.prototype.lighten=function(t){return this.darken(-t)},x.prototype.fade=function(t){return this.a=l(t/f,1),this},x.prototype.spin=function(t){var e=this.toHsl(),i=(e.h+t)%u;return e.h=i<0?u+i:i,this.rgb(s(e))},x.prototype.toHsl=function(){var t,i,n=this,o=n.r/d,a=n.g/d,s=n.b/d,r=n.a,l=e.max(o,a,s),h=e.min(o,a,s),c=(l+h)/2,f=l-h;if(l===h)t=i=0;else{switch(i=c>.5?f/(2-l-h):f/(l+h),l){case o:t=(a-s)/f+(a<s?6:0);break;case a:t=(s-o)/f+2;break;case s:t=(o-a)/f+4}t/=6}return{h:t*u,s:i,l:c,a:r}},x.prototype.luma=function(){var t=this.r/d,i=this.g/d,n=this.b/d;return t=t<=.03928?t/12.92:e.pow((t+.055)/1.055,2.4),i=i<=.03928?i/12.92:e.pow((i+.055)/1.055,2.4),n=n<=.03928?n/12.92:e.pow((n+.055)/1.055,2.4),.2126*t+.7152*i+.0722*n},x.prototype.saturate=function(t){var e=this.toHsl();return e.s+=t/f,e.s=l(e.s),this.rgb(s(e))},x.prototype.desaturate=function(t){return this.saturate(-t)},x.prototype.contrast=function(t,e,i){if(e=v(e)?new x(d,d,d,1):new x(e),t=v(t)?new x(0,0,0,1):new x(t),t.luma()>e.luma()){var n=e;e=t,t=n}return this.a<.5?t:(i=v(i)?.43:h(i),this.luma()<i?e:t)},x.prototype.hexStr=function(){var t=this.r.toString(16),e=this.g.toString(16),i=this.b.toString(16);return 1==t.length&&(t="0"+t),1==e.length&&(e="0"+e),1==i.length&&(i="0"+i),"#"+t+e+i},x.prototype.toCssStr=function(){var t=this;return t.a>0?t.a<1?"rgba("+t.r+","+t.g+","+t.b+","+t.a+")":t.hexStr():"transparent"},x.isColor=a,x.names=m,x.get=function(t){return new x(t)},t.zui({Color:x})}(jQuery,Math,window,void 0),/*!
  * Chart.js 1.0.2
  * Copyright 2015 Nick Downie
  * Released under the MIT license
  * http://chartjs.org/
  */
-function(t){"use strict";var e=t&&t.zui?t.zui:this,i=(e.Chart,function(t){this.canvas=t.canvas,this.ctx=t;var e=function(t,e){return t["offset"+e]?t["offset"+e]:document.defaultView.getComputedStyle(t).getPropertyValue(e)},i=this.width=e(t.canvas,"Width"),o=this.height=e(t.canvas,"Height");t.canvas.width=i,t.canvas.height=o;var i=this.width=t.canvas.width,o=this.height=t.canvas.height;return this.aspectRatio=this.width/this.height,n.retinaScale(this),this});i.defaults={global:{animation:!0,animationSteps:60,animationEasing:"easeOutQuart",showScale:!0,scaleOverride:!1,scaleSteps:null,scaleStepWidth:null,scaleStartValue:null,scaleLineColor:"rgba(0,0,0,.1)",scaleLineWidth:1,scaleShowLabels:!0,scaleLabel:"<%=value%>",scaleIntegersOnly:!0,scaleBeginAtZero:!1,scaleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",scaleFontSize:12,scaleFontStyle:"normal",scaleFontColor:"#666",responsive:!1,maintainAspectRatio:!0,showTooltips:!0,customTooltips:!1,tooltipEvents:["mousemove","touchstart","touchmove","mouseout"],tooltipFillColor:"rgba(0,0,0,0.8)",tooltipFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipFontSize:14,tooltipFontStyle:"normal",tooltipFontColor:"#fff",tooltipTitleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipTitleFontSize:14,tooltipTitleFontStyle:"bold",tooltipTitleFontColor:"#fff",tooltipYPadding:6,tooltipXPadding:6,tooltipCaretSize:8,tooltipCornerRadius:6,tooltipXOffset:10,tooltipTemplate:"<%if (label){%><%=label%>: <%}%><%= value %>",multiTooltipTemplate:"<%if (datasetLabel){%><%=datasetLabel%>: <%}%><%= value %>",multiTooltipTitleTemplate:"<%= label %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},i.types={};var n=i.helpers={},o=n.each=function(t,e,i){var n=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var o;for(o=0;o<t.length;o++)e.apply(i,[t[o],o].concat(n))}else for(var a in t)e.apply(i,[t[a],a].concat(n))},a=n.clone=function(t){var e={};return o(t,function(i,n){t.hasOwnProperty(n)&&(e[n]=i)}),e},s=n.extend=function(t){return o(Array.prototype.slice.call(arguments,1),function(e){o(e,function(i,n){e.hasOwnProperty(n)&&(t[n]=i)})}),t},r=n.merge=function(t,e){var i=Array.prototype.slice.call(arguments,0);return i.unshift({}),s.apply(null,i)},l=n.indexOf=function(t,e){if(Array.prototype.indexOf)return t.indexOf(e);for(var i=0;i<t.length;i++)if(t[i]===e)return i;return-1},h=(n.where=function(t,e){var i=[];return n.each(t,function(t){e(t)&&i.push(t)}),i},n.findNextWhere=function(t,e,i){i||(i=-1);for(var n=i+1;n<t.length;n++){var o=t[n];if(e(o))return o}},n.findPreviousWhere=function(t,e,i){i||(i=t.length);for(var n=i-1;n>=0;n--){var o=t[n];if(e(o))return o}},n.inherits=function(t){var e=this,i=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},n=function(){this.constructor=i};return n.prototype=e.prototype,i.prototype=new n,i.extend=h,t&&s(i.prototype,t),i.__super__=e.prototype,i}),c=n.noop=function(){},d=n.uid=function(){var t=0;return function(){return"chart-"+t++}}(),u=n.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},f=n.amd="function"==typeof define&&define.amd,p=n.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=n.max=function(t){return Math.max.apply(Math,t)},m=n.min=function(t){return Math.min.apply(Math,t)},v=(n.cap=function(t,e,i){if(p(e)){if(t>e)return e}else if(p(i)&&t<i)return i;return t},n.getDecimalPlaces=function(t){return t%1!==0&&p(t)?t.toString().split(".")[1].length:0}),y=n.radians=function(t){return t*(Math.PI/180)},b=(n.getAngleFromPoint=function(t,e){var i=e.x-t.x,n=e.y-t.y,o=Math.sqrt(i*i+n*n),a=2*Math.PI+Math.atan2(n,i);return i<0&&n<0&&(a+=2*Math.PI),{angle:a,distance:o}},n.aliasPixel=function(t){return t%2===0?0:.5}),w=(n.splineCurve=function(t,e,i,n){var o=Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2)),a=Math.sqrt(Math.pow(i.x-e.x,2)+Math.pow(i.y-e.y,2)),s=n*o/(o+a),r=n*a/(o+a);return{inner:{x:e.x-s*(i.x-t.x),y:e.y-s*(i.y-t.y)},outer:{x:e.x+r*(i.x-t.x),y:e.y+r*(i.y-t.y)}}},n.calculateOrderOfMagnitude=function(t){return Math.floor(Math.log(t)/Math.LN10)}),x=(n.calculateScaleRange=function(t,e,i,n,o){var a=2,s=Math.floor(e/(1.5*i)),r=a>=s,l=g(t),h=m(t);l===h&&(l+=.5,h>=.5&&!n?h-=.5:l+=.5);for(var c=Math.abs(l-h),d=w(c),u=Math.ceil(l/(1*Math.pow(10,d)))*Math.pow(10,d),f=n?0:Math.floor(h/(1*Math.pow(10,d)))*Math.pow(10,d),p=u-f,v=Math.pow(10,d),y=Math.round(p/v);(y>s||2*y<s)&&!r;)if(y>s)v*=2,y=Math.round(p/v),y%1!==0&&(r=!0);else if(o&&d>=0){if(v/2%1!==0)break;v/=2,y=Math.round(p/v)}else v/=2,y=Math.round(p/v);return r&&(y=a,v=p/y),{steps:y,stepValue:v,min:f,max:f+y*v}},n.template=function(t,e){function i(t,e){var i=/\W/.test(t)?new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+t.replace(/[\r\t\n]/g," ").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');"):n[t]=n[t];return e?i(e):i}if(t instanceof Function)return t(e);var n={};return i(t,e)}),C=(n.generateLabels=function(t,e,i,n){var a=new Array(e);return labelTemplateString&&o(a,function(e,o){a[o]=x(t,{value:i+n*(o+1)})}),a},n.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:1==(t/=1)?1:(i||(i=.3),n<Math.abs(1)?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),-(n*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)))},easeOutElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:1==(t/=1)?1:(i||(i=.3),n<Math.abs(1)?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),n*Math.pow(2,-10*t)*Math.sin((1*t-e)*(2*Math.PI)/i)+1)},easeInOutElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:2==(t/=.5)?1:(i||(i=1*(.3*1.5)),n<Math.abs(1)?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),t<1?-.5*(n*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)):n*Math.pow(2,-10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)*.5+1)},easeInBack:function(t){var e=1.70158;return 1*(t/=1)*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return 1*((t=t/1-1)*t*((e+1)*t+e)+1)},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?.5*(t*t*(((e*=1.525)+1)*t-e)):.5*((t-=2)*t*(((e*=1.525)+1)*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?1*(7.5625*t*t):t<2/2.75?1*(7.5625*(t-=1.5/2.75)*t+.75):t<2.5/2.75?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}}),_=n.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),k=n.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),T=(n.animationLoop=function(t,e,i,n,o,a){var s=0,r=C[i]||C.linear,l=function(){s++;var i=s/e,h=r(i);t.call(a,h,i,s),n.call(a,h,i),s<e?a.animationFrame=_(l):o.apply(a)};_(l)},n.getRelativePosition=function(t){var e,i,n=t.originalEvent||t,o=t.currentTarget||t.srcElement,a=o.getBoundingClientRect();return n.touches?(e=n.touches[0].clientX-a.left,i=n.touches[0].clientY-a.top):(e=n.clientX-a.left,i=n.clientY-a.top),{x:e,y:i}},n.addEvent=function(t,e,i){t.addEventListener?t.addEventListener(e,i):t.attachEvent?t.attachEvent("on"+e,i):t["on"+e]=i}),S=n.removeEvent=function(t,e,i){t.removeEventListener?t.removeEventListener(e,i,!1):t.detachEvent?t.detachEvent("on"+e,i):t["on"+e]=c},D=(n.bindEvents=function(t,e,i){t.events||(t.events={}),o(e,function(e){t.events[e]=function(){i.apply(t,arguments)},T(t.chart.canvas,e,t.events[e])})},n.unbindEvents=function(t,e){o(e,function(e,i){S(t.chart.canvas,i,e)})}),M=n.getMaximumWidth=function(t){var e=t.parentNode;return e.clientWidth},P=n.getMaximumHeight=function(t){var e=t.parentNode;return e.clientHeight},z=(n.getMaximumSize=n.getMaximumWidth,n.retinaScale=function(t){var e=t.ctx,i=t.canvas.width,n=t.canvas.height;window.devicePixelRatio&&(e.canvas.style.width=i+"px",e.canvas.style.height=n+"px",e.canvas.height=n*window.devicePixelRatio,e.canvas.width=i*window.devicePixelRatio,e.scale(window.devicePixelRatio,window.devicePixelRatio))}),L=n.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},F=n.fontString=function(t,e,i){return e+" "+t+"px "+i},I=n.longestText=function(t,e,i){t.font=e;var n=0;return o(i,function(e){var i=t.measureText(e).width;n=i>n?i:n}),n},A=n.drawRoundedRectangle=function(t,e,i,n,o,a){t.beginPath(),t.moveTo(e+a,i),t.lineTo(e+n-a,i),t.quadraticCurveTo(e+n,i,e+n,i+a),t.lineTo(e+n,i+o-a),t.quadraticCurveTo(e+n,i+o,e+n-a,i+o),t.lineTo(e+a,i+o),t.quadraticCurveTo(e,i+o,e,i+o-a),t.lineTo(e,i+a),t.quadraticCurveTo(e,i,e+a,i),t.closePath()};i.instances={},i.Type=function(t,e,n){this.options=e,this.chart=n,this.id=d(),i.instances[this.id]=this,e.responsive&&this.resize(),this.initialize.call(this,t)},s(i.Type.prototype,{initialize:function(){return this},clear:function(){return L(this.chart),this},stop:function(){return k(this.animationFrame),this},resize:function(t){this.stop();var e=this.chart.canvas,i=M(this.chart.canvas),n=this.options.maintainAspectRatio?i/this.chart.aspectRatio:P(this.chart.canvas);return e.width=this.chart.width=i,e.height=this.chart.height=n,z(this.chart),"function"==typeof t&&t.apply(this,Array.prototype.slice.call(arguments,1)),this},reflow:c,render:function(t){return t&&this.reflow(),this.options.animation&&!t?n.animationLoop(this.draw,this.options.animationSteps,this.options.animationEasing,this.options.onAnimationProgress,this.options.onAnimationComplete,this):(this.draw(),this.options.onAnimationComplete.call(this)),this},generateLegend:function(){return x(this.options.legendTemplate,this)},destroy:function(){this.clear(),D(this,this.events);var t=this.chart.canvas;t.width=this.chart.width,t.height=this.chart.height,t.style.removeProperty?(t.style.removeProperty("width"),t.style.removeProperty("height")):(t.style.removeAttribute("width"),t.style.removeAttribute("height")),delete i.instances[this.id]},showTooltip:function(t,e){"undefined"==typeof this.activeElements&&(this.activeElements=[]);var a=function(t){var e=!1;return t.length!==this.activeElements.length?e=!0:(o(t,function(t,i){t!==this.activeElements[i]&&(e=!0)},this),e)}.call(this,t);if(a||e){if(this.activeElements=t,this.draw(),this.options.customTooltips&&this.options.customTooltips(!1),t.length>0)if(this.datasets&&this.datasets.length>1){for(var s,r,h=this.datasets.length-1;h>=0&&(s=this.datasets[h].points||this.datasets[h].bars||this.datasets[h].segments,r=l(s,t[0]),r===-1);h--);var c=[],d=[],u=function(t){var e,i,o,a,s,l=[],h=[],u=[];return n.each(this.datasets,function(t){t.showTooltips!==!1&&(e=t.points||t.bars||t.segments,e[r]&&e[r].hasValue()&&l.push(e[r]))}),n.each(l,function(t){h.push(t.x),u.push(t.y),c.push(n.template(this.options.multiTooltipTemplate,t)),d.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),s=m(u),o=g(u),a=m(h),i=g(h),{x:a>this.chart.width/2?a:i,y:(s+o)/2}}.call(this,r);new i.MultiTooltip({x:u.x,y:u.y,xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,xOffset:this.options.tooltipXOffset,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,titleTextColor:this.options.tooltipTitleFontColor,titleFontFamily:this.options.tooltipTitleFontFamily,titleFontStyle:this.options.tooltipTitleFontStyle,titleFontSize:this.options.tooltipTitleFontSize,cornerRadius:this.options.tooltipCornerRadius,labels:c,legendColors:d,legendColorBackground:this.options.multiTooltipKeyBackground,title:x(this.options.multiTooltipTitleTemplate,t[0]),chart:this.chart,ctx:this.chart.ctx,custom:this.options.customTooltips}).draw()}else o(t,function(t){var e=t.tooltipPosition();new i.Tooltip({x:Math.round(e.x),y:Math.round(e.y),xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,caretHeight:this.options.tooltipCaretSize,cornerRadius:this.options.tooltipCornerRadius,text:x(this.options.tooltipTemplate,t),chart:this.chart,custom:this.options.customTooltips}).draw()},this);return this}},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)}}),i.Type.extend=function(t){var e=this,n=function(){return e.apply(this,arguments)};if(n.prototype=a(e.prototype),s(n.prototype,t),n.extend=i.Type.extend,t.name||e.prototype.name){var o=t.name||e.prototype.name,l=i.defaults[e.prototype.name]?a(i.defaults[e.prototype.name]):{};i.defaults[o]=s(l,t.defaults),i.types[o]=n,i.prototype[o]=function(t,e){var a=r(i.defaults.global,i.defaults[o],e||{});return new n(t,a,this)}}else u("Name not provided for this chart, so it hasn't been registered");return e},i.Element=function(t){s(this,t),this.initialize.apply(this,arguments),this.save()},s(i.Element.prototype,{initialize:function(){},restore:function(t){return t?o(t,function(t){this[t]=this._saved[t]},this):s(this,this._saved),this},save:function(){return this._saved=a(this),delete this._saved._saved,this},update:function(t){return o(t,function(t,e){this._saved[e]=this[e],this[e]=t},this),this},transition:function(t,e){return o(t,function(t,i){this[i]=(t-this._saved[i])*e+this._saved[i]},this),this},tooltipPosition:function(){return{x:this.x,y:this.y}},hasValue:function(){return p(this.value)}}),i.Element.extend=h,i.Point=i.Element.extend({display:!0,inRange:function(t,e){var i=this.hitDetectionRadius+this.radius;return Math.pow(t-this.x,2)+Math.pow(e-this.y,2)<Math.pow(i,2)},draw:function(){if(this.display){var t=this.ctx;t.beginPath(),t.arc(this.x,this.y,this.radius,0,2*Math.PI),t.closePath(),t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.fillStyle=this.fillColor,t.fill(),t.stroke()}}}),i.Arc=i.Element.extend({inRange:function(t,e){var i=n.getAngleFromPoint(this,{x:t,y:e}),o=i.angle>=this.startAngle&&i.angle<=this.endAngle,a=i.distance>=this.innerRadius&&i.distance<=this.outerRadius;return o&&a},tooltipPosition:function(){var t=this.startAngle+(this.endAngle-this.startAngle)/2,e=(this.outerRadius-this.innerRadius)/2+this.innerRadius;return{x:this.x+Math.cos(t)*e,y:this.y+Math.sin(t)*e}},draw:function(t){var e=this.ctx;if(e.beginPath(),e.arc(this.x,this.y,this.outerRadius,this.startAngle,this.endAngle),e.arc(this.x,this.y,this.innerRadius,this.endAngle,this.startAngle,!0),e.closePath(),e.strokeStyle=this.strokeColor,e.lineWidth=this.strokeWidth,e.fillStyle=this.fillColor,e.fill(),e.lineJoin="bevel",this.showStroke&&e.stroke(),this.circleBeginEnd){var i=(this.outerRadius+this.innerRadius)/2,n=(this.outerRadius-this.innerRadius)/2;e.beginPath(),e.arc(this.x+Math.cos(this.startAngle)*i,this.y+Math.sin(this.startAngle)*i,n,0,2*Math.PI),e.closePath(),e.fill(),e.beginPath(),e.arc(this.x+Math.cos(this.endAngle)*i,this.y+Math.sin(this.endAngle)*i,n,0,2*Math.PI),e.closePath(),e.fill()}}}),i.Rectangle=i.Element.extend({draw:function(){var t=this.ctx,e=this.width/2,i=this.x-e,n=this.x+e,o=this.base-(this.base-this.y),a=this.strokeWidth/2;this.showStroke&&(i+=a,n-=a,o+=a),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(i,this.base),t.lineTo(i,o),t.lineTo(n,o),t.lineTo(n,this.base),t.fill(),this.showStroke&&t.stroke()},height:function(){return this.base-this.y},inRange:function(t,e){return t>=this.x-this.width/2&&t<=this.x+this.width/2&&e>=this.y&&e<=this.base}}),i.Tooltip=i.Element.extend({draw:function(){var t=this.chart.ctx;t.font=F(this.fontSize,this.fontStyle,this.fontFamily),this.xAlign="center",this.yAlign="above";var e=this.caretPadding=2,i=t.measureText(this.text).width+2*this.xPadding,n=this.fontSize+2*this.yPadding,o=n+this.caretHeight+e;this.x+i/2>this.chart.width?this.xAlign="left":this.x-i/2<0&&(this.xAlign="right"),this.y-o<0&&(this.yAlign="below");var a=this.x-i/2,s=this.y-o;if(t.fillStyle=this.fillColor,this.custom)this.custom(this);else{switch(this.yAlign){case"above":t.beginPath(),t.moveTo(this.x,this.y-e),t.lineTo(this.x+this.caretHeight,this.y-(e+this.caretHeight)),t.lineTo(this.x-this.caretHeight,this.y-(e+this.caretHeight)),t.closePath(),t.fill();break;case"below":s=this.y+e+this.caretHeight,t.beginPath(),t.moveTo(this.x,this.y+e),t.lineTo(this.x+this.caretHeight,this.y+e+this.caretHeight),t.lineTo(this.x-this.caretHeight,this.y+e+this.caretHeight),t.closePath(),t.fill()}switch(this.xAlign){case"left":a=this.x-i+(this.cornerRadius+this.caretHeight);break;case"right":a=this.x-(this.cornerRadius+this.caretHeight)}A(t,a,s,i,n,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,a+i/2,s+n/2)}}}),i.MultiTooltip=i.Element.extend({initialize:function(){this.font=F(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=F(this.titleFontSize,this.titleFontStyle,this.titleFontFamily),this.height=this.labels.length*this.fontSize+(this.labels.length-1)*(this.fontSize/2)+2*this.yPadding+1.5*this.titleFontSize,this.ctx.font=this.titleFont;var t=this.ctx.measureText(this.title).width,e=I(this.ctx,this.font,this.labels)+this.fontSize+3,i=g([e,t]);this.width=i+2*this.xPadding;var n=this.height/2;this.y-n<0?this.y=n:this.y+n>this.chart.height&&(this.y=this.chart.height-n),this.x>this.chart.width/2?this.x-=this.xOffset+this.width:this.x+=this.xOffset},getLineHeight:function(t){var e=this.y-this.height/2+this.yPadding,i=t-1;return 0===t?e+this.titleFontSize/2:e+(1.5*this.fontSize*i+this.fontSize/2)+1.5*this.titleFontSize},draw:function(){if(this.custom)this.custom(this);else{A(this.ctx,this.x,this.y-this.height/2,this.width,this.height,this.cornerRadius);var t=this.ctx;t.fillStyle=this.fillColor,t.fill(),t.closePath(),t.textAlign="left",t.textBaseline="middle",t.fillStyle=this.titleTextColor,t.font=this.titleFont,t.fillText(this.title,this.x+this.xPadding,this.getLineHeight(0)),t.font=this.font,n.each(this.labels,function(e,i){t.fillStyle=this.textColor,t.fillText(e,this.x+this.xPadding+this.fontSize+3,this.getLineHeight(i+1)),t.fillStyle=this.legendColorBackground,t.fillRect(this.x+this.xPadding,this.getLineHeight(i+1)-this.fontSize/2,this.fontSize,this.fontSize),t.fillStyle=this.legendColors[i].fill,t.fillRect(this.x+this.xPadding,this.getLineHeight(i+1)-this.fontSize/2,this.fontSize,this.fontSize)},this)}}}),i.Scale=i.Element.extend({initialize:function(){this.fit()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),e=0;e<=this.steps;e++)this.yLabels.push(x(this.templateString,{value:(this.min+e*this.stepValue).toFixed(t)}));this.yLabelWidth=this.display&&this.showLabels?I(this.ctx,this.font,this.yLabels):0},addXLabel:function(t){this.xLabels.push(t),this.valuesCount++,this.fit()},removeXLabel:function(){this.xLabels.shift(),this.valuesCount--,this.fit()},fit:function(){this.startPoint=this.display?this.fontSize:0,this.endPoint=this.display?this.height-1.5*this.fontSize-5:this.height,this.startPoint+=this.padding,this.endPoint-=this.padding;var t,e=this.endPoint-this.startPoint;for(this.calculateYRange(e),this.buildYLabels(),this.calculateXLabelRotation();e>this.endPoint-this.startPoint;)e=this.endPoint-this.startPoint,t=this.yLabelWidth,this.calculateYRange(e),this.buildYLabels(),t<this.yLabelWidth&&this.calculateXLabelRotation()},calculateXLabelRotation:function(){this.ctx.font=this.font;var t,e,i=this.ctx.measureText(this.xLabels[0]).width,n=this.ctx.measureText(this.xLabels[this.xLabels.length-1]).width;if(this.xScalePaddingRight=n/2+3,this.xScalePaddingLeft=i/2>this.yLabelWidth+10?i/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var o,a=I(this.ctx,this.font,this.xLabels);this.xLabelWidth=a;for(var s=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>s&&0===this.xLabelRotation||this.xLabelWidth>s&&this.xLabelRotation<=90&&this.xLabelRotation>0;)o=Math.cos(y(this.xLabelRotation)),t=o*i,e=o*n,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=o*a;this.xLabelRotation>0&&(this.endPoint-=Math.sin(y(this.xLabelRotation))*a+3)}else this.xLabelWidth=0,this.xScalePaddingRight=this.padding,this.xScalePaddingLeft=this.padding},calculateYRange:c,drawingArea:function(){return this.startPoint-this.endPoint},calculateY:function(t){var e=this.drawingArea()/(this.min-this.max);return this.endPoint-e*(t-this.min)},calculateX:function(t){var e=(this.xLabelRotation>0,this.width-(this.xScalePaddingLeft+this.xScalePaddingRight)),i=e/Math.max(this.valuesCount-(this.offsetGridLines?0:1),1),n=i*t+this.xScalePaddingLeft;return this.offsetGridLines&&(n+=i/2),Math.round(n)},update:function(t){n.extend(this,t),this.fit()},draw:function(){var t=this.ctx,e=(this.endPoint-this.startPoint)/this.steps,i=Math.round(this.xScalePaddingLeft);if(this.display){t.fillStyle=this.textColor,t.font=this.font;var a=this.showBeyondLine?5:0;o(this.yLabels,function(o,s){var r=this.endPoint-e*s,l=Math.round(r),h=this.showHorizontalLines;t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(o,i-10,r),0!==s||h||(h=!0),h&&t.beginPath(),s>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),l+=n.aliasPixel(t.lineWidth),h&&(t.moveTo(i,l),t.lineTo(this.width,l),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(i-a,l),t.lineTo(i,l),t.stroke(),t.closePath()},this),o(this.xLabels,function(e,i){var n=this.calculateX(i)+b(this.lineWidth),o=this.calculateX(i-(this.offsetGridLines?.5:0))+b(this.lineWidth),s=this.xLabelRotation>0,r=this.showVerticalLines;0!==i||r||(r=!0),r&&t.beginPath(),i>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),r&&(t.moveTo(o,this.endPoint),t.lineTo(o,this.startPoint-3),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(o,this.endPoint),t.lineTo(o,this.endPoint+a),t.stroke(),t.closePath(),t.save(),t.translate(n,s?this.endPoint+12:this.endPoint+8),t.rotate(y(this.xLabelRotation)*-1),t.font=this.font,t.textAlign=s?"right":"center",t.textBaseline=s?"middle":"top",t.fillText(e,0,0),t.restore()},this)}}}),i.RadialScale=i.Element.extend({initialize:function(){this.size=m([this.height,this.width]),this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2},calculateCenterOffset:function(t){var e=this.drawingArea/(this.max-this.min);return(t-this.min)*e},update:function(){this.lineArc?this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2:this.setScaleSize(),this.buildYLabels()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),e=0;e<=this.steps;e++)this.yLabels.push(x(this.templateString,{value:(this.min+e*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,e,i,n,o,a,s,r,l,h,c,d,u=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),f=this.width,g=0;for(this.ctx.font=F(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),e=0;e<this.valuesCount;e++)t=this.getPointPosition(e,u),i=this.ctx.measureText(x(this.templateString,{value:this.labels[e]})).width+5,0===e||e===this.valuesCount/2?(n=i/2,t.x+n>f&&(f=t.x+n,o=e),t.x-n<g&&(g=t.x-n,s=e)):e<this.valuesCount/2?t.x+i>f&&(f=t.x+i,o=e):e>this.valuesCount/2&&t.x-i<g&&(g=t.x-i,s=e);l=g,h=Math.ceil(f-this.width),a=this.getIndexAngle(o),r=this.getIndexAngle(s),c=h/Math.sin(a+Math.PI/2),d=l/Math.sin(r+Math.PI/2),c=p(c)?c:0,d=p(d)?d:0,this.drawingArea=u-(d+c)/2,this.setCenterPoint(d,c)},setCenterPoint:function(t,e){var i=this.width-e-this.drawingArea,n=t+this.drawingArea;this.xCenter=(n+i)/2,this.yCenter=this.height/2},getIndexAngle:function(t){var e=2*Math.PI/this.valuesCount;return t*e-Math.PI/2},getPointPosition:function(t,e){var i=this.getIndexAngle(t);return{x:Math.cos(i)*e+this.xCenter,y:Math.sin(i)*e+this.yCenter}},draw:function(){if(this.display){var t=this.ctx;if(o(this.yLabels,function(e,i){if(i>0){var n,o=i*(this.drawingArea/this.steps),a=this.yCenter-o;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,o,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var s=0;s<this.valuesCount;s++)n=this.getPointPosition(s,this.calculateCenterOffset(this.min+i*this.stepValue)),0===s?t.moveTo(n.x,n.y):t.lineTo(n.x,n.y);t.closePath(),t.stroke()}if(this.showLabels){if(t.font=F(this.fontSize,this.fontStyle,this.fontFamily),this.showLabelBackdrop){var r=t.measureText(e).width;t.fillStyle=this.backdropColor,t.fillRect(this.xCenter-r/2-this.backdropPaddingX,a-this.fontSize/2-this.backdropPaddingY,r+2*this.backdropPaddingX,this.fontSize+2*this.backdropPaddingY)}t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.fontColor,t.fillText(e,this.xCenter,a)}}},this),!this.lineArc){t.lineWidth=this.angleLineWidth,t.strokeStyle=this.angleLineColor;for(var e=this.valuesCount-1;e>=0;e--){if(this.angleLineWidth>0){var i=this.getPointPosition(e,this.calculateCenterOffset(this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(i.x,i.y),t.stroke(),t.closePath()}var n=this.getPointPosition(e,this.calculateCenterOffset(this.max)+5);t.font=F(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var a=this.labels.length,s=this.labels.length/2,r=s/2,l=e<r||e>a-r,h=e===r||e===a-r;0===e?t.textAlign="center":e===s?t.textAlign="center":e<s?t.textAlign="left":t.textAlign="right",h?t.textBaseline="middle":l?t.textBaseline="bottom":t.textBaseline="top",t.fillText(this.labels[e],n.x,n.y)}}}}}),n.addEvent(window,"resize",function(){var t;return function(){clearTimeout(t),t=setTimeout(function(){o(i.instances,function(t){t.options.responsive&&t.resize(t.render,!0)})},50)}}()),f?define(function(){return i}):"object"==typeof module&&module.exports&&(module.exports=i),e.Chart=i,t.fn.chart=function(){var t=[];return this.each(function(){t.push(new i(this.getContext("2d")))}),1===t.length?t[0]:t}}.call(this,jQuery),function(t){"use strict";var e=t&&t.zui?t.zui:this,i=e.Chart,n=i.helpers,o={scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowBeyondLine:!0,scaleShowVerticalLines:!0,bezierCurve:!0,bezierCurveTension:.4,pointDot:!0,pointDotRadius:4,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Line",defaults:o,initialize:function(e){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:Math.min(this.options.pointHitDetectionRadius,Math.max(2,Math.floor(300/(e.labels.length-1)/2))),ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)<Math.pow(this.radius+this.hitDetectionRadius,2)}}),this.datasets=[],this.options.showTooltips&&n.bindEvents(this,this.options.tooltipEvents,function(t){var e="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),n.each(e,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(e)}),n.each(e.datasets,function(i){if(t.zui&&t.zui.Color&&t.zui.Color.get){var o=t.zui.Color.get(i.color),a=o.toCssStr();i.fillColor||(i.fillColor=o.clone().fade(20).toCssStr()),i.strokeColor||(i.strokeColor=a),i.pointColor||(i.pointColor=a),i.pointStrokeColor||(i.pointStrokeColor="#fff"),i.pointHighlightFill||(i.pointHighlightFill="#fff"),i.pointHighlightStroke||(i.pointHighlightStroke=a)}var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,showTooltips:i.showTooltips!==!1,points:[]};this.datasets.push(s),n.each(i.data,function(t,n){s.points.push(new this.PointClass({value:t,label:e.labels[n],datasetLabel:i.label,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this),this.buildScale(e.labels),this.eachPoints(function(t,e){n.extend(t,{x:this.scale.calculateX(e),y:this.scale.endPoint}),t.save()},this)},this),this.render()},update:function(){this.scale.update(),n.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachPoints(function(t){t.save()}),this.render()},eachPoints:function(t){n.each(this.datasets,function(e){n.each(e.points,t,this)},this)},getPointsAtEvent:function(t){var e=[],i=n.getRelativePosition(t);return n.each(this.datasets,function(t){n.each(t.points,function(t){t.inRange(i.x,i.y)&&e.push(t)})},this),e},buildScale:function(t){var e=this,o=function(){var t=[];return e.eachPoints(function(e){t.push(e.value)}),t},a={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var e=n.calculateScaleRange(o(),t,this.fontSize,this.beginAtZero,this.integersOnly);n.extend(this,e)},xLabels:t,font:n.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,showBeyondLine:this.options.scaleShowBeyondLine,
+function(t){"use strict";var e=t&&t.zui?t.zui:this,i=(e.Chart,function(t){this.canvas=t.canvas,this.ctx=t;var e=function(t,e){return t["offset"+e]?t["offset"+e]:document.defaultView.getComputedStyle(t).getPropertyValue(e)},i=this.width=e(t.canvas,"Width"),o=this.height=e(t.canvas,"Height");t.canvas.width=i,t.canvas.height=o;var i=this.width=t.canvas.width,o=this.height=t.canvas.height;return this.aspectRatio=this.width/this.height,n.retinaScale(this),this});i.defaults={global:{animation:!0,animationSteps:60,animationEasing:"easeOutQuart",showScale:!0,scaleOverride:!1,scaleSteps:null,scaleStepWidth:null,scaleStartValue:null,scaleLineColor:"rgba(0,0,0,.1)",scaleLineWidth:1,scaleShowLabels:!0,scaleLabel:"<%=value%>",scaleIntegersOnly:!0,scaleBeginAtZero:!1,scaleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",scaleFontSize:12,scaleFontStyle:"normal",scaleFontColor:"#666",responsive:!1,maintainAspectRatio:!0,showTooltips:!0,customTooltips:!1,tooltipEvents:["mousemove","touchstart","touchmove","mouseout"],tooltipFillColor:"rgba(0,0,0,0.8)",tooltipFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipFontSize:14,tooltipFontStyle:"normal",tooltipFontColor:"#fff",tooltipTitleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipTitleFontSize:14,tooltipTitleFontStyle:"bold",tooltipTitleFontColor:"#fff",tooltipYPadding:6,tooltipXPadding:6,tooltipCaretSize:8,tooltipCornerRadius:6,tooltipXOffset:10,tooltipTemplate:"<%if (label){%><%=label%>: <%}%><%= value %>",multiTooltipTemplate:"<%if (datasetLabel){%><%=datasetLabel%>: <%}%><%= value %>",multiTooltipTitleTemplate:"<%= label %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},i.types={};var n=i.helpers={},o=n.each=function(t,e,i){var n=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var o;for(o=0;o<t.length;o++)e.apply(i,[t[o],o].concat(n))}else for(var a in t)e.apply(i,[t[a],a].concat(n))},a=n.clone=function(t){var e={};return o(t,function(i,n){t.hasOwnProperty(n)&&(e[n]=i)}),e},s=n.extend=function(t){return o(Array.prototype.slice.call(arguments,1),function(e){o(e,function(i,n){e.hasOwnProperty(n)&&(t[n]=i)})}),t},r=n.merge=function(t,e){var i=Array.prototype.slice.call(arguments,0);return i.unshift({}),s.apply(null,i)},l=n.indexOf=function(t,e){if(Array.prototype.indexOf)return t.indexOf(e);for(var i=0;i<t.length;i++)if(t[i]===e)return i;return-1},h=(n.where=function(t,e){var i=[];return n.each(t,function(t){e(t)&&i.push(t)}),i},n.findNextWhere=function(t,e,i){i||(i=-1);for(var n=i+1;n<t.length;n++){var o=t[n];if(e(o))return o}},n.findPreviousWhere=function(t,e,i){i||(i=t.length);for(var n=i-1;n>=0;n--){var o=t[n];if(e(o))return o}},n.inherits=function(t){var e=this,i=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},n=function(){this.constructor=i};return n.prototype=e.prototype,i.prototype=new n,i.extend=h,t&&s(i.prototype,t),i.__super__=e.prototype,i}),c=n.noop=function(){},d=n.uid=function(){var t=0;return function(){return"chart-"+t++}}(),u=n.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},f=n.amd="function"==typeof define&&define.amd,p=n.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=n.max=function(t){return Math.max.apply(Math,t)},m=n.min=function(t){return Math.min.apply(Math,t)},v=(n.cap=function(t,e,i){if(p(e)){if(t>e)return e}else if(p(i)&&t<i)return i;return t},n.getDecimalPlaces=function(t){return t%1!==0&&p(t)?t.toString().split(".")[1].length:0}),y=n.radians=function(t){return t*(Math.PI/180)},b=(n.getAngleFromPoint=function(t,e){var i=e.x-t.x,n=e.y-t.y,o=Math.sqrt(i*i+n*n),a=2*Math.PI+Math.atan2(n,i);return i<0&&n<0&&(a+=2*Math.PI),{angle:a,distance:o}},n.aliasPixel=function(t){return t%2===0?0:.5}),w=(n.splineCurve=function(t,e,i,n){var o=Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2)),a=Math.sqrt(Math.pow(i.x-e.x,2)+Math.pow(i.y-e.y,2)),s=n*o/(o+a),r=n*a/(o+a);return{inner:{x:e.x-s*(i.x-t.x),y:e.y-s*(i.y-t.y)},outer:{x:e.x+r*(i.x-t.x),y:e.y+r*(i.y-t.y)}}},n.calculateOrderOfMagnitude=function(t){return Math.floor(Math.log(t)/Math.LN10)}),x=(n.calculateScaleRange=function(t,e,i,n,o){var a=2,s=Math.floor(e/(1.5*i)),r=a>=s,l=g(t),h=m(t);l===h&&(l+=.5,h>=.5&&!n?h-=.5:l+=.5);for(var c=Math.abs(l-h),d=w(c),u=Math.ceil(l/(1*Math.pow(10,d)))*Math.pow(10,d),f=n?0:Math.floor(h/(1*Math.pow(10,d)))*Math.pow(10,d),p=u-f,v=Math.pow(10,d),y=Math.round(p/v);(y>s||2*y<s)&&!r;)if(y>s)v*=2,y=Math.round(p/v),y%1!==0&&(r=!0);else if(o&&d>=0){if(v/2%1!==0)break;v/=2,y=Math.round(p/v)}else v/=2,y=Math.round(p/v);return r&&(y=a,v=p/y),{steps:y,stepValue:v,min:f,max:f+y*v}},n.template=function(t,e){function i(t,e){var i=/\W/.test(t)?new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+t.replace(/[\r\t\n]/g," ").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');"):n[t]=n[t];return e?i(e):i}if(t instanceof Function)return t(e);var n={};return i(t,e)}),C=(n.generateLabels=function(t,e,i,n){var a=new Array(e);return labelTemplateString&&o(a,function(e,o){a[o]=x(t,{value:i+n*(o+1)})}),a},n.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:1==(t/=1)?1:(i||(i=.3),n<Math.abs(1)?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),-(n*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)))},easeOutElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:1==(t/=1)?1:(i||(i=.3),n<Math.abs(1)?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),n*Math.pow(2,-10*t)*Math.sin((1*t-e)*(2*Math.PI)/i)+1)},easeInOutElastic:function(t){var e=1.70158,i=0,n=1;return 0===t?0:2==(t/=.5)?1:(i||(i=1*(.3*1.5)),n<Math.abs(1)?(n=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/n),t<1?-.5*(n*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)):n*Math.pow(2,-10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)*.5+1)},easeInBack:function(t){var e=1.70158;return 1*(t/=1)*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return 1*((t=t/1-1)*t*((e+1)*t+e)+1)},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?.5*(t*t*(((e*=1.525)+1)*t-e)):.5*((t-=2)*t*(((e*=1.525)+1)*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?1*(7.5625*t*t):t<2/2.75?1*(7.5625*(t-=1.5/2.75)*t+.75):t<2.5/2.75?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}}),_=n.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),k=n.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),T=(n.animationLoop=function(t,e,i,n,o,a){var s=0,r=C[i]||C.linear,l=function(){s++;var i=s/e,h=r(i);t.call(a,h,i,s),n.call(a,h,i),s<e?a.animationFrame=_(l):o.apply(a)};_(l)},n.getRelativePosition=function(t){var e,i,n=t.originalEvent||t,o=t.currentTarget||t.srcElement,a=o.getBoundingClientRect();return n.touches?(e=n.touches[0].clientX-a.left,i=n.touches[0].clientY-a.top):(e=n.clientX-a.left,i=n.clientY-a.top),{x:e,y:i}},n.addEvent=function(t,e,i){t.addEventListener?t.addEventListener(e,i):t.attachEvent?t.attachEvent("on"+e,i):t["on"+e]=i}),S=n.removeEvent=function(t,e,i){t.removeEventListener?t.removeEventListener(e,i,!1):t.detachEvent?t.detachEvent("on"+e,i):t["on"+e]=c},D=(n.bindEvents=function(t,e,i){t.events||(t.events={}),o(e,function(e){t.events[e]=function(){i.apply(t,arguments)},T(t.chart.canvas,e,t.events[e])})},n.unbindEvents=function(t,e){o(e,function(e,i){S(t.chart.canvas,i,e)})}),M=n.getMaximumWidth=function(t){var e=t.parentNode;return e.clientWidth},P=n.getMaximumHeight=function(t){var e=t.parentNode;return e.clientHeight},z=(n.getMaximumSize=n.getMaximumWidth,n.retinaScale=function(t){var e=t.ctx,i=t.canvas.width,n=t.canvas.height;window.devicePixelRatio&&(e.canvas.style.width=i+"px",e.canvas.style.height=n+"px",e.canvas.height=n*window.devicePixelRatio,e.canvas.width=i*window.devicePixelRatio,e.scale(window.devicePixelRatio,window.devicePixelRatio))}),L=n.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},F=n.fontString=function(t,e,i){return e+" "+t+"px "+i},I=n.longestText=function(t,e,i){t.font=e;var n=0;return o(i,function(e){var i=t.measureText(e).width;n=i>n?i:n}),n},$=n.drawRoundedRectangle=function(t,e,i,n,o,a){t.beginPath(),t.moveTo(e+a,i),t.lineTo(e+n-a,i),t.quadraticCurveTo(e+n,i,e+n,i+a),t.lineTo(e+n,i+o-a),t.quadraticCurveTo(e+n,i+o,e+n-a,i+o),t.lineTo(e+a,i+o),t.quadraticCurveTo(e,i+o,e,i+o-a),t.lineTo(e,i+a),t.quadraticCurveTo(e,i,e+a,i),t.closePath()};i.instances={},i.Type=function(t,e,n){this.options=e,this.chart=n,this.id=d(),i.instances[this.id]=this,e.responsive&&this.resize(),this.initialize.call(this,t)},s(i.Type.prototype,{initialize:function(){return this},clear:function(){return L(this.chart),this},stop:function(){return k(this.animationFrame),this},resize:function(t){this.stop();var e=this.chart.canvas,i=M(this.chart.canvas),n=this.options.maintainAspectRatio?i/this.chart.aspectRatio:P(this.chart.canvas);return e.width=this.chart.width=i,e.height=this.chart.height=n,z(this.chart),"function"==typeof t&&t.apply(this,Array.prototype.slice.call(arguments,1)),this},reflow:c,render:function(t){return t&&this.reflow(),this.options.animation&&!t?n.animationLoop(this.draw,this.options.animationSteps,this.options.animationEasing,this.options.onAnimationProgress,this.options.onAnimationComplete,this):(this.draw(),this.options.onAnimationComplete.call(this)),this},generateLegend:function(){return x(this.options.legendTemplate,this)},destroy:function(){this.clear(),D(this,this.events);var t=this.chart.canvas;t.width=this.chart.width,t.height=this.chart.height,t.style.removeProperty?(t.style.removeProperty("width"),t.style.removeProperty("height")):(t.style.removeAttribute("width"),t.style.removeAttribute("height")),delete i.instances[this.id]},showTooltip:function(t,e){"undefined"==typeof this.activeElements&&(this.activeElements=[]);var a=function(t){var e=!1;return t.length!==this.activeElements.length?e=!0:(o(t,function(t,i){t!==this.activeElements[i]&&(e=!0)},this),e)}.call(this,t);if(a||e){if(this.activeElements=t,this.draw(),this.options.customTooltips&&this.options.customTooltips(!1),t.length>0)if(this.datasets&&this.datasets.length>1){for(var s,r,h=this.datasets.length-1;h>=0&&(s=this.datasets[h].points||this.datasets[h].bars||this.datasets[h].segments,r=l(s,t[0]),r===-1);h--);var c=[],d=[],u=function(t){var e,i,o,a,s,l=[],h=[],u=[];return n.each(this.datasets,function(t){t.showTooltips!==!1&&(e=t.points||t.bars||t.segments,e[r]&&e[r].hasValue()&&l.push(e[r]))}),n.each(l,function(t){h.push(t.x),u.push(t.y),c.push(n.template(this.options.multiTooltipTemplate,t)),d.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),s=m(u),o=g(u),a=m(h),i=g(h),{x:a>this.chart.width/2?a:i,y:(s+o)/2}}.call(this,r);new i.MultiTooltip({x:u.x,y:u.y,xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,xOffset:this.options.tooltipXOffset,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,titleTextColor:this.options.tooltipTitleFontColor,titleFontFamily:this.options.tooltipTitleFontFamily,titleFontStyle:this.options.tooltipTitleFontStyle,titleFontSize:this.options.tooltipTitleFontSize,cornerRadius:this.options.tooltipCornerRadius,labels:c,legendColors:d,legendColorBackground:this.options.multiTooltipKeyBackground,title:x(this.options.multiTooltipTitleTemplate,t[0]),chart:this.chart,ctx:this.chart.ctx,custom:this.options.customTooltips}).draw()}else o(t,function(t){var e=t.tooltipPosition();new i.Tooltip({x:Math.round(e.x),y:Math.round(e.y),xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,caretHeight:this.options.tooltipCaretSize,cornerRadius:this.options.tooltipCornerRadius,text:x(this.options.tooltipTemplate,t),chart:this.chart,custom:this.options.customTooltips}).draw()},this);return this}},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)}}),i.Type.extend=function(t){var e=this,n=function(){return e.apply(this,arguments)};if(n.prototype=a(e.prototype),s(n.prototype,t),n.extend=i.Type.extend,t.name||e.prototype.name){var o=t.name||e.prototype.name,l=i.defaults[e.prototype.name]?a(i.defaults[e.prototype.name]):{};i.defaults[o]=s(l,t.defaults),i.types[o]=n,i.prototype[o]=function(t,e){var a=r(i.defaults.global,i.defaults[o],e||{});return new n(t,a,this)}}else u("Name not provided for this chart, so it hasn't been registered");return e},i.Element=function(t){s(this,t),this.initialize.apply(this,arguments),this.save()},s(i.Element.prototype,{initialize:function(){},restore:function(t){return t?o(t,function(t){this[t]=this._saved[t]},this):s(this,this._saved),this},save:function(){return this._saved=a(this),delete this._saved._saved,this},update:function(t){return o(t,function(t,e){this._saved[e]=this[e],this[e]=t},this),this},transition:function(t,e){return o(t,function(t,i){this[i]=(t-this._saved[i])*e+this._saved[i]},this),this},tooltipPosition:function(){return{x:this.x,y:this.y}},hasValue:function(){return p(this.value)}}),i.Element.extend=h,i.Point=i.Element.extend({display:!0,inRange:function(t,e){var i=this.hitDetectionRadius+this.radius;return Math.pow(t-this.x,2)+Math.pow(e-this.y,2)<Math.pow(i,2)},draw:function(){if(this.display){var t=this.ctx;t.beginPath(),t.arc(this.x,this.y,this.radius,0,2*Math.PI),t.closePath(),t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.fillStyle=this.fillColor,t.fill(),t.stroke()}}}),i.Arc=i.Element.extend({inRange:function(t,e){var i=n.getAngleFromPoint(this,{x:t,y:e}),o=i.angle>=this.startAngle&&i.angle<=this.endAngle,a=i.distance>=this.innerRadius&&i.distance<=this.outerRadius;return o&&a},tooltipPosition:function(){var t=this.startAngle+(this.endAngle-this.startAngle)/2,e=(this.outerRadius-this.innerRadius)/2+this.innerRadius;return{x:this.x+Math.cos(t)*e,y:this.y+Math.sin(t)*e}},draw:function(t){var e=this.ctx;if(e.beginPath(),e.arc(this.x,this.y,this.outerRadius,this.startAngle,this.endAngle),e.arc(this.x,this.y,this.innerRadius,this.endAngle,this.startAngle,!0),e.closePath(),e.strokeStyle=this.strokeColor,e.lineWidth=this.strokeWidth,e.fillStyle=this.fillColor,e.fill(),e.lineJoin="bevel",this.showStroke&&e.stroke(),this.circleBeginEnd){var i=(this.outerRadius+this.innerRadius)/2,n=(this.outerRadius-this.innerRadius)/2;e.beginPath(),e.arc(this.x+Math.cos(this.startAngle)*i,this.y+Math.sin(this.startAngle)*i,n,0,2*Math.PI),e.closePath(),e.fill(),e.beginPath(),e.arc(this.x+Math.cos(this.endAngle)*i,this.y+Math.sin(this.endAngle)*i,n,0,2*Math.PI),e.closePath(),e.fill()}}}),i.Rectangle=i.Element.extend({draw:function(){var t=this.ctx,e=this.width/2,i=this.x-e,n=this.x+e,o=this.base-(this.base-this.y),a=this.strokeWidth/2;this.showStroke&&(i+=a,n-=a,o+=a),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(i,this.base),t.lineTo(i,o),t.lineTo(n,o),t.lineTo(n,this.base),t.fill(),this.showStroke&&t.stroke()},height:function(){return this.base-this.y},inRange:function(t,e){return t>=this.x-this.width/2&&t<=this.x+this.width/2&&e>=this.y&&e<=this.base}}),i.Tooltip=i.Element.extend({draw:function(){var t=this.chart.ctx;t.font=F(this.fontSize,this.fontStyle,this.fontFamily),this.xAlign="center",this.yAlign="above";var e=this.caretPadding=2,i=t.measureText(this.text).width+2*this.xPadding,n=this.fontSize+2*this.yPadding,o=n+this.caretHeight+e;this.x+i/2>this.chart.width?this.xAlign="left":this.x-i/2<0&&(this.xAlign="right"),this.y-o<0&&(this.yAlign="below");var a=this.x-i/2,s=this.y-o;if(t.fillStyle=this.fillColor,this.custom)this.custom(this);else{switch(this.yAlign){case"above":t.beginPath(),t.moveTo(this.x,this.y-e),t.lineTo(this.x+this.caretHeight,this.y-(e+this.caretHeight)),t.lineTo(this.x-this.caretHeight,this.y-(e+this.caretHeight)),t.closePath(),t.fill();break;case"below":s=this.y+e+this.caretHeight,t.beginPath(),t.moveTo(this.x,this.y+e),t.lineTo(this.x+this.caretHeight,this.y+e+this.caretHeight),t.lineTo(this.x-this.caretHeight,this.y+e+this.caretHeight),t.closePath(),t.fill()}switch(this.xAlign){case"left":a=this.x-i+(this.cornerRadius+this.caretHeight);break;case"right":a=this.x-(this.cornerRadius+this.caretHeight)}$(t,a,s,i,n,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,a+i/2,s+n/2)}}}),i.MultiTooltip=i.Element.extend({initialize:function(){this.font=F(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=F(this.titleFontSize,this.titleFontStyle,this.titleFontFamily),this.height=this.labels.length*this.fontSize+(this.labels.length-1)*(this.fontSize/2)+2*this.yPadding+1.5*this.titleFontSize,this.ctx.font=this.titleFont;var t=this.ctx.measureText(this.title).width,e=I(this.ctx,this.font,this.labels)+this.fontSize+3,i=g([e,t]);this.width=i+2*this.xPadding;var n=this.height/2;this.y-n<0?this.y=n:this.y+n>this.chart.height&&(this.y=this.chart.height-n),this.x>this.chart.width/2?this.x-=this.xOffset+this.width:this.x+=this.xOffset},getLineHeight:function(t){var e=this.y-this.height/2+this.yPadding,i=t-1;return 0===t?e+this.titleFontSize/2:e+(1.5*this.fontSize*i+this.fontSize/2)+1.5*this.titleFontSize},draw:function(){if(this.custom)this.custom(this);else{$(this.ctx,this.x,this.y-this.height/2,this.width,this.height,this.cornerRadius);var t=this.ctx;t.fillStyle=this.fillColor,t.fill(),t.closePath(),t.textAlign="left",t.textBaseline="middle",t.fillStyle=this.titleTextColor,t.font=this.titleFont,t.fillText(this.title,this.x+this.xPadding,this.getLineHeight(0)),t.font=this.font,n.each(this.labels,function(e,i){t.fillStyle=this.textColor,t.fillText(e,this.x+this.xPadding+this.fontSize+3,this.getLineHeight(i+1)),t.fillStyle=this.legendColorBackground,t.fillRect(this.x+this.xPadding,this.getLineHeight(i+1)-this.fontSize/2,this.fontSize,this.fontSize),t.fillStyle=this.legendColors[i].fill,t.fillRect(this.x+this.xPadding,this.getLineHeight(i+1)-this.fontSize/2,this.fontSize,this.fontSize)},this)}}}),i.Scale=i.Element.extend({initialize:function(){this.fit()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),e=0;e<=this.steps;e++)this.yLabels.push(x(this.templateString,{value:(this.min+e*this.stepValue).toFixed(t)}));this.yLabelWidth=this.display&&this.showLabels?I(this.ctx,this.font,this.yLabels):0},addXLabel:function(t){this.xLabels.push(t),this.valuesCount++,this.fit()},removeXLabel:function(){this.xLabels.shift(),this.valuesCount--,this.fit()},fit:function(){this.startPoint=this.display?this.fontSize:0,this.endPoint=this.display?this.height-1.5*this.fontSize-5:this.height,this.startPoint+=this.padding,this.endPoint-=this.padding;var t,e=this.endPoint-this.startPoint;for(this.calculateYRange(e),this.buildYLabels(),this.calculateXLabelRotation();e>this.endPoint-this.startPoint;)e=this.endPoint-this.startPoint,t=this.yLabelWidth,this.calculateYRange(e),this.buildYLabels(),t<this.yLabelWidth&&this.calculateXLabelRotation()},calculateXLabelRotation:function(){this.ctx.font=this.font;var t,e,i=this.ctx.measureText(this.xLabels[0]).width,n=this.ctx.measureText(this.xLabels[this.xLabels.length-1]).width;if(this.xScalePaddingRight=n/2+3,this.xScalePaddingLeft=i/2>this.yLabelWidth+10?i/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var o,a=I(this.ctx,this.font,this.xLabels);this.xLabelWidth=a;for(var s=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>s&&0===this.xLabelRotation||this.xLabelWidth>s&&this.xLabelRotation<=90&&this.xLabelRotation>0;)o=Math.cos(y(this.xLabelRotation)),t=o*i,e=o*n,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=o*a;this.xLabelRotation>0&&(this.endPoint-=Math.sin(y(this.xLabelRotation))*a+3)}else this.xLabelWidth=0,this.xScalePaddingRight=this.padding,this.xScalePaddingLeft=this.padding},calculateYRange:c,drawingArea:function(){return this.startPoint-this.endPoint},calculateY:function(t){var e=this.drawingArea()/(this.min-this.max);return this.endPoint-e*(t-this.min)},calculateX:function(t){var e=(this.xLabelRotation>0,this.width-(this.xScalePaddingLeft+this.xScalePaddingRight)),i=e/Math.max(this.valuesCount-(this.offsetGridLines?0:1),1),n=i*t+this.xScalePaddingLeft;return this.offsetGridLines&&(n+=i/2),Math.round(n)},update:function(t){n.extend(this,t),this.fit()},draw:function(){var t=this.ctx,e=(this.endPoint-this.startPoint)/this.steps,i=Math.round(this.xScalePaddingLeft);if(this.display){t.fillStyle=this.textColor,t.font=this.font;var a=this.showBeyondLine?5:0;o(this.yLabels,function(o,s){var r=this.endPoint-e*s,l=Math.round(r),h=this.showHorizontalLines;t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(o,i-10,r),0!==s||h||(h=!0),h&&t.beginPath(),s>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),l+=n.aliasPixel(t.lineWidth),h&&(t.moveTo(i,l),t.lineTo(this.width,l),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(i-a,l),t.lineTo(i,l),t.stroke(),t.closePath()},this),o(this.xLabels,function(e,i){var n=this.calculateX(i)+b(this.lineWidth),o=this.calculateX(i-(this.offsetGridLines?.5:0))+b(this.lineWidth),s=this.xLabelRotation>0,r=this.showVerticalLines;0!==i||r||(r=!0),r&&t.beginPath(),i>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),r&&(t.moveTo(o,this.endPoint),t.lineTo(o,this.startPoint-3),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(o,this.endPoint),t.lineTo(o,this.endPoint+a),t.stroke(),t.closePath(),t.save(),t.translate(n,s?this.endPoint+12:this.endPoint+8),t.rotate(y(this.xLabelRotation)*-1),t.font=this.font,t.textAlign=s?"right":"center",t.textBaseline=s?"middle":"top",t.fillText(e,0,0),t.restore()},this)}}}),i.RadialScale=i.Element.extend({initialize:function(){this.size=m([this.height,this.width]),this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2},calculateCenterOffset:function(t){var e=this.drawingArea/(this.max-this.min);return(t-this.min)*e},update:function(){this.lineArc?this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2:this.setScaleSize(),this.buildYLabels()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),e=0;e<=this.steps;e++)this.yLabels.push(x(this.templateString,{value:(this.min+e*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,e,i,n,o,a,s,r,l,h,c,d,u=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),f=this.width,g=0;for(this.ctx.font=F(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),e=0;e<this.valuesCount;e++)t=this.getPointPosition(e,u),i=this.ctx.measureText(x(this.templateString,{value:this.labels[e]})).width+5,0===e||e===this.valuesCount/2?(n=i/2,t.x+n>f&&(f=t.x+n,o=e),t.x-n<g&&(g=t.x-n,s=e)):e<this.valuesCount/2?t.x+i>f&&(f=t.x+i,o=e):e>this.valuesCount/2&&t.x-i<g&&(g=t.x-i,s=e);l=g,h=Math.ceil(f-this.width),a=this.getIndexAngle(o),r=this.getIndexAngle(s),c=h/Math.sin(a+Math.PI/2),d=l/Math.sin(r+Math.PI/2),c=p(c)?c:0,d=p(d)?d:0,this.drawingArea=u-(d+c)/2,this.setCenterPoint(d,c)},setCenterPoint:function(t,e){var i=this.width-e-this.drawingArea,n=t+this.drawingArea;this.xCenter=(n+i)/2,this.yCenter=this.height/2},getIndexAngle:function(t){var e=2*Math.PI/this.valuesCount;return t*e-Math.PI/2},getPointPosition:function(t,e){var i=this.getIndexAngle(t);return{x:Math.cos(i)*e+this.xCenter,y:Math.sin(i)*e+this.yCenter}},draw:function(){if(this.display){var t=this.ctx;if(o(this.yLabels,function(e,i){if(i>0){var n,o=i*(this.drawingArea/this.steps),a=this.yCenter-o;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,o,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var s=0;s<this.valuesCount;s++)n=this.getPointPosition(s,this.calculateCenterOffset(this.min+i*this.stepValue)),0===s?t.moveTo(n.x,n.y):t.lineTo(n.x,n.y);t.closePath(),t.stroke()}if(this.showLabels){if(t.font=F(this.fontSize,this.fontStyle,this.fontFamily),this.showLabelBackdrop){var r=t.measureText(e).width;t.fillStyle=this.backdropColor,t.fillRect(this.xCenter-r/2-this.backdropPaddingX,a-this.fontSize/2-this.backdropPaddingY,r+2*this.backdropPaddingX,this.fontSize+2*this.backdropPaddingY)}t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.fontColor,t.fillText(e,this.xCenter,a)}}},this),!this.lineArc){t.lineWidth=this.angleLineWidth,t.strokeStyle=this.angleLineColor;for(var e=this.valuesCount-1;e>=0;e--){if(this.angleLineWidth>0){var i=this.getPointPosition(e,this.calculateCenterOffset(this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(i.x,i.y),t.stroke(),t.closePath()}var n=this.getPointPosition(e,this.calculateCenterOffset(this.max)+5);t.font=F(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var a=this.labels.length,s=this.labels.length/2,r=s/2,l=e<r||e>a-r,h=e===r||e===a-r;0===e?t.textAlign="center":e===s?t.textAlign="center":e<s?t.textAlign="left":t.textAlign="right",h?t.textBaseline="middle":l?t.textBaseline="bottom":t.textBaseline="top",t.fillText(this.labels[e],n.x,n.y)}}}}}),n.addEvent(window,"resize",function(){var t;return function(){clearTimeout(t),t=setTimeout(function(){o(i.instances,function(t){t.options.responsive&&t.resize(t.render,!0)})},50)}}()),f?define(function(){return i}):"object"==typeof module&&module.exports&&(module.exports=i),e.Chart=i,t.fn.chart=function(){var t=[];return this.each(function(){t.push(new i(this.getContext("2d")))}),1===t.length?t[0]:t}}.call(this,jQuery),function(t){"use strict";var e=t&&t.zui?t.zui:this,i=e.Chart,n=i.helpers,o={scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowBeyondLine:!0,scaleShowVerticalLines:!0,bezierCurve:!0,bezierCurveTension:.4,pointDot:!0,pointDotRadius:4,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Line",defaults:o,initialize:function(e){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:Math.min(this.options.pointHitDetectionRadius,Math.max(2,Math.floor(300/(e.labels.length-1)/2))),ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)<Math.pow(this.radius+this.hitDetectionRadius,2)}}),this.datasets=[],this.options.showTooltips&&n.bindEvents(this,this.options.tooltipEvents,function(t){var e="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),n.each(e,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(e)}),n.each(e.datasets,function(i){if(t.zui&&t.zui.Color&&t.zui.Color.get){var o=t.zui.Color.get(i.color),a=o.toCssStr();i.fillColor||(i.fillColor=o.clone().fade(20).toCssStr()),i.strokeColor||(i.strokeColor=a),i.pointColor||(i.pointColor=a),i.pointStrokeColor||(i.pointStrokeColor="#fff"),i.pointHighlightFill||(i.pointHighlightFill="#fff"),i.pointHighlightStroke||(i.pointHighlightStroke=a)}var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,showTooltips:i.showTooltips!==!1,points:[]};this.datasets.push(s),n.each(i.data,function(t,n){s.points.push(new this.PointClass({value:t,label:e.labels[n],datasetLabel:i.label,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this),this.buildScale(e.labels),this.eachPoints(function(t,e){n.extend(t,{x:this.scale.calculateX(e),y:this.scale.endPoint}),t.save()},this)},this),this.render()},update:function(){this.scale.update(),n.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachPoints(function(t){t.save()}),this.render()},eachPoints:function(t){n.each(this.datasets,function(e){n.each(e.points,t,this)},this)},getPointsAtEvent:function(t){var e=[],i=n.getRelativePosition(t);return n.each(this.datasets,function(t){n.each(t.points,function(t){t.inRange(i.x,i.y)&&e.push(t)})},this),e},buildScale:function(t){var e=this,o=function(){var t=[];return e.eachPoints(function(e){t.push(e.value)}),t},a={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var e=n.calculateScaleRange(o(),t,this.fontSize,this.beginAtZero,this.integersOnly);n.extend(this,e)},xLabels:t,font:n.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,showBeyondLine:this.options.scaleShowBeyondLine,
 gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.pointDotRadius+this.options.pointDotStrokeWidth,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&n.extend(a,{calculateYRange:n.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new i.Scale(a)},addData:function(t,e){n.each(t,function(t,i){this.datasets[i].points.push(new this.PointClass({value:t,label:e,datasetLabel:this.datasets[i].label,x:this.scale.calculateX(this.scale.valuesCount+1),y:this.scale.endPoint,strokeColor:this.datasets[i].pointStrokeColor,fillColor:this.datasets[i].pointColor}))},this),this.scale.addXLabel(e),this.update()},removeData:function(){this.scale.removeXLabel(),n.each(this.datasets,function(t){t.points.shift()},this),this.update()},reflow:function(){var t=n.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var e=t||1;this.clear();var i=this.chart.ctx,o=function(t){return null!==t.value},a=function(t,e,i){return n.findNextWhere(e,o,i)||t},s=function(t,e,i){return n.findPreviousWhere(e,o,i)||t};this.scale.draw(e),n.each(this.datasets,function(t){var r=n.where(t.points,o);n.each(t.points,function(t,i){t.hasValue()&&t.transition({y:this.scale.calculateY(t.value),x:this.scale.calculateX(i)},e)},this),this.options.bezierCurve&&n.each(r,function(t,e){var i=e>0&&e<r.length-1?this.options.bezierCurveTension:0;t.controlPoints=n.splineCurve(s(t,r,e),t,a(t,r,e),i),t.controlPoints.outer.y>this.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.y<this.scale.startPoint&&(t.controlPoints.outer.y=this.scale.startPoint),t.controlPoints.inner.y>this.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y<this.scale.startPoint&&(t.controlPoints.inner.y=this.scale.startPoint)},this),i.lineWidth=this.options.datasetStrokeWidth,i.strokeStyle=t.strokeColor,i.beginPath(),n.each(r,function(t,e){if(0===e)i.moveTo(t.x,t.y);else if(this.options.bezierCurve){var n=s(t,r,e);i.bezierCurveTo(n.controlPoints.outer.x,n.controlPoints.outer.y,t.controlPoints.inner.x,t.controlPoints.inner.y,t.x,t.y)}else i.lineTo(t.x,t.y)},this),i.stroke(),this.options.datasetFill&&r.length>0&&(i.lineTo(r[r.length-1].x,this.scale.endPoint),i.lineTo(r[0].x,this.scale.endPoint),i.fillStyle=t.fillColor,i.closePath(),i.fill()),n.each(r,function(t){t.draw()})},this)}}),t.fn.lineChart=function(e,n){var o=[];return this.each(function(){var a=t(this);o.push(new i(this.getContext("2d")).Line(e,t.extend(a.data(),n)))}),1===o.length?o[0]:o}}.call(this,jQuery),function(t){"use strict";var e=t&&t.zui?t.zui:this,i=e.Chart,n=i.helpers,o={segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:1,percentageInnerCutout:50,scaleShowLabels:!1,scaleLabel:"<%=value%>",scaleLabelPlacement:"auto",animationSteps:60,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Doughnut",defaults:o,initialize:function(t){this.segments=[],this.outerRadius=(n.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,this.SegmentArc=i.Arc.extend({ctx:this.chart.ctx,x:this.chart.width/2,y:this.chart.height/2}),this.options.showTooltips&&n.bindEvents(this,this.options.tooltipEvents,function(t){var e="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];n.each(this.segments,function(t){t.restore(["fillColor"])}),n.each(e,function(t){t.fillColor=t.highlightColor}),this.showTooltip(e)}),this.calculateTotal(t),n.each(t,function(t,e){this.addData(t,e,!0)},this),this.render()},getSegmentsAtEvent:function(t){var e=[],i=n.getRelativePosition(t);return n.each(this.segments,function(t){t.inRange(i.x,i.y)&&e.push(t)},this),e},addData:function(e,i,n){if(t.zui&&t.zui.Color&&t.zui.Color.get){var o=new t.zui.Color.get(e.color);e.color=o.toCssStr(),e.highlight||(e.highlight=o.lighten(5).toCssStr())}var a=i||this.segments.length;this.segments.splice(a,0,new this.SegmentArc({id:"undefined"==typeof e.id?a:e.id,value:e.value,outerRadius:this.options.animateScale?0:this.outerRadius,innerRadius:this.options.animateScale?0:this.outerRadius/100*this.options.percentageInnerCutout,fillColor:e.color,highlightColor:e.highlight||e.color,showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,startAngle:1.5*Math.PI,circumference:this.options.animateRotate?0:this.calculateCircumference(e.value),showLabel:e.showLabel!==!1,circleBeginEnd:e.circleBeginEnd,label:e.label})),n||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(Math.abs(t)/this.total)},calculateTotal:function(t){this.total=0,n.each(t,function(t){this.total+=Math.abs(t.value)},this)},update:function(){this.calculateTotal(this.segments),n.each(this.activeElements,function(t){t.restore(["fillColor"])}),n.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var e=n.isNumber(t)?t:this.segments.length-1;this.segments.splice(e,1),this.reflow(),this.update()},reflow:function(){n.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(n.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,n.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},drawLabel:function(e,i,o){var a=this.options,s=(e.endAngle+e.startAngle)/2,r=a.scaleLabelPlacement;"inside"!==r&&"outside"!==r&&this.chart.width-this.chart.height>50&&e.circumference<Math.PI/18&&(r="outside");var l=Math.cos(s)*e.outerRadius,h=Math.sin(s)*e.outerRadius,c=n.template(a.scaleLabel,{value:"undefined"==typeof i?e.value:Math.round(i*e.value),label:e.label}),d=this.chart.ctx;d.font=n.fontString(a.scaleFontSize,a.scaleFontStyle,a.scaleFontFamily),d.textBaseline="middle",d.textAlign="center";var u=(d.measureText(c).width,this.chart.width/2),f=this.chart.height/2;if("outside"===r){var p=l>=0,g=l+u,m=h+f;d.textAlign=p?"left":"right",d.measureText(c).width,l=p?Math.max(u+e.outerRadius+10,l+30+u):Math.min(u-e.outerRadius-10,l-30+u);var v=a.scaleFontSize*(a.scaleLineHeight||1),y=Math.round((.8*h+f)/v)+1,b=(Math.floor(this.chart.width/v)+1,p?1:-1);if(o[y*b]&&(y>1?y--:y++),o[y*b])return;h=(y-1)*v+a.scaleFontSize/2,o[y*b]=!0,d.beginPath(),d.moveTo(g,m),d.lineTo(l,h),l=p?l+5:l-5,d.lineTo(l,h),d.strokeStyle=t.zui&&t.zui.Color?new t.zui.Color(e.fillColor).fade(40).toCssStr():e.fillColor,d.strokeWidth=a.scaleLineWidth,d.stroke(),d.fillStyle=e.fillColor}else l=.7*l+u,h=.7*h+f,d.fillStyle=t.zui&&t.zui.Color?new t.zui.Color(e.fillColor).contrast().toCssStr():"#fff";d.fillText(c,l,h)},draw:function(t){var e=t?t:1;this.clear();var i;if(n.each(this.segments,function(t,i){t.transition({circumference:this.calculateCircumference(t.value),outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout},e),t.endAngle=t.startAngle+t.circumference,this.options.reverseDrawOrder||t.draw(),0===i&&(t.startAngle=1.5*Math.PI),i<this.segments.length-1&&(this.segments[i+1].startAngle=t.endAngle)},this),this.options.reverseDrawOrder&&n.each(this.segments.slice().reverse(),function(t,e){t.draw()},this),this.options.scaleShowLabels){var o=this.segments.slice().sort(function(t,e){return e.value-t.value}),i={};n.each(o,function(e,n){e.showLabel&&this.drawLabel(e,t,i)},this)}}}),i.types.Doughnut.extend({name:"Pie",defaults:n.merge(o,{percentageInnerCutout:0})}),t.fn.pieChart=function(e,n){var o=[];return this.each(function(){var a=t(this);o.push(new i(this.getContext("2d")).Pie(e,t.extend(a.data(),n)))}),1===o.length?o[0]:o},t.fn.doughnutChart=function(e,n){var o=[];return this.each(function(){var a=t(this);o.push(new i(this.getContext("2d")).Doughnut(e,t.extend(a.data(),n)))}),1===o.length?o[0]:o}}.call(this,jQuery),function(t){"use strict";var e=t&&t.zui?t.zui:this,i=e.Chart,n=i.helpers,o={scaleBeginAtZero:!0,scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,scaleShowBeyondLine:!0,barShowStroke:!0,barStrokeWidth:1,scaleValuePlacement:"auto",barValueSpacing:5,barDatasetSpacing:1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].fillColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Bar",defaults:o,initialize:function(e){var o=this.options;this.ScaleClass=i.Scale.extend({offsetGridLines:!0,calculateBarX:function(t,e,i){var n=this.calculateBaseWidth(),a=this.calculateX(i)-n/2,s=this.calculateBarWidth(t);return a+s*e+e*o.barDatasetSpacing+s/2},calculateBaseWidth:function(){return this.calculateX(1)-this.calculateX(0)-2*o.barValueSpacing},calculateBarWidth:function(t){var e=this.calculateBaseWidth()-(t-1)*o.barDatasetSpacing;return e/t}}),this.datasets=[],this.options.showTooltips&&n.bindEvents(this,this.options.tooltipEvents,function(t){var e="mouseout"!==t.type?this.getBarsAtEvent(t):[];this.eachBars(function(t){t.restore(["fillColor","strokeColor"])}),n.each(e,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(e)}),this.BarClass=i.Rectangle.extend({strokeWidth:this.options.barStrokeWidth,showStroke:this.options.barShowStroke,ctx:this.chart.ctx}),n.each(e.datasets,function(i,o){if(t.zui&&t.zui.Color&&t.zui.Color.get){var a=t.zui.Color.get(i.color),s=a.toCssStr();i.fillColor||(i.fillColor=a.clone().fade(50).toCssStr()),i.strokeColor||(i.strokeColor=s)}var r={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,bars:[]};this.datasets.push(r),n.each(i.data,function(t,n){r.bars.push(new this.BarClass({value:t,label:e.labels[n],datasetLabel:i.label,strokeColor:i.strokeColor,fillColor:i.fillColor,highlightFill:i.highlightFill||i.fillColor,highlightStroke:i.highlightStroke||i.strokeColor}))},this)},this),this.buildScale(e.labels),this.BarClass.prototype.base=this.scale.endPoint,this.eachBars(function(t,e,i){n.extend(t,{width:this.scale.calculateBarWidth(this.datasets.length),x:this.scale.calculateBarX(this.datasets.length,i,e),y:this.scale.endPoint}),t.save()},this),this.render()},update:function(){this.scale.update(),n.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachBars(function(t){t.save()}),this.render()},eachBars:function(t){n.each(this.datasets,function(e,i){n.each(e.bars,t,this,i)},this)},getBarsAtEvent:function(t){for(var e,i=[],o=n.getRelativePosition(t),a=function(t){i.push(t.bars[e])},s=0;s<this.datasets.length;s++)for(e=0;e<this.datasets[s].bars.length;e++)if(this.datasets[s].bars[e].inRange(o.x,o.y))return n.each(this.datasets,a),i;return i},buildScale:function(t){var e=this,i=function(){var t=[];return e.eachBars(function(e){t.push(e.value)}),t},o={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var e=n.calculateScaleRange(i(),t,this.fontSize,this.beginAtZero,this.integersOnly);n.extend(this,e)},xLabels:t,font:n.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,showBeyondLine:this.options.scaleShowBeyondLine,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.barShowStroke?this.options.barStrokeWidth:0,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&n.extend(o,{calculateYRange:n.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new this.ScaleClass(o)},addData:function(t,e){n.each(t,function(t,i){this.datasets[i].bars.push(new this.BarClass({value:t,label:e,x:this.scale.calculateBarX(this.datasets.length,i,this.scale.valuesCount+1),y:this.scale.endPoint,width:this.scale.calculateBarWidth(this.datasets.length),base:this.scale.endPoint,strokeColor:this.datasets[i].strokeColor,fillColor:this.datasets[i].fillColor}))},this),this.scale.addXLabel(e),this.update()},removeData:function(){this.scale.removeXLabel(),n.each(this.datasets,function(t){t.bars.shift()},this),this.update()},reflow:function(){n.extend(this.BarClass.prototype,{y:this.scale.endPoint,base:this.scale.endPoint});var t=n.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},drawLabel:function(t,e){var i=this.options;e=e||i.scaleValuePlacement,e=e?e.toLowerCase():"auto","auto"===e&&(e=t.y<15?"insdie":"outside");var o="insdie"===e?t.y+10:t.y-10,a=this.chart.ctx;a.font=n.fontString(i.scaleFontSize,i.scaleFontStyle,i.scaleFontFamily),a.textBaseline="middle",a.textAlign="center",a.fillStyle=i.scaleFontColor,a.fillText(t.value,t.x,o)},draw:function(t){var e=t||1;this.clear();this.chart.ctx;this.scale.draw(e);var i=this.options.scaleShowLabels&&this.options.scaleValuePlacement;n.each(this.datasets,function(t,o){n.each(t.bars,function(t,n){t.hasValue()&&(t.base=this.scale.endPoint,t.transition({x:this.scale.calculateBarX(this.datasets.length,o,n),y:this.scale.calculateY(t.value),width:this.scale.calculateBarWidth(this.datasets.length)},e).draw()),i&&this.drawLabel(t)},this)},this)}}),t.fn.barChart=function(e,n){var o=[];return this.each(function(){var a=t(this);o.push(new i(this.getContext("2d")).Bar(e,t.extend(a.data(),n)))}),1===o.length?o[0]:o}}.call(this,jQuery),/*!
  * Datetimepicker for Bootstrap
  * Copyright 2012 Stefan Petre
@@ -63,7 +63,7 @@ selected:r.getSelectedArray()},r))}r.options.selectClass&&o.toggleClass(r.option
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  */
-function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"==typeof module&&module.exports?module.exports=function(e,i){return"undefined"==typeof i&&(i="undefined"!=typeof window?require("jquery"):require("jquery")(e)),t(i),i}:t(jQuery)}(function(t){"use strict";function e(e){var i=e.data;e.isDefaultPrevented()||(e.preventDefault(),t(e.target).closest("form").ajaxSubmit(i))}function i(e){var i=e.target,n=t(i);if(!n.is("[type=submit],[type=image]")){var o=n.closest("[type=submit]");if(0===o.length)return;i=o[0]}var a=i.form;if(a.clk=i,"image"===i.type)if("undefined"!=typeof e.offsetX)a.clk_x=e.offsetX,a.clk_y=e.offsetY;else if("function"==typeof t.fn.offset){var s=n.offset();a.clk_x=e.pageX-s.left,a.clk_y=e.pageY-s.top}else a.clk_x=e.pageX-i.offsetLeft,a.clk_y=e.pageY-i.offsetTop;setTimeout(function(){a.clk=a.clk_x=a.clk_y=null},100)}function n(){if(t.fn.ajaxSubmit.debug){var e="[jquery.form] "+Array.prototype.join.call(arguments,"");window.console&&window.console.log?window.console.log(e):window.opera&&window.opera.postError&&window.opera.postError(e)}}var o=/\r?\n/g,a={};a.fileapi=void 0!==t('<input type="file">').get(0).files,a.formdata="undefined"!=typeof window.FormData;var s=!!t.fn.prop;t.fn.attr2=function(){if(!s)return this.attr.apply(this,arguments);var t=this.prop.apply(this,arguments);return t&&t.jquery||"string"==typeof t?t:this.attr.apply(this,arguments)},t.fn.ajaxSubmit=function(e,i,o,r){function l(i){var n,o,a=t.param(i,e.traditional).split("&"),s=a.length,r=[];for(n=0;n<s;n++)a[n]=a[n].replace(/\+/g," "),o=a[n].split("="),r.push([decodeURIComponent(o[0]),decodeURIComponent(o[1])]);return r}function h(i){for(var n=new FormData,o=0;o<i.length;o++)n.append(i[o].name,i[o].value);if(e.extraData){var a=l(e.extraData);for(o=0;o<a.length;o++)a[o]&&n.append(a[o][0],a[o][1])}e.data=null;var s=t.extend(!0,{},t.ajaxSettings,e,{contentType:!1,processData:!1,cache:!1,type:d||"POST"});e.uploadProgress&&(s.xhr=function(){var i=t.ajaxSettings.xhr();return i.upload&&i.upload.addEventListener("progress",function(t){var i=0,n=t.loaded||t.position,o=t.total;t.lengthComputable&&(i=Math.ceil(n/o*100)),e.uploadProgress(t,n,o,i)},!1),i}),s.data=null;var r=s.beforeSend;return s.beforeSend=function(t,i){e.formData?i.data=e.formData:i.data=n,r&&r.call(this,t,i)},t.ajax(s)}function c(i){function o(t){var e=null;try{t.contentWindow&&(e=t.contentWindow.document)}catch(i){n("cannot get iframe.contentWindow document: "+i)}if(e)return e;try{e=t.contentDocument?t.contentDocument:t.document}catch(i){n("cannot get iframe.contentDocument: "+i),e=t.document}return e}function a(){function e(){try{var t=o(m).readyState;n("state = "+t),t&&"uninitialized"===t.toLowerCase()&&setTimeout(e,50)}catch(i){n("Server abort: ",i," (",i.name,")"),r(M),C&&clearTimeout(C),C=void 0}}var i=p.attr2("target"),a=p.attr2("action"),s="multipart/form-data",l=p.attr("enctype")||p.attr("encoding")||s;_.setAttribute("target",f),d&&!/post/i.test(d)||_.setAttribute("method","POST"),a!==c.url&&_.setAttribute("action",c.url),c.skipEncodingOverride||d&&!/post/i.test(d)||p.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"}),c.timeout&&(C=setTimeout(function(){x=!0,r(D)},c.timeout));var h=[];try{if(c.extraData)for(var u in c.extraData)c.extraData.hasOwnProperty(u)&&(t.isPlainObject(c.extraData[u])&&c.extraData[u].hasOwnProperty("name")&&c.extraData[u].hasOwnProperty("value")?h.push(t('<input type="hidden" name="'+c.extraData[u].name+'">',T).val(c.extraData[u].value).appendTo(_)[0]):h.push(t('<input type="hidden" name="'+u+'">',T).val(c.extraData[u]).appendTo(_)[0]));c.iframeTarget||g.appendTo(S),m.attachEvent?m.attachEvent("onload",r):m.addEventListener("load",r,!1),setTimeout(e,15);try{_.submit()}catch(v){var y=document.createElement("form").submit;y.apply(_)}}finally{_.setAttribute("action",a),_.setAttribute("enctype",l),i?_.setAttribute("target",i):p.removeAttr("target"),t.each(h,function(){this.remove()})}}function r(e){if(!v.aborted&&!I){if(F=o(m),F||(n("cannot access response document"),e=M),e===D&&v)return v.abort("timeout"),void k.reject(v,"timeout");if(e===M&&v)return v.abort("server abort"),void k.reject(v,"error","server abort");if(F&&F.location.href!==c.iframeSrc||x){m.detachEvent?m.detachEvent("onload",r):m.removeEventListener("load",r,!1);var i,a="success";try{if(x)throw"timeout";var s="xml"===c.dataType||F.XMLDocument||t.isXMLDoc(F);if(n("isXml="+s),!s&&window.opera&&(null===F.body||!F.body.innerHTML)&&--A)return n("requeing onLoad callback, DOM not available"),void setTimeout(r,250);var l=F.body?F.body:F.documentElement;v.responseText=l?l.innerHTML:null,v.responseXML=F.XMLDocument?F.XMLDocument:F,s&&(c.dataType="xml"),v.getResponseHeader=function(t){var e={"content-type":c.dataType};return e[t.toLowerCase()]},l&&(v.status=Number(l.getAttribute("status"))||v.status,v.statusText=l.getAttribute("statusText")||v.statusText);var h=(c.dataType||"").toLowerCase(),d=/(json|script|text)/.test(h);if(d||c.textarea){var f=F.getElementsByTagName("textarea")[0];if(f)v.responseText=f.value,v.status=Number(f.getAttribute("status"))||v.status,v.statusText=f.getAttribute("statusText")||v.statusText;else if(d){var p=F.getElementsByTagName("pre")[0],y=F.getElementsByTagName("body")[0];p?v.responseText=p.textContent?p.textContent:p.innerText:y&&(v.responseText=y.textContent?y.textContent:y.innerText)}}else"xml"===h&&!v.responseXML&&v.responseText&&(v.responseXML=$(v.responseText));try{L=O(v,h,c)}catch(b){a="parsererror",v.error=i=b||a}}catch(b){n("error caught: ",b),a="error",v.error=i=b||a}v.aborted&&(n("upload aborted"),a=null),v.status&&(a=v.status>=200&&v.status<300||304===v.status?"success":"error"),"success"===a?(c.success&&c.success.call(c.context,L,"success",v),k.resolve(v.responseText,"success",v),u&&t.event.trigger("ajaxSuccess",[v,c])):a&&("undefined"==typeof i&&(i=v.statusText),c.error&&c.error.call(c.context,v,a,i),k.reject(v,"error",i),u&&t.event.trigger("ajaxError",[v,c,i])),u&&t.event.trigger("ajaxComplete",[v,c]),u&&!--t.active&&t.event.trigger("ajaxStop"),c.complete&&c.complete.call(c.context,v,a),I=!0,c.timeout&&clearTimeout(C),setTimeout(function(){c.iframeTarget?g.attr("src",c.iframeSrc):g.remove(),v.responseXML=null},100)}}}var l,h,c,u,f,g,m,v,b,w,x,C,_=p[0],k=t.Deferred();if(k.abort=function(t){v.abort(t)},i)for(h=0;h<y.length;h++)l=t(y[h]),s?l.prop("disabled",!1):l.removeAttr("disabled");c=t.extend(!0,{},t.ajaxSettings,e),c.context=c.context||c,f="jqFormIO"+(new Date).getTime();var T=_.ownerDocument,S=p.closest("body");if(c.iframeTarget?(g=t(c.iframeTarget,T),w=g.attr2("name"),w?f=w:g.attr2("name",f)):(g=t('<iframe name="'+f+'" src="'+c.iframeSrc+'" />',T),g.css({position:"absolute",top:"-1000px",left:"-1000px"})),m=g[0],v={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(e){var i="timeout"===e?"timeout":"aborted";n("aborting upload... "+i),this.aborted=1;try{m.contentWindow.document.execCommand&&m.contentWindow.document.execCommand("Stop")}catch(o){}g.attr("src",c.iframeSrc),v.error=i,c.error&&c.error.call(c.context,v,i,e),u&&t.event.trigger("ajaxError",[v,c,i]),c.complete&&c.complete.call(c.context,v,i)}},u=c.global,u&&0===t.active++&&t.event.trigger("ajaxStart"),u&&t.event.trigger("ajaxSend",[v,c]),c.beforeSend&&c.beforeSend.call(c.context,v,c)===!1)return c.global&&t.active--,k.reject(),k;if(v.aborted)return k.reject(),k;b=_.clk,b&&(w=b.name,w&&!b.disabled&&(c.extraData=c.extraData||{},c.extraData[w]=b.value,"image"===b.type&&(c.extraData[w+".x"]=_.clk_x,c.extraData[w+".y"]=_.clk_y)));var D=1,M=2,P=t("meta[name=csrf-token]").attr("content"),z=t("meta[name=csrf-param]").attr("content");z&&P&&(c.extraData=c.extraData||{},c.extraData[z]=P),c.forceSync?a():setTimeout(a,10);var L,F,I,A=50,$=t.parseXML||function(t,e){return window.ActiveXObject?(e=new ActiveXObject("Microsoft.XMLDOM"),e.async="false",e.loadXML(t)):e=(new DOMParser).parseFromString(t,"text/xml"),e&&e.documentElement&&"parsererror"!==e.documentElement.nodeName?e:null},E=t.parseJSON||function(t){return window.eval("("+t+")")},O=function(e,i,n){var o=e.getResponseHeader("content-type")||"",a=("xml"===i||!i)&&o.indexOf("xml")>=0,s=a?e.responseXML:e.responseText;return a&&"parsererror"===s.documentElement.nodeName&&t.error&&t.error("parsererror"),n&&n.dataFilter&&(s=n.dataFilter(s,i)),"string"==typeof s&&(("json"===i||!i)&&o.indexOf("json")>=0?s=E(s):("script"===i||!i)&&o.indexOf("javascript")>=0&&t.globalEval(s)),s};return k}if(!this.length)return n("ajaxSubmit: skipping submit process - no element selected"),this;var d,u,f,p=this;"function"==typeof e?e={success:e}:"string"==typeof e||e===!1&&arguments.length>0?(e={url:e,data:i,dataType:o},"function"==typeof r&&(e.success=r)):"undefined"==typeof e&&(e={}),d=e.method||e.type||this.attr2("method"),u=e.url||this.attr2("action"),f="string"==typeof u?t.trim(u):"",f=f||window.location.href||"",f&&(f=(f.match(/^([^#]+)/)||[])[1]),e=t.extend(!0,{url:f,success:t.ajaxSettings.success,type:d||t.ajaxSettings.type,iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},e);var g={};if(this.trigger("form-pre-serialize",[this,e,g]),g.veto)return n("ajaxSubmit: submit vetoed via form-pre-serialize trigger"),this;if(e.beforeSerialize&&e.beforeSerialize(this,e)===!1)return n("ajaxSubmit: submit aborted via beforeSerialize callback"),this;var m=e.traditional;"undefined"==typeof m&&(m=t.ajaxSettings.traditional);var v,y=[],b=this.formToArray(e.semantic,y,e.filtering);if(e.data){var w="function"==typeof e.data?e.data(b):e.data;e.extraData=w,v=t.param(w,m)}if(e.beforeSubmit&&e.beforeSubmit(b,this,e)===!1)return n("ajaxSubmit: submit aborted via beforeSubmit callback"),this;if(this.trigger("form-submit-validate",[b,this,e,g]),g.veto)return n("ajaxSubmit: submit vetoed via form-submit-validate trigger"),this;var x=t.param(b,m);v&&(x=x?x+"&"+v:v),"GET"===e.type.toUpperCase()?(e.url+=(e.url.indexOf("?")>=0?"&":"?")+x,e.data=null):e.data=x;var C=[];if(e.resetForm&&C.push(function(){p.resetForm()}),e.clearForm&&C.push(function(){p.clearForm(e.includeHidden)}),!e.dataType&&e.target){var _=e.success||function(){};C.push(function(i,n,o){var a=arguments,s=e.replaceTarget?"replaceWith":"html";t(e.target)[s](i).each(function(){_.apply(this,a)})})}else e.success&&(Array.isArray(e.success)?t.merge(C,e.success):C.push(e.success));if(e.success=function(t,i,n){for(var o=e.context||this,a=0,s=C.length;a<s;a++)C[a].apply(o,[t,i,n||p,p])},e.error){var k=e.error;e.error=function(t,i,n){var o=e.context||this;k.apply(o,[t,i,n,p])}}if(e.complete){var T=e.complete;e.complete=function(t,i){var n=e.context||this;T.apply(n,[t,i,p])}}var S=t("input[type=file]:enabled",this).filter(function(){return""!==t(this).val()}),D=S.length>0,M="multipart/form-data",P=p.attr("enctype")===M||p.attr("encoding")===M,z=a.fileapi&&a.formdata;n("fileAPI :"+z);var L,F=(D||P)&&!z;e.iframe!==!1&&(e.iframe||F)?e.closeKeepAlive?t.get(e.closeKeepAlive,function(){L=c(b)}):L=c(b):L=(D||P)&&z?h(b):t.ajax(e),p.removeData("jqxhr").data("jqxhr",L);for(var I=0;I<y.length;I++)y[I]=null;return this.trigger("form-submit-notify",[this,e]),this},t.fn.ajaxForm=function(o,a,s,r){if(("string"==typeof o||o===!1&&arguments.length>0)&&(o={url:o,data:a,dataType:s},"function"==typeof r&&(o.success=r)),o=o||{},o.delegation=o.delegation&&"function"==typeof t.fn.on,!o.delegation&&0===this.length){var l={s:this.selector,c:this.context};return!t.isReady&&l.s?(n("DOM not ready, queuing ajaxForm"),t(function(){t(l.s,l.c).ajaxForm(o)}),this):(n("terminating; zero elements found by selector"+(t.isReady?"":" (DOM not ready)")),this)}return o.delegation?(t(document).off("submit.form-plugin",this.selector,e).off("click.form-plugin",this.selector,i).on("submit.form-plugin",this.selector,o,e).on("click.form-plugin",this.selector,o,i),this):this.ajaxFormUnbind().on("submit.form-plugin",o,e).on("click.form-plugin",o,i)},t.fn.ajaxFormUnbind=function(){return this.off("submit.form-plugin click.form-plugin")},t.fn.formToArray=function(e,i,n){var o=[];if(0===this.length)return o;var s,r=this[0],l=this.attr("id"),h=e||"undefined"==typeof r.elements?r.getElementsByTagName("*"):r.elements;if(h&&(h=t.makeArray(h)),l&&(e||/(Edge|Trident)\//.test(navigator.userAgent))&&(s=t(':input[form="'+l+'"]').get(),s.length&&(h=(h||[]).concat(s))),!h||!h.length)return o;"function"==typeof n&&(h=t.map(h,n));var c,d,u,f,p,g,m;for(c=0,g=h.length;c<g;c++)if(p=h[c],u=p.name,u&&!p.disabled)if(e&&r.clk&&"image"===p.type)r.clk===p&&(o.push({name:u,value:t(p).val(),type:p.type}),o.push({name:u+".x",value:r.clk_x},{name:u+".y",value:r.clk_y}));else if(f=t.fieldValue(p,!0),f&&f.constructor===Array)for(i&&i.push(p),d=0,m=f.length;d<m;d++)o.push({name:u,value:f[d]});else if(a.fileapi&&"file"===p.type){i&&i.push(p);var v=p.files;if(v.length)for(d=0;d<v.length;d++)o.push({name:u,value:v[d],type:p.type});else o.push({name:u,value:"",type:p.type})}else null!==f&&"undefined"!=typeof f&&(i&&i.push(p),o.push({name:u,value:f,type:p.type,required:p.required}));if(!e&&r.clk){var y=t(r.clk),b=y[0];u=b.name,u&&!b.disabled&&"image"===b.type&&(o.push({name:u,value:y.val()}),o.push({name:u+".x",value:r.clk_x},{name:u+".y",value:r.clk_y}))}return o},t.fn.formSerialize=function(e){return t.param(this.formToArray(e))},t.fn.fieldSerialize=function(e){var i=[];return this.each(function(){var n=this.name;if(n){var o=t.fieldValue(this,e);if(o&&o.constructor===Array)for(var a=0,s=o.length;a<s;a++)i.push({name:n,value:o[a]});else null!==o&&"undefined"!=typeof o&&i.push({name:this.name,value:o})}}),t.param(i)},t.fn.fieldValue=function(e){for(var i=[],n=0,o=this.length;n<o;n++){var a=this[n],s=t.fieldValue(a,e);null===s||"undefined"==typeof s||s.constructor===Array&&!s.length||(s.constructor===Array?t.merge(i,s):i.push(s))}return i},t.fieldValue=function(e,i){var n=e.name,a=e.type,s=e.tagName.toLowerCase();if("undefined"==typeof i&&(i=!0),i&&(!n||e.disabled||"reset"===a||"button"===a||("checkbox"===a||"radio"===a)&&!e.checked||("submit"===a||"image"===a)&&e.form&&e.form.clk!==e||"select"===s&&e.selectedIndex===-1))return null;if("select"===s){var r=e.selectedIndex;if(r<0)return null;for(var l=[],h=e.options,c="select-one"===a,d=c?r+1:h.length,u=c?r:0;u<d;u++){var f=h[u];if(f.selected&&!f.disabled){var p=f.value;if(p||(p=f.attributes&&f.attributes.value&&!f.attributes.value.specified?f.text:f.value),c)return p;l.push(p)}}return l}return t(e).val().replace(o,"\r\n")},t.fn.clearForm=function(e){return this.each(function(){t("input,select,textarea",this).clearFields(e)})},t.fn.clearFields=t.fn.clearInputs=function(e){var i=/^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i;return this.each(function(){var n=this.type,o=this.tagName.toLowerCase();i.test(n)||"textarea"===o?this.value="":"checkbox"===n||"radio"===n?this.checked=!1:"select"===o?this.selectedIndex=-1:"file"===n?/MSIE/.test(navigator.userAgent)?t(this).replaceWith(t(this).clone(!0)):t(this).val(""):e&&(e===!0&&/hidden/.test(n)||"string"==typeof e&&t(this).is(e))&&(this.value="")})},t.fn.resetForm=function(){return this.each(function(){var e=t(this),i=this.tagName.toLowerCase();switch(i){case"input":this.checked=this.defaultChecked;case"textarea":return this.value=this.defaultValue,!0;case"option":case"optgroup":var n=e.parents("select");return n.length&&n[0].multiple?"option"===i?this.selected=this.defaultSelected:e.find("option").resetForm():n.resetForm(),!0;case"select":return e.find("option").each(function(t){if(this.selected=this.defaultSelected,this.defaultSelected&&!e[0].multiple)return e[0].selectedIndex=t,!1}),!0;case"label":var o=t(e.attr("for")),a=e.find("input,select,textarea");return o[0]&&a.unshift(o[0]),a.resetForm(),!0;case"form":return("function"==typeof this.reset||"object"==typeof this.reset&&!this.reset.nodeType)&&this.reset(),!0;default:return e.find("form,input,label,select,textarea").resetForm(),!0}})},t.fn.enable=function(t){return"undefined"==typeof t&&(t=!0),this.each(function(){this.disabled=!t})},t.fn.selected=function(e){return"undefined"==typeof e&&(e=!0),this.each(function(){var i=this.type;if("checkbox"===i||"radio"===i)this.checked=e;else if("option"===this.tagName.toLowerCase()){var n=t(this).parent("select");e&&n[0]&&"select-one"===n[0].type&&n.find("option").selected(!1),this.selected=e}})},t.fn.ajaxSubmit.debug=!1}),/*!
+function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"==typeof module&&module.exports?module.exports=function(e,i){return"undefined"==typeof i&&(i="undefined"!=typeof window?require("jquery"):require("jquery")(e)),t(i),i}:t(jQuery)}(function(t){"use strict";function e(e){var i=e.data;e.isDefaultPrevented()||(e.preventDefault(),t(e.target).closest("form").ajaxSubmit(i))}function i(e){var i=e.target,n=t(i);if(!n.is("[type=submit],[type=image]")){var o=n.closest("[type=submit]");if(0===o.length)return;i=o[0]}var a=i.form;if(a.clk=i,"image"===i.type)if("undefined"!=typeof e.offsetX)a.clk_x=e.offsetX,a.clk_y=e.offsetY;else if("function"==typeof t.fn.offset){var s=n.offset();a.clk_x=e.pageX-s.left,a.clk_y=e.pageY-s.top}else a.clk_x=e.pageX-i.offsetLeft,a.clk_y=e.pageY-i.offsetTop;setTimeout(function(){a.clk=a.clk_x=a.clk_y=null},100)}function n(){if(t.fn.ajaxSubmit.debug){var e="[jquery.form] "+Array.prototype.join.call(arguments,"");window.console&&window.console.log?window.console.log(e):window.opera&&window.opera.postError&&window.opera.postError(e)}}var o=/\r?\n/g,a={};a.fileapi=void 0!==t('<input type="file">').get(0).files,a.formdata="undefined"!=typeof window.FormData;var s=!!t.fn.prop;t.fn.attr2=function(){if(!s)return this.attr.apply(this,arguments);var t=this.prop.apply(this,arguments);return t&&t.jquery||"string"==typeof t?t:this.attr.apply(this,arguments)},t.fn.ajaxSubmit=function(e,i,o,r){function l(i){var n,o,a=t.param(i,e.traditional).split("&"),s=a.length,r=[];for(n=0;n<s;n++)a[n]=a[n].replace(/\+/g," "),o=a[n].split("="),r.push([decodeURIComponent(o[0]),decodeURIComponent(o[1])]);return r}function h(i){for(var n=new FormData,o=0;o<i.length;o++)n.append(i[o].name,i[o].value);if(e.extraData){var a=l(e.extraData);for(o=0;o<a.length;o++)a[o]&&n.append(a[o][0],a[o][1])}e.data=null;var s=t.extend(!0,{},t.ajaxSettings,e,{contentType:!1,processData:!1,cache:!1,type:d||"POST"});e.uploadProgress&&(s.xhr=function(){var i=t.ajaxSettings.xhr();return i.upload&&i.upload.addEventListener("progress",function(t){var i=0,n=t.loaded||t.position,o=t.total;t.lengthComputable&&(i=Math.ceil(n/o*100)),e.uploadProgress(t,n,o,i)},!1),i}),s.data=null;var r=s.beforeSend;return s.beforeSend=function(t,i){e.formData?i.data=e.formData:i.data=n,r&&r.call(this,t,i)},t.ajax(s)}function c(i){function o(t){var e=null;try{t.contentWindow&&(e=t.contentWindow.document)}catch(i){n("cannot get iframe.contentWindow document: "+i)}if(e)return e;try{e=t.contentDocument?t.contentDocument:t.document}catch(i){n("cannot get iframe.contentDocument: "+i),e=t.document}return e}function a(){function e(){try{var t=o(m).readyState;n("state = "+t),t&&"uninitialized"===t.toLowerCase()&&setTimeout(e,50)}catch(i){n("Server abort: ",i," (",i.name,")"),r(M),C&&clearTimeout(C),C=void 0}}var i=p.attr2("target"),a=p.attr2("action"),s="multipart/form-data",l=p.attr("enctype")||p.attr("encoding")||s;_.setAttribute("target",f),d&&!/post/i.test(d)||_.setAttribute("method","POST"),a!==c.url&&_.setAttribute("action",c.url),c.skipEncodingOverride||d&&!/post/i.test(d)||p.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"}),c.timeout&&(C=setTimeout(function(){x=!0,r(D)},c.timeout));var h=[];try{if(c.extraData)for(var u in c.extraData)c.extraData.hasOwnProperty(u)&&(t.isPlainObject(c.extraData[u])&&c.extraData[u].hasOwnProperty("name")&&c.extraData[u].hasOwnProperty("value")?h.push(t('<input type="hidden" name="'+c.extraData[u].name+'">',T).val(c.extraData[u].value).appendTo(_)[0]):h.push(t('<input type="hidden" name="'+u+'">',T).val(c.extraData[u]).appendTo(_)[0]));c.iframeTarget||g.appendTo(S),m.attachEvent?m.attachEvent("onload",r):m.addEventListener("load",r,!1),setTimeout(e,15);try{_.submit()}catch(v){var y=document.createElement("form").submit;y.apply(_)}}finally{_.setAttribute("action",a),_.setAttribute("enctype",l),i?_.setAttribute("target",i):p.removeAttr("target"),t.each(h,function(){this.remove()})}}function r(e){if(!v.aborted&&!I){if(F=o(m),F||(n("cannot access response document"),e=M),e===D&&v)return v.abort("timeout"),void k.reject(v,"timeout");if(e===M&&v)return v.abort("server abort"),void k.reject(v,"error","server abort");if(F&&F.location.href!==c.iframeSrc||x){m.detachEvent?m.detachEvent("onload",r):m.removeEventListener("load",r,!1);var i,a="success";try{if(x)throw"timeout";var s="xml"===c.dataType||F.XMLDocument||t.isXMLDoc(F);if(n("isXml="+s),!s&&window.opera&&(null===F.body||!F.body.innerHTML)&&--$)return n("requeing onLoad callback, DOM not available"),void setTimeout(r,250);var l=F.body?F.body:F.documentElement;v.responseText=l?l.innerHTML:null,v.responseXML=F.XMLDocument?F.XMLDocument:F,s&&(c.dataType="xml"),v.getResponseHeader=function(t){var e={"content-type":c.dataType};return e[t.toLowerCase()]},l&&(v.status=Number(l.getAttribute("status"))||v.status,v.statusText=l.getAttribute("statusText")||v.statusText);var h=(c.dataType||"").toLowerCase(),d=/(json|script|text)/.test(h);if(d||c.textarea){var f=F.getElementsByTagName("textarea")[0];if(f)v.responseText=f.value,v.status=Number(f.getAttribute("status"))||v.status,v.statusText=f.getAttribute("statusText")||v.statusText;else if(d){var p=F.getElementsByTagName("pre")[0],y=F.getElementsByTagName("body")[0];p?v.responseText=p.textContent?p.textContent:p.innerText:y&&(v.responseText=y.textContent?y.textContent:y.innerText)}}else"xml"===h&&!v.responseXML&&v.responseText&&(v.responseXML=A(v.responseText));try{L=O(v,h,c)}catch(b){a="parsererror",v.error=i=b||a}}catch(b){n("error caught: ",b),a="error",v.error=i=b||a}v.aborted&&(n("upload aborted"),a=null),v.status&&(a=v.status>=200&&v.status<300||304===v.status?"success":"error"),"success"===a?(c.success&&c.success.call(c.context,L,"success",v),k.resolve(v.responseText,"success",v),u&&t.event.trigger("ajaxSuccess",[v,c])):a&&("undefined"==typeof i&&(i=v.statusText),c.error&&c.error.call(c.context,v,a,i),k.reject(v,"error",i),u&&t.event.trigger("ajaxError",[v,c,i])),u&&t.event.trigger("ajaxComplete",[v,c]),u&&!--t.active&&t.event.trigger("ajaxStop"),c.complete&&c.complete.call(c.context,v,a),I=!0,c.timeout&&clearTimeout(C),setTimeout(function(){c.iframeTarget?g.attr("src",c.iframeSrc):g.remove(),v.responseXML=null},100)}}}var l,h,c,u,f,g,m,v,b,w,x,C,_=p[0],k=t.Deferred();if(k.abort=function(t){v.abort(t)},i)for(h=0;h<y.length;h++)l=t(y[h]),s?l.prop("disabled",!1):l.removeAttr("disabled");c=t.extend(!0,{},t.ajaxSettings,e),c.context=c.context||c,f="jqFormIO"+(new Date).getTime();var T=_.ownerDocument,S=p.closest("body");if(c.iframeTarget?(g=t(c.iframeTarget,T),w=g.attr2("name"),w?f=w:g.attr2("name",f)):(g=t('<iframe name="'+f+'" src="'+c.iframeSrc+'" />',T),g.css({position:"absolute",top:"-1000px",left:"-1000px"})),m=g[0],v={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(e){var i="timeout"===e?"timeout":"aborted";n("aborting upload... "+i),this.aborted=1;try{m.contentWindow.document.execCommand&&m.contentWindow.document.execCommand("Stop")}catch(o){}g.attr("src",c.iframeSrc),v.error=i,c.error&&c.error.call(c.context,v,i,e),u&&t.event.trigger("ajaxError",[v,c,i]),c.complete&&c.complete.call(c.context,v,i)}},u=c.global,u&&0===t.active++&&t.event.trigger("ajaxStart"),u&&t.event.trigger("ajaxSend",[v,c]),c.beforeSend&&c.beforeSend.call(c.context,v,c)===!1)return c.global&&t.active--,k.reject(),k;if(v.aborted)return k.reject(),k;b=_.clk,b&&(w=b.name,w&&!b.disabled&&(c.extraData=c.extraData||{},c.extraData[w]=b.value,"image"===b.type&&(c.extraData[w+".x"]=_.clk_x,c.extraData[w+".y"]=_.clk_y)));var D=1,M=2,P=t("meta[name=csrf-token]").attr("content"),z=t("meta[name=csrf-param]").attr("content");z&&P&&(c.extraData=c.extraData||{},c.extraData[z]=P),c.forceSync?a():setTimeout(a,10);var L,F,I,$=50,A=t.parseXML||function(t,e){return window.ActiveXObject?(e=new ActiveXObject("Microsoft.XMLDOM"),e.async="false",e.loadXML(t)):e=(new DOMParser).parseFromString(t,"text/xml"),e&&e.documentElement&&"parsererror"!==e.documentElement.nodeName?e:null},E=t.parseJSON||function(t){return window.eval("("+t+")")},O=function(e,i,n){var o=e.getResponseHeader("content-type")||"",a=("xml"===i||!i)&&o.indexOf("xml")>=0,s=a?e.responseXML:e.responseText;return a&&"parsererror"===s.documentElement.nodeName&&t.error&&t.error("parsererror"),n&&n.dataFilter&&(s=n.dataFilter(s,i)),"string"==typeof s&&(("json"===i||!i)&&o.indexOf("json")>=0?s=E(s):("script"===i||!i)&&o.indexOf("javascript")>=0&&t.globalEval(s)),s};return k}if(!this.length)return n("ajaxSubmit: skipping submit process - no element selected"),this;var d,u,f,p=this;"function"==typeof e?e={success:e}:"string"==typeof e||e===!1&&arguments.length>0?(e={url:e,data:i,dataType:o},"function"==typeof r&&(e.success=r)):"undefined"==typeof e&&(e={}),d=e.method||e.type||this.attr2("method"),u=e.url||this.attr2("action"),f="string"==typeof u?t.trim(u):"",f=f||window.location.href||"",f&&(f=(f.match(/^([^#]+)/)||[])[1]),e=t.extend(!0,{url:f,success:t.ajaxSettings.success,type:d||t.ajaxSettings.type,iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},e);var g={};if(this.trigger("form-pre-serialize",[this,e,g]),g.veto)return n("ajaxSubmit: submit vetoed via form-pre-serialize trigger"),this;if(e.beforeSerialize&&e.beforeSerialize(this,e)===!1)return n("ajaxSubmit: submit aborted via beforeSerialize callback"),this;var m=e.traditional;"undefined"==typeof m&&(m=t.ajaxSettings.traditional);var v,y=[],b=this.formToArray(e.semantic,y,e.filtering);if(e.data){var w="function"==typeof e.data?e.data(b):e.data;e.extraData=w,v=t.param(w,m)}if(e.beforeSubmit&&e.beforeSubmit(b,this,e)===!1)return n("ajaxSubmit: submit aborted via beforeSubmit callback"),this;if(this.trigger("form-submit-validate",[b,this,e,g]),g.veto)return n("ajaxSubmit: submit vetoed via form-submit-validate trigger"),this;var x=t.param(b,m);v&&(x=x?x+"&"+v:v),"GET"===e.type.toUpperCase()?(e.url+=(e.url.indexOf("?")>=0?"&":"?")+x,e.data=null):e.data=x;var C=[];if(e.resetForm&&C.push(function(){p.resetForm()}),e.clearForm&&C.push(function(){p.clearForm(e.includeHidden)}),!e.dataType&&e.target){var _=e.success||function(){};C.push(function(i,n,o){var a=arguments,s=e.replaceTarget?"replaceWith":"html";t(e.target)[s](i).each(function(){_.apply(this,a)})})}else e.success&&(Array.isArray(e.success)?t.merge(C,e.success):C.push(e.success));if(e.success=function(t,i,n){for(var o=e.context||this,a=0,s=C.length;a<s;a++)C[a].apply(o,[t,i,n||p,p])},e.error){var k=e.error;e.error=function(t,i,n){var o=e.context||this;k.apply(o,[t,i,n,p])}}if(e.complete){var T=e.complete;e.complete=function(t,i){var n=e.context||this;T.apply(n,[t,i,p])}}var S=t("input[type=file]:enabled",this).filter(function(){return""!==t(this).val()}),D=S.length>0,M="multipart/form-data",P=p.attr("enctype")===M||p.attr("encoding")===M,z=a.fileapi&&a.formdata;n("fileAPI :"+z);var L,F=(D||P)&&!z;e.iframe!==!1&&(e.iframe||F)?e.closeKeepAlive?t.get(e.closeKeepAlive,function(){L=c(b)}):L=c(b):L=(D||P)&&z?h(b):t.ajax(e),p.removeData("jqxhr").data("jqxhr",L);for(var I=0;I<y.length;I++)y[I]=null;return this.trigger("form-submit-notify",[this,e]),this},t.fn.ajaxForm=function(o,a,s,r){if(("string"==typeof o||o===!1&&arguments.length>0)&&(o={url:o,data:a,dataType:s},"function"==typeof r&&(o.success=r)),o=o||{},o.delegation=o.delegation&&"function"==typeof t.fn.on,!o.delegation&&0===this.length){var l={s:this.selector,c:this.context};return!t.isReady&&l.s?(n("DOM not ready, queuing ajaxForm"),t(function(){t(l.s,l.c).ajaxForm(o)}),this):(n("terminating; zero elements found by selector"+(t.isReady?"":" (DOM not ready)")),this)}return o.delegation?(t(document).off("submit.form-plugin",this.selector,e).off("click.form-plugin",this.selector,i).on("submit.form-plugin",this.selector,o,e).on("click.form-plugin",this.selector,o,i),this):this.ajaxFormUnbind().on("submit.form-plugin",o,e).on("click.form-plugin",o,i)},t.fn.ajaxFormUnbind=function(){return this.off("submit.form-plugin click.form-plugin")},t.fn.formToArray=function(e,i,n){var o=[];if(0===this.length)return o;var s,r=this[0],l=this.attr("id"),h=e||"undefined"==typeof r.elements?r.getElementsByTagName("*"):r.elements;if(h&&(h=t.makeArray(h)),l&&(e||/(Edge|Trident)\//.test(navigator.userAgent))&&(s=t(':input[form="'+l+'"]').get(),s.length&&(h=(h||[]).concat(s))),!h||!h.length)return o;"function"==typeof n&&(h=t.map(h,n));var c,d,u,f,p,g,m;for(c=0,g=h.length;c<g;c++)if(p=h[c],u=p.name,u&&!p.disabled)if(e&&r.clk&&"image"===p.type)r.clk===p&&(o.push({name:u,value:t(p).val(),type:p.type}),o.push({name:u+".x",value:r.clk_x},{name:u+".y",value:r.clk_y}));else if(f=t.fieldValue(p,!0),f&&f.constructor===Array)for(i&&i.push(p),d=0,m=f.length;d<m;d++)o.push({name:u,value:f[d]});else if(a.fileapi&&"file"===p.type){i&&i.push(p);var v=p.files;if(v.length)for(d=0;d<v.length;d++)o.push({name:u,value:v[d],type:p.type});else o.push({name:u,value:"",type:p.type})}else null!==f&&"undefined"!=typeof f&&(i&&i.push(p),o.push({name:u,value:f,type:p.type,required:p.required}));if(!e&&r.clk){var y=t(r.clk),b=y[0];u=b.name,u&&!b.disabled&&"image"===b.type&&(o.push({name:u,value:y.val()}),o.push({name:u+".x",value:r.clk_x},{name:u+".y",value:r.clk_y}))}return o},t.fn.formSerialize=function(e){return t.param(this.formToArray(e))},t.fn.fieldSerialize=function(e){var i=[];return this.each(function(){var n=this.name;if(n){var o=t.fieldValue(this,e);if(o&&o.constructor===Array)for(var a=0,s=o.length;a<s;a++)i.push({name:n,value:o[a]});else null!==o&&"undefined"!=typeof o&&i.push({name:this.name,value:o})}}),t.param(i)},t.fn.fieldValue=function(e){for(var i=[],n=0,o=this.length;n<o;n++){var a=this[n],s=t.fieldValue(a,e);null===s||"undefined"==typeof s||s.constructor===Array&&!s.length||(s.constructor===Array?t.merge(i,s):i.push(s))}return i},t.fieldValue=function(e,i){var n=e.name,a=e.type,s=e.tagName.toLowerCase();if("undefined"==typeof i&&(i=!0),i&&(!n||e.disabled||"reset"===a||"button"===a||("checkbox"===a||"radio"===a)&&!e.checked||("submit"===a||"image"===a)&&e.form&&e.form.clk!==e||"select"===s&&e.selectedIndex===-1))return null;if("select"===s){var r=e.selectedIndex;if(r<0)return null;for(var l=[],h=e.options,c="select-one"===a,d=c?r+1:h.length,u=c?r:0;u<d;u++){var f=h[u];if(f.selected&&!f.disabled){var p=f.value;if(p||(p=f.attributes&&f.attributes.value&&!f.attributes.value.specified?f.text:f.value),c)return p;l.push(p)}}return l}return t(e).val().replace(o,"\r\n")},t.fn.clearForm=function(e){return this.each(function(){t("input,select,textarea",this).clearFields(e)})},t.fn.clearFields=t.fn.clearInputs=function(e){var i=/^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i;return this.each(function(){var n=this.type,o=this.tagName.toLowerCase();i.test(n)||"textarea"===o?this.value="":"checkbox"===n||"radio"===n?this.checked=!1:"select"===o?this.selectedIndex=-1:"file"===n?/MSIE/.test(navigator.userAgent)?t(this).replaceWith(t(this).clone(!0)):t(this).val(""):e&&(e===!0&&/hidden/.test(n)||"string"==typeof e&&t(this).is(e))&&(this.value="")})},t.fn.resetForm=function(){return this.each(function(){var e=t(this),i=this.tagName.toLowerCase();switch(i){case"input":this.checked=this.defaultChecked;case"textarea":return this.value=this.defaultValue,!0;case"option":case"optgroup":var n=e.parents("select");return n.length&&n[0].multiple?"option"===i?this.selected=this.defaultSelected:e.find("option").resetForm():n.resetForm(),!0;case"select":return e.find("option").each(function(t){if(this.selected=this.defaultSelected,this.defaultSelected&&!e[0].multiple)return e[0].selectedIndex=t,!1}),!0;case"label":var o=t(e.attr("for")),a=e.find("input,select,textarea");return o[0]&&a.unshift(o[0]),a.resetForm(),!0;case"form":return("function"==typeof this.reset||"object"==typeof this.reset&&!this.reset.nodeType)&&this.reset(),!0;default:return e.find("form,input,label,select,textarea").resetForm(),!0}})},t.fn.enable=function(t){return"undefined"==typeof t&&(t=!0),this.each(function(){this.disabled=!t})},t.fn.selected=function(e){return"undefined"==typeof e&&(e=!0),this.each(function(){var i=this.type;if("checkbox"===i||"radio"===i)this.checked=e;else if("option"===this.tagName.toLowerCase()){var n=t(this).parent("select");e&&n[0]&&"select-one"===n[0].type&&n.find("option").selected(!1),this.selected=e}})},t.fn.ajaxSubmit.debug=!1}),/*!
  * jQuery Hotkeys Plugin
  * Copyright 2010, John Resig
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -75,5 +75,5 @@ function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"=
  * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
 */
 function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var o="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],a=String.fromCharCode(e.which).toLowerCase(),s="",r={};e.altKey&&"alt"!==o&&(s+="alt+"),e.ctrlKey&&"ctrl"!==o&&(s+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==o&&(s+="meta+"),e.shiftKey&&"shift"!==o&&(s+="shift+"),o?r[s+o]=!0:(r[s+a]=!0,r[s+t.hotkeys.shiftNums[a]]=!0,"shift+"===s&&(r[t.hotkeys.shiftNums[a]]=!0));for(var l=0,h=n.length;l<h;l++)if(r[n[l]])return i.apply(this,arguments)}}}}t.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return Array.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},s[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",o=0,a=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},s={sort:{template:'<a class="sort-handler" href="javascript:;"><i class="icon icon-move"></i></a>'},add:{template:'<a href="javascript:;"><i class="icon icon-plus"></i></a>'},edit:{template:'<a href="javascript:;"><i class="icon icon-pencil"></i></a>'},"delete":{template:'<a href="javascript:;"><i class="icon icon-trash"></i></a>'}};a.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:'<i class="list-toggle icon"></i>'},a.prototype.add=function(e,i,n,o,a){var s,r=t(e),l=this.options;if(r.is("li")?(s=r.children("ul"),s.length||(s=t("<ul/>"),r.append(s),this._initList(s,r))):s=r,s){var h=this;Array.isArray(i)||(i=[i]),t.each(i,function(e,i){var n=t("<li/>").data(i).appendTo(s);void 0!==i.id&&n.attr("data-id",i.id);var o=l.itemWrapper?t(l.itemWrapper===!0?'<div class="tree-item-wrapper"/>':l.itemWrapper).appendTo(n):n;if(i.html)o.html(i.html);else if("function"==typeof h.options.itemCreator){var a=h.options.itemCreator(n,i);a!==!0&&a!==!1&&o.html(a)}else i.url?o.append(t("<a/>",{href:i.url}).text(i.title||i.name)):o.append(t("<span/>").text(i.title||i.name));h._initItem(n,i.idx||e,s,i),i.children&&i.children.length&&h.add(n,i.children)}),this._initList(s),n&&!s.hasClass("tree")&&h.expand(s.parent("li"),o,a)}},a.prototype.reload=function(e){var i=this;e&&(i.$.empty(),i.add(i.$,e)),i.isPreserve&&i.store.time&&i.$.find("li:not(.tree-action-item)").each(function(){var e=t(this);i[i.store[e.data("id")]?"expand":"collapse"](e,!0,!0)})},a.prototype._initList=function(n,o,a,s){var r=this;n.hasClass("tree")?(a=0,o=null):(o=(o||n.closest("li")).addClass("has-list"),o.find(".list-toggle").length||o.prepend(this.options.toggleTemplate),a=a||o.data("idx")),n.removeClass("has-active-item");var l=n.attr("data-idx",a||0).children("li:not(.tree-action-item)").each(function(e){r._initItem(t(this),e+1,n)});1!==l.length||l.find("ul").length||l.addClass("tree-single-item"),s=s||(o?o.data():null);var h=e(s?s.actions:null,this.actions);if(h){if(h.add&&h.add.templateInList!==!1){var c=n.children("li.tree-action-item");c.length?c.detach().appendTo(n):t('<li class="tree-action-item"/>').append(i(h.add,"add",h.add.templateInList)).appendTo(n)}h.sort&&n.sortable(t.extend({dragCssClass:"tree-drag-holder",trigger:".sort-handler",selector:"li:not(.tree-action-item)",finish:function(t){r.callEvent("action",{action:h.sort,$list:n,target:t.target,item:s})}},h.sort.options,t.isPlainObject(this.options.sortable)?this.options.sortable:null))}o&&(o.hasClass("open")||s&&s.open)&&o.addClass("open in")},a.prototype._initItem=function(n,o,a,s){if(void 0===o){var r=n.prev("li");o=r.length?r.data("idx")+1:1}if(a=a||n.closest("ul"),n.attr("data-idx",o).removeClass("tree-single-item"),!n.data("id")){var l=o;a.hasClass("tree")||(l=a.parent("li").data("id")+"-"+l),n.attr("data-id",l)}n.hasClass("active")&&a.parent("li").addClass("has-active-item"),s=s||n.data();var h=e(s.actions,this.actions);if(h){var c=n.find(".tree-actions");c.length||(c=t('<div class="tree-actions"/>').appendTo(this.options.itemWrapper?n.find(".tree-item-wrapper"):n),t.each(h,function(t,e){e&&c.append(i(e,t))}))}var d=n.children("ul");d.length&&this._initList(d,n,o,s)},a.prototype._init=function(){var i=this.options,a=this;this.actions=e(i.actions),this.$.addClass("tree"),i.animate&&this.$.addClass("tree-animate"),this._initList(this.$);var s=i.initialState,r=t.zui&&t.zui.store&&t.zui.store.enable;r&&(this.selector=n+"::"+(i.name||"")+"#"+(this.$.attr("id")||o++),this.store=t.zui.store[i.name?"get":"pageGet"](this.selector,{})),"preserve"===s&&(r?this.isPreserve=!0:this.options.initialState=s="normal"),this.reload(i.data),r&&(this.isPreserve=!0),"expand"===s?this.expand():"collapse"===s?this.collapse():"active"===s&&this.expandSelect(".active"),this.$.on("click",'.list-toggle,a[href="#"],.tree-toggle',function(e){var i=t(this),n=i.parent("li");a.callEvent("hit",{target:n,item:n.data()}),a.toggle(n),i.is("a")&&e.preventDefault()}).on("click",".tree-action",function(){var e=t(this),i=e.data();if(i.action&&(i=i.action),"sort"!==i.type){var n=e.closest("li:not(.tree-action-item)");a.callEvent("action",{action:i,target:this,$item:n,item:n.data()})}})},a.prototype.preserve=function(e,i,n){if(this.isPreserve)if(e)i=i||e.data("id"),n=void 0===n&&e.hasClass("open"),n?this.store[i]=n:delete this.store[i],this.store.time=(new Date).getTime(),t.zui.store[this.options.name?"set":"pageSet"](this.selector,this.store);else{var o=this;this.store={},this.$.find("li").each(function(){o.preserve(t(this))})}},a.prototype.expandSelect=function(t){this.show(t,!0)},a.prototype.expand=function(t,e,i){t?(t.addClass("open"),!e&&this.options.animate?setTimeout(function(){t.addClass("in")},10):t.addClass("in")):t=this.$.find("li.has-list").addClass("open in"),i||this.preserve(t),this.callEvent("expand",t,this)},a.prototype.show=function(e,i,n){var o=this;e instanceof t||(e=o.$.find("li").filter(e)),e.each(function(){var e=t(this);if(o.expand(e,i,n),e)for(var a=e.parent("ul");a&&a.length&&!a.hasClass("tree");){var s=a.parent("li");s.length?(o.expand(s,i,n),a=s.parent("ul")):a=!1}})},a.prototype.collapse=function(t,e,i){t?!e&&this.options.animate?(t.removeClass("in"),setTimeout(function(){t.removeClass("open")},300)):t.removeClass("open in"):t=this.$.find("li.has-list").removeClass("open in"),i||this.preserve(t),this.callEvent("collapse",t,this)},a.prototype.toggle=function(t){var e=t&&t.hasClass("open")||t===!1||void 0===t&&this.$.find("li.has-list.open").length;this[e?"collapse":"expand"](t)},a.prototype.getOptions=function(e){this.options=t.extend({},a.DEFAULTS,this.$.data(),e),null===this.options.animate&&this.$.hasClass("tree-animate")&&(this.options.animate=!0)},a.prototype.toData=function(e,i){"function"==typeof e&&(i=e,e=null),e=e||this.$;var n=this;return e.children("li:not(.tree-action-item)").map(function(){var e=t(this),o=e.data();delete o["zui.droppable"];var a=e.children("ul");return a.length&&(o.children=n.toData(a)),"function"==typeof i?i(o,e):o}).get()},a.prototype.callEvent=function(e,i){var n;return"function"==typeof this.options[e]&&(n=this.options[e](i,this)),this.$.trigger(t.Event(e+"."+this.name,i)),n},t.fn.tree=function(e,i){return this.each(function(){var o=t(this),s=o.data(n),r="object"==typeof e&&e;s||o.data(n,s=new a(this,r)),"string"==typeof e&&s[e](i)})},t.fn.tree.Constructor=a,t(function(){t('[data-ride="tree"]').tree()})}(jQuery),function(t){"use strict";var e="zui.colorPicker",i='<div class="colorpicker"><button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><i class="ic"></i></button><ul class="dropdown-menu clearfix"></ul></div>',n={zh_cn:{errorTip:"不是有效的颜色值"},zh_tw:{errorTip:"不是有效的顏色值"},en:{errorTip:"Not a valid color value"}},o=function(i,n){this.name=e,this.$=t(i),this.getOptions(n),this.init()};o.prototype.init=function(){var e=this,n=e.options,o=e.$,a=o.parent(),s=!1;a.hasClass("colorpicker")?e.$picker=a:(e.$picker=t(n.template||i),s=!0),e.$picker.addClass(n.wrapper).find(".cp-title").toggle(void 0!==n.title).text(n.title),e.$menu=e.$picker.find(".dropdown-menu").toggleClass("pull-right",n.pullMenuRight),e.$btn=e.$picker.find(".btn.dropdown-toggle"),e.$btn.find(".ic").addClass("icon-"+n.icon),n.btnTip&&e.$picker.attr("data-toggle","tooltip").tooltip({title:n.btnTip,placement:n.tooltip,container:"body"}),o.attr("data-provide",null),s&&o.after(e.$picker),e.colors={},t.each(n.colors,function(i,n){if(t.zui.Color.isColor(n)){var o=new t.zui.Color(n);e.colors[o.toCssStr()]=o}}),e.updateColors(),e.$picker.on("click",".cp-tile",function(){e.setValue(t(this).data("color"))});var r=function(){var i=o.val(),a=t.zui.Color.isColor(i);o.parent().toggleClass("has-error",!(a||n.optional&&""===i)),a?e.setValue(i,!0):n.optional&&""===i?o.tooltip("hide"):o.is(":focus")||o.tooltip("show",n.errorTip)};o.is("input:not([type=hidden])")?(n.tooltip&&o.attr("data-toggle","tooltip").tooltip({trigger:"manual",placement:n.tooltip,tipClass:"tooltip-danger",container:"body"}),o.on("keyup paste input change",r)):o.appendTo(e.$picker),r()},o.prototype.addColor=function(e){e instanceof t.zui.Color||(e=new t.zui.Color(e));var i=e.toCssStr(),n=this.options;this.colors[i]||(this.colors[i]=e);var o=t('<a href="###" class="cp-tile"></a>',{titile:e}).data("color",e).css({color:e.contrast().toCssStr(),background:i,"border-color":e.luma()>.43?"#ccc":"transparent"}).attr("data-color",i);this.$menu.append(t("<li/>").css({width:n.tileSize,height:n.tileSize}).append(o)),n.optional&&this.$menu.find(".cp-tile.empty").parent().detach().appendTo(this.$menu)},o.prototype.updateColors=function(e){var i=this.$menu,n=this.options,e=e||this.colors,o=this,a=0;if(i.children("li:not(.heading)").remove(),t.each(e,function(t,e){o.addColor(e),a++}),n.optional){var s=t('<li><a class="cp-tile empty" href="###"></a></li>').css({width:n.tileSize,height:n.tileSize});this.$menu.append(s),a++}i.css("width",Math.min(a,n.lineCount)*n.tileSize+6)},o.prototype.setValue=function(e,i){var n=this,o=n.options,a=n.$btn,s="";n.$menu.find(".cp-tile.active").removeClass("active");var r=o.updateBtn;if("auto"===r){var l=a.find(".color-bar");r=!l.length||function(t){l.css("background",t||"")}}if(e){var h=new t.zui.Color(e);s=h.toCssStr().toLowerCase(),r&&("function"==typeof r?r(s,a,n):a.css({background:s,color:h.contrast().toCssStr(),borderColor:h.luma()>.43?"#ccc":s})),n.colors[s]||n.addColor(h),i||n.$.val().toLowerCase()===s||n.$.val(s).trigger("change"),n.$menu.find('.cp-tile[data-color="'+s+'"]').addClass("active"),n.$.tooltip("hide"),n.$.trigger("colorchange",h)}else r&&("function"==typeof r?r(null,a,n):a.attr("style",null)),i||""===n.$.val()||n.$.val(s).trigger("change"),o.optional&&n.$.tooltip("hide"),n.$menu.find(".cp-tile.empty").addClass("active"),n.$.trigger("colorchange",null);o.updateBorder&&t(o.updateBorder).css("border-color",s),o.updateBackground&&t(o.updateBackground).css("background-color",s),o.updateColor&&t(o.updateColor).css("color",s),o.updateText&&t(o.updateText).text(s)},o.prototype.getOptions=function(i){var a=t.extend({},o.DEFAULTS,this.$.data(),i);"string"==typeof a.colors&&(a.colors=a.colors.split(","));var s=a.lang||t.zui.clientLang(),r=this.lang=t.zui.getLangData?t.zui.getLangData(e,s,n):n[s]||n.en;a.errorTip||(a.errorTip=r.errorTip),t.fn.tooltip||(a.btnTip=!1),this.options=a},o.DEFAULTS={colors:["#00BCD4","#388E3C","#3280fc","#3F51B5","#9C27B0","#795548","#F57C00","#F44336","#E91E63"],pullMenuRight:!0,wrapper:"btn-wrapper",tileSize:30,lineCount:5,optional:!0,tooltip:"top",icon:"caret-down",updateBtn:"auto"},o.LANG=n,t.fn.colorPicker=function(e){return this.each(function(){var i=t(this),n=i.data(name),a="object"==typeof e&&e;n||i.data(name,n=new o(this,a)),"string"==typeof e&&n[e]()})},t.fn.colorPicker.Constructor=o,t(function(){t('[data-provide="colorpicker"]').colorPicker()})}(jQuery),function(t,e){function i(t){return t===e&&(t=o+=1),a[t%a.length]}function n(e,i){var n=t(e);i=t.extend({percent:0,size:20,backColor:"#eee",color:"#00da88",borderColor:"#ccc",borderSize:1,rotate:-90,doughnut:8},n.data(),i);var o=i.percent,a=i.size;"string"==typeof o&&(o=Number.parseFloat(o,10)),"string"==typeof a&&(a=Number.parseFloat(a,10)),a=Math.floor(a);var s=a/2,r=3.14*s,l="http://www.w3.org/2000/svg",h=document.createElementNS(l,"svg"),c=document.createElementNS(l,"circle"),d=document.createElementNS(l,"circle"),u=document.createElementNS(l,"circle");d.setAttribute("r",s),d.setAttribute("cx",s),d.setAttribute("cy",s),d.setAttribute("fill",i.backColor),d.setAttribute("stroke",i.borderColor),d.setAttribute("stroke-width",i.borderSize),u.setAttribute("r",i.doughnut),u.setAttribute("cx",s),u.setAttribute("cy",s),u.setAttribute("fill",i.backColor),c.setAttribute("r",s/2),c.setAttribute("cx",s),c.setAttribute("cy",s),c.setAttribute("fill","transparent"),c.setAttribute("stroke-dasharray",(o*r/100).toFixed(1)+" "+r),c.setAttribute("stroke-width",s),c.setAttribute("stroke",i.color),c.setAttribute("transform","rotate(-90) translate(-"+a+")"),h.setAttribute("viewBox","0 0 "+a+" "+a),h.setAttribute("width",a),h.setAttribute("height",a),h.setAttribute("transform","rotate(180)"),h.appendChild(d),h.appendChild(c),h.appendChild(u),n[0].appendChild(h);var f={width:a,height:a};"inline"===n.css("display")&&(f.display="inline-block",f.verticalAlign="middle"),n.css(f)}var o=0,a=["#00a9fc","#ff5d5d","#fdc137","#00da88","#7ec5ff","#8666b8","#bd7b46","#ff9100","#ff3d00","#f57f17","#00e5ff","#00b0ff","#2979ff","#3d5afe","#651fff","#d500f9","#f50057","#ff1744"];jQuery.fn.tableChart=function(){t(this).each(function(){var e=t(this),n=e.data(),o=n.chart||"pie",a=t(n.target);if(a.length){var s=null;if("pie"===o){n=t.extend({scaleShowLabels:!0,scaleLabel:"<%=label%>: <%=value%>"},n);var r=[],l=e.find("tbody > tr").each(function(e){var n=t(this),o=i();n.attr("data-id",e).find(".chart-color-dot").css("background",o),r.push({label:n.find(".chart-label").text(),value:parseFloat(n.data("value")||n.find(".chart-value").text()),color:o,id:e})});r.length>1?n.scaleLabelPlacement="outside":1===r.length&&(n.scaleLabelPlacement="inside",r.push({label:"",value:r[0].value/2e3,color:"#fff",showLabel:!1})),s=a.pieChart(r,n),a.on("mousemove",function(t){var e=s.getSegmentsAtEvent(t);l.removeClass("active"),e.length&&l.filter('[data-id="'+e[0].id+'"]').addClass("active")})}else if("bar"===o){var h=i(),c=[],d={label:e.find("thead .chart-label").text(),color:h,data:[]},l=e.find("tbody > tr").each(function(e){var i=t(this);c.push(i.find(".chart-label").text()),d.data.push(i.data("value")||parseFloat(i.find(".chart-value").text())),i.find(".chart-color-dot").css("background",h)}),r={labels:c,datasets:[d]};c.length&&(n.barValueSpacing=5),s=a.barChart(r,n)}else if("line"===o){var h=i(),c=[],d={label:e.find("thead .chart-label").text(),color:h,data:[]},l=e.find("tbody > tr").each(function(e){var i=t(this);c.push(i.find(".chart-label").text()),d.data.push(parseInt(i.find(".chart-value").text())),i.find(".chart-color-dot").css("background",h)}),r={labels:c,datasets:[d]};c.length&&(n.barValueSpacing=5),s=a.lineChart(r,n)}null!==s&&e.data("zui.chart",s)}})},t(".table-chart").tableChart();var s=function(i,n){var o=t(i);if(!o.data("pieChart")){var a=o.is("canvas")?o:o.find("canvas"),s=t.extend({value:0,color:t.getThemeColor("primary")||"#006af1",backColor:t.getThemeColor("pale")||"#E9F2FB",doughnut:!0,doughnutSize:85,width:20,height:20,showTip:!1,name:"",tipTemplate:"<%=value%>%",animation:"auto",realValue:parseFloat(o.find(".progress-value").text())},n,o.data()),r=a.length;r||(a=t("<canvas>").appendTo(o)),a.attr("width")!==e?s.width=a.width():a.attr("width",s.width),a.attr("height")!==e?s.height=a.height():a.attr("height",s.height),r||8!=t.zui.browser.ie||G_vmlCanvasManager.initElement(a[0]),"auto"===s.animation&&(s.animation=s.width>30),o.addClass("progress-pie-"+s.width).css({width:s.width,height:s.height}),s.value=Math.max(0,Math.min(100,s.value));var l=[{value:s.value,label:s.name,color:s.color,circleBeginEnd:!0},{value:100-s.value,label:"",color:s.backColor}],h=a[s.doughnut?"doughnutChart":"pieChart"](l,t.extend({segmentShowStroke:!1,animation:s.animation,showTooltips:s.showTip,tooltipTemplate:s.tipTemplate,percentageInnerCutout:s.doughnutSize,reverseDrawOrder:!0,animationEasing:"easeInOutQuart",onAnimationProgress:s.realValue?function(t){o.find(".progress-value").text(Math.floor(s.realValue*t))}:e,onAnimationComplete:s.realValue?function(t){o.find(".progress-value").text(s.realValue)}:e},s.chartOptions));o.data("pieChart",h)}};jQuery.fn.progressPie=function(e){t(this).each(function(){var i=t(this);if(!i.closest(".hidden").length){var n=i.closest(".tab-pane");n.length&&!n.hasClass("active")?t('[data-toggle="tab"][data-target="#'+n.attr("id")+'"]').one("shown.zui.tab",function(){s(i,e)}):s(this,e)}})},t.fn.pieIcon=function(e){t(this).each(function(){n(this,e)})},t(function(){t(".table-chart").tableChart();var e=t(".progress-pie:visible");e.length>100?setTimeout(function(){e.progressPie()},1e3):e.progressPie(),t(".pie-icon:visible").pieIcon()})}(jQuery,void 0),function(t){jQuery.fn.sparkline=function(e){t(this).each(function(){var i=t(this),n=t.extend({values:i.attr("values"),width:i.width()-4,height:i.height()-4},i.data(),e),o=n.height,a=[],s=n.width,r=n.values.split(","),l=0;for(var h in r){var c=parseFloat(r[h]);NaN!=c&&(a.push(c),l=Math.max(c,l))}var d=(Math.min(l,30),Math.min(s,Math.max(10,a.length*s/30))),u=i.children("canvas");u.length||(i.append('<canvas class="projectline-canvas"></canvas>'),u=i.children("canvas")),u.attr("width",d).attr("height",o);var f={labels:a,datasets:[{fillColor:t.getThemeColor("pale")||"rgba(0,0,255,0.05)",strokeColor:t.getThemeColor("primary")||"#0054EC",pointColor:t.getThemeColor("secondary")||"rgba(255,136,0,1)",pointStrokeColor:"#fff",data:a}]},p={animation:!0,scaleOverride:!0,scaleStepWidth:Math.ceil(l/10),scaleSteps:10,scaleStartValue:0,showScale:!1,showTooltips:!1,pointDot:!1,scaleShowGridLines:!1,datasetStrokeWidth:1},g=t(u).lineChart(f,p);i.data("sparklineChart",g)})},t(function(){t(".sparkline").sparkline()})}(jQuery),function(t){t.fn.fixedDate=function(){return t(this).each(function(){var e=t(this).attr("autocomplete","off");"0000-00-00"==e.val()&&e.focus(function(){"0000-00-00"==e.val()&&e.val("").datetimepicker("update")}).blur(function(){""==e.val()&&e.val("0000-00-00")})})},window.datepickerOptions={language:t("html").attr("lang"),weekStart:1,todayBtn:1,autoclose:1,todayHighlight:1,startView:2,forceParse:0,showMeridian:1,format:"yyyy-mm-dd hh:ii",startDate:"1970-1-1"},t.extend(t.fn.datetimepicker.defaults,window.datepickerOptions),t(function(){var e={minView:2,format:"yyyy-mm-dd"},i={eleClass:"only-pick-time",startView:1,minView:0,maxView:1,format:"hh:ii"},n={minView:3,startView:3,format:"yyyy-mm"};t(".datepicker-wrapper").click(function(){t(this).find(".form-date, .form-datetime, .form-time, .form-month").datetimepicker("show").focus()}),t.fn.datepicker=function(i){return this.datetimepicker(t.extend({},e,i))},t.fn.timepicker=function(e){return this.datetimepicker(t.extend({},i,e))},t.fn.monthpicker=function(e){return this.datetimepicker(t.extend({},n,e))},t.fn.datepickerAll=function(){return this.find(".form-datetime").fixedDate().datetimepicker(),this.find(".form-date").fixedDate().datepicker(),this.find(".form-time").fixedDate().timepicker(),this.find(".form-month").fixedDate().monthpicker(),this},t("body").datepickerAll()})}(jQuery),function(t){var e=function(e,i){i=t.extend({idStart:0,idEnd:9,chosen:!0,datetimepicker:!0,colorPicker:!0,hotkeys:!0},i,e.data());var n=e.find(".template");!n.length&&i.template&&(n=t(i.template));var o=0,a=0,s=function(t){t.is("select.chosen")?t.next(".chosen-container").find("input").focus():t.focus()},r=function(t){var i=e.find("[data-ctrl-index]:focus,.chosen-container-active").first();if(i.length){if(i.is(".chosen-container-active")){if(i.hasClass("chosen-with-drop")&&("down"===t||"up"===t))return;i=i.prev("select.chosen")}var n=i.data("ctrlIndex"),r=i.closest("tr").data("row");"down"===t?r<a-1?r+=1:r=0:"up"===t?r>0?r-=1:r=a-1:"left"===t?n>0?n-=1:n=o-1:"right"===t&&(n<o-1?n+=1:n=0),s(e.find('tr[data-row="'+r+'"]').find('[data-ctrl-index="'+n+'"]'))}},l={options:i,focusNext:r,focusControl:s},h=e.find("tbody,.batch-rows"),c=function(e){t.fn.chosen&&i.chosen&&e.find(".chosen").chosen(t.isPlainObject(i.chosen)?i.chosen:null),t.fn.datetimepicker&&i.datetimepicker&&e.datepickerAll(t.isPlainObject(i.datetimepicker)?i.datetimepicker:null),t.fn.colorPicker&&i.colorPicker&&e.find("input.colorpicker").colorPicker(t.isPlainObject(i.colorPicker)?i.colorPicker:null);var n=0;e.find('input[type!="hidden"],textarea,select').each(function(){var e=t(this);e.parent().hasClass("chosen-search")||e.attr("data-ctrl-index",n++)}),o=Math.max(o,n)};if(n.length){var d=n.remove().html(),u=function(e,o){var s=d;"number"!=typeof e&&(e=a),a=Math.max(e+1,a),s=s.replace(/\$idPlus/g,e+1).replace(/\$id/g,e);var r=t("<"+n[0].tagName.toLowerCase()+" />").html(s);return r.attr("data-row",e).addClass(n.attr("class")).removeClass("template"),i.rowCreator&&i.rowCreator(r,e,i),o?o.after(r):h.append(r),c(r),r};t.extend(l,{createRow:u,template:d});for(var f=i.idStart;f<=i.idEnd;++f)u(f)}else c(e);e.on("click",".btn-copy",function(){var e=t(this),i=t(e.data("copyFrom")).val(),n=t(e.data("copyTo")).val(i).addClass("highlight");setTimeout(function(){n.removeClass("highlight")},2e3)}),i.hotkeys&&t(document).on("keydown",function(t){var e={"Ctrl+#37":"left","Ctrl+#39":"right","#38":"up","#40":"down","Ctrl+#38":"up","Ctrl+#40":"down"},i=[];t.ctrlKey&&i.push("Ctrl"),i.push("#"+t.keyCode);var n=e[i.join("+")];n&&(r(n),t.ctrlKey&&(t.stopPropagation(),t.preventDefault()))}),e.data("zui.batchActionForm",l),setTimeout(t.fixTableResponsive,0)};t.fn.batchActionForm=function(i){return this.each(function(){e(t(this),i)})}}(jQuery),function(t,e){"use strict";var i="zui.table",n={zh_cn:{selectedItems:"已选择 <strong>{0}</strong> 项",attrTotal:"{0}总计 <strong>{1}</strong>"},zh_tw:{selectedItems:"已选择 <strong>{0}</strong> 项",attrTotal:"{0}总计 <strong>{1}</strong>"},en:{selectedItems:"Seleted <strong>{0}</strong> items",attrTotal:"{0} total <strong>{1}</strong>"},de:{selectedItems:"<strong>{0}</strong> ausgewählt",attrTotal:"{0} insgesamt <strong>{1}</strong>"},fr:{selectedItems:"<strong>{0}</strong> sélectionnés",attrTotal:"{0} total <strong>{1}</strong>"}},o=/^((?!chrome|android).)*safari/i.test(navigator.userAgent),a=t.zui.browser.isIE(),s=a?200:100,r=function(e,o){var a=this;a.name=i;var s=a.$=t(e);o=a.options=t.extend({},r.DEFAULTS,this.$.data(),o),a.langName=o.lang||t.zui.clientLang(),a.lang=t.zui.getLangData(i,a.langName,n),a.id=s.attr("id"),a.id||(a.id=o.id||"table-"+t.zui.uuid(),a.noID=!0,s.attr("id",a.id),o.hot&&console.warn("ZUI: table hot replace id not defined, the element id attribute should be set.")),s.attr("data-ride")||s.attr("data-ride","table");var l=a.getTable();if(l.length){l.find("thead>tr>th").each(function(){var e=t(this);if(!e.attr("title")){var i=t.trim(e.find("a:first").text()||e.text()||"");i.length&&e.attr("title",i)}}),o.nested&&a.initNestedList(),o.checkable&&(s.on("click",".check-all",function(){a.checkAll(!t(this).hasClass("checked"))}),o.checkOnClickRow&&s.on("click","tbody>tr",function(e){t(e.target).closest('.btn,a,.not-check,.form-control,input[type="text"],.chosen-container').length||a.checkRow(t(this))}),s.on("click",'tbody input[type="checkbox"],tbody label[for]',function(e){e.stopPropagation();var i=t(this);i.is("label")&&(i=i.closest(".checkbox-primary").find('input[type="checkbox"]')),a.checkRow(i.closest("tr"),i.is(":checked"))}),o.selectable&&s.selectable(t.extend({},{selector:a.isDataTable?".fixed-left tbody>tr":"tbody>tr",selectClass:"",trigger:".c-id",clickBehavior:"multi",listenClick:!1,start:function(){this.syncSelectionsFromClass()},select:function(e){a.checkRow(e.target,!0),t.cookie("ajax_dragSelected")||(t.cookie("ajax_dragSelected","on",{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("dragSelected"))},unselect:function(t){a.checkRow(t.target,!1)},rangeStyle:{border:"1px solid #006af1",backgroundColor:"rgba(50,128,252,0.2)",borderRadius:"2px"}},t.isPlainObject(o.selectable)?o.selectable:null)));var h=a.$form=s.is("form")?s:s.find("form");h.length&&(o.ajaxForm?h.ajaxForm(t.isPlainObject(o.ajaxForm)?o.ajaxForm:null):h.on("click","[data-form-action]",function(){h.attr("action",t(this).data("formAction")).submit()})),(o.fixFooter||o.fixHeader)&&(a.pageFooterHeight=t("#footer").outerHeight(),a.updateFixUI(!0),t(window).on("scroll resize",function(){a.updateFixUI()}).on("sidebar.toggle",function(){setTimeout(function(){a.updateFixUI()},200)})),o.group&&(s.on("click",".group-toggle",function(){a.toggleRowGroup(t(this).closest("tr").data("id"))}),t(document).on("click",".group-collapse-all",function(){a.toggleGroups(!1)}).on("click",".group-expand-all",function(){a.toggleGroups(!0)})),a.defaultStatistic=s.find(".table-statistic").html(),a.updateStatistic(),a.initModals(),a.checkItems={},a.updateCheckUI()}};r.prototype.initNestedList=function(){var e=this,i=e.options,n=e.getTable().addClass("table-nested"),o=n.find("tbody"),a=o.children("tr[data-id]"),s={},r=[],l=i.preserveNested,h=i.enableEmptyNestedRow;n.toggleClass("disable-empty-nest-row",!h),a.each(function(e){var i=t(this),n=i.data();n.realOrder=e,n.$row=i,n.nestPath?(n.nestPathList=n.nestPath.split(","),n.nestPathList[0]||n.nestPathList.shift(),n.nestPathList[n.nestPathList.length-1]||n.nestPathList.pop(),n.nestPathLevel=n.nestPathList.length,i.attr("data-level",n.nestPathLevel)):(n.nestPath=","+n.id+",",n.nestPathList=[n.id],n.nestPathLevel=1),s[n.id]=n,delete n.children,r.push(n)});var c=[];t.each(r,function(t,n){return n.nestParent&&(n.parent=s[n.nestParent],n.parent)?(n.parent.children?n.parent.children.push(n):n.parent.children=[n],void(i.expandNestChild||e._initedNestedList||(n.$row.addClass("table-nest-hide"),n.parent.$row.addClass("table-nest-child-hide")))):(n.$row.removeClass("table-nest-hide"),void c.push(n))}),e.nestRowsMap=s,e.$nestBody=o;var d=function(e){for(var n=0;n<e.length;++n){var a=e[n];o.append(a.$row),a.children?(a.$row.addClass("has-nest-child"),d(a.children),a.nestPathLevel<2&&a.$row.addClass("is-top-level")):a.parent?a.$row.addClass("is-nest-child"):h||a.$row.addClass("no-nest");var s=a.$row.find(".table-nest-title");s.length||(s=a.$row.find("td:first"));var r=s.find(".table-nest-icon");r.length||(r=t('<span class="table-nest-icon icon"></span>').prependTo(s)),r.toggleClass("table-nest-toggle",!!a.children||h&&a.nested).css("marginLeft",(a.nestPathLevel-1)*i.nestLevelIndent),delete a.$row}};if(d(c),e.nestConfigStoreName="/"+window.config.currentModule+"/"+window.config.currentMethod+"/table."+e.id+".nestConfig",e.nestConfig=l?t.zui.store.get(e.nestConfigStoreName,{}):{},l)for(var u=0;u<r.length;++u){var f=r[u];if(f.children){var p=!!e.nestConfig[f.id];e.toggleNestedRows(f.id,p,!1,null,!0,!0)}}e.updateNestState(),e._initedNestedList||(o.on("click",".table-nest-toggle",function(){e.toggleNestedRows(t(this).closest("tr").data("id"))}),o.on("mouseenter","tr.has-nest-child",function(){o.find(".table-nest-hover").removeClass("table-nest-hover"),o.find(".table-nest-child-hover").removeClass("table-nest-child-hover");var e=t(this).addClass("table-nest-hover"),i=e.closest("tr").data("id");o.find('[data-nest-path*=",'+i+',"]').addClass("table-nest-child-hover")}).on("mouseleave","tr.table-nest-hover",function(){o.find(".table-nest-hover").removeClass("table-nest-hover"),o.find(".table-nest-child-hover").removeClass("table-nest-child-hover")}),e.$.on("click",".table-nest-toggle-global",function(){for(var t=e.$.hasClass("table-nest-collapsed"),n=0;n<c.length;++n){var o=c[n];(o.children||o.nested&&i.enableEmptyNestedRow)&&e.toggleNestedRows(o.id,t,!0,null,!1,!0)}e.updateNestState()}),e._initedNestedList=!0)},r.prototype.toggleNestedRows=function(i,n,o,a,s,r){var l=this,h=l.nestRowsMap[i],c=l.$nestBody.find('[data-id="'+i+'"]'),d=c.hasClass("table-nest-child-hide");n===e&&(n=d);var u="boolean"==typeof a;u&&!o||c.toggleClass("table-nest-child-hide",!n),u?(c.toggleClass("table-nest-hide",!n||!a),a=!c.hasClass("table-nest-child-hide")):a=n,n?l.nestConfig[i]=!0:l.nestConfig[i]&&delete l.nestConfig[i];var f=h.children;if(f)for(var p=0;p<f.length;++p){var g=f[p];l.toggleNestedRows(g.id,n,o,a,!0,!0)}!l.options.preserveNested||s||u||t.zui.store.set(l.nestConfigStoreName,l.nestConfig),r||l.updateNestState()},r.prototype.updateNestState=function(){var e=this,i=!e.$nestBody.find("tr.is-top-level.has-nest-child:not(.table-nest-child-hide)").length;e.$.toggleClass("table-nest-collapsed",i),e.$.find(".table-nest-toggle-global").each(function(){var e=t(this);e.attr("title",e.data(i?"expandText":"collapseText"))})},r.prototype.reload=function(e){var i=this,n=i.options,o=n.replaceId;if(!o)return e&&e();var a=i.id;if("self"===o){if(i.noID)return;o=a}var s=t("<div></div>");i.$.addClass("load-indicator loading"),s.load(window.location.href+" #"+o,function(r){if(a===o)i.$.empty().html(s.children().html()),i.$.find('[data-ride="pager"]').pager();else{i.$.find("#"+o).empty().html(s.children().html());try{var l=t(r),h=l.find("#"+o).closest('[data-ride="table"],#'+a);if(h.length){var c=h.find(".table-statistic");c.length&&(i.defaultStatistic=c.html());var d=i.$.find('[data-ride="pager"]').data("zui.pager"),u=h.find('[data-ride="pager"]');d&&u.length&&d.set(u.data())}}catch(f){console.error(f)}}i.$.removeClass("load-indicator loading").trigger("beforeTableReload"),delete i.defaultStatistic,i.updateStatistic(),i.initModals(),i.$.datepickerAll();var p=i.$.find("tbody>tr"),g=!1;t.each(i.checkItems,function(t,e){e&&(i.checkRow(p.filter('[data-id="'+t+'"]'),!0,!0),g=!0)}),g&&i.updateCheckUI(),i.$.trigger("tableReload");var m=t("#mainMenu>.btn-toolbar>.btn-active-text>.label");if(m.length){var u=i.$.find(".pager[data-rec-total]"),v=u.length?u.attr("data-rec-total"):i.getTable().find("tbody:first>tr:not(.table-children)").length;m.text(v)}e&&e(),n.afterReload&&n.afterReload()})},r.prototype.initModals=function(){var e=this,i=e.options,n=e.$.find(i.iframeModalTrigger);if(n.length){var o={type:"iframe",onHide:i.replaceId?function(){var n=t.cookie("selfClose");(1==n||i.hot)&&(t("#triggerModal").data("cancel-reload",1),e.reload(function(){t.cookie("selfClose",0)}))}:null};n.modalTrigger(o)}},r.prototype.getTable=function(){var t=this.$;if(this.isDataTable)return t.find("div.datatable");var e=t.is("table")?t:t.find("table:not(.fixed-header-copy)").first();return e.is(".datatable")&&(this.isDataTable=!0,e.data("zui.datatable")||window.initDatatable(e),e=t.find("div.datatable")),e},r.prototype.toggleGroups=function(e){var i=this,n={};i.$.find("tbody>tr").each(function(){var o=t(this).closest("tr").data("id");n[o]||i.toggleRowGroup(o,e)})},r.prototype.toggleRowGroup=function(i,n){var o=this.$.find('tbody>tr[data-id="'+i+'"]'),a=o.filter(".group-summary"),s=n===e?!a.hasClass("hidden"):!!n;
-o.not(".group-summary").toggleClass("hidden",!s),a.toggleClass("hidden",s),t("body").toggleClass("table-group-collapsed",!this.$.find("tbody>tr.group-summary.hidden").length)},r.prototype.updateStatistic=function(){var i=this,n=i.$.find(".table-statistic");if(n.length){if(i.defaultStatistic===e&&(i.defaultStatistic=n.html()),i.options.statisticCreator)return void n.html(i.options.statisticCreator(i)||i.defaultStatistic);var o=i.statisticCols;if(!o&&o!==!1){o={};var a=!1;i.getTable().find("thead th").each(function(e){var i=t(this),n=i.data("statistic");n&&(a=!0,o[e]={format:n,name:i.text()})}),i.statisticCols=!!a&&o}var s=0;o&&t.each(o,function(t){o[t].total=0,o[t].checkedTotal=0}),i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr").each(function(){var e=t(this),i=e.hasClass("checked"),n=e.children("td");i&&s++,o&&t.each(o,function(t){var e=parseFloat(n.eq(t).text());isNaN(e)&&(e=0),o[t].total+=e,i&&(o[t].checkedTotal+=e)})});var r=[];if(s)r.push(i.lang.selectedItems.format(s));else if(i.defaultStatistic)return void n.html(i.defaultStatistic);o&&t.each(o,function(t){var e=o[t],n=e[s?"checkedTotal":"total"];e.format&&(n=e.format.format(n)),r.push(i.lang.attrTotal.format(e.name,n))}),n.html(r.join(", "))}},r.prototype.updateFixUI=function(e){var i=this,n=(new Date).getTime();if(!e&&(i.lastUpdateCall&&clearTimeout(i.lastUpdateCall),!i.lastUpdateTime||n-i.lastUpdateTime<s))return void(i.lastUpdateCall=setTimeout(function(){i.updateFixUI(!0)},s/2));if(i.lastUpdateTime=n,i.lastUpdateCall&&(clearTimeout(i.lastUpdateCall),i.lastUpdateCall=null),o){var a=i.getTable();if(a.parent().is(".table-responsive")){var r=a.find("thead"),l=0;r.find("th").each(function(){l+=t(this).outerWidth()}),a.css("min-width",l)}}i.options.fixHeader&&!i.isDataTable&&i.fixHeader(),i.options.fixFooter&&i.fixFooter()},r.prototype.fixHeader=function(){var e=this,i=e.getTable(),n=i.find("thead"),o=n[0].getBoundingClientRect(),s=e.options.fixFooter,r=t.isFunction(s)?s(o,n):o.top<("number"==typeof s?s:-5),l=e.$.find(".fix-table-copy-wrapper"),h=i.parent(),c=h.is(".table-responsive");if(r){if(l.length||(l=t('<div class="fix-table-copy-wrapper" style="overflow: hidden; position:fixed; z-index: 3; top: 0;"></div>').append(t('<table class="fixed-header-copy"></table>').addClass(i.attr("class")).append(n.clone())).insertAfter(i)),c){var d=h[0].getBoundingClientRect();l.css({left:d.left,width:h.width()}),l.find(".fixed-header-copy").css({left:o.left-d.left,position:"relative",minWidth:i.width()}),a||h.data("fixHeaderScroll")||(h.data("fixHeaderScroll",1),i.width()>h.width()&&h.on("scroll",function(){e.fixHeader()}))}else l.css({left:o.left,width:o.width});var u=l.find("th");n.find("th").each(function(e){u.eq(e).css("width",t(this).outerWidth())})}else l.remove()},r.prototype.fixFooter=function(){var e,i=this,n=i.getTable(),o=i.$.find(".table-footer");if(i.isDataTable)e=n[0].getBoundingClientRect();else{var a=n.find("tbody");if(!a.length)return;e=a[0].getBoundingClientRect()}var s=i.options.fixFooter;o.toggleClass("fixed-footer",!!r);var r=t.isFunction(s)?s(e,o):e.bottom>window.innerHeight-50-("number"==typeof s?s:i.pageFooterHeight||5);o.toggleClass("fixed-footer",!!r),n.toggleClass("with-footer-fixed",!!r),n.trigger("fixFooter",r);var l=t("body"),h=l.hasClass("body-modal");if(r){var c=n.parent(),d=c.is(".table-responsive");o.css({bottom:i.pageFooterHeight||0,left:d?c[0].getBoundingClientRect().left:e.left,width:d?c.width():e.width}),h&&l.css("padding-bottom",40)}else o.css({width:"",left:0,bottom:0}),h&&l.css("padding-bottom",0)},r.prototype.checkAll=function(e){var i=this,n=i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr");n.each(function(){i.checkRow(t(this),e,!0)}),i.updateCheckUI()},r.prototype.checkRow=function(t,i,n){var o=this;o.isDataTable&&!t.is(".datatable-row-left")&&(t=o.getTable().find('.datatable-row-left[data-index="'+t.data("index")+'"]'));var a=t.find('input[type="checkbox"]');a.length&&!a.is(":disabled")&&(i===e&&(i=!a.is(":checked")),o.isDataTable?o.getTable().find('.datatable-row[data-index="'+t.data("index")+'"]').toggleClass("checked",i):t.toggleClass("checked",i),this.checkItems[t.data("id")]=i,a.prop("checked",i).trigger("change"),n||o.updateCheckUI())},r.prototype.updateCheckUI=function(){var e=this,i=e.getTable(),n=i.find(e.isDataTable?".fixed-left tbody>tr":"tbody>tr").not(".group-summary"),o=!1,a=null,s=0,r=!1,l=n.length;n.each(function(n){var h=t(this),c=h.find('input[type="checkbox"]');r=c.is(":checked");var d=e.isDataTable?i.find('.datatable-row[data-index="'+h.data("index")+'"]'):h;d.toggleClass("checked",r),d.toggleClass("row-check-begin",r&&!o),a&&a.toggleClass("row-check-end",!r&&o),r&&(s+=1),a=d,o=r,l===n+1&&d.toggleClass("row-check-end",r)}),e.$.toggleClass("has-row-checked",s>0).find(".check-all").toggleClass("checked",!(!l||s!==l)),e.updateStatistic(),e.options.onCheckChange&&e.options.onCheckChange()},r.DEFAULTS={checkable:!0,checkOnClickRow:!0,ajaxForm:!1,selectable:!0,fixHeader:!a,fixFooter:!a,iframeWidth:900,replaceId:"self",nestLevelIndent:18,nested:!1,preserveNested:!0,hot:!1,iframeModalTrigger:".iframe"},t.fn.table=function(e){return this.each(function(){var n=t(this),o=n.data(i),a="object"==typeof e&&e;o||n.data(i,o=new r(this,a)),"string"==typeof e&&o[e]()})},r.NAME=i,t.fn.table.Constructor=r,t(function(){t('[data-ride="table"]').table()})}(jQuery,void 0),function(t,e,i){t.fn._ajaxForm=t.fn.ajaxForm;var n={timeout:e.config?e.config.timeout:0,dataType:"json",method:"post"},o="";t.fn.enableForm=function(e,n,o){return e===i&&(e=!0),this.each(function(){var i=t(this);n||i.find('[type="submit"]').attr("disabled",e?null:"disabled"),!o&&i.hasClass("load-indicator")&&i.toggleClass("loading",!e),i.toggleClass("form-disabled",!e)})},t.enableForm=function(e,i,n,o){"string"==typeof e||e instanceof t?e=t(e):(o=n,n=i,i=e,e=t("form")),e.enableForm(i!==!1,n,o)},t.disableForm=function(e,i,n){t.enableForm(e,!1,i,n)};var a=function(e,i,n){"string"==typeof i&&(n=i,i=null),n=n||"show",t.zui.messager?t.zui.messager[n](e,i):alert(e)};t.ajaxForm=function(s,r){var l=t(s);if(l.length>1)return l.each(function(){t.ajaxForm(this,r)});t.isFunction(r)&&(r={complete:r}),r=t.extend({},n,l.data(),r);var h=r.beforeSubmit,c=r.error,d=r.success,u=r.finish;delete r.finish,delete r.success,delete r.onError,delete r.beforeSubmit,r=t.extend({beforeSubmit:function(n,a,s){if(l.enableForm(!1),(h&&h(n,a,s))!==!1){var r={},c=a.find('[type="file"]');r.fileapi=c.length&&c[0].files!==i,r.formdata=e.FormData!==i;var d=r.fileapi&&a.find('input[type="file"]:enabled').filter(function(){return""!==t(this).val()}),u=d.length,f="multipart/form-data",p=a.attr("enctype")==f||a.attr("encoding")==f,g=r.fileapi&&r.formdata,m=u&&!g||p&&!r.formdata;m&&(""==o&&(o=s.url),s.url!=o&&(s.url=o),s.url=s.url.indexOf("&")>=0?s.url+"&HTTP_X_REQUESTED_WITH=XMLHttpRequest":s.url+"?HTTP_X_REQUESTED_WITH=XMLHttpRequest")}},success:function(i,n,o){if((d&&d(i,n,o,l))!==!1){try{"string"==typeof i&&(i=JSON.parse(i))}catch(s){}if(null===i||"object"!=typeof i)return i?alert(i):a("No response.","danger");var h=r.responser?t(r.responser):l.find(".form-responser");h.length||(h=t("#responser"));var c=i.message,f=function(){var n=i.callback;if(n){var o=n.indexOf("("),a=(o>0?n.substr(0,o):n).split("."),s=e,r=a[0];a.length>1&&(r=a[1],"top"===a[0]?s=e.top:"parent"===a[0]&&(s=e.parent));var h=s[r];if(t.isFunction(h)){var c=[];return o>0&&")"==n[n.length-1]&&(c=t.parseJSON("["+n.substring(o+1,n.length-1)+"]")),c.push(i),h.apply(l,c)}}};if("success"===i.result){var p=r.locate||i.locate;if(l.enableForm(!0,!!p),c){var g=l.find('[type="submit"]').first(),m=!1;g.length&&(g.popover({container:"body",trigger:"manual",content:c,tipClass:"popover-in-modal popover-success popover-form-result",placement:i.placement||r.popoverPlacement||"right"}).popover("show"),setTimeout(function(){g.popover("destroy")},r.popoverTime||2e3),m=!0),h.length&&(h.html('<span class="small text-success">'+c+"</span>").show().delay(3e3).fadeOut(100),m=!0),m||a(c,"success")}if(u)return u(i,!0,l);if((r.closeModal||i.closeModal)&&setTimeout(t.zui.closeModal,r.closeModalTime||2e3),f()===!1)return;if(p)if("loadInModal"==p){var v=t(".modal");setTimeout(function(){v.load(v.attr("ref"),function(){t(this).find(".modal-dialog").css("width",t(this).data("width")),t.zui.ajustModalPosition()})},1e3)}else"parent"===p||"top"===p?e[p]&&setTimeout(function(){e[p].location.reload()},1200):"reload"===p?setTimeout(function(){e.location.href=e.location.href},1200):setTimeout(function(){t.tabs?t.tabs.open(p):e.location.href=p},1200);var y=r.ajaxReload||i.ajaxReload;if(y){var b=t(y);b.length&&b.load(e.location.href+" "+y,function(){b.find('[data-toggle="modal"]').modalTrigger()})}}else{if(l.enableForm(),"string"==typeof c)h.length?h.html('<span class="text-small text-red">'+c+"</span>").show().delay(3e3).fadeOut(100):a(c,"danger");else if("object"==typeof c){var w=!1,x=[];t.each(c,function(e,i){var n=t.isArray(i)?i.join(""):i,o=t("#"+e);if(!o.length)return void x.push(n);var a=e+"Label",s=t("#"+a);if(!s.length){var r=o.closest(".input-group").length,l=o.closest("td").length;s=t('<div id="'+a+'" class="text-danger help-text" />').appendTo(l?o.closest("td"):r?o.closest(".input-group").parent():o.parent())}s.empty().append(n),o.addClass("has-error");var h=function(){var e=t("#"+a);if(e.length)return e.remove(),o.removeClass("has-error"),!0};o.on("change input mousedown",h);var c=t("#"+e+"_chosen");if(c.length&&c.find(".chosen-single,.chosen-choices").addClass("has-error").on("mousedown",function(){h()===!0&&t(this).removeClass("has-error")}),!w){if(o.hasClass("chosen"))o.trigger("chosen:activate");else if(o.is("textarea")&&o.data("keditor")){var d=o.data("keditor");d.focus(),d.edit.doc.body.focus()}else o.focus();w=!0}}),x.length&&a(x.join(";"),"danger")}if(u)return u(i,!1,l);if(f()===!1)return}}},error:function(t,i,n){if((c&&c(t,i,n,l))!==!1){l.enableForm();var o="timeout"==i||"error"==i?e.lang?e.lang.timeout:i:t.responseText+i+n;a(o,"danger")}}},r),l._ajaxForm(r).data("zui.ajaxform",!0),l.on("click","[data-form-action]",function(){l.attr("action",t(this).data("formAction")).submit()})},t.setAjaxForm=function(e,i,n){t.ajaxForm(e,t.isPlainObject(i)?i:{onFinish:i,beforeSubmit:n})},t.fn.ajaxForm=function(e){return this.each(function(){t.ajaxForm(this,e)})},t.fn.setInputRequired=function(){return this.each(function(){var e=t(this),i=e.parent();i.is(".input-control,td")?i.addClass("required"):e.is(".chosen")?e.attr("required",null).next(".chosen-container").addClass("required"):i.addClass("required"),e.attr("required",null);var n=i.closest(".input-group");n.length&&1===n.find(".required,input[required],select[required]").length&&n.addClass("required")})},t(function(){t('.form-ajax,form[data-type="ajax"]').ajaxForm(),setTimeout(function(){var i=e.config.requiredFields,n=t("form");i&&(i=i.split(",")),i&&i.length&&t.each(i,function(t,e){n.find("#"+e).attr("required","required")}),n.find("input[required],select[required],textarea[required]").setInputRequired()},400),t("#hiddenwin"),t('form[target="hiddenwin"]').on("submit",function(){var e=t(this);e.data("zui.ajaxform")||e.enableForm(!1).data("disabledTime",(new Date).getTime())}).on("click",function(){var e=t(this),i=e.data("disabledTime");i&&(new Date).getTime()-i>1e4&&e.enableForm(!0).data("disabledTime",null)})})}(jQuery,window,void 0),function(t){"use strict";var e="zui.searchList",i=function(t,e){if(t&&t.length)for(var i=0;i<t.length;++i)if(e.indexOf(t[i])<0)return!1;return!0},n=function(i,o){var a=this;a.name=e;var s=a.$=t(i);o=a.options=t.extend({},n.DEFAULTS,this.$.data(),o);var r=s.find(o.searchBox);r.length&&(r.searchBox({onSearchChange:function(t){a.search(t)},onKeyDown:function(t){var e=t.which;if(13===e){var i=a.getActiveItem();i.length&&(o.onSelectItem?o.onSelectItem(i):window.location.href=i.attr("href")),t.preventDefault()}else if(38===e){var i=a.getActiveItem();i.removeClass("active");for(var n=i.prev();n.length&&!n.is(".search-list-item:not(.hidden)");)n=n.prev();n.length||(n=a.getItems().not(".hidden").last()),a.scrollTo(n.addClass("active")),t.preventDefault()}else if(40===e){var i=a.getActiveItem();i.removeClass("active");for(var s=i.next();s.length&&!s.is(".search-list-item:not(.hidden)");)s=s.next();s.length||(s=a.getItems().not(".hidden").first()),a.scrollTo(s.addClass("active")),t.preventDefault()}},onFocus:function(){s.addClass("searchbox-focus")},onBlur:function(){s.removeClass("searchbox-focus")}}),a.searchBox=r.data("zui.searchBox"),a.search(a.searchBox.getSearch()));var l=a.$menu=s.closest(".dropdown-menu");if(l.length){a.isDropdown=!0,s.on("click",function(e){t(e.target).closest(o.selector+",[data-toggle]").length||e.stopPropagation()});var h=l.parent();h.on(h.hasClass("dropdown-hover")?"mouseenter":"shown.zui.dropdown",function(){a.tryLoadRemote(function(){if(h.hasClass("dropup")){var t=null,e=h[0].getBoundingClientRect();e.top<220&&(t=Math.floor(e.top)-57),l.find(".list-group").css("max-height",t)}setTimeout(function(){a.searchBox&&a.searchBox.focus()},50)})})}s.on("mouseenter",o.selector,function(){s.find(a.options.selector).not(".hidden").removeClass("active"),t(this).addClass("active")})};n.prototype.tryLoadRemote=function(t){var e=this,i=e.options;i.url||i.ajax?e.isLoaded?t():e.loadRemote(t):t()},n.prototype.loadRemote=function(e){var i=this,n=i.options;i.$menu.addClass("load-indicator loading").find(".list-group").remove(),i.isLoaded=!1,t.ajax(t.extend({url:n.url,type:"GET",dataType:"html",success:function(n,o,a){var s=t(n);s.hasClass("list-group")||(s=t('<div class="list-group"></div>').append(s)),i.$menu.append(s),i.$menu.removeClass("loading"),i.isLoaded=!0,e&&e(!0)},error:function(){i.$menu.removeClass("loading").append('<div class="list-group"><div class="text-error has-padding">'+(n.errorText||window.lang&&window.lang.timeout)+"</div></div>"),e&&e(!1)}},n.ajax))},n.prototype.scrollTo=function(t){t.length&&t[0].scrollIntoViewIfNeeded&&t[0].scrollIntoViewIfNeeded({behavior:"smooth"})},n.prototype.getItems=function(){return this.$.find(this.options.selector).addClass("search-list-item")},n.prototype.getActiveItem=function(){return this.getItems().filter(".active:first")},n.prototype.search=function(e){var n=this,o=void 0===e||null===e||""===e;n.$.toggleClass("has-search-text",!o);var a=n.getItems().removeClass("active");if(o)a.removeClass("hidden");else{var s=t.trim(e).split(" ");a.each(function(){var e=t(this),n=e.text()+" "+(e.data("key")||e.data("filter"));e.toggleClass("hidden",!i(s,n))})}n.scrollTo(a.not(".hidden").first().addClass("active"))},n.DEFAULTS={selector:".list-group a:not(.not-list-item)",searchBox:".search-box",onSelectItem:null},t.fn.searchList=function(i){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof i&&i;a||o.data(e,a=new n(this,s)),"string"==typeof i&&a[i]()})},n.NAME=e,t.fn.searchList.Constructor=n,t(function(){t('[data-ride="searchList"]').searchList()})}(jQuery),function(t){"use strict";var e="zui.labelSelector",i=function(n,o){var a=this;a.name=e,a.$=t(n),o=a.options=t.extend({},i.DEFAULTS,this.$.data(),o),a.$.hide(),a.update()};i.prototype.select=function(t){t+="",this.$wrapper.find(".label.active").removeClass("active"),this.$wrapper.find('.label[data-value="'+t+'"]').addClass("active"),this.$.val(t).trigger("change")},i.prototype.update=function(){var e=this,i=e.options,n=e.$wrapper;if(!n){if(i.wrapper)n=t(i.wrapper);else{var o=e.$.next();n=o.hasClass(".label-selector")?o:t('<div class="label-selector"></div>')}n.parent().length||e.$.after(n),e.$wrapper=n,n.on("click",".label",function(i){var n=e.$.val(),o=t(this).data("value");e.hasEmptyValue!==!1&&o==n&&(o=e.hasEmptyValue),e.select(o),i.preventDefault()})}n.empty();var a=e.$.val();e.hasEmptyValue=!1,e.$.children("option").each(function(){var e=t(this),o={label:e.text(),value:e.val()},s=""===o.value||"0"===o.value,r=t(i.labelTemplate||'<span class="label"></span>');i.labelClass&&!s&&r.addClass(i.labelClass),i.labelCreator?r=i.labelCreator(r):(r.data("option",o).attr("data-value",o.value),s&&!o.label?r.addClass("empty").append('<i class="icon icon-close"></i>'):r.text(o.label).toggleClass("active",a===o.value)),n.append(r)})},i.DEFAULTS={},t.fn.labelSelector=function(n){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof n&&n;a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},i.NAME=e,t.fn.labelSelector.Constructor=i,t(function(){t('[data-provide="labelSelector"]').labelSelector()})}(jQuery),function(t){"use strict";var e="zui.fileInput",i=t.BYTE_UNITS={B:1,KB:1024,MB:1048576,GB:1073741824,TB:1099511627776},n=t.formatBytes=function(t,e,n){return void 0===e&&(e=2),n||(n=t<i.KB?"B":t<i.MB?"KB":t<i.GB?"MB":t<i.TB?"GB":"TB"),(t/i[n]).toFixed(e)+n},o=function(t){if("string"==typeof t){t=t.toUpperCase();var e=t.replace(/\d+/,"");t=parseFloat(t.replace(e,"")),t*=i[e]||i[e+"B"],t=Math.floor(t)}return t},a=function(i,s){var r=this;r.name=e;var l=r.$=t(i);s=r.options=t.extend({},a.DEFAULTS,this.$.data(),s),s.fileMaxSize&&"string"==typeof s.fileMaxSize&&(s.fileMaxSize=o(s.fileMaxSize));var h=r.$input=l.find('input[type="file"]');l.on("click",".file-input-btn",function(){h.trigger("click")}).on("click",".file-input-rename",function(){r.oldName=l.addClass("edit").find(".file-editbox").focus().val(),t.fn.fixInputGroup&&l.find(".input-group,.btn-group").fixInputGroup()}).on("click",".file-input-delete",function(){h.val(""),r.update(),s.onDelete&&s.onDelete(r)}).on("click",".file-name-cancel",function(){l.removeClass("edit").find(".file-editbox").focus().val(r.oldName)}).on("click",".file-name-confirm",function(){var e=l.find(".file-editbox"),i=t.trim(e.val());i.length?l.removeClass("edit").find(".file-title").text(i).attr("title",i):e.focus()}).on("change input paste",".file-editbox",function(){var e=t(this);e.attr("size",Math.max(5,e.val().length))}),h.on("change",function(){var t=r.getFile();t&&s.fileMaxSize&&t.size>s.fileMaxSize&&(h.val(""),(window.bootbox||window).alert(s.fileSizeError.format(n(s.fileMaxSize)))),r.update()}),r.update()};a.prototype.getFile=function(){var t=this.$input.prop("files");return t&&t[0]},a.prototype.update=function(){var t=this,e=t.$,i=t.getFile(),o=!i;e.toggleClass("normal",!o).toggleClass("empty",o),i?(t.oldName=i.name,e.find(".file-title").text(i.name).attr("title",i.name),e.find(".file-size").text(n(i.size)),e.find(".file-editbox").val(i.name).attr("size",i.name.length),t.options.onSelect&&t.options.onSelect(i,t)):e.find(".file-editbox").val("")},a.DEFAULTS={fileMaxSize:0,fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInput=function(i){return this.each(function(){var n=t(this),o=n.data(e),s="object"==typeof i&&i;o||n.data(e,o=new a(this,s)),"string"==typeof i&&o[i]()})},a.NAME=e,t.fn.fileInput.Constructor=a,t(function(){t('[data-provide="fileInput"]').fileInput()});var s="zui.fileInputList",r=function(e,i){var n=this;n.name=s;var o=n.$=t(e);i=n.options=t.extend({},r.DEFAULTS,this.$.data(),i),n.$template=o.find(".file-input").detach(),n.add()};r.prototype.add=function(){var t=this,e=t.options,i=t.$template.clone();"before"===e.appendWay?t.$.prepend(i):t.$.append(i),i.fileInput({fileMaxSize:e.eachFileMaxSize,fileSizeError:e.fileSizeError,onDelete:function(e){e.$.remove(),t.options.onDelete&&t.options.onDelete(e,t)},onSelect:function(e,i){t.add(),t.options.onSelect&&t.options.onSelect(e,i,t)}})},r.DEFAULTS={fileMaxSize:0,eachFileMaxSize:0,appendWay:"after",fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInputList=function(e){return this.each(function(){var i=t(this),n=i.data(s),o="object"==typeof e&&e;n||i.data(s,n=new r(this,o)),"string"==typeof e&&n[e]()})},r.NAME=s,t.fn.fileInputList.Constructor=r,t(function(){t('[data-provide="fileInputList"]').fileInputList()})}(jQuery),function(t){window.config||(window.config={}),t.createLink=window.createLink=function(e,n,o,a,s,r,l){if("object"==typeof e)return t.createLink(e.moduleName,e.methodName,e.vars,e.viewType,e.isOnlyBody,e.prj,e.hash);if(a||(a=config.defaultView),s||(s=!1),o)for("string"==typeof o&&(o=o.split("&")),i=0;i<o.length;i++)if("string"==typeof o[i]){var h=o[i].split("=");o[i]=[h.shift(),h.join("=")]}var c;if("GET"===config.requestType){if(c=config.router+"?"+config.moduleVar+"="+e+"&"+config.methodVar+"="+n,o)for(i=0;i<o.length;i++)c+="&"+o[i][0]+"="+o[i][1];c+="&"+config.viewVar+"="+a}else{if("PATH_INFO"==config.requestType&&(c=config.webRoot+e+config.requestFix+n),"PATH_INFO2"==config.requestType&&(c=config.webRoot+"index.php/"+e+config.requestFix+n),o)for(i=0;i<o.length;i++)c+=config.requestFix+o[i][1];c+="."+a}if(void 0!==config.onlybody&&"yes"==config.onlybody||s){var d="GET"!=config.requestType?"?onlybody=yes":"&onlybody=yes";c+=d}return void 0===r||window.navGroup&&"project"!==window.navGroup[e]||(c+=(c.indexOf("?")>0?"&":"?")+"PRJ="+r),c+(l?("#"===l[0]?"":"#")+l:"")},t(function(){var e=t("#main,#mainContent,#mainRow,.auto-fade-in");e.length&&e.hasClass("fade")&&setTimeout(function(){e.addClass("in")},e.data("fadeTime")||200)}),t.ajaxSendScore=function(e){t.get(t.createLink("score","ajax","method="+e))};var e=function(t){var e=0;if(t){var i=t.split(":");e+=60*parseInt(i[0]),e+=parseInt(i[1])}return e},n=function(t){t%=1440;var e=Math.floor(t/60),i=t%60;return e<10&&(e="0"+e),i<10&&(i="0"+i),e+":"+i},o=function(t){if("string"==typeof t&&(t=e(t)),"number"==typeof t)if(t<1e5){var i=new Date;i.setHours(Math.floor(t/60)%24),i.setMinutes(t%60),t=i}else t=new Date(t);return t},a=function(t,i){for(var a=i?o(i):new Date,s=a.getHours(),r=10*Math.floor(a.getMinutes()/10)+10,l=0;l<24;++l){var h=(l+s)%24;if(!(h<5))for(var c=0;c<6;++c){var d=n(60*h+10*c+r);t.append('<option value="'+d+'">'+d+"</option>")}}t.val()||(time=e(a.format("hh:mm")),time=time-time%10+10,t.val(n(time)))};t.fn.timeSpanControl=function(i){return this.each(function(){var s=t(this),r=t.extend({},i,s.data()),l=s.find('[name="begin"],.control-time-begin'),h=s.find('[name="end"],.control-time-end'),c=function(){var t=l.val();if(s.find(".hide-empty-begin").toggleClass("hide",!t),t){var i=n(e(t)+30);h.find('option[value="'+i+'"]').length&&h.val(i),r.onChange&&r.onChange(h,i)}};if(s.data("timeSpanControlInit")){if(r.begin){var d=o(r.begin).format("hh:mm");l.find('option[value="'+d+'"]').length&&l.val(d),r.onChange&&r.onChange(l,d)}if(r.end){var u=o(r.end).format("hh:mm");h.find('option[value="'+u+'"]').length&&h.val(u),r.onChange&&r.onChange(h,u)}}else l.on("change",c),a(l,r.begin),a(h,r.end),s.data("timeSpanControlInit",!0);r.end||c()})},t.timeSpanControl={convertTimeToNum:e,convertNumToTime:n,initTimeSelect:a,createTime:o};var s=t.setSearchType=function(e,i){var n=t("#searchType");e||(e=n.val()),e=e||"bug",n.val(e);var o=t("#searchTypeMenu");o.find("li.selected").removeClass("selected");var a=o.find('a[data-value="'+e+'"]'),s=a.text();a.parent().addClass("selected"),t("#searchTypeName").text(s),i||t("#searchInput").focus()};t.gotoObject=function(e,i){if(e||(e=t("#searchType").val()),i||(i=t("#searchInput").val()),i&&e)if(i=i.replace(/[^\d]/g,"")){var n=e.split("-");e=n[0];var o=n.length>1?n[1]:"testsuite"===e?"library":"view",a=t.createLink(e,o,"id="+i);t.apps?t.apps.open(a):window.location.href=a}else{var s={zh_cn:"请输入数字ID进行搜索",zh_tw:"請輸入數值ID行搜索"};alert(lang.searchTip||s[t.zui.clientLang()]||"Please enter a numberic id to search")}t("#searchInput").val(i).focus()},t(function(){s(null,!0),t(document).on("keydown",function(e){e.ctrlKey&&71===e.keyCode&&(t("#searchInput").val("").focus(),e.stopPropagation(),e.preventDefault())})}),t.removeAnchor=window.removeAnchor=function(t){var e=t.lastIndexOf("#");return e>-1?t.substr(0,e):t},t.refreshPage=function(t){var e=removeAnchor(location.href);t&&window.parent!==window?window.parent.location.href=e:location.href=e},t.selectLang=window.selectLang=function(e){t.cookie("lang",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectLang"),t.refreshPage(1)},t.selectTheme=window.selectTheme=function(e){t.cookie("theme",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectTheme"),t.refreshPage(1)},t.zui.Picker&&t.zui.Picker.enableChosen(),t.chosenDefaultOptions={middle_highlight:!0,disable_search_threshold:1,compact_search:!0,allow_single_deselect:!0,placeholder_text_single:" ",placeholder_text_multiple:" ",search_contains:!0,max_drop_width:500,max_drop_height:245,no_wrap:!0,drop_direction:function(){var e=t(this.container).closest(".table-responsive:not(.scroll-none)");if(console.log("dropDirection","$tableResponsive.length",e.length,"drop_directionFixed",this.drop_directionFixed),e.length){if(this.drop_directionFixed)return this.drop_directionFixed;e.css("position","relative");var i="down",n=this.container.find(".chosen-drop"),o=this.container.position(),a=n.outerHeight();return o.top>=a&&o.top+31+a>e.outerHeight()&&(i="up"),this.drop_directionFixed=i,i}return"auto"}},t.chosenSimpleOptions=t.extend({},t.chosenDefaultOptions,{disable_search_threshold:6}),t.fn._chosen=t.fn.chosen,t.fn.chosen=function(e){return"string"==typeof e?this._chosen(e):this.each(function(){var i=t(this).addClass("chosen-controled");return i._chosen(t.extend({},i.hasClass("chosen-simple")?t.chosenSimpleOptions:t.chosenDefaultOptions,i.data(),e))})},t.fn.chosen.Constructor=t.fn._chosen.Constructor,t(function(){t(".chosen,.chosen-simple").each(function(){var e=t(this);e.closest(".template").length||e.chosen()})}),t.extend(t.fn.pager.Constructor.DEFAULTS,{maxNavCount:8,prevIcon:"icon-angle-left",nextIcon:"icon-angle-right",firstIcon:"icon-first-page",lastIcon:"icon-last-page",navEllipsisItem:"…",menuDirection:"dropup",pageSizeOptions:[5,10,15,20,25,30,35,40,45,50,100,200,500,1e3,2e3],elements:["total_text","size_menu","first_icon","prev_icon",'<div class="pager-label"><strong>{page}</strong>/<strong>{totalPage}</strong></div>',"next_icon","last_icon"],onPageChange:function(e,i){e.recPerPage!==i.recPerPage&&t.cookie(this.options.pageCookie,e.recPerPage,{expires:config.cookieLife,path:config.webRoot}),e.recPerPage!==i.recPerPage&&(window.location.href=this.createLink())}}),t.extend(!0,t.zui.Messager.DEFAULTS,{cssClass:"messagger-zt",icons:{success:"check-circle",info:"chat-line",warning:"exclamation-sign",danger:"exclamation-sign"}}),t.fn.reverseOrder=function(){return this.each(function(){var e=t(this);e.prependTo(e.parent())})};var r=function(e,i){var n=t(e);if(!n.data("historiesInited")){n.data("historiesInited",1),i=t.extend({},n.data(),i);var o=n.find(".histories-list"),a=!0,s=!1;n.on("click",".btn-reverse",function(){o.children("li").reverseOrder(),a=!a,t(this).find(".icon").toggleClass("icon-arrow-up",a).toggleClass("icon-arrow-down",!a);var e="#lastComment",i=t(e);i.length&&window.KindEditor&&(window.KindEditor.remove(e),i.kindeditor())}).on("click",".btn-expand-all",function(){var e=t(this).find(".icon");s=!s,e.toggleClass("icon-plus",!s).toggleClass("icon-minus",s),o.children("li").toggleClass("show-changes",s)}).on("click",".btn-expand",function(){t(this).closest("li").toggleClass("show-changes")}).on("click",".btn-strip",function(){var e=t(this),n=e.find(".icon"),o=n.hasClass("icon-code");n.toggleClass("icon-code",!o).toggleClass("icon-text",o),e.attr("title",o?i.original:i.textdiff),e.closest("li").toggleClass("show-original",o)}),o.find(".btn-strip").attr("title",i.original);var r=n.find(".modal-comment").modal({show:!1}).on("shown.zui.modal",function(){var t=r.find("#comment");t.length&&(t.focus(),window.editor&&window.editor.comment&&window.editor.comment.focus())}).on("show.zui.modal",function(){var e=r.find("#comment");e.length&&!e.data("keditor")&&t.fn.kindeditor&&e.kindeditor()});n.on("click",".btn-comment",function(t){r.modal("toggle"),t.preventDefault()}).on("click",".btn-edit-comment,.btn-hide-form",function(){t(this).closest("li").toggleClass("show-form")});var l=n.find(".comment-edit-form");l.ajaxForm({success:function(t,e,i,n){setTimeout(function(){l.closest("li").removeClass("show-form")},2e3)}})}};t.fn.histories=function(t){return this.each(function(){r(this,t)})},t(function(){t(".histories").histories()});var l=0,h=0;t.toggleSidebar=function(e){var i=t("#sidebar");if(i.length){var n=t("main");if(void 0===e)e=n.hasClass("hide-sidebar");else if(e&&!n.hasClass("hide-sidebar"))return;n.toggleClass("hide-sidebar",!e),clearTimeout(l),t.zui.store.set(h,e);var o=i.children(".cell"),a={overflow:"visible",maxHeight:"initial"};e?(i.addClass("showing"),l=setTimeout(function(){i.removeClass("showing"),i.trigger("sidebar.toggle",e)},210)):(i.trigger("sidebar.toggle",e),t(window).width()<1900&&(a={overflow:"hidden",maxHeight:t(window).height()-45})),o.css(a)}};var c=t.initSidebar=function(){var e=t("#sidebar");if(e.length){if(e.data("init"))return!0;h="sidebar:"+(e.data("id")||config.currentModule+"/"+config.currentMethod);var i=t("main");if(i.length){i.on("click",".sidebar-toggle",function(){t.toggleSidebar(i.hasClass("hide-sidebar"))});var n=t.zui.store.get(h,e.data("hide")!==!1);n===!1&&e.addClass("no-animate"),t.toggleSidebar(n),n===!1&&setTimeout(function(){e.removeClass("no-animate")},500);var o=e.find(".sidebar-toggle");if(o.length){var a=function(){var e=o[0].getBoundingClientRect(),i=t(window).height(),n=Math.max(0,Math.floor(Math.min(i-40,e.top+e.height)-Math.max(e.top,0))/2)+(e.top<0?0-e.top:0);o.removeClass("fade").find(".icon").css("top",n+(t.zui.browser.isIE()?(i-80)/2:0))};a(),e.data("init",1).on("sidebar.toggle",a);var s=t.zui.browser.isIE()?1500:0,r=0,l=null,c=function(){var t=Date.now();return l&&(clearTimeout(l),l=null),t-r<s?(l=setTimeout(c,s/2),void o.addClass("fade")):(r=t,void a())};return t(window).on("resize scroll",s?c:a),!0}}}};c()||t(c),t.toggleQueryBox=function(e,i){var n=t(i||"#queryBox");if(n.length){if(void 0===e&&(e=!n.hasClass("show")),n.toggleClass("show",!!e),!n.data("init")){n.addClass("load-indicator loading").data("init",1);var o=n.data("url")||t.createLink("search","buildForm",n.data("module")?"module="+n.data("module"):"");t.get(o,function(t){n.html(t).removeClass("loading")})}t(".querybox-toggle").toggleClass("querybox-opened",e)}},t(function(){var e=t("#queryBox");e.length&&(t(document).on("click",".querybox-toggle",function(){t.toggleQueryBox()}),e.hasClass("show")&&t.toggleQueryBox(!0))}),t.extend(t.fn.colorPicker.Constructor.DEFAULTS,{colors:["#3DA7F5","#75C941","#2DBDB2","#797EC9","#FFAF38","#FF4E3E"]}),window.setCheckedCookie=function(){var e=[],i=t('#mainContent .main-table tbody>tr input[type="checkbox"]:checked');i.each(function(){var i=parseInt(t(this).val(),10);NaN!==i&&e.push(i)}),t.cookie("checkedItem",e.join(","),{expires:config.cookieLife,path:config.webRoot})},t.extend(t.fn.modal.bs.Constructor.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:100}),t.extend(t.zui.ModalTrigger.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:40}),t.fn.initIframeModal=function(){return this.each(function(){var e=t(this);if(!e.parents('[data-ride="table"],.skip-iframe-modal').length){var i={type:"iframe"};e.hasClass("export")&&t.extend(i,{width:800,shown:setCheckedCookie},e.data()),e.modalTrigger(i)}})},t(function(){t("a.iframe,.export").initIframeModal()});var d=function(){var e,i,n=t(this),o=t.extend({limitSize:40,suffix:"…"},n.data()),a=n.text();if(a.length>o.limitSize){e=a,i=a.substr(0,o.limitSize)+o.suffix,n.text(i).addClass("limit-text-on");var s=o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle");s.text(s.data("textExpand")),s.on("click",function(){var t=n.toggleClass("limit-text-on").hasClass("limit-text-on");n.text(t?i:e),s.text(s.data(t?"textExpand":"textCollapse"))})}else(o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle")).hide()};t.fn.textLimit=function(){return this.each(d)},t(function(){t(".text-limit").textLimit()}),t.fixedTableHead=window.fixedTableHead=function(e,i){var n=t(e);if(n.is("table")||(n=n.find("table")),n.length){var o=t(i||window),a=null,s=function(){var e=n.children("thead"),i=e[0].getBoundingClientRect(),o=n.next(".fixed-head-table");if(i.top<0){var s=e.width();if(o.length){if(a!==s){a=s;var r=o.find("th");e.find("th").each(function(e){
-r.eq(e).width(t(this).width())})}}else{var o=t("<table class='table fixed-head-table' style='position:fixed; top: 0;'></table>").addClass(n.attr("class")),l=e.clone(),r=l.find("th");e.find("th").each(function(e){r.eq(e).width(t(this).width())}),o.append(l).insertAfter(n)}o.css({left:i.left,width:i.width}).show()}else o.hide()};o.on("scroll",s).on("resize",s),s()}},t(document).on("click","tr[data-url]",function(){var e=t(this),i=e.data("href")||e.data("url");i&&(window.location.href=i)}),"yes"===config.onlybody&&self===parent&&(window.location.href=window.location.href.replace("?onlybody=yes","").replace("&onlybody=yes","")),t(function(){t("body").addClass("m-{currentModule}-{currentMethod}".format(config))});var u,f,p,g,m,v=function(){u||(u=t("#subNavbar"),f=t("#pageNav"),p=t("#pageActions"),g=u.children(".nav"),m=g.outerWidth());var e=u.outerWidth(),i=f.outerWidth()||0,n=p.outerWidth()||0;if(i=i?i+15:0,n=n?n+15:0,!i&&!n)return void g.css({maxWidth:null,left:null,position:"static"});var o=Math.max(300,e-i-n),a=Math.min(o,m),s=(e-a)/2,r=i&&s<i?i:n&&s<n?e-a-n:0;g.css({maxWidth:o,left:r?r-s:0,position:"relative"})},y=function(){t.cookie("windowWidth",window.innerWidth),t.cookie("windowHeight",window.innerHeight),v()};t(y),t(window).on("resize",y);var b=function(){var e=t("#back").attr("href");e&&(window.location.href=e)},w=function(){t.cookie("ajax_lastNext")||(t.cookie("ajax_lastNext","on",{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("lastNext"))},x=function(){var e=t("#prevPage").attr("href");e&&(window.location.href=e),w()},C=function(){var e=t("#nextPage").attr("href");e&&(window.location.href=e),w()};t(document).on("keydown",function(e){t("body").hasClass("modal-open")||(e.altKey&&38===e.keyCode?b():37===e.keyCode?x():39===e.keyCode&&C())}),t.fn.tree.Constructor.DEFAULTS.initialState="preserve",t.closeModal=function(e,i,n){t.zui.closeModal(n,e,i)},t.getThemeColor=function(e){if(!t.themeColor){var i=t("#mainHeader");i.length&&(t.themeColor={primary:i.css("border-top-color"),pale:i.css("border-bottom-color"),secondary:i.css("background-color")})}return e?t.themeColor&&t.themeColor[e]:t.themeColor};var _=function(e){var i=t(e);if(!i.hasClass("header-angle-btn")){var n,o,a=i.children(".input-group-addon,.form-control:not(.chosen-controled),.chosen-container,.btn,.input-control,.input-group-btn,.datepicker-wrapper").not(".hidden"),s=1===a.length;a.each(function(e){var i=t(this),r=i.is(".input-group-addon")?"addon":i.is(".chosen-container")?"chosen":i.is(".btn")?"btn":i.is(".input-control,.datepicker-wrapper")?"insideInput":i.is(".input-group-btn")?"insideBtn":"input",l={};if(s)l.borderTopLeftRadius=4,l.borderBottomLeftRadius=4,l.borderTopRightRadius=4,l.borderBottomRightRadius=4;else{var h=!n,c=e===a.length-1,d="btn"===r?4:2;l.borderTopLeftRadius=0,l.borderBottomLeftRadius=0,l.borderTopRightRadius=0,l.borderBottomRightRadius=0,h&&("addon"===r&&(l.borderLeftWidth=1),l.borderTopLeftRadius=d,l.borderBottomLeftRadius=d),c&&("addon"===r&&(l.borderRightWidth=1),l.borderTopRightRadius=d,l.borderBottomRightRadius=d),o&&("chosen"!==o&&"input"!==o&&"btn"!==o&&"insideInput"!==o&&"insideBtn"!==o||"chosen"!==r&&"input"!==r&&"btn"!==r&&"insideInput"!==r&&"insideBtn"!==r?"addon"===o&&"addon"===r&&(l.borderLeftWidth=1):l.borderLeftColor="transparent")}("insideBtn"===r?i.find(".btn"):"insideInput"===r?i.find(".form-control"):"chosen"===r?i.find(".chosen-single,.chosen-choices"):i).css(l),n=i,o=r})}};t.fn.fixInputGroup=function(){return this.each(function(){_(this)})};var k=function(){var e=t(".main-actions>.btn-toolbar");if(e.length){var i,n,o=e.children(),a=o.length,s=!1,r=null;if(a)for(o.each(function(e){i=t(this),n=i.is(".divider"),n&&!r&&i.hide(),s||n||(s=!0),r=n?null:i,!n||e!==a-1&&0!==e||i.hide()});i.length&&i.is(".divider");)i=i.hide().prev();s||e.hide()}};t(function(){t(".input-group,.btn-group").fixInputGroup(),k()}),window.holders&&t.each(window.holders,function(e){var i=t("#"+e);i.length&&i.is("input")&&i.attr("placeholder",window.holders[e])}),t(function(){var e=t(".table-responsive"),i=t.fixTableResponsive=function(){e.each(function(){this.scrollHeight-3<=this.clientHeight&&this.scrollWidth-3<=this.clientWidth?t(this).addClass("scroll-none").css("overflow","visible"):t(this).removeClass("scroll-none").css("overflow","auto")})};e.length&&(t(window).on("resize",i),setTimeout(i,100))});var T=function(){var e=this,i=t(e),n=i.closest("tr").find("textarea");if(n.length){var o=32;n.each(function(){var e=t(this).closest("td"),i=e.css("height");e.css("height",this.style.height),this.style.height="auto";var n=this.value?this.scrollHeight+2:32;o=Math.max(o,n),e.css("height",i)}),n.css("height",o)}else{e.style.height="auto";var a=e.value?e.scrollHeight+2:32;e.style.height=a+"px"}};t.autoResizeTextarea=function(e){t(e).each(T)},t(function(){t("textarea.autosize").each(T),t(document).on("input paste change","textarea.autosize",T)}),t(function(){var e=t("#dropMenu,.drop-menu");e.length&&e.on("click",".toggle-right-col",function(e){var i=t(this).closest("#dropMenu,.drop-menu").toggleClass("show-right-col");i.find(".search-box").width(i.hasClass("show-right-col")?i.find(".col-left").width()-20:"auto"),e.stopPropagation(),e.preventDefault()})});var S="undefined"!=typeof InstallTrigger;t.zui.browser.firefox=S,t("html").toggleClass("is-firefox",S).toggleClass("not-firefox",!S),t(function(){var e=t("#mainContent>.main-col"),i=e.children(".main-actions");if(i.length){var n=i.prev();if(i.length&&n.length){t('<div class="main-actions-holder"></div>').css("height",i.outerHeight()).insertAfter(i);var o=0,a=function(){var e=n[0].getBoundingClientRect(),s=e.top+e.height+120>t(window).height();if(t("body").toggleClass("main-actions-fixed",s),s){const r=n.width();r?i.width(r):o<10&&setTimeout(a,1e3)}o++};t.resetToolbarPosition=a,a(),t(window).on("resize scroll",a)}}}),t(document).on("show.zui.modal",function(e){t("body.body-modal").length&&window.parent&&window.parent!==window&&t(e.target).is(".modal")&&window.parent.$("body").addClass("hide-modal-close")}).on("hidden.zui.modal",function(){t("body.body-modal").length&&window.parent&&window.parent!==window&&window.parent.$("body").removeClass("hide-modal-close")}),t(function(){var e=t(".dropdown-menu.with-search");e.length&&(e.find(".menu-search").on("click",function(t){return t.stopPropagation(),!1}),e.on("keyup change paste","input",function(){var e=t(this),i=e.closest(".dropdown-menu.with-search"),n=e.val().toLowerCase(),o=i.find(".option");""==n?o.removeClass("hide"):o.each(function(){var e=t(this);e.toggleClass("hide",e.text().toString().toLowerCase().indexOf(n)<0&&e.data("key").toString().toLowerCase().indexOf(n)<0)})}),e.parents(".dropdown-submenu").one("mouseenter",function(){var e=t(this).find(".dropdown-list")[0];e&&e.getBoundingClientRect&&setTimeout(function(){var t=270,i=e.getBoundingClientRect();i.top<0&&(t=Math.min(270,i.height)+i.top),e.style.maxHeight=Math.min(270,t)+"px"},50)})),t(".dropdown-menu.with-search .menu-search").on("click",function(t){return t.stopPropagation(),!1})})}(jQuery),function(t){function e(){var e=window.parent,i=config.currentModule,n=config.currentMethod,o="#_single"===location.hash||!t("#mainHeader").length||"tutorial"===i||"install"===i||"upgrade"===i||"index"===i&&"index"===n||"user"===i&&("login"===n||"deny"===n)||"my"===i&&"changepassword"===n||t("body").hasClass("allow-self-open"),a=location.href;if(e===window&&!o){var s=location.pathname+location.search+location.hash,r="";return location.href=t.createLink("index","index",r)+"#app="+encodeURIComponent(s)}if(e!==window&&e.$.apps){var l=window.name;if(0===l.indexOf("app-")){t.apps=window.apps=e.$.apps;var h=l.substr(4);t.appCode=h,t(document).on("click",function(t){var i=e.document.getElementById(window.name);if(i){var n=e.document.getElementById(i.name)||i;n&&n.dispatchEvent(new Event(t.type,{bubbles:!0}))}}).on("click","a,.open-in-app,.show-in-app",function(e){var i=t(this);if(!i.is("[data-modal],[data-toggle],[data-ride],[data-app],.iframe,.not-in-app,[target]")&&!i.data("zui.modaltrigger")){var n=i.hasClass("show-in-app")?"":i.attr("href")||(i.is("a")?"":i.data("url"));if(!n||0!==n.indexOf("javascript:")){var o=i.data("app")||i.data("group");(n||o)&&(o||(o=t.apps.getAppCode(n)),o&&t.apps.open(n,o)&&e.preventDefault())}}}),t.apps.updateUrl(h,a,document.title)}}}function i(){var e=t("#navbar>.nav");if(e.length){var i=t("#heading"),n=+i.css("left").replace("px",""),o=i.outerWidth(),a=e.width(),s=t("#mainHeader>.container").width()-2*n,r=Math.floor((s-a)/2);e.css("marginLeft",r<o?2*(o-r):"")}}Array.prototype.includes||Object.defineProperty(Array.prototype,"includes",{value:function(t,e){function i(t,e){return t===e||"number"==typeof t&&"number"==typeof e&&isNaN(t)&&isNaN(e)}if(null==this)throw new TypeError('"this" is null or not defined');var n=Object(this),o=n.length>>>0;if(0===o)return!1;for(var a=0|e,s=Math.max(a>=0?a:o-Math.abs(a),0);s<o;){if(i(n[s],t))return!0;s++}return!1}}),t.getSearchParam=function(t,e){e=void 0===e?window.location.search:e;var i={};return e.length>1&&("?"===e[0]&&(e=e.substr(1)),e.split("&").forEach(function(t){var e=t.split("=",2);if(e.length>1)try{i[e[0]]=decodeURIComponent(e[1])}catch(n){i[e[0]]=""}else i[e[0]]=""})),t?i[t]:i},t.parseLink=function(e){if(!e)return{};var i=e.split("#"),n=i[0].split("?"),o=n[1],a=o?t.getSearchParam("",o):{},s=n[0],r={isOnlyBody:"yes"===a.onlybody,prj:a.PRJ||"",vars:[],hash:i[1]||"",params:a};if("GET"===config.requestType){r.moduleName=a[config.moduleVar],r.methodName=a[config.methodVar],r.viewType=a[config.viewVar]||config.defaultView;for(var l in a)l!==config.moduleVar&&l!==config.methodVar&&l!==config.viewVar&&"onlybody"!==l&&r.vars.push([l,a[l]])}else{var h=s.lastIndexOf("/");h===s.length-1&&(s=s.substr(0,h),h=s.lastIndexOf("/")),h>=0&&(s=s.substr(h+1));var c=s.lastIndexOf(".");c>=0?(r.viewType=s.substr(c+1),s=s.substr(0,c)):r.viewType=config.defaultView;var d=s.split(config.requestFix);if(r.moduleName=d[0],r.methodName=d[1]||"index",d.length>2)for(var u=2;u<d.length;u++)r.vars.push(["",d[u]]),a["$"+(u-1)]=d[u]}return r},t(function(){e(),t("#navbar>.nav>li").length>10&&(i(),t(window).on("resize",i))})}(jQuery),$.zui.lang("de",{"zui.pager":{pageOfText:"Seite {0}",prev:"Zurück",next:"Nächste Seite",first:"Erste Seite",last:"Letzte Seite","goto":"Goto",pageOf:"Seite <strong>{page}</strong>",totalPage:"<strong>{totalPage}</strong> Seiten",totalCount:"Total: <strong>{recTotal}</strong> Artikel",pageSize:"<strong>{recPerPage}</strong> Artikel pro Seite",itemsRange:"Seiten <strong>{start}</strong> bis <strong>{end}</strong>",pageOfTotal:"Seite <strong>{page}</strong>/<strong>{totalPage}</strong>"},"zui.boards":{append2end:"Gehen Sie zum Ende"},"zui.browser":{tip:"Online. Sorgenfrei. Aktualisiere deinen Browser noch heute!"},"zui.calendar":{weekNames:["Son","Mon","Die","Mit","Don","Fri","Sam"],monthNames:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",year:"{0}Jahr",month:"{0}Monat",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Kein Icon]",commonIcons:"Gemeinsame Symbole",webIcons:"Web-Symbol",editorIcons:"Editor-Symbol",directionalIcons:"Pfeil Zusammenfluss",otherIcons:"Andere Symbole"},"zui.colorPicker":{errorTip:"Kein gültiger Farbwert"},"zui.datagrid":{errorCannotGetDataFromRemote:"Daten vom Remote-Server ({0}) können nicht abgerufen werden.",errorCannotHandleRemoteData:"Die vom Remote-Server zurückgegebenen Daten können nicht verarbeitet werden."},"zui.guideViewer":{prevStep:"Vorheriger Schritt",nextStep:"Nächster Schritt"},"zui.tabs":{reload:"Neu laden",close:"Schliessen",closeOthers:"Schließen Sie andere Registerkarten",closeRight:"Schließen Sie die rechte Registerkarte",reopenLast:"Letzten geschlossenen Tab wiederherstellen",errorCannotFetchFromRemote:"Inhalt kann nicht vom Remote-Server abgerufen werden ({0})."},"zui.uploader":{},datetimepicker:{days:["Sonntag","Montag","Diensteg","Mittwoch","Donnerstag","Freitag","Samstag"],daysShort:["Son","Mon","Die","Mit","Don","Fri","Sam"],daysMin:["Son","Mon","Die","Mit","Don","Fri","Sam"],months:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",suffix:[],meridiem:[]},chosen:{no_results_text:"Nicht gefunden"},bootbox:{OK:"OK",CANCEL:"Stornieren",CONFIRM:"Bestätigen"}}),$.zui.lang("fr",{"zui.pager":{pageOfText:"Page {0}",prev:"Prev",next:"Suivant",first:"First",last:"Last","goto":"Goto",pageOf:"Page <strong>{page}</strong>",totalPage:"<strong>{totalPage}</strong> pages",totalCount:"Total: <strong>{recTotal}</strong> items",pageSize:"<strong>{recPerPage}</strong> per page",itemsRange:"De <strong>{start}</strong> à <strong>{end}</strong>",pageOfTotal:"Page <strong>{page}</strong> de <strong>{totalPage}</strong>"},"zui.boards":{append2end:"Aller jusqu'au bout"},"zui.browser":{tip:"Naviguez sans crainte sur Internet. Mettez votre navigateur à jour dès aujourd'hui!"},"zui.calendar":{weekNames:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],monthNames:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",year:"{0} Année",month:"{0} Mois",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Aucune icône]",commonIcons:"Icônes communes",webIcons:"Icône Web",editorIcons:"Icône de l'éditeur",directionalIcons:"Flèche confluence",otherIcons:"Autres icônes"},"zui.colorPicker":{errorTip:"Pas une valeur de couleur valide"},"zui.datagrid":{errorCannotGetDataFromRemote:"Impossible d'obtenir les données du serveur distant ({0}).",errorCannotHandleRemoteData:"Impossible de traiter les données renvoyées par le serveur distant."},"zui.guideViewer":{prevStep:"Étape précédente",nextStep:"Prochaine étape"},"zui.tabs":{reload:"Recharger",close:"Fermer",closeOthers:"Fermez les autres onglets",closeRight:"Fermer l'onglet de droite",reopenLast:"Restaurer le dernier onglet fermé",errorCannotFetchFromRemote:"Impossible d'obtenir le contenu du serveur distant ({0})."},"zui.uploader":{},datetimepicker:{days:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],daysShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],daysMin:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],months:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],monthsShort:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",suffix:[],meridiem:[]},chosen:{no_results_text:"Pas trouvé"},bootbox:{OK:"D'accord",CANCEL:"Annuler",CONFIRM:"Confirmer"}});
\ No newline at end of file
+o.not(".group-summary").toggleClass("hidden",!s),a.toggleClass("hidden",s),t("body").toggleClass("table-group-collapsed",!this.$.find("tbody>tr.group-summary.hidden").length)},r.prototype.updateStatistic=function(){var i=this,n=i.$.find(".table-statistic");if(n.length){if(i.defaultStatistic===e&&(i.defaultStatistic=n.html()),i.options.statisticCreator)return void n.html(i.options.statisticCreator(i)||i.defaultStatistic);var o=i.statisticCols;if(!o&&o!==!1){o={};var a=!1;i.getTable().find("thead th").each(function(e){var i=t(this),n=i.data("statistic");n&&(a=!0,o[e]={format:n,name:i.text()})}),i.statisticCols=!!a&&o}var s=0;o&&t.each(o,function(t){o[t].total=0,o[t].checkedTotal=0}),i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr").each(function(){var e=t(this),i=e.hasClass("checked"),n=e.children("td");i&&s++,o&&t.each(o,function(t){var e=parseFloat(n.eq(t).text());isNaN(e)&&(e=0),o[t].total+=e,i&&(o[t].checkedTotal+=e)})});var r=[];if(s)r.push(i.lang.selectedItems.format(s));else if(i.defaultStatistic)return void n.html(i.defaultStatistic);o&&t.each(o,function(t){var e=o[t],n=e[s?"checkedTotal":"total"];e.format&&(n=e.format.format(n)),r.push(i.lang.attrTotal.format(e.name,n))}),n.html(r.join(", "))}},r.prototype.updateFixUI=function(e){var i=this,n=(new Date).getTime();if(!e&&(i.lastUpdateCall&&clearTimeout(i.lastUpdateCall),!i.lastUpdateTime||n-i.lastUpdateTime<s))return void(i.lastUpdateCall=setTimeout(function(){i.updateFixUI(!0)},s/2));if(i.lastUpdateTime=n,i.lastUpdateCall&&(clearTimeout(i.lastUpdateCall),i.lastUpdateCall=null),o){var a=i.getTable();if(a.parent().is(".table-responsive")){var r=a.find("thead"),l=0;r.find("th").each(function(){l+=t(this).outerWidth()}),a.css("min-width",l)}}i.options.fixHeader&&!i.isDataTable&&i.fixHeader(),i.options.fixFooter&&i.fixFooter()},r.prototype.fixHeader=function(){var e=this,i=e.getTable(),n=i.find("thead"),o=n[0].getBoundingClientRect(),s=e.options.fixFooter,r=t.isFunction(s)?s(o,n):o.top<("number"==typeof s?s:-5),l=e.$.find(".fix-table-copy-wrapper"),h=i.parent(),c=h.is(".table-responsive");if(r){if(l.length||(l=t('<div class="fix-table-copy-wrapper" style="overflow: hidden; position:fixed; z-index: 3; top: 0;"></div>').append(t('<table class="fixed-header-copy"></table>').addClass(i.attr("class")).append(n.clone())).insertAfter(i)),c){var d=h[0].getBoundingClientRect();l.css({left:d.left,width:h.width()}),l.find(".fixed-header-copy").css({left:o.left-d.left,position:"relative",minWidth:i.width()}),a||h.data("fixHeaderScroll")||(h.data("fixHeaderScroll",1),i.width()>h.width()&&h.on("scroll",function(){e.fixHeader()}))}else l.css({left:o.left,width:o.width});var u=l.find("th");n.find("th").each(function(e){u.eq(e).css("width",t(this).outerWidth())})}else l.remove()},r.prototype.fixFooter=function(){var e,i=this,n=i.getTable(),o=i.$.find(".table-footer");if(i.isDataTable)e=n[0].getBoundingClientRect();else{var a=n.find("tbody");if(!a.length)return;e=a[0].getBoundingClientRect()}var s=i.options.fixFooter;o.toggleClass("fixed-footer",!!r);var r=t.isFunction(s)?s(e,o):e.bottom>window.innerHeight-50-("number"==typeof s?s:i.pageFooterHeight||5);o.toggleClass("fixed-footer",!!r),n.toggleClass("with-footer-fixed",!!r),n.trigger("fixFooter",r);var l=t("body"),h=l.hasClass("body-modal");if(r){var c=n.parent(),d=c.is(".table-responsive");o.css({bottom:i.pageFooterHeight||0,left:d?c[0].getBoundingClientRect().left:e.left,width:d?c.width():e.width}),h&&l.css("padding-bottom",40)}else o.css({width:"",left:0,bottom:0}),h&&l.css("padding-bottom",0)},r.prototype.checkAll=function(e){var i=this,n=i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr");n.each(function(){i.checkRow(t(this),e,!0)}),i.updateCheckUI()},r.prototype.checkRow=function(t,i,n){var o=this;o.isDataTable&&!t.is(".datatable-row-left")&&(t=o.getTable().find('.datatable-row-left[data-index="'+t.data("index")+'"]'));var a=t.find('input[type="checkbox"]');a.length&&!a.is(":disabled")&&(i===e&&(i=!a.is(":checked")),o.isDataTable?o.getTable().find('.datatable-row[data-index="'+t.data("index")+'"]').toggleClass("checked",i):t.toggleClass("checked",i),this.checkItems[t.data("id")]=i,a.prop("checked",i).trigger("change"),n||o.updateCheckUI())},r.prototype.updateCheckUI=function(){var e=this,i=e.getTable(),n=i.find(e.isDataTable?".fixed-left tbody>tr":"tbody>tr").not(".group-summary"),o=!1,a=null,s=0,r=!1,l=n.length;n.each(function(n){var h=t(this),c=h.find('input[type="checkbox"]');r=c.is(":checked");var d=e.isDataTable?i.find('.datatable-row[data-index="'+h.data("index")+'"]'):h;d.toggleClass("checked",r),d.toggleClass("row-check-begin",r&&!o),a&&a.toggleClass("row-check-end",!r&&o),r&&(s+=1),a=d,o=r,l===n+1&&d.toggleClass("row-check-end",r)}),e.$.toggleClass("has-row-checked",s>0).find(".check-all").toggleClass("checked",!(!l||s!==l)),e.updateStatistic(),e.options.onCheckChange&&e.options.onCheckChange()},r.DEFAULTS={checkable:!0,checkOnClickRow:!0,ajaxForm:!1,selectable:!0,fixHeader:!a,fixFooter:!a,iframeWidth:900,replaceId:"self",nestLevelIndent:18,nested:!1,preserveNested:!0,hot:!1,iframeModalTrigger:".iframe"},t.fn.table=function(e){return this.each(function(){var n=t(this),o=n.data(i),a="object"==typeof e&&e;o||n.data(i,o=new r(this,a)),"string"==typeof e&&o[e]()})},r.NAME=i,t.fn.table.Constructor=r,t(function(){t('[data-ride="table"]').table()})}(jQuery,void 0),function(t,e,i){t.fn._ajaxForm=t.fn.ajaxForm;var n={timeout:e.config?e.config.timeout:0,dataType:"json",method:"post"},o="";t.fn.enableForm=function(e,n,o){return e===i&&(e=!0),this.each(function(){var i=t(this);n||i.find('[type="submit"]').attr("disabled",e?null:"disabled"),!o&&i.hasClass("load-indicator")&&i.toggleClass("loading",!e),i.toggleClass("form-disabled",!e)})},t.enableForm=function(e,i,n,o){"string"==typeof e||e instanceof t?e=t(e):(o=n,n=i,i=e,e=t("form")),e.enableForm(i!==!1,n,o)},t.disableForm=function(e,i,n){t.enableForm(e,!1,i,n)};var a=function(e,i,n){"string"==typeof i&&(n=i,i=null),n=n||"show",t.zui.messager?t.zui.messager[n](e,i):alert(e)};t.ajaxForm=function(s,r){var l=t(s);if(l.length>1)return l.each(function(){t.ajaxForm(this,r)});"function"==typeof r&&(r={complete:r}),r=t.extend({},n,l.data(),r);var h=r.beforeSubmit,c=r.error,d=r.success,u=r.finish;delete r.finish,delete r.success,delete r.onError,delete r.beforeSubmit,r=t.extend({beforeSubmit:function(n,a,s){if(l.removeClass("form-watched").enableForm(!1),(h&&h(n,a,s))!==!1){var r={},c=a.find('[type="file"]');r.fileapi=c.length&&c[0].files!==i,r.formdata=e.FormData!==i;var d=r.fileapi&&a.find('input[type="file"]:enabled').filter(function(){return""!==t(this).val()}),u=d.length,f="multipart/form-data",p=a.attr("enctype")==f||a.attr("encoding")==f,g=r.fileapi&&r.formdata,m=u&&!g||p&&!r.formdata;m&&(""==o&&(o=s.url),s.url!=o&&(s.url=o),s.url=s.url.indexOf("&")>=0?s.url+"&HTTP_X_REQUESTED_WITH=XMLHttpRequest":s.url+"?HTTP_X_REQUESTED_WITH=XMLHttpRequest")}},success:function(i,n,o){if((d&&d(i,n,o,l))!==!1){try{"string"==typeof i&&(i=JSON.parse(i))}catch(s){}if(null===i||"object"!=typeof i)return i?alert(i):a("No response.","danger");var h=r.responser?t(r.responser):l.find(".form-responser");h.length||(h=t("#responser"));var c=i.message,f=function(){var n=i.callback;if(n){var o=n.indexOf("("),a=(o>0?n.substr(0,o):n).split("."),s=e,r=a[0];a.length>1&&(r=a[1],"top"===a[0]?s=e.top:"parent"===a[0]&&(s=e.parent));var h=s[r];if("function"==typeof h){var c=[];return o>0&&")"==n[n.length-1]&&(c=t.parseJSON("["+n.substring(o+1,n.length-1)+"]")),c.push(i),h.apply(l,c)}}};if("success"===i.result){var p=r.locate||i.locate;if(l.enableForm(!0,!!p),c){var g=l.find('[type="submit"]').first(),m=!1;g.length&&(g.popover({container:"body",trigger:"manual",content:c,tipClass:"popover-in-modal popover-success popover-form-result",placement:i.placement||r.popoverPlacement||"right"}).popover("show"),setTimeout(function(){g.popover("destroy")},r.popoverTime||2e3),m=!0),h.length&&(h.html('<span class="small text-success">'+c+"</span>").show().delay(3e3).fadeOut(100),m=!0),m||a(c,"success")}if(u)return u(i,!0,l);if((r.closeModal||i.closeModal)&&setTimeout(t.zui.closeModal,r.closeModalTime||2e3),f()===!1)return;if(p)if("loadInModal"==p){var v=t(".modal");setTimeout(function(){v.load(v.attr("ref"),function(){t(this).find(".modal-dialog").css("width",t(this).data("width")),t.zui.ajustModalPosition()})},1e3)}else"parent"===p||"top"===p?e[p]&&setTimeout(function(){e[p].location.reload()},1200):"reload"===p?setTimeout(function(){e.location.href=e.location.href},1200):setTimeout(function(){t.tabs?t.tabs.open(p):e.location.href=p},1200);var y=r.ajaxReload||i.ajaxReload;if(y){var b=t(y);b.length&&b.load(e.location.href+" "+y,function(){b.find('[data-toggle="modal"]').modalTrigger()})}}else{if(l.enableForm(),"string"==typeof c)h.length?h.html('<span class="text-small text-red">'+c+"</span>").show().delay(3e3).fadeOut(100):a(c,"danger");else if("object"==typeof c){var w=!1,x=[];t.each(c,function(e,i){var n=t.isArray(i)?i.join(""):i,o=t("#"+e);if(!o.length)return void x.push(n);var a=e+"Label",s=t("#"+a);if(!s.length){var r=o.closest(".input-group").length,l=o.closest("td").length;s=t('<div id="'+a+'" class="text-danger help-text" />').appendTo(l?o.closest("td"):r?o.closest(".input-group").parent():o.parent())}s.empty().append(n),o.addClass("has-error");var h=function(){var e=t("#"+a);if(e.length)return e.remove(),o.removeClass("has-error"),!0};o.on("change input mousedown",h);var c=t("#"+e+"_chosen");if(c.length&&c.find(".chosen-single,.chosen-choices").addClass("has-error").on("mousedown",function(){h()===!0&&t(this).removeClass("has-error")}),!w){if(o.hasClass("chosen"))o.trigger("chosen:activate");else if(o.is("textarea")&&o.data("keditor")){var d=o.data("keditor");d.focus(),d.edit.doc.body.focus()}else o.focus();w=!0}}),x.length&&a(x.join(";"),"danger")}if(u)return u(i,!1,l);if(f()===!1)return}}},error:function(t,i,n){if((c&&c(t,i,n,l))!==!1){l.enableForm();var o="timeout"==i||"error"==i?e.lang?e.lang.timeout:i:t.responseText+i+n;a(o,"danger")}}},r),l._ajaxForm(r).data("zui.ajaxform",!0),l.on("click","[data-form-action]",function(){l.attr("action",t(this).data("formAction")).submit()})},t.setAjaxForm=function(e,i,n){t.ajaxForm(e,t.isPlainObject(i)?i:{onFinish:i,beforeSubmit:n})},t.fn.ajaxForm=function(e){return this.each(function(){t.ajaxForm(this,e)})},t.fn.setInputRequired=function(){return this.each(function(){var e=t(this),i=e.parent();i.is(".input-control,td")?i.addClass("required"):e.is(".chosen")?e.attr("required",null).next(".chosen-container").addClass("required"):i.addClass("required"),e.attr("required",null);var n=i.closest(".input-group");n.length&&1===n.find(".required,input[required],select[required]").length&&n.addClass("required")})},t(function(){t('.form-ajax,form[data-type="ajax"]').ajaxForm(),setTimeout(function(){var i=e.config.requiredFields,n=t("form");i&&(i=i.split(",")),i&&i.length&&t.each(i,function(t,e){n.find("#"+e).attr("required","required")}),n.find("input[required],select[required],textarea[required]").setInputRequired()},400),t("#hiddenwin"),t('form[target="hiddenwin"]').on("submit",function(){var e=t(this);e.data("zui.ajaxform")||e.enableForm(!1).data("disabledTime",(new Date).getTime())}).on("click",function(){var e=t(this),i=e.data("disabledTime");i&&(new Date).getTime()-i>1e4&&e.enableForm(!0).data("disabledTime",null)})})}(jQuery,window,void 0),function(t){"use strict";var e="zui.searchList",i=function(t,e){if(t&&t.length)for(var i=0;i<t.length;++i)if(e.indexOf(t[i])<0)return!1;return!0},n=function(i,o){var a=this;a.name=e;var s=a.$=t(i);o=a.options=t.extend({},n.DEFAULTS,this.$.data(),o);var r=s.find(o.searchBox);r.length&&(r.searchBox({onSearchChange:function(t){a.search(t)},onKeyDown:function(t){var e=t.which;if(13===e){var i=a.getActiveItem();i.length&&(o.onSelectItem?o.onSelectItem(i):window.location.href=i.attr("href")),t.preventDefault()}else if(38===e){var i=a.getActiveItem();i.removeClass("active");for(var n=i.prev();n.length&&!n.is(".search-list-item:not(.hidden)");)n=n.prev();n.length||(n=a.getItems().not(".hidden").last()),a.scrollTo(n.addClass("active")),t.preventDefault()}else if(40===e){var i=a.getActiveItem();i.removeClass("active");for(var s=i.next();s.length&&!s.is(".search-list-item:not(.hidden)");)s=s.next();s.length||(s=a.getItems().not(".hidden").first()),a.scrollTo(s.addClass("active")),t.preventDefault()}},onFocus:function(){s.addClass("searchbox-focus")},onBlur:function(){s.removeClass("searchbox-focus")}}),a.searchBox=r.data("zui.searchBox"),a.search(a.searchBox.getSearch()));var l=a.$menu=s.closest(".dropdown-menu");if(l.length){a.isDropdown=!0,s.on("click",function(e){t(e.target).closest(o.selector+",[data-toggle]").length||e.stopPropagation()});var h=l.parent();h.on(h.hasClass("dropdown-hover")?"mouseenter":"shown.zui.dropdown",function(){a.tryLoadRemote(function(){if(h.hasClass("dropup")){var t=null,e=h[0].getBoundingClientRect();e.top<220&&(t=Math.floor(e.top)-57),l.find(".list-group").css("max-height",t)}setTimeout(function(){a.searchBox&&a.searchBox.focus()},50)})})}s.on("mouseenter",o.selector,function(){s.find(a.options.selector).not(".hidden").removeClass("active"),t(this).addClass("active")})};n.prototype.tryLoadRemote=function(t){var e=this,i=e.options;i.url||i.ajax?e.isLoaded?t():e.loadRemote(t):t()},n.prototype.loadRemote=function(e){var i=this,n=i.options;i.$menu.addClass("load-indicator loading").find(".list-group").remove(),i.isLoaded=!1,t.ajax(t.extend({url:n.url,type:"GET",dataType:"html",success:function(n,o,a){var s=t(n);s.hasClass("list-group")||(s=t('<div class="list-group"></div>').append(s)),i.$menu.append(s),i.$menu.removeClass("loading"),i.isLoaded=!0,e&&e(!0)},error:function(){i.$menu.removeClass("loading").append('<div class="list-group"><div class="text-error has-padding">'+(n.errorText||window.lang&&window.lang.timeout)+"</div></div>"),e&&e(!1)}},n.ajax))},n.prototype.scrollTo=function(t){t.length&&t[0].scrollIntoViewIfNeeded&&t[0].scrollIntoViewIfNeeded({behavior:"smooth"})},n.prototype.getItems=function(){return this.$.find(this.options.selector).addClass("search-list-item")},n.prototype.getActiveItem=function(){return this.getItems().filter(".active:first")},n.prototype.search=function(e){var n=this,o=void 0===e||null===e||""===e;n.$.toggleClass("has-search-text",!o);var a=n.getItems().removeClass("active");if(o)a.removeClass("hidden");else{var s=t.trim(e).split(" ");a.each(function(){var e=t(this),n=e.text()+" "+(e.data("key")||e.data("filter"));e.toggleClass("hidden",!i(s,n))})}n.scrollTo(a.not(".hidden").first().addClass("active"))},n.DEFAULTS={selector:".list-group a:not(.not-list-item)",searchBox:".search-box",onSelectItem:null},t.fn.searchList=function(i){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof i&&i;a||o.data(e,a=new n(this,s)),"string"==typeof i&&a[i]()})},n.NAME=e,t.fn.searchList.Constructor=n,t(function(){t('[data-ride="searchList"]').searchList()})}(jQuery),function(t){"use strict";var e="zui.labelSelector",i=function(n,o){var a=this;a.name=e,a.$=t(n),o=a.options=t.extend({},i.DEFAULTS,this.$.data(),o),a.$.hide(),a.update()};i.prototype.select=function(t){t+="",this.$wrapper.find(".label.active").removeClass("active"),this.$wrapper.find('.label[data-value="'+t+'"]').addClass("active"),this.$.val(t).trigger("change")},i.prototype.update=function(){var e=this,i=e.options,n=e.$wrapper;if(!n){if(i.wrapper)n=t(i.wrapper);else{var o=e.$.next();n=o.hasClass(".label-selector")?o:t('<div class="label-selector"></div>')}n.parent().length||e.$.after(n),e.$wrapper=n,n.on("click",".label",function(i){var n=e.$.val(),o=t(this).data("value");e.hasEmptyValue!==!1&&o==n&&(o=e.hasEmptyValue),e.select(o),i.preventDefault()})}n.empty();var a=e.$.val();e.hasEmptyValue=!1,e.$.children("option").each(function(){var e=t(this),o={label:e.text(),value:e.val()},s=""===o.value||"0"===o.value,r=t(i.labelTemplate||'<span class="label"></span>');i.labelClass&&!s&&r.addClass(i.labelClass),i.labelCreator?r=i.labelCreator(r):(r.data("option",o).attr("data-value",o.value),s&&!o.label?r.addClass("empty").append('<i class="icon icon-close"></i>'):r.text(o.label).toggleClass("active",a===o.value)),n.append(r)})},i.DEFAULTS={},t.fn.labelSelector=function(n){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof n&&n;a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},i.NAME=e,t.fn.labelSelector.Constructor=i,t(function(){t('[data-provide="labelSelector"]').labelSelector()})}(jQuery),function(t){"use strict";var e="zui.fileInput",i=t.BYTE_UNITS={B:1,KB:1024,MB:1048576,GB:1073741824,TB:1099511627776},n=t.formatBytes=function(t,e,n){return void 0===e&&(e=2),n||(n=t<i.KB?"B":t<i.MB?"KB":t<i.GB?"MB":t<i.TB?"GB":"TB"),(t/i[n]).toFixed(e)+n},o=function(t){if("string"==typeof t){t=t.toUpperCase();var e=t.replace(/\d+/,"");t=parseFloat(t.replace(e,"")),t*=i[e]||i[e+"B"],t=Math.floor(t)}return t},a=function(i,s){var r=this;r.name=e;var l=r.$=t(i);s=r.options=t.extend({},a.DEFAULTS,this.$.data(),s),s.fileMaxSize&&"string"==typeof s.fileMaxSize&&(s.fileMaxSize=o(s.fileMaxSize));var h=r.$input=l.find('input[type="file"]');l.on("click",".file-input-btn",function(){h.trigger("click")}).on("click",".file-input-rename",function(){r.oldName=l.addClass("edit").find(".file-editbox").focus().val(),t.fn.fixInputGroup&&l.find(".input-group,.btn-group").fixInputGroup()}).on("click",".file-input-delete",function(){h.val(""),r.update(),s.onDelete&&s.onDelete(r)}).on("click",".file-name-cancel",function(){l.removeClass("edit").find(".file-editbox").focus().val(r.oldName)}).on("click",".file-name-confirm",function(){var e=l.find(".file-editbox"),i=t.trim(e.val());i.length?l.removeClass("edit").find(".file-title").text(i).attr("title",i):e.focus()}).on("change input paste",".file-editbox",function(){var e=t(this);e.attr("size",Math.max(5,e.val().length))}),h.on("change",function(){var t=r.getFile();t&&s.fileMaxSize&&t.size>s.fileMaxSize&&(h.val(""),(window.bootbox||window).alert(s.fileSizeError.format(n(s.fileMaxSize)))),r.update()}),r.update()};a.prototype.getFile=function(){var t=this.$input.prop("files");return t&&t[0]},a.prototype.update=function(){var t=this,e=t.$,i=t.getFile(),o=!i;e.toggleClass("normal",!o).toggleClass("empty",o),i?(t.oldName=i.name,e.find(".file-title").text(i.name).attr("title",i.name),e.find(".file-size").text(n(i.size)),e.find(".file-editbox").val(i.name).attr("size",i.name.length),t.options.onSelect&&t.options.onSelect(i,t)):e.find(".file-editbox").val("")},a.DEFAULTS={fileMaxSize:0,fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInput=function(i){return this.each(function(){var n=t(this),o=n.data(e),s="object"==typeof i&&i;o||n.data(e,o=new a(this,s)),"string"==typeof i&&o[i]()})},a.NAME=e,t.fn.fileInput.Constructor=a,t(function(){t('[data-provide="fileInput"]').fileInput()});var s="zui.fileInputList",r=function(e,i){var n=this;n.name=s;var o=n.$=t(e);i=n.options=t.extend({},r.DEFAULTS,this.$.data(),i),n.$template=o.find(".file-input").detach(),n.add()};r.prototype.add=function(){var t=this,e=t.options,i=t.$template.clone();"before"===e.appendWay?t.$.prepend(i):t.$.append(i),i.fileInput({fileMaxSize:e.eachFileMaxSize,fileSizeError:e.fileSizeError,onDelete:function(e){e.$.remove(),t.options.onDelete&&t.options.onDelete(e,t)},onSelect:function(e,i){t.add(),t.options.onSelect&&t.options.onSelect(e,i,t)}})},r.DEFAULTS={fileMaxSize:0,eachFileMaxSize:0,appendWay:"after",fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInputList=function(e){return this.each(function(){var i=t(this),n=i.data(s),o="object"==typeof e&&e;n||i.data(s,n=new r(this,o)),"string"==typeof e&&n[e]()})},r.NAME=s,t.fn.fileInputList.Constructor=r,t(function(){t('[data-provide="fileInputList"]').fileInputList()})}(jQuery),function(t){window.config||(window.config={}),t.createLink=window.createLink=function(e,n,o,a,s,r,l){if("object"==typeof e)return t.createLink(e.moduleName,e.methodName,e.vars,e.viewType,e.isOnlyBody,e.prj,e.hash);if(a||(a=config.defaultView),s||(s=!1),o)for("string"==typeof o&&(o=o.split("&")),i=0;i<o.length;i++)if("string"==typeof o[i]){var h=o[i].split("=");o[i]=[h.shift(),h.join("=")]}var c;if("GET"===config.requestType){if(c=config.router+"?"+config.moduleVar+"="+e+"&"+config.methodVar+"="+n,o)for(i=0;i<o.length;i++)c+="&"+o[i][0]+"="+o[i][1];c+="&"+config.viewVar+"="+a}else{if("PATH_INFO"==config.requestType&&(c=config.webRoot+e+config.requestFix+n),"PATH_INFO2"==config.requestType&&(c=config.webRoot+"index.php/"+e+config.requestFix+n),o)for(i=0;i<o.length;i++)c+=config.requestFix+o[i][1];c+="."+a}if(void 0!==config.onlybody&&"yes"==config.onlybody||s){var d="GET"!=config.requestType?"?onlybody=yes":"&onlybody=yes";c+=d}return void 0===r||window.navGroup&&"project"!==window.navGroup[e]||(c+=(c.indexOf("?")>0?"&":"?")+"PRJ="+r),c+(l?("#"===l[0]?"":"#")+l:"")},t(function(){var e=t("#main,#mainContent,#mainRow,.auto-fade-in");e.length&&e.hasClass("fade")&&setTimeout(function(){e.addClass("in")},e.data("fadeTime")||200)}),t.ajaxSendScore=function(e){t.get(t.createLink("score","ajax","method="+e))};var e=function(t){var e=0;if(t){var i=t.split(":");e+=60*parseInt(i[0]),e+=parseInt(i[1])}return e},n=function(t){t%=1440;var e=Math.floor(t/60),i=t%60;return e<10&&(e="0"+e),i<10&&(i="0"+i),e+":"+i},o=function(t){if("string"==typeof t&&(t=e(t)),"number"==typeof t)if(t<1e5){var i=new Date;i.setHours(Math.floor(t/60)%24),i.setMinutes(t%60),t=i}else t=new Date(t);return t},a=function(t,i){for(var a=i?o(i):new Date,s=a.getHours(),r=10*Math.floor(a.getMinutes()/10)+10,l=0;l<24;++l){var h=(l+s)%24;if(!(h<5))for(var c=0;c<6;++c){var d=n(60*h+10*c+r);t.append('<option value="'+d+'">'+d+"</option>")}}t.val()||(time=e(a.format("hh:mm")),time=time-time%10+10,t.val(n(time)))};t.fn.timeSpanControl=function(i){return this.each(function(){var s=t(this),r=t.extend({},i,s.data()),l=s.find('[name="begin"],.control-time-begin'),h=s.find('[name="end"],.control-time-end'),c=function(){var t=l.val();if(s.find(".hide-empty-begin").toggleClass("hide",!t),t){var i=n(e(t)+30);h.find('option[value="'+i+'"]').length&&h.val(i),r.onChange&&r.onChange(h,i)}};if(s.data("timeSpanControlInit")){if(r.begin){var d=o(r.begin).format("hh:mm");l.find('option[value="'+d+'"]').length&&l.val(d),r.onChange&&r.onChange(l,d)}if(r.end){var u=o(r.end).format("hh:mm");h.find('option[value="'+u+'"]').length&&h.val(u),r.onChange&&r.onChange(h,u)}}else l.on("change",c),a(l,r.begin),a(h,r.end),s.data("timeSpanControlInit",!0);r.end||c()})},t.timeSpanControl={convertTimeToNum:e,convertNumToTime:n,initTimeSelect:a,createTime:o};var s=t.setSearchType=function(e,i){var n=t("#searchType");e||(e=n.val()),e=e||"bug",n.val(e);var o=t("#searchTypeMenu");o.find("li.selected").removeClass("selected");var a=o.find('a[data-value="'+e+'"]'),s=a.text();a.parent().addClass("selected"),t("#searchTypeName").text(s),i||t("#searchInput").focus()};t.gotoObject=function(e,i){if(e||(e=t("#searchType").val()),i||(i=t("#searchInput").val()),i&&e)if(i=i.replace(/[^\d]/g,"")){var n=e.split("-");e=n[0];var o=n.length>1?n[1]:"testsuite"===e?"library":"view",a=t.createLink(e,o,"id="+i);t.apps?t.apps.open(a):window.location.href=a}else{var s={zh_cn:"请输入数字ID进行搜索",zh_tw:"請輸入數值ID行搜索"};alert(lang.searchTip||s[t.zui.clientLang()]||"Please enter a numberic id to search")}t("#searchInput").val(i).focus()},t(function(){s(null,!0),t(document).on("keydown",function(e){e.ctrlKey&&71===e.keyCode&&(t("#searchInput").val("").focus(),e.stopPropagation(),e.preventDefault())})}),t.removeAnchor=window.removeAnchor=function(t){var e=t.lastIndexOf("#");return e>-1?t.substr(0,e):t},t.refreshPage=function(t){var e=removeAnchor(location.href);t&&window.parent!==window?window.parent.location.href=e:location.href=e},t.selectLang=window.selectLang=function(e){t.cookie("lang",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectLang"),t.refreshPage(1)},t.selectTheme=window.selectTheme=function(e){t.cookie("theme",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectTheme"),t.refreshPage(1)},t.zui.Picker&&t.zui.Picker.enableChosen(),t.chosenDefaultOptions={middle_highlight:!0,disable_search_threshold:1,compact_search:!0,allow_single_deselect:!0,placeholder_text_single:" ",placeholder_text_multiple:" ",search_contains:!0,max_drop_width:500,max_drop_height:245,no_wrap:!0,drop_direction:function(){var e=t(this.container).closest(".table-responsive:not(.scroll-none)");if(e.length){if(this.drop_directionFixed)return this.drop_directionFixed;e.css("position","relative");var i="down",n=this.container.find(".chosen-drop"),o=this.container.position(),a=n.outerHeight();return o.top>=a&&o.top+31+a>e.outerHeight()&&(i="up"),this.drop_directionFixed=i,i}return"auto"}},t.chosenSimpleOptions=t.extend({},t.chosenDefaultOptions,{disable_search_threshold:6}),t.fn._chosen=t.fn.chosen,t.fn.chosen=function(e){return"string"==typeof e?this._chosen(e):this.each(function(){var i=t(this).addClass("chosen-controled");return i._chosen(t.extend({},i.hasClass("chosen-simple")?t.chosenSimpleOptions:t.chosenDefaultOptions,i.data(),e))})},t.fn.chosen.Constructor=t.fn._chosen.Constructor,t(function(){t(".chosen,.chosen-simple").each(function(){var e=t(this);e.closest(".template").length||e.chosen()})}),t.extend(t.fn.pager.Constructor.DEFAULTS,{maxNavCount:8,prevIcon:"icon-angle-left",nextIcon:"icon-angle-right",firstIcon:"icon-first-page",lastIcon:"icon-last-page",navEllipsisItem:"…",menuDirection:"dropup",pageSizeOptions:[5,10,15,20,25,30,35,40,45,50,100,200,500,1e3,2e3],elements:["total_text","size_menu","first_icon","prev_icon",'<div class="pager-label"><strong>{page}</strong>/<strong>{totalPage}</strong></div>',"next_icon","last_icon"],onPageChange:function(e,i){e.recPerPage!==i.recPerPage&&t.cookie(this.options.pageCookie,e.recPerPage,{expires:config.cookieLife,path:config.webRoot}),e.recPerPage!==i.recPerPage&&(window.location.href=this.createLink())}}),t.extend(!0,t.zui.Messager.DEFAULTS,{cssClass:"messagger-zt",icons:{success:"check-circle",info:"chat-line",warning:"exclamation-sign",danger:"exclamation-sign"}}),t.fn.reverseOrder=function(){return this.each(function(){var e=t(this);e.prependTo(e.parent())})};var r=function(e,i){var n=t(e);if(!n.data("historiesInited")){n.data("historiesInited",1),i=t.extend({},n.data(),i);var o=n.find(".histories-list"),a=!0,s=!1;n.on("click",".btn-reverse",function(){o.children("li").reverseOrder(),a=!a,t(this).find(".icon").toggleClass("icon-arrow-up",a).toggleClass("icon-arrow-down",!a);var e="#lastComment",i=t(e);i.length&&window.KindEditor&&(window.KindEditor.remove(e),i.kindeditor())}).on("click",".btn-expand-all",function(){var e=t(this).find(".icon");s=!s,e.toggleClass("icon-plus",!s).toggleClass("icon-minus",s),o.children("li").toggleClass("show-changes",s)}).on("click",".btn-expand",function(){t(this).closest("li").toggleClass("show-changes")}).on("click",".btn-strip",function(){var e=t(this),n=e.find(".icon"),o=n.hasClass("icon-code");n.toggleClass("icon-code",!o).toggleClass("icon-text",o),e.attr("title",o?i.original:i.textdiff),e.closest("li").toggleClass("show-original",o)}),o.find(".btn-strip").attr("title",i.original);var r=n.find(".modal-comment").modal({show:!1}).on("shown.zui.modal",function(){var t=r.find("#comment");t.length&&(t.focus(),window.editor&&window.editor.comment&&window.editor.comment.focus())}).on("show.zui.modal",function(){var e=r.find("#comment");e.length&&!e.data("keditor")&&t.fn.kindeditor&&e.kindeditor()});n.on("click",".btn-comment",function(t){r.modal("toggle"),t.preventDefault()}).on("click",".btn-edit-comment,.btn-hide-form",function(){t(this).closest("li").toggleClass("show-form")});var l=n.find(".comment-edit-form");l.ajaxForm({success:function(t,e,i,n){setTimeout(function(){l.closest("li").removeClass("show-form")},2e3)}})}};t.fn.histories=function(t){return this.each(function(){r(this,t)})},t(function(){t(".histories").histories()});var l=0,h=0;t.toggleSidebar=function(e){var i=t("#sidebar");if(i.length){var n=t("main");if(void 0===e)e=n.hasClass("hide-sidebar");else if(e&&!n.hasClass("hide-sidebar"))return;n.toggleClass("hide-sidebar",!e),clearTimeout(l),t.zui.store.set(h,e);var o=i.children(".cell"),a={overflow:"visible",maxHeight:"initial"};e?(i.addClass("showing"),l=setTimeout(function(){i.removeClass("showing"),i.trigger("sidebar.toggle",e)},210)):(i.trigger("sidebar.toggle",e),t(window).width()<1900&&(a={overflow:"hidden",maxHeight:t(window).height()-45})),o.css(a)}};var c=t.initSidebar=function(){var e=t("#sidebar");if(e.length){if(e.data("init"))return!0;h="sidebar:"+(e.data("id")||config.currentModule+"/"+config.currentMethod);var i=t("main");if(i.length){i.on("click",".sidebar-toggle",function(){t.toggleSidebar(i.hasClass("hide-sidebar"))});var n=t.zui.store.get(h,e.data("hide")!==!1);n===!1&&e.addClass("no-animate"),t.toggleSidebar(n),n===!1&&setTimeout(function(){e.removeClass("no-animate")},500);var o=e.find(".sidebar-toggle");if(o.length){var a=function(){var e=o[0].getBoundingClientRect(),i=t(window).height(),n=Math.max(0,Math.floor(Math.min(i-40,e.top+e.height)-Math.max(e.top,0))/2)+(e.top<0?0-e.top:0);o.removeClass("fade").find(".icon").css("top",n+(t.zui.browser.isIE()?(i-80)/2:0))};a(),e.data("init",1).on("sidebar.toggle",a);var s=t.zui.browser.isIE()?1500:0,r=0,l=null,c=function(){var t=Date.now();return l&&(clearTimeout(l),l=null),t-r<s?(l=setTimeout(c,s/2),void o.addClass("fade")):(r=t,void a())};return t(window).on("resize scroll",s?c:a),!0}}}};c()||t(c),t.toggleQueryBox=function(e,i){var n=t(i||"#queryBox");if(n.length){if(void 0===e&&(e=!n.hasClass("show")),n.toggleClass("show",!!e),!n.data("init")){n.addClass("load-indicator loading").data("init",1);var o=n.data("url")||t.createLink("search","buildForm",n.data("module")?"module="+n.data("module"):"");t.get(o,function(t){n.html(t).removeClass("loading")})}t(".querybox-toggle").toggleClass("querybox-opened",e)}},t(function(){var e=t("#queryBox");e.length&&(t(document).on("click",".querybox-toggle",function(){t.toggleQueryBox()}),e.hasClass("show")&&t.toggleQueryBox(!0))}),t.extend(t.fn.colorPicker.Constructor.DEFAULTS,{colors:["#3DA7F5","#75C941","#2DBDB2","#797EC9","#FFAF38","#FF4E3E"]}),window.setCheckedCookie=function(){var e=[],i=t('#mainContent .main-table tbody>tr input[type="checkbox"]:checked');i.each(function(){var i=parseInt(t(this).val(),10);NaN!==i&&e.push(i)}),t.cookie("checkedItem",e.join(","),{expires:config.cookieLife,path:config.webRoot})},t.extend(t.fn.modal.bs.Constructor.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:100}),t.extend(t.zui.ModalTrigger.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:40}),t.fn.initIframeModal=function(){return this.each(function(){var e=t(this);if(!e.parents('[data-ride="table"],.skip-iframe-modal').length){var i={type:"iframe"};e.hasClass("export")&&t.extend(i,{width:800,shown:setCheckedCookie},e.data()),e.modalTrigger(i)}})},t(function(){t("a.iframe,.export").initIframeModal()});var d=function(){var e,i,n=t(this),o=t.extend({limitSize:40,suffix:"…"},n.data()),a=n.text();if(a.length>o.limitSize){e=a,i=a.substr(0,o.limitSize)+o.suffix,n.text(i).addClass("limit-text-on");var s=o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle");s.text(s.data("textExpand")),s.on("click",function(){var t=n.toggleClass("limit-text-on").hasClass("limit-text-on");n.text(t?i:e),s.text(s.data(t?"textExpand":"textCollapse"))})}else(o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle")).hide()};t.fn.textLimit=function(){return this.each(d)},t(function(){t(".text-limit").textLimit()}),t.fixedTableHead=window.fixedTableHead=function(e,i){var n=t(e);if(n.is("table")||(n=n.find("table")),n.length){var o=t(i||window),a=null,s=function(){var e=n.children("thead"),i=e[0].getBoundingClientRect(),o=n.next(".fixed-head-table");if(i.top<0){var s=e.width();if(o.length){if(a!==s){a=s;var r=o.find("th");e.find("th").each(function(e){r.eq(e).width(t(this).width())})}}else{var o=t("<table class='table fixed-head-table' style='position:fixed; top: 0;'></table>").addClass(n.attr("class")),l=e.clone(),r=l.find("th");
+e.find("th").each(function(e){r.eq(e).width(t(this).width())}),o.append(l).insertAfter(n)}o.css({left:i.left,width:i.width}).show()}else o.hide()};o.on("scroll",s).on("resize",s),s()}},t(document).on("click","tr[data-url]",function(){var e=t(this),i=e.data("href")||e.data("url");i&&(window.location.href=i)}),"yes"===config.onlybody&&self===parent&&(window.location.href=window.location.href.replace("?onlybody=yes","").replace("&onlybody=yes","")),t(function(){t("body").addClass("m-{currentModule}-{currentMethod}".format(config))});var u,f,p,g,m,v=function(){u||(u=t("#subNavbar"),f=t("#pageNav"),p=t("#pageActions"),g=u.children(".nav"),m=g.outerWidth());var e=u.outerWidth(),i=f.outerWidth()||0,n=p.outerWidth()||0;if(i=i?i+15:0,n=n?n+15:0,!i&&!n)return void g.css({maxWidth:null,left:null,position:"static"});var o=Math.max(300,e-i-n),a=Math.min(o,m),s=(e-a)/2,r=i&&s<i?i:n&&s<n?e-a-n:0;g.css({maxWidth:o,left:r?r-s:0,position:"relative"})},y=function(){t.cookie("windowWidth",window.innerWidth),t.cookie("windowHeight",window.innerHeight),v()};t(y),t(window).on("resize",y);var b=function(){var e=t("#back").attr("href");e&&(window.location.href=e)},w=function(){t.cookie("ajax_lastNext")||(t.cookie("ajax_lastNext","on",{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("lastNext"))},x=function(){var e=t("#prevPage").attr("href");e&&(window.location.href=e),w()},C=function(){var e=t("#nextPage").attr("href");e&&(window.location.href=e),w()};t(document).on("keydown",function(e){t("body").hasClass("modal-open")||(e.altKey&&38===e.keyCode?b():37===e.keyCode?x():39===e.keyCode&&C())}),t.fn.tree.Constructor.DEFAULTS.initialState="preserve",t.closeModal=function(e,i,n){t.zui.closeModal(n,e,i)},t.getThemeColor=function(e){if(!t.themeColor){var i=t("#mainHeader");i.length&&(t.themeColor={primary:i.css("border-top-color"),pale:i.css("border-bottom-color"),secondary:i.css("background-color")})}return e?t.themeColor&&t.themeColor[e]:t.themeColor};var _=function(e){var i=t(e);if(!i.hasClass("header-angle-btn")){var n,o,a=i.children(".input-group-addon,.form-control:not(.chosen-controled),.chosen-container,.btn,.input-control,.input-group-btn,.datepicker-wrapper").not(".hidden"),s=1===a.length;a.each(function(e){var i=t(this),r=i.is(".input-group-addon")?"addon":i.is(".chosen-container")?"chosen":i.is(".btn")?"btn":i.is(".input-control,.datepicker-wrapper")?"insideInput":i.is(".input-group-btn")?"insideBtn":"input",l={};if(s)l.borderTopLeftRadius=4,l.borderBottomLeftRadius=4,l.borderTopRightRadius=4,l.borderBottomRightRadius=4;else{var h=!n,c=e===a.length-1,d="btn"===r?4:2;l.borderTopLeftRadius=0,l.borderBottomLeftRadius=0,l.borderTopRightRadius=0,l.borderBottomRightRadius=0,h&&("addon"===r&&(l.borderLeftWidth=1),l.borderTopLeftRadius=d,l.borderBottomLeftRadius=d),c&&("addon"===r&&(l.borderRightWidth=1),l.borderTopRightRadius=d,l.borderBottomRightRadius=d),o&&("chosen"!==o&&"input"!==o&&"btn"!==o&&"insideInput"!==o&&"insideBtn"!==o||"chosen"!==r&&"input"!==r&&"btn"!==r&&"insideInput"!==r&&"insideBtn"!==r?"addon"===o&&"addon"===r&&(l.borderLeftWidth=1):l.borderLeftColor="transparent")}("insideBtn"===r?i.find(".btn"):"insideInput"===r?i.find(".form-control"):"chosen"===r?i.find(".chosen-single,.chosen-choices"):i).css(l),n=i,o=r})}};t.fn.fixInputGroup=function(){return this.each(function(){_(this)})};var k=function(){var e=t(".main-actions>.btn-toolbar");if(e.length){var i,n,o=e.children(),a=o.length,s=!1,r=null;if(a)for(o.each(function(e){i=t(this),n=i.is(".divider"),n&&!r&&i.hide(),s||n||(s=!0),r=n?null:i,!n||e!==a-1&&0!==e||i.hide()});i.length&&i.is(".divider");)i=i.hide().prev();s||e.hide()}};t(function(){t(".input-group,.btn-group").fixInputGroup(),k()}),window.holders&&t.each(window.holders,function(e){var i=t("#"+e);i.length&&i.is("input")&&i.attr("placeholder",window.holders[e])}),t(function(){var e=t(".table-responsive"),i=t.fixTableResponsive=function(){e.each(function(){this.scrollHeight-3<=this.clientHeight&&this.scrollWidth-3<=this.clientWidth?t(this).addClass("scroll-none").css("overflow","visible"):t(this).removeClass("scroll-none").css("overflow","auto")})};e.length&&(t(window).on("resize",i),setTimeout(i,100))});var T=function(){var e=this,i=t(e),n=i.closest("tr").find("textarea");if(n.length){var o=32;n.each(function(){var e=t(this).closest("td"),i=e.css("height");e.css("height",this.style.height),this.style.height="auto";var n=this.value?this.scrollHeight+2:32;o=Math.max(o,n),e.css("height",i)}),n.css("height",o)}else{e.style.height="auto";var a=e.value?e.scrollHeight+2:32;e.style.height=a+"px"}};t.autoResizeTextarea=function(e){t(e).each(T)},t(function(){t("textarea.autosize").each(T),t(document).on("input paste change","textarea.autosize",T)}),t(function(){var e=t("#dropMenu,.drop-menu");e.length&&e.on("click",".toggle-right-col",function(e){var i=t(this).closest("#dropMenu,.drop-menu").toggleClass("show-right-col");i.find(".search-box").width(i.hasClass("show-right-col")?i.find(".col-left").width()-20:"auto"),e.stopPropagation(),e.preventDefault()})});var S="undefined"!=typeof InstallTrigger;t.zui.browser.firefox=S,t("html").toggleClass("is-firefox",S).toggleClass("not-firefox",!S),t(function(){var e=t("#mainContent>.main-col"),i=e.children(".main-actions");if(i.length){var n=i.prev();if(i.length&&n.length){t('<div class="main-actions-holder"></div>').css("height",i.outerHeight()).insertAfter(i);var o=0,a=function(){var e=n[0].getBoundingClientRect(),s=e.top+e.height+120>t(window).height();if(t("body").toggleClass("main-actions-fixed",s),s){const r=n.width();r?i.width(r):o<10&&setTimeout(a,1e3)}o++};t.resetToolbarPosition=a,a(),t(window).on("resize scroll",a)}}}),t(document).on("show.zui.modal",function(e){t("body.body-modal").length&&window.parent&&window.parent!==window&&t(e.target).is(".modal")&&window.parent.$("body").addClass("hide-modal-close")}).on("hidden.zui.modal",function(){t("body.body-modal").length&&window.parent&&window.parent!==window&&window.parent.$("body").removeClass("hide-modal-close")}),t(function(){var e=t(".dropdown-menu.with-search");e.length&&(e.find(".menu-search").on("click",function(t){return t.stopPropagation(),!1}),e.on("keyup change paste","input",function(){var e=t(this),i=e.closest(".dropdown-menu.with-search"),n=e.val().toLowerCase(),o=i.find(".option");""==n?o.removeClass("hide"):o.each(function(){var e=t(this);e.toggleClass("hide",e.text().toString().toLowerCase().indexOf(n)<0&&e.data("key").toString().toLowerCase().indexOf(n)<0)})}),e.parents(".dropdown-submenu").one("mouseenter",function(){var e=t(this).find(".dropdown-list")[0];e&&e.getBoundingClientRect&&setTimeout(function(){var t=270,i=e.getBoundingClientRect();i.top<0&&(t=Math.min(270,i.height)+i.top),e.style.maxHeight=Math.min(270,t)+"px"},50)})),t(".dropdown-menu.with-search .menu-search").on("click",function(t){return t.stopPropagation(),!1})})}(jQuery),function(t){function e(){var e=window.parent,i=config.currentModule,n=config.currentMethod,o="#_single"===location.hash||!t("#mainHeader").length||"tutorial"===i||"install"===i||"upgrade"===i||"index"===i&&"index"===n||"user"===i&&("login"===n||"deny"===n)||"my"===i&&"changepassword"===n||t("body").hasClass("allow-self-open"),a=location.href;if(e===window&&!o){var s=location.pathname+location.search+location.hash,r="";return location.href=t.createLink("index","index",r)+"#app="+encodeURIComponent(s)}if(e!==window&&e.$.apps){var l=window.name;if(0===l.indexOf("app-")){t.apps=window.apps=e.$.apps;var h=l.substr(4);t.appCode=h,t(document).on("click",function(t){var i=e.document.getElementById(window.name);if(i){var n=e.document.getElementById(i.name)||i;n&&n.dispatchEvent(new Event(t.type,{bubbles:!0}))}}).on("click","a,.open-in-app,.show-in-app",function(e){var i=t(this);if(!i.is("[data-modal],[data-toggle],[data-ride],[data-tab],.iframe,.not-in-app,[target]")&&!i.data("zui.modaltrigger")){var n=i.hasClass("show-in-app")?"":i.attr("href")||(i.is("a")?"":i.data("url"));if(!n||0!==n.indexOf("javascript:")){var o=i.data("app")||i.data("group");(n||o)&&(o||(o=t.apps.getAppCode(n)),o&&t.apps.open(n,o)&&e.preventDefault())}}}),t.apps.updateUrl(h,a,document.title)}}}function i(){var e=t("#navbar>.nav");if(e.length){var i=t("#heading"),n=+i.css("left").replace("px",""),o=i.outerWidth(),a=e.width(),s=t("#mainHeader>.container").width()-2*n,r=Math.floor((s-a)/2);e.css("marginLeft",r<o?2*(o-r):"")}}function n(){var e=function(e,i){var n={zh_cn:{modal:"对话框中有未提交的表单，是否关闭？",app:"应用“{0}”中有未提交的表单，是否继续？"},zh_tw:{modal:"對話框中有未提交的表單，是否關閉？ ",app:"應用“{0}”中有未提交的表單，是否繼續？ "},en:{modal:"There is an uncommitted form in the dialog box. Do you want to close?",app:"There are uncommitted forms in the application '{0}'. Do you want to continue?"}};return t.zui.formatString((n[t.zui.clientLang()]||n.en)[e||"page"],i)};if(parent===window)return void(t.apps&&t(window).on("beforeunload",function(i){var n,o;if(t.each(t.apps.openedApps,function(t,e){if(o=e.$iframe&&e.$iframe[0].contentWindow.hasFormChanged())return n=t,!1}),n)return t.apps.open(n),o.addClass("form-unsaved"),setTimeout(function(){o.removeClass("form-unsaved")},5e3),i.preventDefault(),e("app",t.apps.appsMap[n].text)}));var i=t("#main form:not(.not-watch)");if(i.length){i.each(function(){var e=t(this);e.closest('[data-ride="table"]').length||e.data("zui.table")||e.find('[data-ride="table"]').length||e.addClass("form-watched").data("originalFormData",e.serialize())});var n=function(){var i=hasFormChanged();if(i){i.addClass("form-unsaved");var n=!i.closest("body.body-modal").length;if(!confirm(i.data("unsavedTip")||e(n?"app":"modal",n?t.apps.appsMap[t.appCode].text:"")))return setTimeout(function(){i.removeClass("form-unsaved")},5e3),!1;i.removeClass("form-unsaved")}};t(document.body).hasClass("body-modal")?t("body").on("modalhide.zui.modal",n):parent.$.apps&&t(document).on("openapp.apps closeapp.apps",function(t,e,i){if("closeapp"===t.type||i)return n()})}}Array.prototype.includes||Object.defineProperty(Array.prototype,"includes",{value:function(t,e){function i(t,e){return t===e||"number"==typeof t&&"number"==typeof e&&isNaN(t)&&isNaN(e)}if(null==this)throw new TypeError('"this" is null or not defined');var n=Object(this),o=n.length>>>0;if(0===o)return!1;for(var a=0|e,s=Math.max(a>=0?a:o-Math.abs(a),0);s<o;){if(i(n[s],t))return!0;s++}return!1}}),t.getSearchParam=function(t,e){e=void 0===e?window.location.search:e;var i={};return e.length>1&&("?"===e[0]&&(e=e.substr(1)),e.split("&").forEach(function(t){var e=t.split("=",2);if(e.length>1)try{i[e[0]]=decodeURIComponent(e[1])}catch(n){i[e[0]]=""}else i[e[0]]=""})),t?i[t]:i},t.parseLink=function(e){if(!e)return{};var i=e.split("#"),n=i[0].split("?"),o=n[1],a=o?t.getSearchParam("",o):{},s=n[0],r={isOnlyBody:"yes"===a.onlybody,prj:a.PRJ||"",vars:[],hash:i[1]||"",params:a};if("GET"===config.requestType){r.moduleName=a[config.moduleVar],r.methodName=a[config.methodVar],r.viewType=a[config.viewVar]||config.defaultView;for(var l in a)l!==config.moduleVar&&l!==config.methodVar&&l!==config.viewVar&&"onlybody"!==l&&r.vars.push([l,a[l]])}else{var h=s.lastIndexOf("/");h===s.length-1&&(s=s.substr(0,h),h=s.lastIndexOf("/")),h>=0&&(s=s.substr(h+1));var c=s.lastIndexOf(".");c>=0?(r.viewType=s.substr(c+1),s=s.substr(0,c)):r.viewType=config.defaultView;var d=s.split(config.requestFix);if(r.moduleName=d[0],r.methodName=d[1]||"index",d.length>2)for(var u=2;u<d.length;u++)r.vars.push(["",d[u]]),a["$"+(u-1)]=d[u]}return r},window.hasFormChanged=function(e){var i=t(".modal.in iframe");if(i.length)for(var n=0;n<i.length;++n){var o=i[n],a=o.contentWindow.hasFormChanged();if(a)return a}e||(e=".form-watched");var s=t(e);if(!s.length)return!1;for(var n=0;n<s.length;++n){var r=s.eq(n),l=r.data("originalFormData");if(null!==l&&r.hasClass("form-watched")&&!r.hasClass("form-disabled")&&l!==r.serialize())return r}return!1},t(function(){e(),t("#navbar>.nav>li").length>10&&(i(),t(window).on("resize",i)),setTimeout(n,1e3)})}(jQuery),$.zui.lang("de",{"zui.pager":{pageOfText:"Seite {0}",prev:"Zurück",next:"Nächste Seite",first:"Erste Seite",last:"Letzte Seite","goto":"Goto",pageOf:"Seite <strong>{page}</strong>",totalPage:"<strong>{totalPage}</strong> Seiten",totalCount:"Total: <strong>{recTotal}</strong> Artikel",pageSize:"<strong>{recPerPage}</strong> Artikel pro Seite",itemsRange:"Seiten <strong>{start}</strong> bis <strong>{end}</strong>",pageOfTotal:"Seite <strong>{page}</strong>/<strong>{totalPage}</strong>"},"zui.boards":{append2end:"Gehen Sie zum Ende"},"zui.browser":{tip:"Online. Sorgenfrei. Aktualisiere deinen Browser noch heute!"},"zui.calendar":{weekNames:["Son","Mon","Die","Mit","Don","Fri","Sam"],monthNames:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",year:"{0}Jahr",month:"{0}Monat",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Kein Icon]",commonIcons:"Gemeinsame Symbole",webIcons:"Web-Symbol",editorIcons:"Editor-Symbol",directionalIcons:"Pfeil Zusammenfluss",otherIcons:"Andere Symbole"},"zui.colorPicker":{errorTip:"Kein gültiger Farbwert"},"zui.datagrid":{errorCannotGetDataFromRemote:"Daten vom Remote-Server ({0}) können nicht abgerufen werden.",errorCannotHandleRemoteData:"Die vom Remote-Server zurückgegebenen Daten können nicht verarbeitet werden."},"zui.guideViewer":{prevStep:"Vorheriger Schritt",nextStep:"Nächster Schritt"},"zui.tabs":{reload:"Neu laden",close:"Schliessen",closeOthers:"Schließen Sie andere Registerkarten",closeRight:"Schließen Sie die rechte Registerkarte",reopenLast:"Letzten geschlossenen Tab wiederherstellen",errorCannotFetchFromRemote:"Inhalt kann nicht vom Remote-Server abgerufen werden ({0})."},"zui.uploader":{},datetimepicker:{days:["Sonntag","Montag","Diensteg","Mittwoch","Donnerstag","Freitag","Samstag"],daysShort:["Son","Mon","Die","Mit","Don","Fri","Sam"],daysMin:["Son","Mon","Die","Mit","Don","Fri","Sam"],months:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",suffix:[],meridiem:[]},chosen:{no_results_text:"Nicht gefunden"},bootbox:{OK:"OK",CANCEL:"Stornieren",CONFIRM:"Bestätigen"}}),$.zui.lang("fr",{"zui.pager":{pageOfText:"Page {0}",prev:"Prev",next:"Suivant",first:"First",last:"Last","goto":"Goto",pageOf:"Page <strong>{page}</strong>",totalPage:"<strong>{totalPage}</strong> pages",totalCount:"Total: <strong>{recTotal}</strong> items",pageSize:"<strong>{recPerPage}</strong> per page",itemsRange:"De <strong>{start}</strong> à <strong>{end}</strong>",pageOfTotal:"Page <strong>{page}</strong> de <strong>{totalPage}</strong>"},"zui.boards":{append2end:"Aller jusqu'au bout"},"zui.browser":{tip:"Naviguez sans crainte sur Internet. Mettez votre navigateur à jour dès aujourd'hui!"},"zui.calendar":{weekNames:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],monthNames:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",year:"{0} Année",month:"{0} Mois",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Aucune icône]",commonIcons:"Icônes communes",webIcons:"Icône Web",editorIcons:"Icône de l'éditeur",directionalIcons:"Flèche confluence",otherIcons:"Autres icônes"},"zui.colorPicker":{errorTip:"Pas une valeur de couleur valide"},"zui.datagrid":{errorCannotGetDataFromRemote:"Impossible d'obtenir les données du serveur distant ({0}).",errorCannotHandleRemoteData:"Impossible de traiter les données renvoyées par le serveur distant."},"zui.guideViewer":{prevStep:"Étape précédente",nextStep:"Prochaine étape"},"zui.tabs":{reload:"Recharger",close:"Fermer",closeOthers:"Fermez les autres onglets",closeRight:"Fermer l'onglet de droite",reopenLast:"Restaurer le dernier onglet fermé",errorCannotFetchFromRemote:"Impossible d'obtenir le contenu du serveur distant ({0})."},"zui.uploader":{},datetimepicker:{days:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],daysShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],daysMin:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],months:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],monthsShort:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",suffix:[],meridiem:[]},chosen:{no_results_text:"Pas trouvé"},bootbox:{OK:"D'accord",CANCEL:"Annuler",CONFIRM:"Confirmer"}});
diff --git a/www/theme/blackberry/style.css b/www/theme/blackberry/style.css
index 6c12a3bbb1..6294c4fb41 100644
--- a/www/theme/blackberry/style.css
+++ b/www/theme/blackberry/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - blackberry - v1.9.2 - 2021-01-06
+ * ZUI: Zentao Theme - blackberry - v1.9.2 - 2021-03-17
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
- */a{color:#3c4353}a:focus,a:hover{color:#23304d}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#23304d;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#161f31;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:#0b0f18;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:#23304d;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#161f31;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:#0b0f18;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:#23304d;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#23304d;background-color:#ebf1f9;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#23304d;background-color:#ccdbf0;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:#b0c8e7;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:#ebf1f9;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#23304d;background-color:#ccdbf0;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:#b0c8e7;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:#ebf1f9;border-color:transparent}.btn-link{color:#3c4353;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:#23304d}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#23304d}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#131a2a}.label-primary.label-outline{color:#23304d;background:0 0;border:1px solid #23304d}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#131a2a}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#435c93}.text-primary{color:#23304d}.text-primary:hover{color:#131a2a}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#23304d}a.bg-primary:hover{background-color:#131a2a}.hl-primary{background-color:#ebf1f9}a.hl-primary:hover{background-color:#c4d6ed}.progress{background-color:#ebf1f9;border-radius:3px}.progress-bar{color:#fff;background-color:#23304d;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#23304d;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)}.form-control:focus{border-color:#23304d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#23304d;border-color:#23304d}.switch input:focus+label{color:#23304d}.switch input:focus+label:before{border-color:#23304d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #23304d;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #23304d}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#23304d;border-color:#23304d}.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:#23304d;-webkit-box-shadow:0 0 8px #23304d;box-shadow:0 0 8px #23304d}.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:#23304d}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#23304d}.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:#304269}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#ebf1f9}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#23304d;border-color:#23304d}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#304269;border-color:#202c46}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#283758}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#3a4f7e}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#40588c}.navbar-inverse .navbar-toggle{border-color:#40588c}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#283758}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#253351}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#40588c}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#202c46}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#3a4f7e}.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:#40588c}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #40588c;-webkit-box-shadow:inset 0 -1px 0 #202c46;box-shadow:inset 0 -1px 0 #202c46}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#23304d}.nav>li>a:focus,.nav>li>a:hover{color:#23304d}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#23304d}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#23304d;border-color:#23304d}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#23304d;border-bottom-color:#23304d}.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 #cbd0db}.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 #23304d;box-shadow:inset 2px 0 0 #23304d}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#23304d;border-color:#23304d}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#23304d}.panel-primary>.panel-heading{color:#fff;background-color:#23304d;border-color:#23304d}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#23304d}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#23304d}.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:#ebf1f9}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#23304d!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:#23304d!important;border-bottom-left-radius:#23304d!important}.chosen-container .chosen-results li.highlighted{background-color:#23304d!important}.chosen-container-active .chosen-single{border-color:#23304d!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#23304d!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:#23304d!important;border-bottom-left-radius:#23304d!important}.chosen-container.chosen-highlight-selected .result-selected{color:#23304d;background:#ebf1f9}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#23304d;border-color:#23304d}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#23304d}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#23304d}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#23304d}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#23304d!important;border-color:#131a2a!important}.datetimepicker td.day.active:hover{background-color:#131a2a!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#23304d!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important}.ke-menu-item-on{background-color:#23304d!important}.ke-colorpicker-cell-on{background-color:#23304d!important}.ke-input-text:focus{border-color:#23304d!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#23304d}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#ebf1f9}.alert-primary hr{border-top-color:#d0def1}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#23304d;border-color:#23304d}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#ebf1f9}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#23304d}.tree-drag-holder{background-color:#ebf1f9}.tree-menu li.active>a{color:#fff;background-color:#23304d;border-color:#23304d}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#304269}a.text-primary{color:#23304d}.nav-primary>li.active>a{color:#23304d}.nav-primary>li.active>a:hover{color:#23304d}.bg-primary,.m-user-login{background:#304269 -webkit-gradient(linear,right top,left top,from(#23304d),to(#304269))!important;background:#304269 -webkit-linear-gradient(right,#23304d 0,#304269 100%)!important;background:#304269 -o-linear-gradient(right,#23304d 0,#304269 100%)!important;background:#304269 linear-gradient(-90deg,#23304d 0,#304269 100%)!important}.bg-secondary{background:#304269}.alert-info{color:#23304d;background:#ebf1f9}.btn-primary{color:#fff;background-color:#23304d;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(35,48,77,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1b253b;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:#23304d;border-color:transparent}.btn-secondary{color:#fff;background-color:#304269;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(48,66,105,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#283758;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:#304269;border-color:transparent}.btn-info{color:#23304d;background-color:#ebf1f9;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#23304d;background-color:rgba(235,241,249,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#d7e3f3;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(35,48,77,.3);background-color:#ebf1f9;border-color:transparent}.btn-icon-left>.icon{color:#304269;background:#ebf1f9}.btn-active-line{color:#23304d}.btn-active-line:after{border-bottom-color:#23304d}.btn-active-line:hover{color:#23304d}.btn-active-text .text{color:#23304d}.btn-active-text .text:after{border-bottom-color:#23304d}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(35,48,77,.8)}.label-primary{background:#23304d!important}.label-pale{background:#c4d6ed!important}.label-outline.label-primary{background:#ebf1f9!important;border-color:rgba(35,48,77,.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:#23304d;border-color:#23304d}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#23304d;-webkit-box-shadow:0 0 0 3px rgba(35,48,77,.2);box-shadow:0 0 0 3px rgba(35,48,77,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#23304d}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#23304d!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#23304d!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#23304d!important}.panel-actions .btn.text-primary{color:#23304d}.status-bars .bar{background:#23304d}.status-bars-h .bar{background:#23304d}.messagger-zt .messager-content>.icon{color:#23304d}.tree li.active>a{color:#23304d}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#23304d}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#304269}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#ebf1f9}.dropdown-submenu:hover>a:after{border-left-color:#23304d}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#304269}.timeline>li>a:after,.timeline>li>div:after{background-color:#23304d}.timeline>li.active:before{background-color:rgba(35,48,77,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#23304d!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#23304d!important}#mainHeader{background:#304269 -webkit-gradient(linear,right top,left top,from(#23304d),to(#304269));background:#304269 -webkit-linear-gradient(right,#23304d 0,#304269 100%);background:#304269 -o-linear-gradient(right,#23304d 0,#304269 100%);background:#304269 linear-gradient(-90deg,#23304d 0,#304269 100%);background-color:#304269;border-top-color:#23304d;border-bottom-color:#ebf1f9}.header-angle-btn .btn{background-color:#304269}.header-angle-btn .btn::after{border-left-color:#304269}.header-angle-btn .btn:hover,.header-angle-btn.active .btn{background:#202c46}.header-angle-btn .btn:hover::after,.header-angle-btn.active .btn::after{border-left-color:#202c46}.header-angle-btn.active .btn:hover{background:#1d283f}.header-angle-btn.active .btn:hover::after{border-left-color:#1d283f}.header-angle-btn+.header-angle-btn::after,.header-angle-btn+.header-angle-btn::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn+.header-angle-btn::after{border-left-color:#304269}#searchGo{background-color:#304269}#searchGo:hover{background-color:#23304d}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#23304d}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#23304d}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#23304d}.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 #23304d}.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 #23304d}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #23304d}#sidebarHeader .title{color:#23304d}#sidebar>.sidebar-toggle>.icon{background:#506eaf}#main .querybox-toggle.querybox-opened{color:#23304d}#contentNav .nav>li.active>a{color:#23304d}#contentNav .nav>li.active>a:before{background:#23304d}#mainContent .side-col .nav-tabs>li.active>a:before{background:#23304d}td.c-actions .btn{color:#304269}td.c-actions .btn:hover{color:#23304d;background-color:#d7e3f3}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#23304d;background:#ebf1f9}.main-table table .btn-icon-left:hover>.icon{background:#ebf1f9}.main-table tbody>tr:hover{background:#ebf1f9}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#23304d}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f3f6fb}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f3f6fb}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#304269}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#5773b2}.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:#23304d}.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:#23304d}.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:#23304d}.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:#ebf1f9}.table-footer .checkbox-primary.checked label:after{border-color:#23304d!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#334670!important;border-color:#334670!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#23304d}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#23304d;border-color:#23304d}.article-content a{color:#23304d}.article-content a:focus,.article-content a:hover{color:#304269}.list-group{overflow-y:auto}.list-group>a.selected{color:#ebf1f9;background-color:#23304d}.list-group>a.active{color:#23304d;background-color:#ebf1f9}.list-group>a.active:hover,.list-group>a:hover{background-color:#23304d}.release-line>li>a:hover:before{background-color:#ebf1f9}.release-line>li>a:hover .title{color:#23304d}.release-line>li.active>a:before{border-color:#23304d}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#304269}#poweredBy .icon-zentao{color:#304269}#poweredBy a:hover{color:#23304d}#poweredBy a:hover .icon-zentao{color:#23304d}#poweredBy a.text-primary{color:#23304d}#poweredBy a.text-primary:hover{color:#304269}.block-statistic .nav-secondary>li.active>a:before{background:#23304d!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#304269!important}.dynamic.active .dynamic-date:before{background-color:#304269!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:#23304d!important}.table td.has-child>.task-toggle:hover{color:#23304d!important}#openTaskPage.open:hover,#task .task-nav{color:#23304d!important;background:#ebf1f9!important}#tasksProgress>.progress-bar{background:#23304d!important}#tasksProgress .progress-text{color:#23304d!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#23304d!important;background:#ebf1f9!important;border-left-color:#23304d!important;-webkit-box-shadow:inset 4px 0 0 #23304d!important;box-shadow:inset 4px 0 0 #23304d!important}#copyProjectModal a:hover{border-color:#304269!important}#zeroTaskStory.checked{background:#ebf1f9!important;border-color:#304269!important}.cols-list .col:hover{background:#ebf1f9!important}.files-grid .actions,.files-grid .col:hover .file{background:#ebf1f9!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:#23304d!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#304269!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#23304d!important}#bars>li.active:after{background:#ebf1f9!important}
\ No newline at end of file
+ */a{color:#3c4353}a:focus,a:hover{color:#23304d}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#23304d;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#161f31;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:#0b0f18;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:#23304d;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#161f31;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:#0b0f18;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:#23304d;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#23304d;background-color:#ebf1f9;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#23304d;background-color:#ccdbf0;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:#b0c8e7;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:#ebf1f9;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#23304d;background-color:#ccdbf0;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:#b0c8e7;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:#ebf1f9;border-color:transparent}.btn-link{color:#3c4353;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:#23304d}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#23304d}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#131a2a}.label-primary.label-outline{color:#23304d;background:0 0;border:1px solid #23304d}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#131a2a}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#435c93}.text-primary{color:#23304d}.text-primary:hover{color:#131a2a}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#23304d}a.bg-primary:hover{background-color:#131a2a}.hl-primary{background-color:#ebf1f9}a.hl-primary:hover{background-color:#c4d6ed}.progress{background-color:#ebf1f9;border-radius:3px}.progress-bar{color:#fff;background-color:#23304d;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#23304d;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)}.form-control:focus{border-color:#23304d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#23304d;border-color:#23304d}.switch input:focus+label{color:#23304d}.switch input:focus+label:before{border-color:#23304d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #23304d;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #23304d}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#23304d;border-color:#23304d}.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:#23304d;-webkit-box-shadow:0 0 8px #23304d;box-shadow:0 0 8px #23304d}.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:#23304d}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#23304d}.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:#304269}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#ebf1f9}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#23304d;border-color:#23304d}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#304269;border-color:#202c46}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#283758}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#3a4f7e}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#40588c}.navbar-inverse .navbar-toggle{border-color:#40588c}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#283758}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#253351}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#40588c}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#202c46}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#3a4f7e}.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:#40588c}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #40588c;-webkit-box-shadow:inset 0 -1px 0 #202c46;box-shadow:inset 0 -1px 0 #202c46}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#23304d}.nav>li>a:focus,.nav>li>a:hover{color:#23304d}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#23304d}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#23304d;border-color:#23304d}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#23304d;border-bottom-color:#23304d}.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 #cbd0db}.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 #23304d;box-shadow:inset 2px 0 0 #23304d}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#23304d;border-color:#23304d}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#23304d}.panel-primary>.panel-heading{color:#fff;background-color:#23304d;border-color:#23304d}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#23304d}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#23304d}.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:#ebf1f9}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#23304d!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:#23304d!important;border-bottom-left-radius:#23304d!important}.chosen-container .chosen-results li.highlighted{background-color:#23304d!important}.chosen-container-active .chosen-single{border-color:#23304d!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#23304d!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:#23304d!important;border-bottom-left-radius:#23304d!important}.chosen-container.chosen-highlight-selected .result-selected{color:#23304d;background:#ebf1f9}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#23304d;border-color:#23304d}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#23304d}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#23304d}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#23304d}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#23304d!important;border-color:#131a2a!important}.datetimepicker td.day.active:hover{background-color:#131a2a!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#23304d!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important}.ke-menu-item-on{background-color:#23304d!important}.ke-colorpicker-cell-on{background-color:#23304d!important}.ke-input-text:focus{border-color:#23304d!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(35,48,77,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#23304d}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#ebf1f9}.alert-primary hr{border-top-color:#d0def1}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#23304d;border-color:#23304d}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#ebf1f9}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#23304d}.tree-drag-holder{background-color:#ebf1f9}.tree-menu li.active>a{color:#fff;background-color:#23304d;border-color:#23304d}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#304269}a.text-primary{color:#23304d}.nav-primary>li.active>a{color:#23304d}.nav-primary>li.active>a:hover{color:#23304d}.bg-primary,.m-user-login{background:#304269 -webkit-gradient(linear,right top,left top,from(#23304d),to(#304269))!important;background:#304269 -webkit-linear-gradient(right,#23304d 0,#304269 100%)!important;background:#304269 -o-linear-gradient(right,#23304d 0,#304269 100%)!important;background:#304269 linear-gradient(-90deg,#23304d 0,#304269 100%)!important}.bg-secondary{background:#304269}.alert-info{color:#23304d;background:#ebf1f9}.btn-primary{color:#fff;background-color:#23304d;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(35,48,77,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1b253b;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:#23304d;border-color:transparent}.btn-secondary{color:#fff;background-color:#304269;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(48,66,105,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#283758;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:#304269;border-color:transparent}.btn-info{color:#23304d;background-color:#ebf1f9;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#23304d;background-color:rgba(235,241,249,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#d7e3f3;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(35,48,77,.3);background-color:#ebf1f9;border-color:transparent}.btn-icon-left>.icon{color:#304269;background:#ebf1f9}.btn-active-line{color:#23304d}.btn-active-line:after{border-bottom-color:#23304d}.btn-active-line:hover{color:#23304d}.btn-active-text .text{color:#23304d}.btn-active-text .text:after{border-bottom-color:#23304d}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(35,48,77,.8)}.label-primary{background:#23304d!important}.label-pale{background:#c4d6ed!important}.label-outline.label-primary{background:#ebf1f9!important;border-color:rgba(35,48,77,.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:#23304d;border-color:#23304d}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#23304d;-webkit-box-shadow:0 0 0 3px rgba(35,48,77,.2);box-shadow:0 0 0 3px rgba(35,48,77,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#23304d}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#23304d!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#23304d!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#23304d!important}.panel-actions .btn.text-primary{color:#23304d}.status-bars .bar{background:#23304d}.status-bars-h .bar{background:#23304d}.messagger-zt .messager-content>.icon{color:#23304d}.tree li.active>a{color:#23304d}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#23304d}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#304269}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#ebf1f9}.dropdown-submenu:hover>a:after{border-left-color:#23304d}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#304269}.timeline>li>a:after,.timeline>li>div:after{background-color:#23304d}.timeline>li.active:before{background-color:rgba(35,48,77,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#23304d!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#23304d!important}#mainHeader{background:#304269 -webkit-gradient(linear,right top,left top,from(#23304d),to(#304269));background:#304269 -webkit-linear-gradient(right,#23304d 0,#304269 100%);background:#304269 -o-linear-gradient(right,#23304d 0,#304269 100%);background:#304269 linear-gradient(-90deg,#23304d 0,#304269 100%);background-color:#304269;border-top-color:#23304d;border-bottom-color:#ebf1f9}#searchGo{background-color:#304269}#searchGo:hover{background-color:#23304d}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#23304d}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#23304d}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#23304d}.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 #23304d}.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 #23304d}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #23304d}#sidebarHeader .title{color:#23304d}#sidebar>.sidebar-toggle>.icon{background:#506eaf}#main .querybox-toggle.querybox-opened{color:#23304d}#contentNav .nav>li.active>a{color:#23304d}#contentNav .nav>li.active>a:before{background:#23304d}#mainContent .side-col .nav-tabs>li.active>a:before{background:#23304d}td.c-actions .btn{color:#304269}td.c-actions .btn:hover{color:#23304d;background-color:#d7e3f3}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#23304d;background:#ebf1f9}.main-table table .btn-icon-left:hover>.icon{background:#ebf1f9}.main-table tbody>tr:hover{background:#ebf1f9}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#23304d}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f3f6fb}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f3f6fb}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#304269}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#5773b2}.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:#23304d}.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:#23304d}.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:#23304d}.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:#ebf1f9}.table-footer .checkbox-primary.checked label:after{border-color:#23304d!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#334670!important;border-color:#334670!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#23304d}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#23304d;border-color:#23304d}.article-content a{color:#23304d}.article-content a:focus,.article-content a:hover{color:#304269}.list-group{overflow-y:auto}.list-group>a.selected{color:#ebf1f9;background-color:#23304d}.list-group>a.active{color:#23304d;background-color:#ebf1f9}.list-group>a.active:hover,.list-group>a:hover{background-color:#23304d}.release-line>li>a:hover:before{background-color:#ebf1f9}.release-line>li>a:hover .title{color:#23304d}.release-line>li.active>a:before{border-color:#23304d}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#304269}#poweredBy .icon-zentao{color:#304269}#poweredBy a:hover{color:#23304d}#poweredBy a:hover .icon-zentao{color:#23304d}#poweredBy a.text-primary{color:#23304d}#poweredBy a.text-primary:hover{color:#304269}.block-statistic .nav-secondary>li.active>a:before{background:#23304d!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#304269!important}.dynamic.active .dynamic-date:before{background-color:#304269!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:#23304d!important}.table td.has-child>.task-toggle:hover{color:#23304d!important}#openTaskPage.open:hover,#task .task-nav{color:#23304d!important;background:#ebf1f9!important}#tasksProgress>.progress-bar{background:#23304d!important}#tasksProgress .progress-text{color:#23304d!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#23304d!important;background:#ebf1f9!important;border-left-color:#23304d!important;-webkit-box-shadow:inset 4px 0 0 #23304d!important;box-shadow:inset 4px 0 0 #23304d!important}#copyProjectModal a:hover{border-color:#304269!important}#zeroTaskStory.checked{background:#ebf1f9!important;border-color:#304269!important}.cols-list .col:hover{background:#ebf1f9!important}.files-grid .actions,.files-grid .col:hover .file{background:#ebf1f9!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:#23304d!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#304269!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#23304d!important}#bars>li.active:after{background:#ebf1f9!important}
\ No newline at end of file
diff --git a/www/theme/classic/style.css b/www/theme/classic/style.css
index 4d8b174812..8160b379d6 100644
--- a/www/theme/classic/style.css
+++ b/www/theme/classic/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - classic - v1.9.2 - 2021-01-06
+ * ZUI: Zentao Theme - classic - v1.9.2 - 2021-03-17
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
- */a{color:#3c4353}a:focus,a:hover{color:#036}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:0}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#036;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#001f3d;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:#000d1a;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:#036;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#001f3d;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:#000d1a;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:#036;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#036;background-color:#edf3fe;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#036;background-color:#c6d9fc;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:#a5c3fa;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:#edf3fe;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#036;background-color:#c6d9fc;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:#a5c3fa;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:#edf3fe;border-color:transparent}.btn-link{color:#3c4353;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:#036}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:0}.label{border-radius:0}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#036}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#001933}.label-primary.label-outline{color:#036;background:0 0;border:1px solid #036}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#001933}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#06c}.text-primary{color:#036}.text-primary:hover{color:#001933}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#036}a.bg-primary:hover{background-color:#001933}.hl-primary{background-color:#edf3fe}a.hl-primary:hover{background-color:#bdd3fb}.progress{background-color:#edf3fe;border-radius:3px}.progress-bar{color:#fff;background-color:#036;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#036;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)}.form-control:focus{border-color:#036;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:0}.switch>input:checked+label:before{background-color:#036;border-color:#036}.switch input:focus+label{color:#036}.switch input:focus+label:before{border-color:#036;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #036;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #036}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#036;border-color:#036}.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:#036;-webkit-box-shadow:0 0 8px #036;box-shadow:0 0 8px #036}.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:#036}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#036}.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:#114f8e}.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:0;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:0}.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:0}.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 #cbd0db}.list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}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:#3c4353;text-decoration:none;background-color:#edf3fe}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#036;border-color:#036}.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:#3c495c}.navbar-toggle{border-radius:0}@media (min-width:768px){.navbar{border-radius:0}}.navbar-inverse{background-color:#114f8e;border-color:#0c3660}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#0e4277}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#145ea9}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#1668bc}.navbar-inverse .navbar-toggle{border-color:#1668bc}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#0e4277}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#0d3d6e}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#1668bc}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#0c3660}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#145ea9}.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:#1668bc}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #1668bc;-webkit-box-shadow:inset 0 -1px 0 #0c3660;box-shadow:inset 0 -1px 0 #0c3660}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#0d3b6a}.nav>li>a:focus,.nav>li>a:hover{color:#036}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#036}.nav-primary>li:first-child>a{border-top-left-radius:0;border-bottom-left-radius:0}.nav-primary>li:last-child>a{border-top-right-radius:0;border-bottom-right-radius:0}.nav-primary>li>a{border:1px solid #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#036;border-color:#036}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#036;border-bottom-color:#036}.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:0;border-top-right-radius:0}.nav-stacked.nav-primary>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li.nav-heading{background-color:#f1f1f1;border:1px solid #cbd0db}.nav-stacked.nav-secondary>li>a{border-top-right-radius:0;border-bottom-right-radius:0;-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 #036;box-shadow:inset 2px 0 0 #036}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.nav-tabs>li>a{border-radius:0}.pager{border-radius:0}.pager>li>a,.pager>li>span{background-color:#fff;border:1px solid #cbd0db}.pager>li:first-child>a,.pager>li:first-child>span{border-top-left-radius:0;border-bottom-left-radius:0}.pager>li:last-child>a,.pager>li:last-child>span{border-top-right-radius:0;border-bottom-right-radius:0}.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:#036;border-color:#036}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.panel{border-radius:0}.panel>.panel-heading{background-image:none;border-top-left-radius:0;border-top-right-radius:0}.panel-group .panel{border-radius:0}.dashboard .panel{-webkit-box-shadow:none;box-shadow:none}.panel-primary{border-color:#036}.panel-primary>.panel-heading{color:#fff;background-color:#036;border-color:#036}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#036}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#036}.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:#edf3fe}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#036!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:#036!important;border-bottom-left-radius:#036!important}.chosen-container .chosen-results li.highlighted{background-color:#036!important}.chosen-container-active .chosen-single{border-color:#036!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#036!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:#036!important;border-bottom-left-radius:#036!important}.chosen-container.chosen-highlight-selected .result-selected{color:#036;background:#edf3fe}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#036;border-color:#036}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0;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:0;border-bottom-left-radius:0}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0}.menu>.nav>li.show>a,.menu>.nav>li.show>a:focus,.menu>.nav>li.show>a:hover{color:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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:0;border-bottom-left-radius:0}.menu>.nav>li.nav-heading{background-color:#f1f1f1;border:1px solid #cbd0db}.dropdown-menu{border-radius:0}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#036}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#036}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#036}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#036!important;border-color:#001933!important}.datetimepicker td.day.active:hover{background-color:#001933!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:0!important}.ke-container.focus{border-color:#036!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important}.ke-menu-item-on{background-color:#036!important}.ke-colorpicker-cell-on{background-color:#036!important}.ke-input-text:focus{border-color:#036!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important}.messager{border-radius:0}.messager-primary{background-color:#036}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:0}.alert-primary{color:#313744;background-color:#edf3fe}.alert-primary hr{border-top-color:#cbdcfc}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#036;border-color:#036}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.25)}.alert-primary-inverse .alert-link{color:rgba(255,255,255,.8)}.modal-dialog{border-radius:0}.card{border-radius:0;-webkit-box-shadow:none;box-shadow:none}pre{border-radius:0}.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:#edf3fe}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#036}.tree-drag-holder{background-color:#edf3fe}.tree-menu li.active>a{color:#fff;background-color:#036;border-color:#036}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#114f8e}a.text-primary{color:#036}.nav-primary>li.active>a{color:#036}.nav-primary>li.active>a:hover{color:#036}.bg-primary,.m-user-login{background:#114f8e -webkit-gradient(linear,right top,left top,from(#036),to(#114f8e))!important;background:#114f8e -webkit-linear-gradient(right,#036 0,#114f8e 100%)!important;background:#114f8e -o-linear-gradient(right,#036 0,#114f8e 100%)!important;background:#114f8e linear-gradient(-90deg,#036 0,#114f8e 100%)!important}.bg-secondary{background:#114f8e}.alert-info{color:#036;background:#edf3fe}.btn-primary{color:#fff;background-color:#036;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(0,51,102,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#00264d;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:#036;border-color:transparent}.btn-secondary{color:#fff;background-color:#114f8e;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(17,79,142,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#0e4277;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:#114f8e;border-color:transparent}.btn-info{color:#036;background-color:#edf3fe;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#036;background-color:rgba(237,243,254,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#d5e3fd;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(0,51,102,.3);background-color:#edf3fe;border-color:transparent}.btn-icon-left>.icon{color:#114f8e;background:#edf3fe}.btn-active-line{color:#036}.btn-active-line:after{border-bottom-color:#036}.btn-active-line:hover{color:#036}.btn-active-text .text{color:#036}.btn-active-text .text:after{border-bottom-color:#036}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(0,51,102,.8)}.label-primary{background:#036!important}.label-pale{background:#bdd3fb!important}.label-outline.label-primary{background:#edf3fe!important;border-color:rgba(0,51,102,.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:#114f8e;border-color:#114f8e}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#114f8e;-webkit-box-shadow:0 0 0 3px rgba(17,79,142,.2);box-shadow:0 0 0 3px rgba(17,79,142,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#114f8e}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#114f8e!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#114f8e!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#114f8e!important}.panel-actions .btn.text-primary{color:#036}.status-bars .bar{background:#036}.status-bars-h .bar{background:#036}.messagger-zt .messager-content>.icon{color:#036}.tree li.active>a{color:#036}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#036}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#114f8e}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#edf3fe}.dropdown-submenu:hover>a:after{border-left-color:#036}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#114f8e}.timeline>li>a:after,.timeline>li>div:after{background-color:#036}.timeline>li.active:before{background-color:rgba(0,51,102,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#036!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#036!important}#mainHeader{background:#114f8e -webkit-gradient(linear,right top,left top,from(#036),to(#114f8e));background:#114f8e -webkit-linear-gradient(right,#036 0,#114f8e 100%);background:#114f8e -o-linear-gradient(right,#036 0,#114f8e 100%);background:#114f8e linear-gradient(-90deg,#036 0,#114f8e 100%);background-color:#114f8e;border-top-color:#036;border-bottom-color:#edf3fe}.header-angle-btn .btn{background-color:#114f8e}.header-angle-btn .btn::after{border-left-color:#114f8e}.header-angle-btn .btn:hover,.header-angle-btn.active .btn{background:#0c3660}.header-angle-btn .btn:hover::after,.header-angle-btn.active .btn::after{border-left-color:#0c3660}.header-angle-btn.active .btn:hover{background:#0a3157}.header-angle-btn.active .btn:hover::after{border-left-color:#0a3157}.header-angle-btn+.header-angle-btn::after,.header-angle-btn+.header-angle-btn::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn+.header-angle-btn::after{border-left-color:#114f8e}#searchGo{background-color:#114f8e}#searchGo:hover{background-color:#036}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#036}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#036}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#036}.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 #036}.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 #036}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #036}#sidebarHeader .title{color:#036}#sidebar>.sidebar-toggle>.icon{background:#2182e4}#main .querybox-toggle.querybox-opened{color:#036}#contentNav .nav>li.active>a{color:#036}#contentNav .nav>li.active>a:before{background:#036}#mainContent .side-col .nav-tabs>li.active>a:before{background:#036}td.c-actions .btn{color:#114f8e}td.c-actions .btn:hover{color:#036;background-color:#d5e3fd}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#036;background:#edf3fe}.main-table table .btn-icon-left:hover>.icon{background:#edf3fe}.main-table tbody>tr:hover{background:#edf3fe}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#036}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f7f9ff}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f7f9ff}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#03c}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#551a8b}.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:#1a53ff}.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:#036}.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:#036}.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:#edf3fe}.table-footer .checkbox-primary.checked label:after{border-color:#114f8e!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#1668bc!important;border-color:#1668bc!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#036}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#036;border-color:#036}.article-content a{color:#036}.article-content a:focus,.article-content a:hover{color:#114f8e}.list-group{overflow-y:auto}.list-group>a.selected{color:#edf3fe;background-color:#036}.list-group>a.active{color:#036;background-color:#edf3fe}.list-group>a.active:hover,.list-group>a:hover{background-color:#036}.release-line>li>a:hover:before{background-color:#edf3fe}.release-line>li>a:hover .title{color:#036}.release-line>li.active>a:before{border-color:#036}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#114f8e}#poweredBy .icon-zentao{color:#114f8e}#poweredBy a:hover{color:#036}#poweredBy a:hover .icon-zentao{color:#036}#poweredBy a.text-primary{color:#036}#poweredBy a.text-primary:hover{color:#114f8e}.block-statistic .nav-secondary>li.active>a:before{background:#036!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#114f8e!important}.dynamic.active .dynamic-date:before{background-color:#114f8e!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:#036!important}.table td.has-child>.task-toggle:hover{color:#036!important}#openTaskPage.open:hover,#task .task-nav{color:#036!important;background:#edf3fe!important}#tasksProgress>.progress-bar{background:#036!important}#tasksProgress .progress-text{color:#036!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#036!important;background:#edf3fe!important;border-left-color:#036!important;-webkit-box-shadow:inset 4px 0 0 #036!important;box-shadow:inset 4px 0 0 #036!important}#copyProjectModal a:hover{border-color:#114f8e!important}#zeroTaskStory.checked{background:#edf3fe!important;border-color:#114f8e!important}.cols-list .col:hover{background:#edf3fe!important}.files-grid .actions,.files-grid .col:hover .file{background:#edf3fe!important}.dashboard .panel,.panel-default{-webkit-box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06);box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06)}#menu .nav>li.active>a{background:#036!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#114f8e!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#036!important}#bars>li.active:after{background:#edf3fe!important}#loginPanel,#productsBox .product,#sidebarHeader,#task .task-desc>ul>li[data-target]:after,.avatar,.block-todoes .todoes-form,.btn,.btn>.label-icon,.cell,.checkbox-primary>label:after,.chosen-container .chosen-results>li,.chosen-container-multi .chosen-choices li.search-choice,.chosen-container-single .chosen-drop,.chosen-container-single .chosen-search input[type=text],.datetimepicker td,.datetimepicker th,.dropdown-menu,.dropdown-menu>li>a,.files-grid .actions,.files-grid .file,.form-control,.ke-container,.list-group>a,.main-actions .btn-toolbar,.main-content,.main-table,.main-table tbody>tr.checked.row-check-begin>td:first-child:before,.main-table tbody>tr.checked.row-check-end>td:first-child:before,.modal-dialog,.modal-iframe .modal-body>iframe,.nav>li>a,.panel,.progress,.progress-bar,.radio-primary>label:after,.search-box-circle .input-control-icon-left,.search-box-circle .input-control-icon-right,.search-box-circle>.form-control,.table,.table-footer{border-radius:0!important}#header,#mainMenu+#mainContent.main-row .cell,#sidebarHeader,.cell,.main-content,.main-table>.table,.main-table>.table-footer,.main-table>.table-header,.main-table>.table-responsive,.panel{-webkit-box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06);box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06)}#footer{border-top-color:transparent;-webkit-box-shadow:0 -1px 3px 0 rgba(0,0,0,.08),0 -1px 1px 0 rgba(0,0,0,.05),0 -2px 1px -1px rgba(0,0,0,.06);box-shadow:0 -1px 3px 0 rgba(0,0,0,.08),0 -1px 1px 0 rgba(0,0,0,.05),0 -2px 1px -1px rgba(0,0,0,.06)}.block-statistic .nav-stacked,.main-table thead>tr>th,.table-footer{border-color:#e5e5e5;border-top-width:1px;border-bottom-width:1px}td.c-actions .btn{opacity:.85}td.c-actions .btn:hover{opacity:1}.main-table tbody>tr.checked{background:#fff3e0;-webkit-box-shadow:none!important;box-shadow:none!important}.main-table tbody>tr.checked:hover{background:#ffe9c6}.main-table td.c-actions .btn.disabled{opacity:.5}
\ No newline at end of file
+ */a{color:#3c4353}a:focus,a:hover{color:#036}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:0}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#036;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#001f3d;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:#000d1a;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:#036;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#001f3d;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:#000d1a;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:#036;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#036;background-color:#edf3fe;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#036;background-color:#c6d9fc;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:#a5c3fa;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:#edf3fe;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#036;background-color:#c6d9fc;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:#a5c3fa;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:#edf3fe;border-color:transparent}.btn-link{color:#3c4353;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:#036}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:0}.label{border-radius:0}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#036}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#001933}.label-primary.label-outline{color:#036;background:0 0;border:1px solid #036}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#001933}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#06c}.text-primary{color:#036}.text-primary:hover{color:#001933}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#036}a.bg-primary:hover{background-color:#001933}.hl-primary{background-color:#edf3fe}a.hl-primary:hover{background-color:#bdd3fb}.progress{background-color:#edf3fe;border-radius:3px}.progress-bar{color:#fff;background-color:#036;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#036;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)}.form-control:focus{border-color:#036;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:0}.switch>input:checked+label:before{background-color:#036;border-color:#036}.switch input:focus+label{color:#036}.switch input:focus+label:before{border-color:#036;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #036;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #036}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#036;border-color:#036}.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:#036;-webkit-box-shadow:0 0 8px #036;box-shadow:0 0 8px #036}.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:#036}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#036}.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:#114f8e}.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:0;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:0}.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:0}.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 #cbd0db}.list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}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:#3c4353;text-decoration:none;background-color:#edf3fe}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#036;border-color:#036}.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:#3c495c}.navbar-toggle{border-radius:0}@media (min-width:768px){.navbar{border-radius:0}}.navbar-inverse{background-color:#114f8e;border-color:#0c3660}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#0e4277}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#145ea9}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#1668bc}.navbar-inverse .navbar-toggle{border-color:#1668bc}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#0e4277}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#0d3d6e}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#1668bc}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#0c3660}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#145ea9}.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:#1668bc}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #1668bc;-webkit-box-shadow:inset 0 -1px 0 #0c3660;box-shadow:inset 0 -1px 0 #0c3660}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#0d3b6a}.nav>li>a:focus,.nav>li>a:hover{color:#036}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#036}.nav-primary>li:first-child>a{border-top-left-radius:0;border-bottom-left-radius:0}.nav-primary>li:last-child>a{border-top-right-radius:0;border-bottom-right-radius:0}.nav-primary>li>a{border:1px solid #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#036;border-color:#036}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#036;border-bottom-color:#036}.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:0;border-top-right-radius:0}.nav-stacked.nav-primary>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li.nav-heading{background-color:#f1f1f1;border:1px solid #cbd0db}.nav-stacked.nav-secondary>li>a{border-top-right-radius:0;border-bottom-right-radius:0;-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 #036;box-shadow:inset 2px 0 0 #036}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.nav-tabs>li>a{border-radius:0}.pager{border-radius:0}.pager>li>a,.pager>li>span{background-color:#fff;border:1px solid #cbd0db}.pager>li:first-child>a,.pager>li:first-child>span{border-top-left-radius:0;border-bottom-left-radius:0}.pager>li:last-child>a,.pager>li:last-child>span{border-top-right-radius:0;border-bottom-right-radius:0}.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:#036;border-color:#036}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.panel{border-radius:0}.panel>.panel-heading{background-image:none;border-top-left-radius:0;border-top-right-radius:0}.panel-group .panel{border-radius:0}.dashboard .panel{-webkit-box-shadow:none;box-shadow:none}.panel-primary{border-color:#036}.panel-primary>.panel-heading{color:#fff;background-color:#036;border-color:#036}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#036}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#036}.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:#edf3fe}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#036!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:#036!important;border-bottom-left-radius:#036!important}.chosen-container .chosen-results li.highlighted{background-color:#036!important}.chosen-container-active .chosen-single{border-color:#036!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#036!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:#036!important;border-bottom-left-radius:#036!important}.chosen-container.chosen-highlight-selected .result-selected{color:#036;background:#edf3fe}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#036;border-color:#036}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0;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:0;border-bottom-left-radius:0}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0}.menu>.nav>li.show>a,.menu>.nav>li.show>a:focus,.menu>.nav>li.show>a:hover{color:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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:0;border-bottom-left-radius:0}.menu>.nav>li.nav-heading{background-color:#f1f1f1;border:1px solid #cbd0db}.dropdown-menu{border-radius:0}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#036}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#036}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#036}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#036!important;border-color:#001933!important}.datetimepicker td.day.active:hover{background-color:#001933!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:0!important}.ke-container.focus{border-color:#036!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important}.ke-menu-item-on{background-color:#036!important}.ke-colorpicker-cell-on{background-color:#036!important}.ke-input-text:focus{border-color:#036!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,51,102,.6)!important}.messager{border-radius:0}.messager-primary{background-color:#036}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:0}.alert-primary{color:#313744;background-color:#edf3fe}.alert-primary hr{border-top-color:#cbdcfc}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#036;border-color:#036}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.25)}.alert-primary-inverse .alert-link{color:rgba(255,255,255,.8)}.modal-dialog{border-radius:0}.card{border-radius:0;-webkit-box-shadow:none;box-shadow:none}pre{border-radius:0}.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:#edf3fe}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#036}.tree-drag-holder{background-color:#edf3fe}.tree-menu li.active>a{color:#fff;background-color:#036;border-color:#036}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#114f8e}a.text-primary{color:#036}.nav-primary>li.active>a{color:#036}.nav-primary>li.active>a:hover{color:#036}.bg-primary,.m-user-login{background:#114f8e -webkit-gradient(linear,right top,left top,from(#036),to(#114f8e))!important;background:#114f8e -webkit-linear-gradient(right,#036 0,#114f8e 100%)!important;background:#114f8e -o-linear-gradient(right,#036 0,#114f8e 100%)!important;background:#114f8e linear-gradient(-90deg,#036 0,#114f8e 100%)!important}.bg-secondary{background:#114f8e}.alert-info{color:#036;background:#edf3fe}.btn-primary{color:#fff;background-color:#036;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(0,51,102,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#00264d;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:#036;border-color:transparent}.btn-secondary{color:#fff;background-color:#114f8e;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(17,79,142,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#0e4277;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:#114f8e;border-color:transparent}.btn-info{color:#036;background-color:#edf3fe;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#036;background-color:rgba(237,243,254,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#d5e3fd;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(0,51,102,.3);background-color:#edf3fe;border-color:transparent}.btn-icon-left>.icon{color:#114f8e;background:#edf3fe}.btn-active-line{color:#036}.btn-active-line:after{border-bottom-color:#036}.btn-active-line:hover{color:#036}.btn-active-text .text{color:#036}.btn-active-text .text:after{border-bottom-color:#036}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(0,51,102,.8)}.label-primary{background:#036!important}.label-pale{background:#bdd3fb!important}.label-outline.label-primary{background:#edf3fe!important;border-color:rgba(0,51,102,.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:#114f8e;border-color:#114f8e}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#114f8e;-webkit-box-shadow:0 0 0 3px rgba(17,79,142,.2);box-shadow:0 0 0 3px rgba(17,79,142,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#114f8e}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#114f8e!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#114f8e!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#114f8e!important}.panel-actions .btn.text-primary{color:#036}.status-bars .bar{background:#036}.status-bars-h .bar{background:#036}.messagger-zt .messager-content>.icon{color:#036}.tree li.active>a{color:#036}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#036}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#114f8e}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#edf3fe}.dropdown-submenu:hover>a:after{border-left-color:#036}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#114f8e}.timeline>li>a:after,.timeline>li>div:after{background-color:#036}.timeline>li.active:before{background-color:rgba(0,51,102,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#036!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#036!important}#mainHeader{background:#114f8e -webkit-gradient(linear,right top,left top,from(#036),to(#114f8e));background:#114f8e -webkit-linear-gradient(right,#036 0,#114f8e 100%);background:#114f8e -o-linear-gradient(right,#036 0,#114f8e 100%);background:#114f8e linear-gradient(-90deg,#036 0,#114f8e 100%);background-color:#114f8e;border-top-color:#036;border-bottom-color:#edf3fe}#searchGo{background-color:#114f8e}#searchGo:hover{background-color:#036}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#036}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#036}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#036}.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 #036}.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 #036}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #036}#sidebarHeader .title{color:#036}#sidebar>.sidebar-toggle>.icon{background:#2182e4}#main .querybox-toggle.querybox-opened{color:#036}#contentNav .nav>li.active>a{color:#036}#contentNav .nav>li.active>a:before{background:#036}#mainContent .side-col .nav-tabs>li.active>a:before{background:#036}td.c-actions .btn{color:#114f8e}td.c-actions .btn:hover{color:#036;background-color:#d5e3fd}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#036;background:#edf3fe}.main-table table .btn-icon-left:hover>.icon{background:#edf3fe}.main-table tbody>tr:hover{background:#edf3fe}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#036}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f7f9ff}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f7f9ff}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#03c}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#551a8b}.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:#1a53ff}.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:#036}.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:#036}.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:#edf3fe}.table-footer .checkbox-primary.checked label:after{border-color:#114f8e!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#1668bc!important;border-color:#1668bc!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#036}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#036;border-color:#036}.article-content a{color:#036}.article-content a:focus,.article-content a:hover{color:#114f8e}.list-group{overflow-y:auto}.list-group>a.selected{color:#edf3fe;background-color:#036}.list-group>a.active{color:#036;background-color:#edf3fe}.list-group>a.active:hover,.list-group>a:hover{background-color:#036}.release-line>li>a:hover:before{background-color:#edf3fe}.release-line>li>a:hover .title{color:#036}.release-line>li.active>a:before{border-color:#036}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#114f8e}#poweredBy .icon-zentao{color:#114f8e}#poweredBy a:hover{color:#036}#poweredBy a:hover .icon-zentao{color:#036}#poweredBy a.text-primary{color:#036}#poweredBy a.text-primary:hover{color:#114f8e}.block-statistic .nav-secondary>li.active>a:before{background:#036!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#114f8e!important}.dynamic.active .dynamic-date:before{background-color:#114f8e!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:#036!important}.table td.has-child>.task-toggle:hover{color:#036!important}#openTaskPage.open:hover,#task .task-nav{color:#036!important;background:#edf3fe!important}#tasksProgress>.progress-bar{background:#036!important}#tasksProgress .progress-text{color:#036!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#036!important;background:#edf3fe!important;border-left-color:#036!important;-webkit-box-shadow:inset 4px 0 0 #036!important;box-shadow:inset 4px 0 0 #036!important}#copyProjectModal a:hover{border-color:#114f8e!important}#zeroTaskStory.checked{background:#edf3fe!important;border-color:#114f8e!important}.cols-list .col:hover{background:#edf3fe!important}.files-grid .actions,.files-grid .col:hover .file{background:#edf3fe!important}.dashboard .panel,.panel-default{-webkit-box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06);box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06)}#menu .nav>li.active>a{background:#036!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#114f8e!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#036!important}#bars>li.active:after{background:#edf3fe!important}#loginPanel,#productsBox .product,#sidebarHeader,#task .task-desc>ul>li[data-target]:after,.avatar,.block-todoes .todoes-form,.btn,.btn>.label-icon,.cell,.checkbox-primary>label:after,.chosen-container .chosen-results>li,.chosen-container-multi .chosen-choices li.search-choice,.chosen-container-single .chosen-drop,.chosen-container-single .chosen-search input[type=text],.datetimepicker td,.datetimepicker th,.dropdown-menu,.dropdown-menu>li>a,.files-grid .actions,.files-grid .file,.form-control,.ke-container,.list-group>a,.main-actions .btn-toolbar,.main-content,.main-table,.main-table tbody>tr.checked.row-check-begin>td:first-child:before,.main-table tbody>tr.checked.row-check-end>td:first-child:before,.modal-dialog,.modal-iframe .modal-body>iframe,.nav>li>a,.panel,.progress,.progress-bar,.radio-primary>label:after,.search-box-circle .input-control-icon-left,.search-box-circle .input-control-icon-right,.search-box-circle>.form-control,.table,.table-footer{border-radius:0!important}#header,#mainMenu+#mainContent.main-row .cell,#sidebarHeader,.cell,.main-content,.main-table>.table,.main-table>.table-footer,.main-table>.table-header,.main-table>.table-responsive,.panel{-webkit-box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06);box-shadow:0 1px 3px 0 rgba(0,0,0,.08),0 1px 1px 0 rgba(0,0,0,.05),0 2px 1px -1px rgba(0,0,0,.06)}#footer{border-top-color:transparent;-webkit-box-shadow:0 -1px 3px 0 rgba(0,0,0,.08),0 -1px 1px 0 rgba(0,0,0,.05),0 -2px 1px -1px rgba(0,0,0,.06);box-shadow:0 -1px 3px 0 rgba(0,0,0,.08),0 -1px 1px 0 rgba(0,0,0,.05),0 -2px 1px -1px rgba(0,0,0,.06)}.block-statistic .nav-stacked,.main-table thead>tr>th,.table-footer{border-color:#e5e5e5;border-top-width:1px;border-bottom-width:1px}td.c-actions .btn{opacity:.85}td.c-actions .btn:hover{opacity:1}.main-table tbody>tr.checked{background:#fff3e0;-webkit-box-shadow:none!important;box-shadow:none!important}.main-table tbody>tr.checked:hover{background:#ffe9c6}.main-table td.c-actions .btn.disabled{opacity:.5}
\ No newline at end of file
diff --git a/www/theme/default/images/main/qrcode.png b/www/theme/default/images/main/qrcode.png
new file mode 100644
index 0000000000..83de50ec01
Binary files /dev/null and b/www/theme/default/images/main/qrcode.png differ
diff --git a/www/theme/default/images/main/zendata.png b/www/theme/default/images/main/zendata.png
new file mode 100644
index 0000000000..2db14ac26d
Binary files /dev/null and b/www/theme/default/images/main/zendata.png differ
diff --git a/www/theme/default/images/main/ztf.png b/www/theme/default/images/main/ztf.png
new file mode 100644
index 0000000000..ef98d64363
Binary files /dev/null and b/www/theme/default/images/main/ztf.png differ
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index d590325307..e32309b018 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -14,16 +14,6 @@
 
 #pageNav .btn-group.angle-btn{margin-right:10px !important;}
 
-#dropMenu.show-right-col{width:502px;max-width:520px;}
-#dropMenu.has-search-text{width:250px;max-width:260px;}
-#dropMenu.has-search-text .col-right{margin-left:0px;}
-#dropMenu>.search-box{max-width:240px;}
-#dropMenu .list-group{width:250px; max-width:260px;}
-#dropMenu.show-right-col>.list-group{width:502px;max-width:520px;}
-#dropMenu.show-right-col .col-left>.list-group{width:250px;max-width:260px;}
-#dropMenu.show-right-col .col-right>.list-group{width:250px;max-width:260px;}
-#dropMenu .col-footer{width:230px;}
-
 .main-actions .btn-toolbar .divider {margin-right:8px !important; margin-left: 8px !important;}
 .main-actions .btn-toolbar .btn + .btn {margin-left: 8px !important;}
 
@@ -54,8 +44,18 @@ a.showMoreImage:hover {opacity: 1;}
 .table-actions .btn {background: #78bdf5; color: #fff; border-color: #78bdf5}
 .table-footer .checked+div .btn, .table-actions .btn:hover {background: #16a8f8; border-color: #16a8f8}
 
-#header #toolbar a{color: #fff; font-size: 13px; line-height: 15px; border: #84a2e2 1px solid}
-#header #toolbar i{font-size: 16px;}
+#header #toolbar a {color: #3c4353; font-size: 13px; position: relative;}
+#header #toolbar a:hover, .selected a {color: #fff!important;}
+#header #toolbar i {font-size: 16px; top: 0;}
+#header .header-btn i {font-size: 16px;}
 
-#navbar .nav>li.divider {margin: 15px 8px 15px 8px;}
-#navbar .nav>li>a { padding: 10px 10px;}
+#toolbar {top: 0px; height: 50px;}
+#userNav {float: none; margin: 0;}
+#userNav>li {text-align: center;}
+#userNav>li>a {padding: 10px 5px; color: #000; opacity: .9; margin-left: 0px}
+#userNav>li>a:hover {height: 50px;}
+#userNav>li>.dropdown-menu {margin: 0; text-align: left;}
+#userNav>li>.dropdown-menu a {color: #fff;}
+#userNav>li .pull-right {right: -1px;}
+#userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu {top: -60px;}
+#userNav .dropdown-menu>li>a>.icon { position: initial; display: inline;}
diff --git a/www/theme/green/style.css b/www/theme/green/style.css
index efa0471432..f49bf22239 100644
--- a/www/theme/green/style.css
+++ b/www/theme/green/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - Green - v1.9.2 - 2021-01-06
+ * ZUI: Zentao Theme - Green - v1.9.2 - 2021-03-17
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
- */a{color:#3c4353}a:focus,a:hover{color:#00b791}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#00b791;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#008e71;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:#006b54;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:#00b791;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#008e71;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:#006b54;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:#00b791;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#00b791;background-color:#e5fbf3;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#00b791;background-color:#c2f6e3;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:#a3f1d4;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:#e5fbf3;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#00b791;background-color:#c2f6e3;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:#a3f1d4;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:#e5fbf3;border-color:transparent}.btn-link{color:#3c4353;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:#00b791}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#00b791}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#008469}.label-primary.label-outline{color:#00b791;background:0 0;border:1px solid #00b791}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#008469}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#1effd0}.text-primary{color:#00b791}.text-primary:hover{color:#008469}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#00b791}a.bg-primary:hover{background-color:#008469}.hl-primary{background-color:#e5fbf3}a.hl-primary:hover{background-color:#b9f4df}.progress{background-color:#e5fbf3;border-radius:3px}.progress-bar{color:#fff;background-color:#00b791;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#00b791;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)}.form-control:focus{border-color:#00b791;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#00b791;border-color:#00b791}.switch input:focus+label{color:#00b791}.switch input:focus+label:before{border-color:#00b791;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #00b791;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #00b791}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#00b791;border-color:#00b791}.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:#00b791;-webkit-box-shadow:0 0 8px #00b791;box-shadow:0 0 8px #00b791}.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:#00b791}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#00b791}.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:#5adf96}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#e5fbf3}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#00b791;border-color:#00b791}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#5adf96;border-color:#2fd77b}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#45db88}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#74e4a6}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#85e7b1}.navbar-inverse .navbar-toggle{border-color:#85e7b1}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#45db88}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#3cd983}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#85e7b1}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#2fd77b}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#74e4a6}.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:#85e7b1}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #85e7b1;-webkit-box-shadow:inset 0 -1px 0 #2fd77b;box-shadow:inset 0 -1px 0 #2fd77b}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#38d880}.nav>li>a:focus,.nav>li>a:hover{color:#00b791}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#00b791}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#00b791;border-color:#00b791}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#00b791;border-bottom-color:#00b791}.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 #cbd0db}.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 #00b791;box-shadow:inset 2px 0 0 #00b791}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#00b791;border-color:#00b791}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#00b791}.panel-primary>.panel-heading{color:#fff;background-color:#00b791;border-color:#00b791}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#00b791}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#00b791}.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:#e5fbf3}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#00b791!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:#00b791!important;border-bottom-left-radius:#00b791!important}.chosen-container .chosen-results li.highlighted{background-color:#00b791!important}.chosen-container-active .chosen-single{border-color:#00b791!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#00b791!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:#00b791!important;border-bottom-left-radius:#00b791!important}.chosen-container.chosen-highlight-selected .result-selected{color:#00b791;background:#e5fbf3}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#00b791;border-color:#00b791}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#00b791}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#00b791}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#00b791}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#00b791!important;border-color:#008469!important}.datetimepicker td.day.active:hover{background-color:#008469!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#00b791!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important}.ke-menu-item-on{background-color:#00b791!important}.ke-colorpicker-cell-on{background-color:#00b791!important}.ke-input-text:focus{border-color:#00b791!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#00b791}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#e5fbf3}.alert-primary hr{border-top-color:#c6f6e5}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#00b791;border-color:#00b791}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#e5fbf3}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#00b791}.tree-drag-holder{background-color:#e5fbf3}.tree-menu li.active>a{color:#fff;background-color:#00b791;border-color:#00b791}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#5adf96}a.text-primary{color:#00b791}.nav-primary>li.active>a{color:#00b791}.nav-primary>li.active>a:hover{color:#00b791}.bg-primary,.m-user-login{background:#5adf96 -webkit-gradient(linear,right top,left top,from(#00b791),to(#5adf96))!important;background:#5adf96 -webkit-linear-gradient(right,#00b791 0,#5adf96 100%)!important;background:#5adf96 -o-linear-gradient(right,#00b791 0,#5adf96 100%)!important;background:#5adf96 linear-gradient(-90deg,#00b791 0,#5adf96 100%)!important}.bg-secondary{background:#5adf96}.alert-info{color:#00b791;background:#e5fbf3}.btn-primary{color:#fff;background-color:#00b791;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(0,183,145,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#009e7d;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:#00b791;border-color:transparent}.btn-secondary{color:#fff;background-color:#5adf96;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(90,223,150,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#45db88;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:#5adf96;border-color:transparent}.btn-info{color:#00b791;background-color:#e5fbf3;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#00b791;background-color:rgba(229,251,243,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#cff8e9;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(0,183,145,.3);background-color:#e5fbf3;border-color:transparent}.btn-icon-left>.icon{color:#5adf96;background:#e5fbf3}.btn-active-line{color:#00b791}.btn-active-line:after{border-bottom-color:#00b791}.btn-active-line:hover{color:#00b791}.btn-active-text .text{color:#00b791}.btn-active-text .text:after{border-bottom-color:#00b791}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(0,183,145,.8)}.label-primary{background:#00b791!important}.label-pale{background:#b9f4df!important}.label-outline.label-primary{background:#e5fbf3!important;border-color:rgba(0,183,145,.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:#00b791;border-color:#00b791}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#00b791;-webkit-box-shadow:0 0 0 3px rgba(0,183,145,.2);box-shadow:0 0 0 3px rgba(0,183,145,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#00b791}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#00b791!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#00b791!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#00b791!important}.panel-actions .btn.text-primary{color:#00b791}.status-bars .bar{background:#00b791}.status-bars-h .bar{background:#00b791}.messagger-zt .messager-content>.icon{color:#00b791}.tree li.active>a{color:#00b791}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#00b791}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#5adf96}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#e5fbf3}.dropdown-submenu:hover>a:after{border-left-color:#00b791}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#5adf96}.timeline>li>a:after,.timeline>li>div:after{background-color:#00b791}.timeline>li.active:before{background-color:rgba(0,183,145,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#00b791!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#00b791!important}#mainHeader{background:#5adf96 -webkit-gradient(linear,right top,left top,from(#00b791),to(#5adf96));background:#5adf96 -webkit-linear-gradient(right,#00b791 0,#5adf96 100%);background:#5adf96 -o-linear-gradient(right,#00b791 0,#5adf96 100%);background:#5adf96 linear-gradient(-90deg,#00b791 0,#5adf96 100%);background-color:#5adf96;border-top-color:#00b791;border-bottom-color:#e5fbf3}.header-angle-btn .btn{background-color:#5adf96}.header-angle-btn .btn::after{border-left-color:#5adf96}.header-angle-btn .btn:hover,.header-angle-btn.active .btn{background:#2fd77b}.header-angle-btn .btn:hover::after,.header-angle-btn.active .btn::after{border-left-color:#2fd77b}.header-angle-btn.active .btn:hover{background:#29d376}.header-angle-btn.active .btn:hover::after{border-left-color:#29d376}.header-angle-btn+.header-angle-btn::after,.header-angle-btn+.header-angle-btn::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn+.header-angle-btn::after{border-left-color:#5adf96}#searchGo{background-color:#5adf96}#searchGo:hover{background-color:#00b791}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#00b791}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#00b791}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#00b791}.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 #00b791}.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 #00b791}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #00b791}#sidebarHeader .title{color:#00b791}#sidebar>.sidebar-toggle>.icon{background:#aff0cc}#main .querybox-toggle.querybox-opened{color:#00b791}#contentNav .nav>li.active>a{color:#00b791}#contentNav .nav>li.active>a:before{background:#00b791}#mainContent .side-col .nav-tabs>li.active>a:before{background:#00b791}td.c-actions .btn{color:#5adf96}td.c-actions .btn:hover{color:#00b791;background-color:#cff8e9}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#00b791;background:#e5fbf3}.main-table table .btn-icon-left:hover>.icon{background:#e5fbf3}.main-table tbody>tr:hover{background:#e5fbf3}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#00b791}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#eefcf7}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#eefcf7}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#00ad89}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#00605c}.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:#00b791}.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:#00b791}.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:#00b791}.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:#e5fbf3}.table-footer .checkbox-primary.checked label:after{border-color:#00b791!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#00eab9!important;border-color:#00eab9!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#00b791}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#00b791;border-color:#00b791}.article-content a{color:#00b791}.article-content a:focus,.article-content a:hover{color:#5adf96}.list-group{overflow-y:auto}.list-group>a.selected{color:#e5fbf3;background-color:#00b791}.list-group>a.active{color:#00b791;background-color:#e5fbf3}.list-group>a.active:hover,.list-group>a:hover{background-color:#00b791}.release-line>li>a:hover:before{background-color:#e5fbf3}.release-line>li>a:hover .title{color:#00b791}.release-line>li.active>a:before{border-color:#00b791}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#5adf96}#poweredBy .icon-zentao{color:#5adf96}#poweredBy a:hover{color:#00b791}#poweredBy a:hover .icon-zentao{color:#00b791}#poweredBy a.text-primary{color:#00b791}#poweredBy a.text-primary:hover{color:#5adf96}.block-statistic .nav-secondary>li.active>a:before{background:#00b791!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#5adf96!important}.dynamic.active .dynamic-date:before{background-color:#5adf96!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:#00b791!important}.table td.has-child>.task-toggle:hover{color:#00b791!important}#openTaskPage.open:hover,#task .task-nav{color:#00b791!important;background:#e5fbf3!important}#tasksProgress>.progress-bar{background:#00b791!important}#tasksProgress .progress-text{color:#00b791!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#00b791!important;background:#e5fbf3!important;border-left-color:#00b791!important;-webkit-box-shadow:inset 4px 0 0 #00b791!important;box-shadow:inset 4px 0 0 #00b791!important}#copyProjectModal a:hover{border-color:#5adf96!important}#zeroTaskStory.checked{background:#e5fbf3!important;border-color:#5adf96!important}.cols-list .col:hover{background:#e5fbf3!important}.files-grid .actions,.files-grid .col:hover .file{background:#e5fbf3!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:#00b791!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#5adf96!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#00b791!important}#bars>li.active:after{background:#e5fbf3!important}
\ No newline at end of file
+ */a{color:#3c4353}a:focus,a:hover{color:#00b791}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#00b791;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#008e71;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:#006b54;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:#00b791;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#008e71;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:#006b54;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:#00b791;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#00b791;background-color:#e5fbf3;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#00b791;background-color:#c2f6e3;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:#a3f1d4;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:#e5fbf3;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#00b791;background-color:#c2f6e3;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:#a3f1d4;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:#e5fbf3;border-color:transparent}.btn-link{color:#3c4353;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:#00b791}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#00b791}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#008469}.label-primary.label-outline{color:#00b791;background:0 0;border:1px solid #00b791}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#008469}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#1effd0}.text-primary{color:#00b791}.text-primary:hover{color:#008469}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#00b791}a.bg-primary:hover{background-color:#008469}.hl-primary{background-color:#e5fbf3}a.hl-primary:hover{background-color:#b9f4df}.progress{background-color:#e5fbf3;border-radius:3px}.progress-bar{color:#fff;background-color:#00b791;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#00b791;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)}.form-control:focus{border-color:#00b791;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#00b791;border-color:#00b791}.switch input:focus+label{color:#00b791}.switch input:focus+label:before{border-color:#00b791;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #00b791;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #00b791}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#00b791;border-color:#00b791}.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:#00b791;-webkit-box-shadow:0 0 8px #00b791;box-shadow:0 0 8px #00b791}.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:#00b791}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#00b791}.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:#5adf96}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#e5fbf3}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#00b791;border-color:#00b791}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#5adf96;border-color:#2fd77b}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#45db88}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#74e4a6}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#85e7b1}.navbar-inverse .navbar-toggle{border-color:#85e7b1}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#45db88}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#3cd983}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#85e7b1}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#2fd77b}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#74e4a6}.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:#85e7b1}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #85e7b1;-webkit-box-shadow:inset 0 -1px 0 #2fd77b;box-shadow:inset 0 -1px 0 #2fd77b}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#38d880}.nav>li>a:focus,.nav>li>a:hover{color:#00b791}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#00b791}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#00b791;border-color:#00b791}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#00b791;border-bottom-color:#00b791}.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 #cbd0db}.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 #00b791;box-shadow:inset 2px 0 0 #00b791}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#00b791;border-color:#00b791}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#00b791}.panel-primary>.panel-heading{color:#fff;background-color:#00b791;border-color:#00b791}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#00b791}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#00b791}.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:#e5fbf3}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#00b791!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:#00b791!important;border-bottom-left-radius:#00b791!important}.chosen-container .chosen-results li.highlighted{background-color:#00b791!important}.chosen-container-active .chosen-single{border-color:#00b791!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#00b791!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:#00b791!important;border-bottom-left-radius:#00b791!important}.chosen-container.chosen-highlight-selected .result-selected{color:#00b791;background:#e5fbf3}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#00b791;border-color:#00b791}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#00b791}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#00b791}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#00b791}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#00b791!important;border-color:#008469!important}.datetimepicker td.day.active:hover{background-color:#008469!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#00b791!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important}.ke-menu-item-on{background-color:#00b791!important}.ke-colorpicker-cell-on{background-color:#00b791!important}.ke-input-text:focus{border-color:#00b791!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,183,145,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#00b791}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#e5fbf3}.alert-primary hr{border-top-color:#c6f6e5}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#00b791;border-color:#00b791}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#e5fbf3}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#00b791}.tree-drag-holder{background-color:#e5fbf3}.tree-menu li.active>a{color:#fff;background-color:#00b791;border-color:#00b791}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#5adf96}a.text-primary{color:#00b791}.nav-primary>li.active>a{color:#00b791}.nav-primary>li.active>a:hover{color:#00b791}.bg-primary,.m-user-login{background:#5adf96 -webkit-gradient(linear,right top,left top,from(#00b791),to(#5adf96))!important;background:#5adf96 -webkit-linear-gradient(right,#00b791 0,#5adf96 100%)!important;background:#5adf96 -o-linear-gradient(right,#00b791 0,#5adf96 100%)!important;background:#5adf96 linear-gradient(-90deg,#00b791 0,#5adf96 100%)!important}.bg-secondary{background:#5adf96}.alert-info{color:#00b791;background:#e5fbf3}.btn-primary{color:#fff;background-color:#00b791;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(0,183,145,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#009e7d;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:#00b791;border-color:transparent}.btn-secondary{color:#fff;background-color:#5adf96;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(90,223,150,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#45db88;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:#5adf96;border-color:transparent}.btn-info{color:#00b791;background-color:#e5fbf3;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#00b791;background-color:rgba(229,251,243,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#cff8e9;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(0,183,145,.3);background-color:#e5fbf3;border-color:transparent}.btn-icon-left>.icon{color:#5adf96;background:#e5fbf3}.btn-active-line{color:#00b791}.btn-active-line:after{border-bottom-color:#00b791}.btn-active-line:hover{color:#00b791}.btn-active-text .text{color:#00b791}.btn-active-text .text:after{border-bottom-color:#00b791}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(0,183,145,.8)}.label-primary{background:#00b791!important}.label-pale{background:#b9f4df!important}.label-outline.label-primary{background:#e5fbf3!important;border-color:rgba(0,183,145,.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:#00b791;border-color:#00b791}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#00b791;-webkit-box-shadow:0 0 0 3px rgba(0,183,145,.2);box-shadow:0 0 0 3px rgba(0,183,145,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#00b791}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#00b791!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#00b791!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#00b791!important}.panel-actions .btn.text-primary{color:#00b791}.status-bars .bar{background:#00b791}.status-bars-h .bar{background:#00b791}.messagger-zt .messager-content>.icon{color:#00b791}.tree li.active>a{color:#00b791}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#00b791}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#5adf96}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#e5fbf3}.dropdown-submenu:hover>a:after{border-left-color:#00b791}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#5adf96}.timeline>li>a:after,.timeline>li>div:after{background-color:#00b791}.timeline>li.active:before{background-color:rgba(0,183,145,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#00b791!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#00b791!important}#mainHeader{background:#5adf96 -webkit-gradient(linear,right top,left top,from(#00b791),to(#5adf96));background:#5adf96 -webkit-linear-gradient(right,#00b791 0,#5adf96 100%);background:#5adf96 -o-linear-gradient(right,#00b791 0,#5adf96 100%);background:#5adf96 linear-gradient(-90deg,#00b791 0,#5adf96 100%);background-color:#5adf96;border-top-color:#00b791;border-bottom-color:#e5fbf3}#searchGo{background-color:#5adf96}#searchGo:hover{background-color:#00b791}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#00b791}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#00b791}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#00b791}.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 #00b791}.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 #00b791}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #00b791}#sidebarHeader .title{color:#00b791}#sidebar>.sidebar-toggle>.icon{background:#aff0cc}#main .querybox-toggle.querybox-opened{color:#00b791}#contentNav .nav>li.active>a{color:#00b791}#contentNav .nav>li.active>a:before{background:#00b791}#mainContent .side-col .nav-tabs>li.active>a:before{background:#00b791}td.c-actions .btn{color:#5adf96}td.c-actions .btn:hover{color:#00b791;background-color:#cff8e9}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#00b791;background:#e5fbf3}.main-table table .btn-icon-left:hover>.icon{background:#e5fbf3}.main-table tbody>tr:hover{background:#e5fbf3}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#00b791}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#eefcf7}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#eefcf7}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#00ad89}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#00605c}.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:#00b791}.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:#00b791}.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:#00b791}.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:#e5fbf3}.table-footer .checkbox-primary.checked label:after{border-color:#00b791!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#00eab9!important;border-color:#00eab9!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#00b791}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#00b791;border-color:#00b791}.article-content a{color:#00b791}.article-content a:focus,.article-content a:hover{color:#5adf96}.list-group{overflow-y:auto}.list-group>a.selected{color:#e5fbf3;background-color:#00b791}.list-group>a.active{color:#00b791;background-color:#e5fbf3}.list-group>a.active:hover,.list-group>a:hover{background-color:#00b791}.release-line>li>a:hover:before{background-color:#e5fbf3}.release-line>li>a:hover .title{color:#00b791}.release-line>li.active>a:before{border-color:#00b791}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#5adf96}#poweredBy .icon-zentao{color:#5adf96}#poweredBy a:hover{color:#00b791}#poweredBy a:hover .icon-zentao{color:#00b791}#poweredBy a.text-primary{color:#00b791}#poweredBy a.text-primary:hover{color:#5adf96}.block-statistic .nav-secondary>li.active>a:before{background:#00b791!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#5adf96!important}.dynamic.active .dynamic-date:before{background-color:#5adf96!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:#00b791!important}.table td.has-child>.task-toggle:hover{color:#00b791!important}#openTaskPage.open:hover,#task .task-nav{color:#00b791!important;background:#e5fbf3!important}#tasksProgress>.progress-bar{background:#00b791!important}#tasksProgress .progress-text{color:#00b791!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#00b791!important;background:#e5fbf3!important;border-left-color:#00b791!important;-webkit-box-shadow:inset 4px 0 0 #00b791!important;box-shadow:inset 4px 0 0 #00b791!important}#copyProjectModal a:hover{border-color:#5adf96!important}#zeroTaskStory.checked{background:#e5fbf3!important;border-color:#5adf96!important}.cols-list .col:hover{background:#e5fbf3!important}.files-grid .actions,.files-grid .col:hover .file{background:#e5fbf3!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:#00b791!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#5adf96!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#00b791!important}#bars>li.active:after{background:#e5fbf3!important}
\ No newline at end of file
diff --git a/www/theme/pink/style.css b/www/theme/pink/style.css
index 49fd482acd..091fbab16e 100644
--- a/www/theme/pink/style.css
+++ b/www/theme/pink/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - pink - v1.9.2 - 2021-01-06
+ * ZUI: Zentao Theme - pink - v1.9.2 - 2021-03-17
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
- */a{color:#3c4353}a:focus,a:hover{color:#a050d7}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#a050d7;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#8e2fcf;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:#7a29b2;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:#a050d7;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#8e2fcf;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:#7a29b2;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:#a050d7;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#a050d7;background-color:#ffebf8;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#a050d7;background-color:#ffc2ea;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:#ff9edd;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:#ffebf8;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#a050d7;background-color:#ffc2ea;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:#ff9edd;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:#ffebf8;border-color:transparent}.btn-link{color:#3c4353;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:#a050d7}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#a050d7}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#882dc7}.label-primary.label-outline{color:#a050d7;background:0 0;border:1px solid #a050d7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#882dc7}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#cda3ea}.text-primary{color:#a050d7}.text-primary:hover{color:#882dc7}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#a050d7}a.bg-primary:hover{background-color:#882dc7}.hl-primary{background-color:#ffebf8}a.hl-primary:hover{background-color:#ffb8e6}.progress{background-color:#ffebf8;border-radius:3px}.progress-bar{color:#fff;background-color:#a050d7;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#a050d7;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)}.form-control:focus{border-color:#a050d7;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#a050d7;border-color:#a050d7}.switch input:focus+label{color:#a050d7}.switch input:focus+label:before{border-color:#a050d7;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #a050d7;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #a050d7}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#a050d7;border-color:#a050d7}.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:#a050d7;-webkit-box-shadow:0 0 8px #a050d7;box-shadow:0 0 8px #a050d7}.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:#a050d7}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#a050d7}.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:#f7889c}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#ffebf8}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#a050d7;border-color:#a050d7}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#f7889c;border-color:#f45874}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#f57088}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#f9a5b4}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#fab8c4}.navbar-inverse .navbar-toggle{border-color:#fab8c4}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#f57088}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#f56780}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#fab8c4}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#f45874}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#f9a5b4}.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:#fab8c4}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #fab8c4;-webkit-box-shadow:inset 0 -1px 0 #f45874;box-shadow:inset 0 -1px 0 #f45874}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#f4627c}.nav>li>a:focus,.nav>li>a:hover{color:#a050d7}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#a050d7}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#a050d7;border-color:#a050d7}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#a050d7;border-bottom-color:#a050d7}.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 #cbd0db}.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 #a050d7;box-shadow:inset 2px 0 0 #a050d7}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#a050d7;border-color:#a050d7}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#a050d7}.panel-primary>.panel-heading{color:#fff;background-color:#a050d7;border-color:#a050d7}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#a050d7}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#a050d7}.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:#ffebf8}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#a050d7!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:#a050d7!important;border-bottom-left-radius:#a050d7!important}.chosen-container .chosen-results li.highlighted{background-color:#a050d7!important}.chosen-container-active .chosen-single{border-color:#a050d7!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#a050d7!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:#a050d7!important;border-bottom-left-radius:#a050d7!important}.chosen-container.chosen-highlight-selected .result-selected{color:#a050d7;background:#ffebf8}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#a050d7;border-color:#a050d7}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#a050d7}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#a050d7}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#a050d7}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#a050d7!important;border-color:#882dc7!important}.datetimepicker td.day.active:hover{background-color:#882dc7!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#a050d7!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important}.ke-menu-item-on{background-color:#a050d7!important}.ke-colorpicker-cell-on{background-color:#a050d7!important}.ke-input-text:focus{border-color:#a050d7!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#a050d7}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#ffebf8}.alert-primary hr{border-top-color:#ffc7ec}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#a050d7;border-color:#a050d7}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#ffebf8}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#a050d7}.tree-drag-holder{background-color:#ffebf8}.tree-menu li.active>a{color:#fff;background-color:#a050d7;border-color:#a050d7}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#f7889c}a.text-primary{color:#a050d7}.nav-primary>li.active>a{color:#a050d7}.nav-primary>li.active>a:hover{color:#a050d7}.bg-primary,.m-user-login{background:#f7889c -webkit-gradient(linear,right top,left top,from(#a050d7),to(#f7889c))!important;background:#f7889c -webkit-linear-gradient(right,#a050d7 0,#f7889c 100%)!important;background:#f7889c -o-linear-gradient(right,#a050d7 0,#f7889c 100%)!important;background:#f7889c linear-gradient(-90deg,#a050d7 0,#f7889c 100%)!important}.bg-secondary{background:#f7889c}.alert-info{color:#a050d7;background:#ffebf8}.btn-primary{color:#fff;background-color:#a050d7;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(160,80,215,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#953bd2;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:#a050d7;border-color:transparent}.btn-secondary{color:#fff;background-color:#f7889c;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(247,136,156,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#f57088;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:#f7889c;border-color:transparent}.btn-info{color:#a050d7;background-color:#ffebf8;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#a050d7;background-color:rgba(255,235,248,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#ffd1ef;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(160,80,215,.3);background-color:#ffebf8;border-color:transparent}.btn-icon-left>.icon{color:#f7889c;background:#ffebf8}.btn-active-line{color:#a050d7}.btn-active-line:after{border-bottom-color:#a050d7}.btn-active-line:hover{color:#a050d7}.btn-active-text .text{color:#a050d7}.btn-active-text .text:after{border-bottom-color:#a050d7}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(160,80,215,.8)}.label-primary{background:#a050d7!important}.label-pale{background:#ffb8e6!important}.label-outline.label-primary{background:#ffebf8!important;border-color:rgba(160,80,215,.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:#a050d7;border-color:#a050d7}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#a050d7;-webkit-box-shadow:0 0 0 3px rgba(160,80,215,.2);box-shadow:0 0 0 3px rgba(160,80,215,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#a050d7}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#a050d7!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#a050d7!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#a050d7!important}.panel-actions .btn.text-primary{color:#a050d7}.status-bars .bar{background:#a050d7}.status-bars-h .bar{background:#a050d7}.messagger-zt .messager-content>.icon{color:#a050d7}.tree li.active>a{color:#a050d7}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#a050d7}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#f7889c}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#ffebf8}.dropdown-submenu:hover>a:after{border-left-color:#a050d7}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#f7889c}.timeline>li>a:after,.timeline>li>div:after{background-color:#a050d7}.timeline>li.active:before{background-color:rgba(160,80,215,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#a050d7!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#a050d7!important}#mainHeader{background:#f7889c -webkit-gradient(linear,right top,left top,from(#a050d7),to(#f7889c));background:#f7889c -webkit-linear-gradient(right,#a050d7 0,#f7889c 100%);background:#f7889c -o-linear-gradient(right,#a050d7 0,#f7889c 100%);background:#f7889c linear-gradient(-90deg,#a050d7 0,#f7889c 100%);background-color:#f7889c;border-top-color:#a050d7;border-bottom-color:#ffebf8}.header-angle-btn .btn{background-color:#f7889c}.header-angle-btn .btn::after{border-left-color:#f7889c}.header-angle-btn .btn:hover,.header-angle-btn.active .btn{background:#f45874}.header-angle-btn .btn:hover::after,.header-angle-btn.active .btn::after{border-left-color:#f45874}.header-angle-btn.active .btn:hover{background:#f34f6c}.header-angle-btn.active .btn:hover::after{border-left-color:#f34f6c}.header-angle-btn+.header-angle-btn::after,.header-angle-btn+.header-angle-btn::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn+.header-angle-btn::after{border-left-color:#f7889c}#searchGo{background-color:#f7889c}#searchGo:hover{background-color:#a050d7}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#a050d7}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#a050d7}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#a050d7}.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 #a050d7}.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 #a050d7}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #a050d7}#sidebarHeader .title{color:#a050d7}#sidebar>.sidebar-toggle>.icon{background:#fde8ec}#main .querybox-toggle.querybox-opened{color:#a050d7}#contentNav .nav>li.active>a{color:#a050d7}#contentNav .nav>li.active>a:before{background:#a050d7}#mainContent .side-col .nav-tabs>li.active>a:before{background:#a050d7}td.c-actions .btn{color:#f7889c}td.c-actions .btn:hover{color:#a050d7;background-color:#ffd1ef}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#a050d7;background:#ffebf8}.main-table table .btn-icon-left:hover>.icon{background:#ffebf8}.main-table tbody>tr:hover{background:#ffebf8}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#a050d7}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#fff5fc}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#fff5fc}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#9b48d5}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#8a27aa}.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:#a050d7}.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:#a050d7}.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:#a050d7}.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:#ffebf8}.table-footer .checkbox-primary.checked label:after{border-color:#a050d7!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#b77ae0!important;border-color:#b77ae0!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#a050d7}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#a050d7;border-color:#a050d7}.article-content a{color:#a050d7}.article-content a:focus,.article-content a:hover{color:#f7889c}.list-group{overflow-y:auto}.list-group>a.selected{color:#ffebf8;background-color:#a050d7}.list-group>a.active{color:#a050d7;background-color:#ffebf8}.list-group>a.active:hover,.list-group>a:hover{background-color:#a050d7}.release-line>li>a:hover:before{background-color:#ffebf8}.release-line>li>a:hover .title{color:#a050d7}.release-line>li.active>a:before{border-color:#a050d7}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#f7889c}#poweredBy .icon-zentao{color:#f7889c}#poweredBy a:hover{color:#a050d7}#poweredBy a:hover .icon-zentao{color:#a050d7}#poweredBy a.text-primary{color:#a050d7}#poweredBy a.text-primary:hover{color:#f7889c}.block-statistic .nav-secondary>li.active>a:before{background:#a050d7!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#f7889c!important}.dynamic.active .dynamic-date:before{background-color:#f7889c!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:#a050d7!important}.table td.has-child>.task-toggle:hover{color:#a050d7!important}#openTaskPage.open:hover,#task .task-nav{color:#a050d7!important;background:#ffebf8!important}#tasksProgress>.progress-bar{background:#a050d7!important}#tasksProgress .progress-text{color:#a050d7!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#a050d7!important;background:#ffebf8!important;border-left-color:#a050d7!important;-webkit-box-shadow:inset 4px 0 0 #a050d7!important;box-shadow:inset 4px 0 0 #a050d7!important}#copyProjectModal a:hover{border-color:#f7889c!important}#zeroTaskStory.checked{background:#ffebf8!important;border-color:#f7889c!important}.cols-list .col:hover{background:#ffebf8!important}.files-grid .actions,.files-grid .col:hover .file{background:#ffebf8!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:#a050d7!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#f7889c!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#a050d7!important}#bars>li.active:after{background:#ffebf8!important}
\ No newline at end of file
+ */a{color:#3c4353}a:focus,a:hover{color:#a050d7}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#a050d7;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#8e2fcf;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:#7a29b2;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:#a050d7;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#8e2fcf;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:#7a29b2;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:#a050d7;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#a050d7;background-color:#ffebf8;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#a050d7;background-color:#ffc2ea;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:#ff9edd;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:#ffebf8;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#a050d7;background-color:#ffc2ea;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:#ff9edd;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:#ffebf8;border-color:transparent}.btn-link{color:#3c4353;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:#a050d7}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#a050d7}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#882dc7}.label-primary.label-outline{color:#a050d7;background:0 0;border:1px solid #a050d7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#882dc7}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#cda3ea}.text-primary{color:#a050d7}.text-primary:hover{color:#882dc7}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#a050d7}a.bg-primary:hover{background-color:#882dc7}.hl-primary{background-color:#ffebf8}a.hl-primary:hover{background-color:#ffb8e6}.progress{background-color:#ffebf8;border-radius:3px}.progress-bar{color:#fff;background-color:#a050d7;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#a050d7;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)}.form-control:focus{border-color:#a050d7;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#a050d7;border-color:#a050d7}.switch input:focus+label{color:#a050d7}.switch input:focus+label:before{border-color:#a050d7;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #a050d7;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #a050d7}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#a050d7;border-color:#a050d7}.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:#a050d7;-webkit-box-shadow:0 0 8px #a050d7;box-shadow:0 0 8px #a050d7}.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:#a050d7}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#a050d7}.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:#f7889c}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#ffebf8}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#a050d7;border-color:#a050d7}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#f7889c;border-color:#f45874}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#f57088}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#f9a5b4}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#fab8c4}.navbar-inverse .navbar-toggle{border-color:#fab8c4}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#f57088}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#f56780}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#fab8c4}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#f45874}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#f9a5b4}.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:#fab8c4}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #fab8c4;-webkit-box-shadow:inset 0 -1px 0 #f45874;box-shadow:inset 0 -1px 0 #f45874}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#f4627c}.nav>li>a:focus,.nav>li>a:hover{color:#a050d7}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#a050d7}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#a050d7;border-color:#a050d7}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#a050d7;border-bottom-color:#a050d7}.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 #cbd0db}.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 #a050d7;box-shadow:inset 2px 0 0 #a050d7}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#a050d7;border-color:#a050d7}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#a050d7}.panel-primary>.panel-heading{color:#fff;background-color:#a050d7;border-color:#a050d7}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#a050d7}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#a050d7}.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:#ffebf8}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#a050d7!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:#a050d7!important;border-bottom-left-radius:#a050d7!important}.chosen-container .chosen-results li.highlighted{background-color:#a050d7!important}.chosen-container-active .chosen-single{border-color:#a050d7!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#a050d7!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:#a050d7!important;border-bottom-left-radius:#a050d7!important}.chosen-container.chosen-highlight-selected .result-selected{color:#a050d7;background:#ffebf8}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#a050d7;border-color:#a050d7}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#a050d7}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#a050d7}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#a050d7}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#a050d7!important;border-color:#882dc7!important}.datetimepicker td.day.active:hover{background-color:#882dc7!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#a050d7!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important}.ke-menu-item-on{background-color:#a050d7!important}.ke-colorpicker-cell-on{background-color:#a050d7!important}.ke-input-text:focus{border-color:#a050d7!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(160,80,215,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#a050d7}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#ffebf8}.alert-primary hr{border-top-color:#ffc7ec}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#a050d7;border-color:#a050d7}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#ffebf8}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#a050d7}.tree-drag-holder{background-color:#ffebf8}.tree-menu li.active>a{color:#fff;background-color:#a050d7;border-color:#a050d7}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#f7889c}a.text-primary{color:#a050d7}.nav-primary>li.active>a{color:#a050d7}.nav-primary>li.active>a:hover{color:#a050d7}.bg-primary,.m-user-login{background:#f7889c -webkit-gradient(linear,right top,left top,from(#a050d7),to(#f7889c))!important;background:#f7889c -webkit-linear-gradient(right,#a050d7 0,#f7889c 100%)!important;background:#f7889c -o-linear-gradient(right,#a050d7 0,#f7889c 100%)!important;background:#f7889c linear-gradient(-90deg,#a050d7 0,#f7889c 100%)!important}.bg-secondary{background:#f7889c}.alert-info{color:#a050d7;background:#ffebf8}.btn-primary{color:#fff;background-color:#a050d7;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(160,80,215,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#953bd2;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:#a050d7;border-color:transparent}.btn-secondary{color:#fff;background-color:#f7889c;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(247,136,156,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#f57088;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:#f7889c;border-color:transparent}.btn-info{color:#a050d7;background-color:#ffebf8;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#a050d7;background-color:rgba(255,235,248,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#ffd1ef;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(160,80,215,.3);background-color:#ffebf8;border-color:transparent}.btn-icon-left>.icon{color:#f7889c;background:#ffebf8}.btn-active-line{color:#a050d7}.btn-active-line:after{border-bottom-color:#a050d7}.btn-active-line:hover{color:#a050d7}.btn-active-text .text{color:#a050d7}.btn-active-text .text:after{border-bottom-color:#a050d7}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(160,80,215,.8)}.label-primary{background:#a050d7!important}.label-pale{background:#ffb8e6!important}.label-outline.label-primary{background:#ffebf8!important;border-color:rgba(160,80,215,.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:#a050d7;border-color:#a050d7}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#a050d7;-webkit-box-shadow:0 0 0 3px rgba(160,80,215,.2);box-shadow:0 0 0 3px rgba(160,80,215,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#a050d7}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#a050d7!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#a050d7!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#a050d7!important}.panel-actions .btn.text-primary{color:#a050d7}.status-bars .bar{background:#a050d7}.status-bars-h .bar{background:#a050d7}.messagger-zt .messager-content>.icon{color:#a050d7}.tree li.active>a{color:#a050d7}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#a050d7}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#f7889c}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#ffebf8}.dropdown-submenu:hover>a:after{border-left-color:#a050d7}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#f7889c}.timeline>li>a:after,.timeline>li>div:after{background-color:#a050d7}.timeline>li.active:before{background-color:rgba(160,80,215,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#a050d7!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#a050d7!important}#mainHeader{background:#f7889c -webkit-gradient(linear,right top,left top,from(#a050d7),to(#f7889c));background:#f7889c -webkit-linear-gradient(right,#a050d7 0,#f7889c 100%);background:#f7889c -o-linear-gradient(right,#a050d7 0,#f7889c 100%);background:#f7889c linear-gradient(-90deg,#a050d7 0,#f7889c 100%);background-color:#f7889c;border-top-color:#a050d7;border-bottom-color:#ffebf8}#searchGo{background-color:#f7889c}#searchGo:hover{background-color:#a050d7}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#a050d7}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#a050d7}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#a050d7}.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 #a050d7}.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 #a050d7}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #a050d7}#sidebarHeader .title{color:#a050d7}#sidebar>.sidebar-toggle>.icon{background:#fde8ec}#main .querybox-toggle.querybox-opened{color:#a050d7}#contentNav .nav>li.active>a{color:#a050d7}#contentNav .nav>li.active>a:before{background:#a050d7}#mainContent .side-col .nav-tabs>li.active>a:before{background:#a050d7}td.c-actions .btn{color:#f7889c}td.c-actions .btn:hover{color:#a050d7;background-color:#ffd1ef}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#a050d7;background:#ffebf8}.main-table table .btn-icon-left:hover>.icon{background:#ffebf8}.main-table tbody>tr:hover{background:#ffebf8}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#a050d7}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#fff5fc}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#fff5fc}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#9b48d5}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#8a27aa}.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:#a050d7}.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:#a050d7}.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:#a050d7}.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:#ffebf8}.table-footer .checkbox-primary.checked label:after{border-color:#a050d7!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#b77ae0!important;border-color:#b77ae0!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#a050d7}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#a050d7;border-color:#a050d7}.article-content a{color:#a050d7}.article-content a:focus,.article-content a:hover{color:#f7889c}.list-group{overflow-y:auto}.list-group>a.selected{color:#ffebf8;background-color:#a050d7}.list-group>a.active{color:#a050d7;background-color:#ffebf8}.list-group>a.active:hover,.list-group>a:hover{background-color:#a050d7}.release-line>li>a:hover:before{background-color:#ffebf8}.release-line>li>a:hover .title{color:#a050d7}.release-line>li.active>a:before{border-color:#a050d7}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#f7889c}#poweredBy .icon-zentao{color:#f7889c}#poweredBy a:hover{color:#a050d7}#poweredBy a:hover .icon-zentao{color:#a050d7}#poweredBy a.text-primary{color:#a050d7}#poweredBy a.text-primary:hover{color:#f7889c}.block-statistic .nav-secondary>li.active>a:before{background:#a050d7!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#f7889c!important}.dynamic.active .dynamic-date:before{background-color:#f7889c!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:#a050d7!important}.table td.has-child>.task-toggle:hover{color:#a050d7!important}#openTaskPage.open:hover,#task .task-nav{color:#a050d7!important;background:#ffebf8!important}#tasksProgress>.progress-bar{background:#a050d7!important}#tasksProgress .progress-text{color:#a050d7!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#a050d7!important;background:#ffebf8!important;border-left-color:#a050d7!important;-webkit-box-shadow:inset 4px 0 0 #a050d7!important;box-shadow:inset 4px 0 0 #a050d7!important}#copyProjectModal a:hover{border-color:#f7889c!important}#zeroTaskStory.checked{background:#ffebf8!important;border-color:#f7889c!important}.cols-list .col:hover{background:#ffebf8!important}.files-grid .actions,.files-grid .col:hover .file{background:#ffebf8!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:#a050d7!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#f7889c!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#a050d7!important}#bars>li.active:after{background:#ffebf8!important}
\ No newline at end of file
diff --git a/www/theme/purple/style.css b/www/theme/purple/style.css
index 4a7c6b8ca0..45148b5fe8 100644
--- a/www/theme/purple/style.css
+++ b/www/theme/purple/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - purple - v1.9.2 - 2021-01-06
+ * ZUI: Zentao Theme - purple - v1.9.2 - 2021-03-17
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
- */a{color:#3c4353}a:focus,a:hover{color:#3123ae}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#3123ae;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#271c8c;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:#1f166e;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:#3123ae;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#271c8c;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:#1f166e;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:#3123ae;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#3123ae;background-color:#f2eafc;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#3123ae;background-color:#dcc6f7;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:#c9a7f2;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:#f2eafc;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#3123ae;background-color:#dcc6f7;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:#c9a7f2;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:#f2eafc;border-color:transparent}.btn-link{color:#3c4353;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:#3123ae}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#3123ae}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#251a84}.label-primary.label-outline{color:#3123ae;background:0 0;border:1px solid #3123ae}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#251a84}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#6759de}.text-primary{color:#3123ae}.text-primary:hover{color:#251a84}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#3123ae}a.bg-primary:hover{background-color:#251a84}.hl-primary{background-color:#f2eafc}a.hl-primary:hover{background-color:#d6bdf6}.progress{background-color:#f2eafc;border-radius:3px}.progress-bar{color:#fff;background-color:#3123ae;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#3123ae;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)}.form-control:focus{border-color:#3123ae;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#3123ae;border-color:#3123ae}.switch input:focus+label{color:#3123ae}.switch input:focus+label:before{border-color:#3123ae;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #3123ae;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #3123ae}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#3123ae;border-color:#3123ae}.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:#3123ae;-webkit-box-shadow:0 0 8px #3123ae;box-shadow:0 0 8px #3123ae}.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:#3123ae}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#3123ae}.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:#9958dc}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#f2eafc}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#3123ae;border-color:#3123ae}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#9958dc;border-color:#7f2ed3}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#8c43d8}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#a871e1}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#b382e5}.navbar-inverse .navbar-toggle{border-color:#b382e5}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#8c43d8}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#873ad6}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#b382e5}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#7f2ed3}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#a871e1}.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:#b382e5}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #b382e5;-webkit-box-shadow:inset 0 -1px 0 #7f2ed3;box-shadow:inset 0 -1px 0 #7f2ed3}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#8436d5}.nav>li>a:focus,.nav>li>a:hover{color:#3123ae}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#3123ae}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#3123ae;border-color:#3123ae}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#3123ae;border-bottom-color:#3123ae}.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 #cbd0db}.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 #3123ae;box-shadow:inset 2px 0 0 #3123ae}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#3123ae;border-color:#3123ae}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#3123ae}.panel-primary>.panel-heading{color:#fff;background-color:#3123ae;border-color:#3123ae}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#3123ae}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#3123ae}.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:#f2eafc}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#3123ae!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:#3123ae!important;border-bottom-left-radius:#3123ae!important}.chosen-container .chosen-results li.highlighted{background-color:#3123ae!important}.chosen-container-active .chosen-single{border-color:#3123ae!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#3123ae!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:#3123ae!important;border-bottom-left-radius:#3123ae!important}.chosen-container.chosen-highlight-selected .result-selected{color:#3123ae;background:#f2eafc}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#3123ae;border-color:#3123ae}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#3123ae}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#3123ae}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#3123ae}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#3123ae!important;border-color:#251a84!important}.datetimepicker td.day.active:hover{background-color:#251a84!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#3123ae!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important}.ke-menu-item-on{background-color:#3123ae!important}.ke-colorpicker-cell-on{background-color:#3123ae!important}.ke-input-text:focus{border-color:#3123ae!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#3123ae}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#f2eafc}.alert-primary hr{border-top-color:#dfcbf8}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#3123ae;border-color:#3123ae}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#f2eafc}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#3123ae}.tree-drag-holder{background-color:#f2eafc}.tree-menu li.active>a{color:#fff;background-color:#3123ae;border-color:#3123ae}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#9958dc}a.text-primary{color:#3123ae}.nav-primary>li.active>a{color:#3123ae}.nav-primary>li.active>a:hover{color:#3123ae}.bg-primary,.m-user-login{background:#9958dc -webkit-gradient(linear,right top,left top,from(#3123ae),to(#9958dc))!important;background:#9958dc -webkit-linear-gradient(right,#3123ae 0,#9958dc 100%)!important;background:#9958dc -o-linear-gradient(right,#3123ae 0,#9958dc 100%)!important;background:#9958dc linear-gradient(-90deg,#3123ae 0,#9958dc 100%)!important}.bg-secondary{background:#9958dc}.alert-info{color:#3123ae;background:#f2eafc}.btn-primary{color:#fff;background-color:#3123ae;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(49,35,174,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#2b1f99;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:#3123ae;border-color:transparent}.btn-secondary{color:#fff;background-color:#9958dc;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(153,88,220,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#8c43d8;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:#9958dc;border-color:transparent}.btn-info{color:#3123ae;background-color:#f2eafc;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#3123ae;background-color:rgba(242,234,252,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#e4d4f9;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(49,35,174,.3);background-color:#f2eafc;border-color:transparent}.btn-icon-left>.icon{color:#9958dc;background:#f2eafc}.btn-active-line{color:#3123ae}.btn-active-line:after{border-bottom-color:#3123ae}.btn-active-line:hover{color:#3123ae}.btn-active-text .text{color:#3123ae}.btn-active-text .text:after{border-bottom-color:#3123ae}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(49,35,174,.8)}.label-primary{background:#3123ae!important}.label-pale{background:#d6bdf6!important}.label-outline.label-primary{background:#f2eafc!important;border-color:rgba(49,35,174,.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:#3123ae;border-color:#3123ae}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#3123ae;-webkit-box-shadow:0 0 0 3px rgba(49,35,174,.2);box-shadow:0 0 0 3px rgba(49,35,174,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#3123ae}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#3123ae!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#3123ae!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#3123ae!important}.panel-actions .btn.text-primary{color:#3123ae}.status-bars .bar{background:#3123ae}.status-bars-h .bar{background:#3123ae}.messagger-zt .messager-content>.icon{color:#3123ae}.tree li.active>a{color:#3123ae}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#3123ae}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#9958dc}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#f2eafc}.dropdown-submenu:hover>a:after{border-left-color:#3123ae}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#9958dc}.timeline>li>a:after,.timeline>li>div:after{background-color:#3123ae}.timeline>li.active:before{background-color:rgba(49,35,174,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#3123ae!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#3123ae!important}#mainHeader{background:#9958dc -webkit-gradient(linear,right top,left top,from(#3123ae),to(#9958dc));background:#9958dc -webkit-linear-gradient(right,#3123ae 0,#9958dc 100%);background:#9958dc -o-linear-gradient(right,#3123ae 0,#9958dc 100%);background:#9958dc linear-gradient(-90deg,#3123ae 0,#9958dc 100%);background-color:#9958dc;border-top-color:#3123ae;border-bottom-color:#f2eafc}.header-angle-btn .btn{background-color:#9958dc}.header-angle-btn .btn::after{border-left-color:#9958dc}.header-angle-btn .btn:hover,.header-angle-btn.active .btn{background:#7f2ed3}.header-angle-btn .btn:hover::after,.header-angle-btn.active .btn::after{border-left-color:#7f2ed3}.header-angle-btn.active .btn:hover{background:#7a2bcc}.header-angle-btn.active .btn:hover::after{border-left-color:#7a2bcc}.header-angle-btn+.header-angle-btn::after,.header-angle-btn+.header-angle-btn::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn+.header-angle-btn::after{border-left-color:#9958dc}#searchGo{background-color:#9958dc}#searchGo:hover{background-color:#3123ae}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#3123ae}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#3123ae}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#3123ae}.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 #3123ae}.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 #3123ae}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #3123ae}#sidebarHeader .title{color:#3123ae}#sidebar>.sidebar-toggle>.icon{background:#cdacee}#main .querybox-toggle.querybox-opened{color:#3123ae}#contentNav .nav>li.active>a{color:#3123ae}#contentNav .nav>li.active>a:before{background:#3123ae}#mainContent .side-col .nav-tabs>li.active>a:before{background:#3123ae}td.c-actions .btn{color:#9958dc}td.c-actions .btn:hover{color:#3123ae;background-color:#e4d4f9}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#3123ae;background:#f2eafc}.main-table table .btn-icon-left:hover>.icon{background:#f2eafc}.main-table tbody>tr:hover{background:#f2eafc}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#3123ae}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f8f3fd}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f8f3fd}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#2f21a6}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#2a1466}.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:#3123ae}.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:#3123ae}.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:#3123ae}.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:#f2eafc}.table-footer .checkbox-primary.checked label:after{border-color:#3123ae!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#402fd5!important;border-color:#402fd5!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#3123ae}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#3123ae;border-color:#3123ae}.article-content a{color:#3123ae}.article-content a:focus,.article-content a:hover{color:#9958dc}.list-group{overflow-y:auto}.list-group>a.selected{color:#f2eafc;background-color:#3123ae}.list-group>a.active{color:#3123ae;background-color:#f2eafc}.list-group>a.active:hover,.list-group>a:hover{background-color:#3123ae}.release-line>li>a:hover:before{background-color:#f2eafc}.release-line>li>a:hover .title{color:#3123ae}.release-line>li.active>a:before{border-color:#3123ae}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#9958dc}#poweredBy .icon-zentao{color:#9958dc}#poweredBy a:hover{color:#3123ae}#poweredBy a:hover .icon-zentao{color:#3123ae}#poweredBy a.text-primary{color:#3123ae}#poweredBy a.text-primary:hover{color:#9958dc}.block-statistic .nav-secondary>li.active>a:before{background:#3123ae!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#9958dc!important}.dynamic.active .dynamic-date:before{background-color:#9958dc!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:#3123ae!important}.table td.has-child>.task-toggle:hover{color:#3123ae!important}#openTaskPage.open:hover,#task .task-nav{color:#3123ae!important;background:#f2eafc!important}#tasksProgress>.progress-bar{background:#3123ae!important}#tasksProgress .progress-text{color:#3123ae!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#3123ae!important;background:#f2eafc!important;border-left-color:#3123ae!important;-webkit-box-shadow:inset 4px 0 0 #3123ae!important;box-shadow:inset 4px 0 0 #3123ae!important}#copyProjectModal a:hover{border-color:#9958dc!important}#zeroTaskStory.checked{background:#f2eafc!important;border-color:#9958dc!important}.cols-list .col:hover{background:#f2eafc!important}.files-grid .actions,.files-grid .col:hover .file{background:#f2eafc!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:#3123ae!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#9958dc!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#3123ae!important}#bars>li.active:after{background:#f2eafc!important}
\ No newline at end of file
+ */a{color:#3c4353}a:focus,a:hover{color:#3123ae}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#3123ae;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#271c8c;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:#1f166e;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:#3123ae;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#271c8c;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:#1f166e;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:#3123ae;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#3123ae;background-color:#f2eafc;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#3123ae;background-color:#dcc6f7;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:#c9a7f2;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:#f2eafc;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#3123ae;background-color:#dcc6f7;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:#c9a7f2;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:#f2eafc;border-color:transparent}.btn-link{color:#3c4353;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:#3123ae}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#3123ae}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#251a84}.label-primary.label-outline{color:#3123ae;background:0 0;border:1px solid #3123ae}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#251a84}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#6759de}.text-primary{color:#3123ae}.text-primary:hover{color:#251a84}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#3123ae}a.bg-primary:hover{background-color:#251a84}.hl-primary{background-color:#f2eafc}a.hl-primary:hover{background-color:#d6bdf6}.progress{background-color:#f2eafc;border-radius:3px}.progress-bar{color:#fff;background-color:#3123ae;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#3123ae;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)}.form-control:focus{border-color:#3123ae;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#3123ae;border-color:#3123ae}.switch input:focus+label{color:#3123ae}.switch input:focus+label:before{border-color:#3123ae;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #3123ae;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #3123ae}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#3123ae;border-color:#3123ae}.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:#3123ae;-webkit-box-shadow:0 0 8px #3123ae;box-shadow:0 0 8px #3123ae}.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:#3123ae}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#3123ae}.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:#9958dc}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#f2eafc}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#3123ae;border-color:#3123ae}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#9958dc;border-color:#7f2ed3}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#8c43d8}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#a871e1}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#b382e5}.navbar-inverse .navbar-toggle{border-color:#b382e5}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#8c43d8}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#873ad6}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#b382e5}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#7f2ed3}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#a871e1}.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:#b382e5}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #b382e5;-webkit-box-shadow:inset 0 -1px 0 #7f2ed3;box-shadow:inset 0 -1px 0 #7f2ed3}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#8436d5}.nav>li>a:focus,.nav>li>a:hover{color:#3123ae}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#3123ae}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#3123ae;border-color:#3123ae}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#3123ae;border-bottom-color:#3123ae}.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 #cbd0db}.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 #3123ae;box-shadow:inset 2px 0 0 #3123ae}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#3123ae;border-color:#3123ae}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#3123ae}.panel-primary>.panel-heading{color:#fff;background-color:#3123ae;border-color:#3123ae}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#3123ae}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#3123ae}.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:#f2eafc}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#3123ae!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:#3123ae!important;border-bottom-left-radius:#3123ae!important}.chosen-container .chosen-results li.highlighted{background-color:#3123ae!important}.chosen-container-active .chosen-single{border-color:#3123ae!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#3123ae!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:#3123ae!important;border-bottom-left-radius:#3123ae!important}.chosen-container.chosen-highlight-selected .result-selected{color:#3123ae;background:#f2eafc}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#3123ae;border-color:#3123ae}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#3123ae}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#3123ae}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#3123ae}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#3123ae!important;border-color:#251a84!important}.datetimepicker td.day.active:hover{background-color:#251a84!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#3123ae!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important}.ke-menu-item-on{background-color:#3123ae!important}.ke-colorpicker-cell-on{background-color:#3123ae!important}.ke-input-text:focus{border-color:#3123ae!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(49,35,174,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#3123ae}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#f2eafc}.alert-primary hr{border-top-color:#dfcbf8}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#3123ae;border-color:#3123ae}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#f2eafc}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#3123ae}.tree-drag-holder{background-color:#f2eafc}.tree-menu li.active>a{color:#fff;background-color:#3123ae;border-color:#3123ae}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#9958dc}a.text-primary{color:#3123ae}.nav-primary>li.active>a{color:#3123ae}.nav-primary>li.active>a:hover{color:#3123ae}.bg-primary,.m-user-login{background:#9958dc -webkit-gradient(linear,right top,left top,from(#3123ae),to(#9958dc))!important;background:#9958dc -webkit-linear-gradient(right,#3123ae 0,#9958dc 100%)!important;background:#9958dc -o-linear-gradient(right,#3123ae 0,#9958dc 100%)!important;background:#9958dc linear-gradient(-90deg,#3123ae 0,#9958dc 100%)!important}.bg-secondary{background:#9958dc}.alert-info{color:#3123ae;background:#f2eafc}.btn-primary{color:#fff;background-color:#3123ae;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(49,35,174,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#2b1f99;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:#3123ae;border-color:transparent}.btn-secondary{color:#fff;background-color:#9958dc;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(153,88,220,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#8c43d8;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:#9958dc;border-color:transparent}.btn-info{color:#3123ae;background-color:#f2eafc;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#3123ae;background-color:rgba(242,234,252,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#e4d4f9;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(49,35,174,.3);background-color:#f2eafc;border-color:transparent}.btn-icon-left>.icon{color:#9958dc;background:#f2eafc}.btn-active-line{color:#3123ae}.btn-active-line:after{border-bottom-color:#3123ae}.btn-active-line:hover{color:#3123ae}.btn-active-text .text{color:#3123ae}.btn-active-text .text:after{border-bottom-color:#3123ae}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(49,35,174,.8)}.label-primary{background:#3123ae!important}.label-pale{background:#d6bdf6!important}.label-outline.label-primary{background:#f2eafc!important;border-color:rgba(49,35,174,.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:#3123ae;border-color:#3123ae}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#3123ae;-webkit-box-shadow:0 0 0 3px rgba(49,35,174,.2);box-shadow:0 0 0 3px rgba(49,35,174,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#3123ae}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#3123ae!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#3123ae!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#3123ae!important}.panel-actions .btn.text-primary{color:#3123ae}.status-bars .bar{background:#3123ae}.status-bars-h .bar{background:#3123ae}.messagger-zt .messager-content>.icon{color:#3123ae}.tree li.active>a{color:#3123ae}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#3123ae}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#9958dc}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#f2eafc}.dropdown-submenu:hover>a:after{border-left-color:#3123ae}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#9958dc}.timeline>li>a:after,.timeline>li>div:after{background-color:#3123ae}.timeline>li.active:before{background-color:rgba(49,35,174,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#3123ae!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#3123ae!important}#mainHeader{background:#9958dc -webkit-gradient(linear,right top,left top,from(#3123ae),to(#9958dc));background:#9958dc -webkit-linear-gradient(right,#3123ae 0,#9958dc 100%);background:#9958dc -o-linear-gradient(right,#3123ae 0,#9958dc 100%);background:#9958dc linear-gradient(-90deg,#3123ae 0,#9958dc 100%);background-color:#9958dc;border-top-color:#3123ae;border-bottom-color:#f2eafc}#searchGo{background-color:#9958dc}#searchGo:hover{background-color:#3123ae}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#3123ae}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#3123ae}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#3123ae}.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 #3123ae}.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 #3123ae}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #3123ae}#sidebarHeader .title{color:#3123ae}#sidebar>.sidebar-toggle>.icon{background:#cdacee}#main .querybox-toggle.querybox-opened{color:#3123ae}#contentNav .nav>li.active>a{color:#3123ae}#contentNav .nav>li.active>a:before{background:#3123ae}#mainContent .side-col .nav-tabs>li.active>a:before{background:#3123ae}td.c-actions .btn{color:#9958dc}td.c-actions .btn:hover{color:#3123ae;background-color:#e4d4f9}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#3123ae;background:#f2eafc}.main-table table .btn-icon-left:hover>.icon{background:#f2eafc}.main-table tbody>tr:hover{background:#f2eafc}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#3123ae}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f8f3fd}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f8f3fd}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#2f21a6}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#2a1466}.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:#3123ae}.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:#3123ae}.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:#3123ae}.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:#f2eafc}.table-footer .checkbox-primary.checked label:after{border-color:#3123ae!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#402fd5!important;border-color:#402fd5!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#3123ae}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#3123ae;border-color:#3123ae}.article-content a{color:#3123ae}.article-content a:focus,.article-content a:hover{color:#9958dc}.list-group{overflow-y:auto}.list-group>a.selected{color:#f2eafc;background-color:#3123ae}.list-group>a.active{color:#3123ae;background-color:#f2eafc}.list-group>a.active:hover,.list-group>a:hover{background-color:#3123ae}.release-line>li>a:hover:before{background-color:#f2eafc}.release-line>li>a:hover .title{color:#3123ae}.release-line>li.active>a:before{border-color:#3123ae}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#9958dc}#poweredBy .icon-zentao{color:#9958dc}#poweredBy a:hover{color:#3123ae}#poweredBy a:hover .icon-zentao{color:#3123ae}#poweredBy a.text-primary{color:#3123ae}#poweredBy a.text-primary:hover{color:#9958dc}.block-statistic .nav-secondary>li.active>a:before{background:#3123ae!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#9958dc!important}.dynamic.active .dynamic-date:before{background-color:#9958dc!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:#3123ae!important}.table td.has-child>.task-toggle:hover{color:#3123ae!important}#openTaskPage.open:hover,#task .task-nav{color:#3123ae!important;background:#f2eafc!important}#tasksProgress>.progress-bar{background:#3123ae!important}#tasksProgress .progress-text{color:#3123ae!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#3123ae!important;background:#f2eafc!important;border-left-color:#3123ae!important;-webkit-box-shadow:inset 4px 0 0 #3123ae!important;box-shadow:inset 4px 0 0 #3123ae!important}#copyProjectModal a:hover{border-color:#9958dc!important}#zeroTaskStory.checked{background:#f2eafc!important;border-color:#9958dc!important}.cols-list .col:hover{background:#f2eafc!important}.files-grid .actions,.files-grid .col:hover .file{background:#f2eafc!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:#3123ae!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#9958dc!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#3123ae!important}#bars>li.active:after{background:#f2eafc!important}
\ No newline at end of file
diff --git a/www/theme/red/style.css b/www/theme/red/style.css
index 63107a2bbc..4f7ebc3dd6 100644
--- a/www/theme/red/style.css
+++ b/www/theme/red/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - red - v1.9.2 - 2021-01-06
+ * ZUI: Zentao Theme - red - v1.9.2 - 2021-03-17
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
- */a{color:#3c4353}a:focus,a:hover{color:#e62340}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#e62340;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#c91731;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:#a9132a;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:#e62340;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#c91731;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:#a9132a;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:#e62340;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#e62340;background-color:#fceaea;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#e62340;background-color:#f7c6c6;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:#f2a7a7;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:#fceaea;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#e62340;background-color:#f7c6c6;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:#f2a7a7;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:#fceaea;border-color:transparent}.btn-link{color:#3c4353;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:#e62340}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#e62340}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#c0162f}.label-primary.label-outline{color:#e62340;background:0 0;border:1px solid #e62340}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#c0162f}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#f07f90}.text-primary{color:#e62340}.text-primary:hover{color:#c0162f}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#e62340}a.bg-primary:hover{background-color:#c0162f}.hl-primary{background-color:#fceaea}a.hl-primary:hover{background-color:#f6bdbd}.progress{background-color:#fceaea;border-radius:3px}.progress-bar{color:#fff;background-color:#e62340;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#e62340;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)}.form-control:focus{border-color:#e62340;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#e62340;border-color:#e62340}.switch input:focus+label{color:#e62340}.switch input:focus+label:before{border-color:#e62340;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #e62340;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #e62340}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#e62340;border-color:#e62340}.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:#e62340;-webkit-box-shadow:0 0 8px #e62340;box-shadow:0 0 8px #e62340}.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:#e62340}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#e62340}.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:#f5515f}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#fceaea}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#e62340;border-color:#e62340}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#f5515f;border-color:#f22133}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#f43949}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#f76e7a}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#f8818b}.navbar-inverse .navbar-toggle{border-color:#f8818b}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#f43949}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#f32f40}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#f8818b}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#f22133}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#f76e7a}.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:#f8818b}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #f8818b;-webkit-box-shadow:inset 0 -1px 0 #f22133;box-shadow:inset 0 -1px 0 #f22133}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#f32a3c}.nav>li>a:focus,.nav>li>a:hover{color:#e62340}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#e62340}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#e62340;border-color:#e62340}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#e62340;border-bottom-color:#e62340}.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 #cbd0db}.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 #e62340;box-shadow:inset 2px 0 0 #e62340}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#e62340;border-color:#e62340}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#e62340}.panel-primary>.panel-heading{color:#fff;background-color:#e62340;border-color:#e62340}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#e62340}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#e62340}.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:#fceaea}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#e62340!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:#e62340!important;border-bottom-left-radius:#e62340!important}.chosen-container .chosen-results li.highlighted{background-color:#e62340!important}.chosen-container-active .chosen-single{border-color:#e62340!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#e62340!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:#e62340!important;border-bottom-left-radius:#e62340!important}.chosen-container.chosen-highlight-selected .result-selected{color:#e62340;background:#fceaea}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#e62340;border-color:#e62340}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e62340}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#e62340}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#e62340}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#e62340!important;border-color:#c0162f!important}.datetimepicker td.day.active:hover{background-color:#c0162f!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#e62340!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important}.ke-menu-item-on{background-color:#e62340!important}.ke-colorpicker-cell-on{background-color:#e62340!important}.ke-input-text:focus{border-color:#e62340!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#e62340}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#fceaea}.alert-primary hr{border-top-color:#f8cbcb}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#e62340;border-color:#e62340}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#fceaea}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#e62340}.tree-drag-holder{background-color:#fceaea}.tree-menu li.active>a{color:#fff;background-color:#e62340;border-color:#e62340}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#f5515f}a.text-primary{color:#e62340}.nav-primary>li.active>a{color:#e62340}.nav-primary>li.active>a:hover{color:#e62340}.bg-primary,.m-user-login{background:#f5515f -webkit-gradient(linear,right top,left top,from(#e62340),to(#f5515f))!important;background:#f5515f -webkit-linear-gradient(right,#e62340 0,#f5515f 100%)!important;background:#f5515f -o-linear-gradient(right,#e62340 0,#f5515f 100%)!important;background:#f5515f linear-gradient(-90deg,#e62340 0,#f5515f 100%)!important}.bg-secondary{background:#f5515f}.alert-info{color:#e62340;background:#fceaea}.btn-primary{color:#fff;background-color:#e62340;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(230,35,64,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#d71835;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:#e62340;border-color:transparent}.btn-secondary{color:#fff;background-color:#f5515f;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(245,81,95,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#f43949;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:#f5515f;border-color:transparent}.btn-info{color:#e62340;background-color:#fceaea;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#e62340;background-color:rgba(252,234,234,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#f9d4d4;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(230,35,64,.3);background-color:#fceaea;border-color:transparent}.btn-icon-left>.icon{color:#f5515f;background:#fceaea}.btn-active-line{color:#e62340}.btn-active-line:after{border-bottom-color:#e62340}.btn-active-line:hover{color:#e62340}.btn-active-text .text{color:#e62340}.btn-active-text .text:after{border-bottom-color:#e62340}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(230,35,64,.8)}.label-primary{background:#e62340!important}.label-pale{background:#f6bdbd!important}.label-outline.label-primary{background:#fceaea!important;border-color:rgba(230,35,64,.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:#e62340;border-color:#e62340}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#e62340;-webkit-box-shadow:0 0 0 3px rgba(230,35,64,.2);box-shadow:0 0 0 3px rgba(230,35,64,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#e62340}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#e62340!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#e62340!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#e62340!important}.panel-actions .btn.text-primary{color:#e62340}.status-bars .bar{background:#e62340}.status-bars-h .bar{background:#e62340}.messagger-zt .messager-content>.icon{color:#e62340}.tree li.active>a{color:#e62340}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#e62340}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#f5515f}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#fceaea}.dropdown-submenu:hover>a:after{border-left-color:#e62340}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#f5515f}.timeline>li>a:after,.timeline>li>div:after{background-color:#e62340}.timeline>li.active:before{background-color:rgba(230,35,64,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#e62340!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#e62340!important}#mainHeader{background:#f5515f -webkit-gradient(linear,right top,left top,from(#e62340),to(#f5515f));background:#f5515f -webkit-linear-gradient(right,#e62340 0,#f5515f 100%);background:#f5515f -o-linear-gradient(right,#e62340 0,#f5515f 100%);background:#f5515f linear-gradient(-90deg,#e62340 0,#f5515f 100%);background-color:#f5515f;border-top-color:#e62340;border-bottom-color:#fceaea}.header-angle-btn .btn{background-color:#f5515f}.header-angle-btn .btn::after{border-left-color:#f5515f}.header-angle-btn .btn:hover,.header-angle-btn.active .btn{background:#f22133}.header-angle-btn .btn:hover::after,.header-angle-btn.active .btn::after{border-left-color:#f22133}.header-angle-btn.active .btn:hover{background:#f2172a}.header-angle-btn.active .btn:hover::after{border-left-color:#f2172a}.header-angle-btn+.header-angle-btn::after,.header-angle-btn+.header-angle-btn::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn+.header-angle-btn::after{border-left-color:#f5515f}#searchGo{background-color:#f5515f}#searchGo:hover{background-color:#e62340}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#e62340}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#e62340}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#e62340}.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 #e62340}.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 #e62340}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #e62340}#sidebarHeader .title{color:#e62340}#sidebar>.sidebar-toggle>.icon{background:#fbb1b8}#main .querybox-toggle.querybox-opened{color:#e62340}#contentNav .nav>li.active>a{color:#e62340}#contentNav .nav>li.active>a:before{background:#e62340}#mainContent .side-col .nav-tabs>li.active>a:before{background:#e62340}td.c-actions .btn{color:#f5515f}td.c-actions .btn:hover{color:#e62340;background-color:#f9d4d4}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#e62340;background:#fceaea}.main-table table .btn-icon-left:hover>.icon{background:#fceaea}.main-table tbody>tr:hover{background:#fceaea}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#e62340}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#fdf3f3}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#fdf3f3}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#e51a38}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#a01512}.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:#e62340}.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:#e62340}.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:#e62340}.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:#fceaea}.table-footer .checkbox-primary.checked label:after{border-color:#e62340!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#eb5168!important;border-color:#eb5168!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#e62340}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#e62340;border-color:#e62340}.article-content a{color:#e62340}.article-content a:focus,.article-content a:hover{color:#f5515f}.list-group{overflow-y:auto}.list-group>a.selected{color:#fceaea;background-color:#e62340}.list-group>a.active{color:#e62340;background-color:#fceaea}.list-group>a.active:hover,.list-group>a:hover{background-color:#e62340}.release-line>li>a:hover:before{background-color:#fceaea}.release-line>li>a:hover .title{color:#e62340}.release-line>li.active>a:before{border-color:#e62340}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#f5515f}#poweredBy .icon-zentao{color:#f5515f}#poweredBy a:hover{color:#e62340}#poweredBy a:hover .icon-zentao{color:#e62340}#poweredBy a.text-primary{color:#e62340}#poweredBy a.text-primary:hover{color:#f5515f}.block-statistic .nav-secondary>li.active>a:before{background:#e62340!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#f5515f!important}.dynamic.active .dynamic-date:before{background-color:#f5515f!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:#e62340!important}.table td.has-child>.task-toggle:hover{color:#e62340!important}#openTaskPage.open:hover,#task .task-nav{color:#e62340!important;background:#fceaea!important}#tasksProgress>.progress-bar{background:#e62340!important}#tasksProgress .progress-text{color:#e62340!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#e62340!important;background:#fceaea!important;border-left-color:#e62340!important;-webkit-box-shadow:inset 4px 0 0 #e62340!important;box-shadow:inset 4px 0 0 #e62340!important}#copyProjectModal a:hover{border-color:#f5515f!important}#zeroTaskStory.checked{background:#fceaea!important;border-color:#f5515f!important}.cols-list .col:hover{background:#fceaea!important}.files-grid .actions,.files-grid .col:hover .file{background:#fceaea!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:#e62340!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#f5515f!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#e62340!important}#bars>li.active:after{background:#fceaea!important}
\ No newline at end of file
+ */a{color:#3c4353}a:focus,a:hover{color:#e62340}.btn{color:#3c4353;background-color:#fff;border-color:#d6dae3;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:#ebebeb;border-color:#b2b9ca;-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:#b8bfce;-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:#d6dae3}.btn-primary{color:#fff;background-color:#e62340;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#c91731;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:#a9132a;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:#e62340;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#c91731;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:#a9132a;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:#e62340;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#d68000;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:#b36a00;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#ff3434;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:#f11;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#00b16f;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:#008e58;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:#00da88;border-color:transparent}.btn-info{color:#e62340;background-color:#fceaea;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#e62340;background-color:#f7c6c6;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:#f2a7a7;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:#fceaea;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#e62340;background-color:#f7c6c6;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:#f2a7a7;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:#fceaea;border-color:transparent}.btn-link{color:#3c4353;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:#e62340}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#cbd0db}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#e62340}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#c0162f}.label-primary.label-outline{color:#e62340;background:0 0;border:1px solid #e62340}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#c0162f}.label-success{background-color:#00da88}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#00a768}.label-success.label-outline{color:#00da88;background:0 0;border:1px solid #00da88}.label-success[href]:focus,.label-success[href]:hover{background-color:#00a768}.label-info{background-color:#2196f3}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#0c7cd5}.label-info.label-outline{color:#2196f3;background:0 0;border:1px solid #2196f3}.label-info[href]:focus,.label-info[href]:hover{background-color:#0c7cd5}.label-warning{background-color:#ff9800}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#cc7a00}.label-warning.label-outline{color:#ff9800;background:0 0;border:1px solid #ff9800}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#cc7a00}.label-danger{background-color:#ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#ff2a2a}.label-danger.label-outline{color:#ff5d5d;background:0 0;border:1px solid #ff5d5d}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#ff2a2a}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#f07f90}.text-primary{color:#e62340}.text-primary:hover{color:#c0162f}.text-warning{color:#ff9800}.text-warning:hover{color:#cc7a00}.text-danger{color:#ff5d5d}.text-danger:hover{color:#ff2a2a}.text-success{color:#00da88}.text-success:hover{color:#00a768}.text-info{color:#2196f3}.text-info:hover{color:#0c7cd5}.text-important{color:#bd7b46}.text-important:hover{color:#996337}.text-special{color:#8666b8}.text-special:hover{color:#6c4aa1}.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.bg-primary{background-color:#e62340}a.bg-primary:hover{background-color:#c0162f}.hl-primary{background-color:#fceaea}a.hl-primary:hover{background-color:#f6bdbd}.progress{background-color:#fceaea;border-radius:3px}.progress-bar{color:#fff;background-color:#e62340;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#e62340;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)}.form-control:focus{border-color:#e62340;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#e62340;border-color:#e62340}.switch input:focus+label{color:#e62340}.switch input:focus+label:before{border-color:#e62340;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #e62340;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #e62340}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border:1px solid #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:#e62340;border-color:#e62340}.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:#e62340;-webkit-box-shadow:0 0 8px #e62340;box-shadow:0 0 8px #e62340}.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:#e62340}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#e62340}.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:#f5515f}.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 #cbd0db}.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:#3c4353;text-decoration:none;background-color:#fceaea}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#e62340;border-color:#e62340}.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:#3c495c}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#f5515f;border-color:#f22133}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#f43949}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#f76e7a}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#f8818b}.navbar-inverse .navbar-toggle{border-color:#f8818b}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#f43949}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#f32f40}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#f8818b}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#f22133}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#f76e7a}.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:#f8818b}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #f8818b;-webkit-box-shadow:inset 0 -1px 0 #f22133;box-shadow:inset 0 -1px 0 #f22133}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#dadee5;background-color:#f32a3c}.nav>li>a:focus,.nav>li>a:hover{color:#e62340}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#3c4353}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#e62340}.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 #cbd0db}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#e62340;border-color:#e62340}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#e62340;border-bottom-color:#e62340}.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 #cbd0db}.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 #e62340;box-shadow:inset 2px 0 0 #e62340}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.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 #cbd0db}.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:#e62340;border-color:#e62340}.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:#cbd0db;background-color:#fff;border-color:#cbd0db}.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:#e62340}.panel-primary>.panel-heading{color:#fff;background-color:#e62340;border-color:#e62340}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#e62340}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#e62340}.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:#fceaea}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe9c6}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#3c4353!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#e62340!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:#e62340!important;border-bottom-left-radius:#e62340!important}.chosen-container .chosen-results li.highlighted{background-color:#e62340!important}.chosen-container-active .chosen-single{border-color:#e62340!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b6bdcc!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#e62340!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:#e62340!important;border-bottom-left-radius:#e62340!important}.chosen-container.chosen-highlight-selected .result-selected{color:#e62340;background:#fceaea}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #cbd0db}.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:#e62340;border-color:#e62340}.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:#3c4353;background-color:#fff;border-color:#cbd0db}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#3c4353}.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 #cbd0db}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e62340}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#e62340}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#e62340}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ff9800!important;border-color:#ff9800!important}.datetimepicker td.day.active{background-color:#e62340!important;border-color:#c0162f!important}.datetimepicker td.day.active:hover{background-color:#c0162f!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#cc7a00!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#e62340!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important}.ke-menu-item-on{background-color:#e62340!important}.ke-colorpicker-cell-on{background-color:#e62340!important}.ke-input-text:focus{border-color:#e62340!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(230,35,64,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#e62340}.messager-success{background-color:#00da88}.messager-info{background-color:#2196f3}.messager-warning{background-color:#ff9800}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.comment:hover>.content>.actions>a{color:#3c4353}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#313744;background-color:#fceaea}.alert-primary hr{border-top-color:#f8cbcb}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#e8f5e9}.alert-success hr{border-top-color:#c7e6c4}.alert-success .alert-link{color:#009d62}.alert-info{color:#0d8aee;background-color:#e3f2fd}.alert-info hr{border-top-color:#9ce0f8}.alert-info .alert-link{color:#0b76cc}.alert-warning{color:#e68900;background-color:#fff3e0}.alert-warning hr{border-top-color:#ffe0c6}.alert-warning .alert-link{color:#c27400}.alert-danger{color:#ff4343;background-color:#ffebee}.alert-danger hr{border-top-color:#ffd1e0}.alert-danger .alert-link{color:#ff2020}.alert-primary-inverse{color:#fff;background-color:#e62340;border-color:#e62340}.alert-primary-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.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:#fceaea}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#e62340}.tree-drag-holder{background-color:#fceaea}.tree-menu li.active>a{color:#fff;background-color:#e62340;border-color:#e62340}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#f5515f}a.text-primary{color:#e62340}.nav-primary>li.active>a{color:#e62340}.nav-primary>li.active>a:hover{color:#e62340}.bg-primary,.m-user-login{background:#f5515f -webkit-gradient(linear,right top,left top,from(#e62340),to(#f5515f))!important;background:#f5515f -webkit-linear-gradient(right,#e62340 0,#f5515f 100%)!important;background:#f5515f -o-linear-gradient(right,#e62340 0,#f5515f 100%)!important;background:#f5515f linear-gradient(-90deg,#e62340 0,#f5515f 100%)!important}.bg-secondary{background:#f5515f}.alert-info{color:#e62340;background:#fceaea}.btn-primary{color:#fff;background-color:#e62340;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(230,35,64,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#d71835;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:#e62340;border-color:transparent}.btn-secondary{color:#fff;background-color:#f5515f;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(245,81,95,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#f43949;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:#f5515f;border-color:transparent}.btn-info{color:#e62340;background-color:#fceaea;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#e62340;background-color:rgba(252,234,234,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#f9d4d4;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(230,35,64,.3);background-color:#fceaea;border-color:transparent}.btn-icon-left>.icon{color:#f5515f;background:#fceaea}.btn-active-line{color:#e62340}.btn-active-line:after{border-bottom-color:#e62340}.btn-active-line:hover{color:#e62340}.btn-active-text .text{color:#e62340}.btn-active-text .text:after{border-bottom-color:#e62340}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(230,35,64,.8)}.label-primary{background:#e62340!important}.label-pale{background:#f6bdbd!important}.label-outline.label-primary{background:#fceaea!important;border-color:rgba(230,35,64,.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:#e62340;border-color:#e62340}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#e62340;-webkit-box-shadow:0 0 0 3px rgba(230,35,64,.2);box-shadow:0 0 0 3px rgba(230,35,64,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#e62340}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#e62340!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#e62340!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#e62340!important}.panel-actions .btn.text-primary{color:#e62340}.status-bars .bar{background:#e62340}.status-bars-h .bar{background:#e62340}.messagger-zt .messager-content>.icon{color:#e62340}.tree li.active>a{color:#e62340}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#e62340}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#f5515f}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#3c4353;background-color:#fceaea}.dropdown-submenu:hover>a:after{border-left-color:#e62340}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#f5515f}.timeline>li>a:after,.timeline>li>div:after{background-color:#e62340}.timeline>li.active:before{background-color:rgba(230,35,64,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#e62340!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#e62340!important}#mainHeader{background:#f5515f -webkit-gradient(linear,right top,left top,from(#e62340),to(#f5515f));background:#f5515f -webkit-linear-gradient(right,#e62340 0,#f5515f 100%);background:#f5515f -o-linear-gradient(right,#e62340 0,#f5515f 100%);background:#f5515f linear-gradient(-90deg,#e62340 0,#f5515f 100%);background-color:#f5515f;border-top-color:#e62340;border-bottom-color:#fceaea}#searchGo{background-color:#f5515f}#searchGo:hover{background-color:#e62340}#subNavbar{margin-top:7px;font-size:15px;text-align:center}#subNavbar .nav>li.active>a{color:#e62340}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#e62340}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#e62340}.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 #e62340}.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 #e62340}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}#sidebarHeader{border-left:3px solid #e62340}#sidebarHeader .title{color:#e62340}#sidebar>.sidebar-toggle>.icon{background:#fbb1b8}#main .querybox-toggle.querybox-opened{color:#e62340}#contentNav .nav>li.active>a{color:#e62340}#contentNav .nav>li.active>a:before{background:#e62340}#mainContent .side-col .nav-tabs>li.active>a:before{background:#e62340}td.c-actions .btn{color:#f5515f}td.c-actions .btn:hover{color:#e62340;background-color:#f9d4d4}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#e62340;background:#fceaea}.main-table table .btn-icon-left:hover>.icon{background:#fceaea}.main-table tbody>tr:hover{background:#fceaea}.main-table tbody>tr.checked:hover{background:#ffebbc}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#e62340}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#fdf3f3}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#fdf3f3}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#e51a38}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#a01512}.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:#e62340}.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:#e62340}.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:#e62340}.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:#fceaea}.table-footer .checkbox-primary.checked label:after{border-color:#e62340!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#eb5168!important;border-color:#eb5168!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffebbc}.files-list>li>a:hover{color:#e62340}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#e62340;border-color:#e62340}.article-content a{color:#e62340}.article-content a:focus,.article-content a:hover{color:#f5515f}.list-group{overflow-y:auto}.list-group>a.selected{color:#fceaea;background-color:#e62340}.list-group>a.active{color:#e62340;background-color:#fceaea}.list-group>a.active:hover,.list-group>a:hover{background-color:#e62340}.release-line>li>a:hover:before{background-color:#fceaea}.release-line>li>a:hover .title{color:#e62340}.release-line>li.active>a:before{border-color:#e62340}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#f5515f}#poweredBy .icon-zentao{color:#f5515f}#poweredBy a:hover{color:#e62340}#poweredBy a:hover .icon-zentao{color:#e62340}#poweredBy a.text-primary{color:#e62340}#poweredBy a.text-primary:hover{color:#f5515f}.block-statistic .nav-secondary>li.active>a:before{background:#e62340!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#f5515f!important}.dynamic.active .dynamic-date:before{background-color:#f5515f!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:#e62340!important}.table td.has-child>.task-toggle:hover{color:#e62340!important}#openTaskPage.open:hover,#task .task-nav{color:#e62340!important;background:#fceaea!important}#tasksProgress>.progress-bar{background:#e62340!important}#tasksProgress .progress-text{color:#e62340!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#e62340!important;background:#fceaea!important;border-left-color:#e62340!important;-webkit-box-shadow:inset 4px 0 0 #e62340!important;box-shadow:inset 4px 0 0 #e62340!important}#copyProjectModal a:hover{border-color:#f5515f!important}#zeroTaskStory.checked{background:#fceaea!important;border-color:#f5515f!important}.cols-list .col:hover{background:#fceaea!important}.files-grid .actions,.files-grid .col:hover .file{background:#fceaea!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:#e62340!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#f5515f!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#e62340!important}#bars>li.active:after{background:#fceaea!important}
\ No newline at end of file
diff --git a/www/theme/zui/css/min.css b/www/theme/zui/css/min.css
index 9862d731b4..6888520e4b 100644
--- a/www/theme/zui/css/min.css
+++ b/www/theme/zui/css/min.css
@@ -1,5 +1,5 @@
 /*!
- * ZUI: ZUI for Zentao20 - v1.9.2 - 2021-03-04
+ * ZUI: ZUI for Zentao - v1.9.2 - 2021-05-27
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 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 #b6bdcc;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:#0c64eb;background:#e9f2fb}.chosen-container-single .chosen-single{display:block;width:100%;height:32px;padding:5px 8px;overflow:hidden;line-height:1.42857143;color:#222;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:#0c64eb}.chosen-container-single .chosen-search:before{position:absolute;top:10px;right:10px;display:block;font-family:ZentaoIcon;font-size:18px;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:#0c64eb}.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:18px;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 #cbd0db;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:#adb5c6;-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:18px;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:#0c64eb;-webkit-box-shadow:none,0 0 8px rgba(12,100,235,.6);box-shadow:none,0 0 8px rgba(12,100,235,.6)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #b6bdcc;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:#0c64eb;-webkit-box-shadow:none,0 0 8px rgba(12,100,235,.6);box-shadow:none,0 0 8px rgba(12,100,235,.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}.container,.container-fixed,.container-fluid{position:relative}.container{max-width:1800px!important}body{background-color:#efefef}body.article-content,body.body-modal{background:0 0}body.body-modal{padding:0}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:#3c4353}.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:#ffe066}.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:#16a8f8}a.text-primary{color:#0c64eb}.nav-primary>li>a{min-width:100px;padding:5px 8px;color:#838a9d;border-color:#e7f1fc}.nav-primary>li.active>a{color:#0c64eb;background-color:#e7f1fc;border-color:#e7f1fc}.nav-primary>li.active>a:hover{color:#0c64eb;background-color:#c3dcf7;border-color:#c3dcf7}.end-marker{margin-bottom:20px;color:#cbd0db;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:#ff5d5d!important}.icon-pro-version{font-size:14px!important}.icon-pro-version:before{position:relative;top:-1px;font-size:14px;color:#ff5d5d;content:"\e92b"}.bg-primary{color:#fff;background:#1183fb -webkit-gradient(linear,right top,left top,from(#0a48d1),to(#1183fb));background:#1183fb -webkit-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb -o-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb linear-gradient(-90deg,#0a48d1 0,#1183fb 100%);background-color:#00b1fd}.bg-secondary{color:#fff;background:#16a8f8}.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 2000px rgba(0,0,0,.2)!important;box-shadow:0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 2000px rgba(0,0,0,.2)!important}.btn.tooltip-tutorial,.hl-tutorial.hl-in:hover{-webkit-box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 2000px rgba(0,0,0,.3)!important;box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 2000px 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:ZentaoIcon;font-style:normal;font-weight:400;src:url(../fonts/ZentaoIcon.eot?v=1.7.0);src:url(../fonts/ZentaoIcon.eot?#iefix&v=1.7.0) format('embedded-opentype'),url(../fonts/ZentaoIcon.woff?v=1.7.0) format('woff'),url(../fonts/ZentaoIcon.ttf?v=1.7.0) format('truetype'),url(../fonts/ZentaoIcon.svg#regular?v=1.7.0) format('svg')}.icon,[class*=" icon-"],[class^=icon-]{font-family:ZentaoIcon;font-size:18px;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:18px;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:36px}.icon-3x{font-size:54px}.icon-4x{font-size:72px}.icon-5x{font-size:90px}.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-run:before{content:"\e9a9"}.icon-program:before{content:"\e9aa"}.icon-alter:before{content:"\e9ab"}.icon-test:before{content:"\e956"}.icon-infinite:before{content:"\e9a3"}.icon-devops:before{content:"\e9a3"}.icon-waterfall:before{content:"\e9a4"}.icon-shield-check:before{content:"\e9a5"}.icon-ok:before{content:"\e9a6"}.icon-more-alt:before{content:"\e9a7"}.icon-sprint:before{content:"\e9a2"}.icon-manual:before{content:"\e98d"}.icon-split:before{content:"\e98e"}.icon-lightbulb-alt:before{content:"\e98f"}.icon-product:before{content:"\e98f"}.icon-code1:before{content:"\e990"}.icon-feedback:before{content:"\e991"}.icon-account:before{content:"\e992"}.icon-controls:before{content:"\e993"}.icon-flow:before{content:"\e994"}.icon-about:before{content:"\e995"}.icon-cog-outline:before{content:"\e996"}.icon-backend:before{content:"\e996"}.icon-recent:before{content:"\e997"}.icon-statistic:before{content:"\e999"}.icon-exit:before{content:"\e99a"}.icon-doc:before{content:"\e99b"}.icon-rocket:before{content:"\e99c"}.icon-project:before{content:"\e99c"}.icon-usecase:before{content:"\e99d"}.icon-aiux:before{content:"\e99e"}.icon-ops:before{content:"\e99f"}.icon-theme:before{content:"\e9a0"}.icon-oa:before{content:"\e9a1"}.icon-globe:before{content:"\f0ac"}.icon-lang:before{content:"\f0ac"}.icon-more-circle:before{content:"\e988"}.icon-fields:before{content:"\e989"}.icon-trigger:before{content:"\e98a"}.icon-layout:before{content:"\e98b"}.icon-audit:before{content:"\e98c"}.icon-qc:before{content:"\e986"}.icon-q:before{content:"\e985"}.icon-c:before{content:"\e987"}.icon-menu-report:before{content:"\e974"}.icon-menu-users:before{content:"\e975"}.icon-menu-backend:before{content:"\e976"}.icon-menu-recent:before{content:"\e977"}.icon-menu-doc:before{content:"\e978"}.icon-menu-project:before{content:"\e979"}.icon-menu-my:before{content:"\e97a"}.icon-swap:before{content:"\e97b"}.icon-clock:before{content:"\e97c"}.icon-cost:before{content:"\e97d"}.icon-group:before{content:"\e97e"}.icon-private:before{content:"\e97f"}.icon-menu-collapse:before{content:"\e980"}.icon-menu-expand:before{content:"\e981"}.icon-kanban:before{content:"\e983"}.icon-fullscreen-exit:before{content:"\e972"}.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-pencil-alt:before{content:"\e984"}.icon-list:before{content:"\e9a8"}.icon-format-list-bulleted:before{content:"\e9a8"}.icon-chat:before{content:"\e940"}.icon-message:before{content:"\e940"}.icon-share:before{content:"\f064"}.icon-severity:before{content:"\e973"}.icon-book:before{content:"\f02d"}.icon-treemap-alt:before{content:"\e971"}.icon-collapse-alt:before{content:"\e6f2"}.icon-expand-alt:before{content:"\e6f1"}.icon-more:before{content:"\e744"}.icon-angle-double-right:before{content:"\f101"}.icon-certificate:before{content:"\f0a3"}.icon-bell:before{content:"\e7f5"}.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-fullscreen:before{content:"\e96b"}.icon-image:before{content:"\e96c"}.icon-table-large:before{content:"\e96d"}.icon-columns:before{content:"\f0db"}.icon-cancel:before{content:"\e951"}.icon-ban-circle:before{content:"\e951"}.icon-persons:before{content:"\e94d"}.icon-team:before{content:"\e94d"}.icon-eye:before{content:"\e94e"}.icon-unlock:before{content:"\e94f"}.icon-eye-off:before{content:"\e96e"}.icon-lock:before{content:"\e950"}.icon-move:before{content:"\e94c"}.icon-help:before{content:"\e968"}.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-restart:before{content:"\e95e"}.icon-history:before{content:"\e95f"}.icon-home:before{content:"\e958"}.icon-pencil:before{content:"\e254"}.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-zentao-alt:before{content:"\e900"}.icon-zentao:before{content:"\e901"}.icon-severity-solid:before{content:"\e902"}.icon-chat-line:before{content:"\e998"}.icon-bar-chart:before{content:"\e903"}.icon-import:before{content:"\e904"}.icon-download:before{content:"\e904"}.icon-export:before{content:"\e905"}.icon-printer:before{content:"\e906"}.icon-hand-right:before{content:"\e907"}.icon-hand-right-alt:before{content:"\e96f"}.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-bullhorn:before{content:"\e910"}.icon-bug:before{content:"\e911"}.icon-list-alt:before{content:"\e912"}.icon-fork:before{content:"\e913"}.icon-change:before{content:"\e970"}.icon-glasses:before{content:"\e914"}.icon-sitemap:before{content:"\e915"}.icon-plus-sign:before{content:"\e916"}.icon-pluses:before{content:"\e917"}.icon-flag-alt:before{content:"\e918"}.icon-magic:before{content:"\e919"}.icon-treemap:before{content:"\e91a"}.icon-confirm:before{content:"\e91b"}.icon-lightbulb:before{content:"\e91c"}.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-arrow-up:before{content:"\e923"}.icon-arrow-down:before{content:"\e924"}.icon-arrow-left:before{content:"\e952"}.icon-arrow-right:before{content:"\e93e"}.icon-plus:before{content:"\e925"}.icon-minus:before{content:"\e926"}.icon-exchange:before{content:"\e927"}.icon-search:before{content:"\e928"}.icon-envelope-o:before{content:"\e92a"}.icon-check:before{content:"\e5ca"}.icon-circle:before{content:"\e836"}.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-check-circle:before{content:"\e92f"}.icon-exclamation-sign:before{content:"\e930"}.icon-unfold-all:before{content:"\e931"}.icon-fold-all:before{content:"\e932"}.icon-plus-sm:before{content:"\e933"}.icon-chevron-left:before{content:"\e934"}.icon-chevron-right:before{content:"\e935"}.icon-close:before{content:"\e936"}.icon-flag:before{content:"\e937"}.icon-check-sign:before{content:"\e938"}.icon-minus-sign:before{content:"\e939"}.icon-bars-sign:before{content:"\e93a"}.icon-cog:before{content:"\e93b"}.icon-color:before{content:"\e93c"}.icon-paper-clip:before{content:"\e93d"}.icon-back:before{content:"\e93f"}.icon-person:before{content:"\e941"}.icon-stack:before{content:"\e943"}.icon-cube:before{content:"\e967"}.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-bars:before{content:"\e948"}.icon-cards-view:before{content:"\e949"}.icon-star-empty:before{content:"\e94a"}.icon-star:before{content:"\e94b"}.icon-ellipsis-v:before{content:"\e5d4"}.icon-spinner-indicator:before{content:"\e982"}.icon-text:before{content:"\e929"}.icon-code:before{content:"\e957"}.icon-chevron-double-up:before{content:"\e959"}.icon-chevron-double-down:before{content:"\e95a"}.icon-chart-pie:before{content:"\e95b"}.icon-chart-line:before{content:"\e95c"}.icon-chart-bar:before{content:"\e95d"}.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:18px;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:#ff5d5d;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:#3c4353;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:#3c4353;background-color:#fff;border-color:#d6dae3}.btn.active,.btn.hover,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:rgba(255,255,255,.8);border-color:#b8bfce}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#f2f2f2;background-image:none;border-color:#b8bfce}.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(60,67,83,.3);background-color:#fff;border-color:#d6dae3}.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:#0c64eb;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(12,100,235,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#0b5ad3;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:#0c64eb;border-color:transparent}.btn-secondary{color:#fff;background-color:#16a8f8;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(22,168,248,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#079ced;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:#16a8f8;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;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,152,0,.8);border-color:rgba(0,0,0,0)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e68900;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;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(255,93,93,.8);border-color:rgba(0,0,0,0)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#ff4343;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;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(0,218,136,.8);border-color:rgba(0,0,0,0)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#00c178;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:#00da88;border-color:transparent}.btn-info{color:#0c64eb;background-color:#e9f2fb;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#0c64eb;background-color:rgba(233,242,251,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#d3e5f7;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(12,100,235,.3);background-color:#e9f2fb;border-color:transparent}.btn-link{padding-right:6px;padding-left:6px;font-weight:400;color:#3c495c;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:#222;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:#cbd0db;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:ellipsis;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:#16a8f8;text-align:center;background:#e9f2fb}.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:#0c64eb}.btn-active-line:after{position:absolute;right:5px;bottom:1px;left:5px;display:block;content:' ';border-bottom:2px solid #0c64eb}.btn-active-line:hover{color:#0c64eb}.btn-active-text .text{position:relative;top:-1px;display:inline-block;font-weight:700;color:#0c64eb}.btn-active-text .text:after{position:absolute;bottom:-5px;display:block;width:100%;content:' ';border-bottom:2px solid #0c64eb}.angle-btn{position:relative;padding:1px;background:#fff;border:1px solid #cbd0db;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 #cbd0db;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 #cbd0db;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:#0c64eb}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#0c64eb}.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 #0c64eb}.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 #0c64eb}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}.nav>li>.btn.btn-primary{color:#fff}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(12,100,235,.8)}.btn.btn-action,.c-actions .btn{display:inline-block;width:26px;padding:2px;overflow:hidden;line-height:20px;color:#16a8f8;background:0 0;border-color:transparent}.btn.btn-action .icon,.c-actions .btn .icon{font-size:18px}.btn.btn-action:hover,.c-actions .btn:hover{color:#0c64eb;background-color:#d3e5f7}.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:#bed8f3!important}.label-badge{border-radius:9px}.label-light{color:#3c4353;background-color:#ddd}.label-primary{background:#0c64eb!important}.label-gray{color:#878da0;background:#e8ebef}.label-outline.label-danger{color:#ff5d5d;background:#ffebee;border-color:rgba(255,93,93,.25)}.label-outline.label-light{color:#838a9d;background:#f2f5fb;border-color:#e1e5ee}.label-primary.label-outline{background:#e9f2fb!important;border-color:rgba(12,100,235,.25)}.label-outline.label-success{background:#e8f5e9;border-color:rgba(0,218,136,.25)}.label-outline.label-info{border-color:rgba(33,150,243,.25)}.label-outline.label-warning{border-color:rgba(255,152,0,.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:#ff5d5d}[class*=" status-"],[class^=status-]{color:#3c4353}.status-changed,.status-delayed,.status-doing,.status-fail,.status-investigate{color:#ff5d5d}.status-changed>.label-dot,.status-delayed>.label-dot,.status-doing>.label-dot,.status-fail>.label-dot,.status-investigate>.label-dot{background-color:#ff5d5d}.status-wait{color:#838a9d}.status-wait>.label-dot{background-color:#7ec5ff}.status-unclosed{color:#838a9d}.status-unclosed>.label-dot{background-color:#0c64eb}.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:#00da88}.status-postpone{color:#838a9d}.status-postpone>.label-dot{background-color:#ff5d5d}.status-blocked{position:relative;left:-5px;display:inline-block;padding:0 5px;line-height:20px;color:#3c4353;background:#fff3e0;border-radius:10px}.status-blocked>.label-dot{background-color:#ff9800}.status-pause,.status-suspended{color:#ff9800}.status-pause>.label-dot,.status-suspended>.label-dot{background-color:#ff9800}.status-active.status-bug,.status-draft{color:#8666b8}.status-active.status-bug>.label-dot,.status-draft>.label-dot{background-color:#8666b8}.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:#cbd0db}.label-pri{display:inline-block;min-width:20px;max-width:67px;height:20px;padding:0 4px;overflow:hidden;line-height:17px;color:#838a9d;text-align:center;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle;border:2px solid #838a9d;border-radius:10px}.label-selector>.label-pri,[class*=label-pri-]{color:#158af1;border-color:#2098ee}.label-pri-1,.label-selector>.label-pri[data-value="1"]{color:#d50000;border-color:#d50000}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#ff9800;border-color:#ff9800}.label-pri-3,.label-selector>.label-pri[data-value="3"]{color:#2098ee;border-color:#2098ee}.label-pri-4,.label-selector>.label-pri[data-value="4"]{color:#009688;border-color:#009688}.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:18px;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="0"]:after,.label-severity[data-value="0"]:after{display:none}.label-severity[data-severity="1"],.label-severity[data-value="1"]{color:#c62828}.label-severity[data-severity="2"],.label-severity[data-value="2"]{color:#ff8f00}.label-severity[data-severity="3"],.label-severity[data-value="3"]{color:#fdd835}.label-severity[data-severity="4"],.label-severity[data-value="4"]{color:#cddc39}.label-severity[data-severity="5"],.label-severity[data-value="5"]{color:#8bc34a}.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>.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:30px;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:1px;right:0;left:0;display:block;width:18px;height:18px;line-height:18px;text-align:center;content:' ';border-radius:3px}.checkbox-primary>label:after,.radio-primary>label:after{z-index:1;border:2px solid #eee;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:18px;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:#00da88;border-color:#00da88;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.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#00da88;-webkit-box-shadow:0 0 0 3px rgba(0,218,136,.2);box-shadow:0 0 0 3px rgba(0,218,136,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#00da88}.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:#00da88;border-width:2px}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#00da88}.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}.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}.panel-actions>li>a:hover{color:#3c495c;text-decoration:initial;background-color:#f1f1f1}.panel-actions .btn-icon{color:#a6aab8}.panel-actions .btn.text-primary{color:#0c64eb}.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;color:#2196f3;-webkit-transform:scale(.7,1);-ms-transform:scale(.7,1);-o-transform:scale(.7,1);transform:scale(.7,1)}.progress-pie-24[data-value="100"] .progress-info{-webkit-transform:scale(.6,1);-ms-transform:scale(.6,1);-o-transform:scale(.6,1);transform:scale(.6,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:#0c64eb;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:#0c64eb;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}.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:#3c4353;background-color:#fff}.messagger-zt .messager-icon>.icon{color:#0c64eb}.messagger-zt .messager-actions>.action{color:#838a9d}.messagger-zt.messager-success .messager-icon>.icon{color:#00da88}.messagger-zt.messager-danger .messager-icon>.icon{color:#ff5d5d}.messagger-zt.messager-warning .messager-icon>.icon{color:#ff9800}.messagger-zt.messager-info .messager-icon>.icon{color:#2196f3}.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:#3c495c}.tree li>a{display:block;max-width:90%;padding:2px 6px;color:#3c495c;word-break:break-all}.tree li>a:hover{color:#3c4353}.tree li>a.tree-toggle:hover{background:0 0}.tree li.active>a{position:relative;font-weight:700;color:#0c64eb}.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:#0c64eb}.tree li.has-active-item>.list-toggle{color:#3c4353}.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:#3c495c;vertical-align:middle}.tree li>.module-name:hover{background-color:#f0f2f5}.tree li>.module-name:hover>a{color:#3c4353}.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.active>a,.dropdown-menu>li.selected>a{position:relative;color:#fff;background-color:#16a8f8}.dropdown-menu>li.selected>a:after{position:absolute;top:2px;right:4px;display:block;font-family:ZentaoIcon;font-size:18px;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:#3c4353;background-color:#e9f2fb}.dropdown-submenu:hover>a:after{border-left-color:#0c64eb}.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:#16a8f8}.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:#222}.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:#3c495c}.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:#cbd0db;border:none;border:1px solid #cbd0db}.timeline>li>a:after,.timeline>li>div:after{top:11px;left:-17px;z-index:3;width:9px;height:9px;background-color:#0c64eb;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(12,100,235,.2);border:none}.timeline>li>a,.timeline>li>div{display:block;padding:5px;line-height:20px}.timeline>li.active>a{color:#3c4353}.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:#3c495c}.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;white-space:normal}.chosen-container-single .chosen-single div b{position:relative;top:1px;color:#cbd0db}.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}.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{top:7px;right:8px}.datetimepicker{padding:10px}.datetimepicker td.day.today{background-color:#f77}.datetimepicker td.day.active{background-color:#16a8f8}.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:18px;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:#0c64eb!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:ellipsis;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:#0c64eb!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:#ff5d5d!important;-webkit-box-shadow:0 0 6px #ffc3c3!important;box-shadow:0 0 6px #ffc3c3!important}.popover-success.popover-form-result{font-weight:700;color:#fff;background:#00da88}.popover-success.popover-form-result.popover.right .arrow:after{border-right-color:#00da88}#mainHeader{height:50px;color:#fff;background:#1183fb -webkit-gradient(linear,right top,left top,from(#0a48d1),to(#1183fb));background:#1183fb -webkit-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb -o-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb linear-gradient(-90deg,#0a48d1 0,#1183fb 100%);background-color:#1183fb;border-top-color:#0c64eb;border-bottom-color:#e9f2fb}#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:ellipsis;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 15px;line-height:30px;color:#fff;border-radius:0;opacity:.9}@media (max-width:992px){#navbar .nav>li>a{padding:10px}}#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;background:rgba(255,255,255,.4)}#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:#6a9afd;border-radius:2px}#searchGo:hover{color:#fff!important;background-color:#0c64eb}#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:ellipsis;white-space:nowrap}#userNav>li>a:hover{background-color:rgba(0,0,0,.1);opacity:1}#userNav>li>a span{display:inline-block;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:#ff5d5d;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}}#pageNav{position:absolute;top:8px;left:0;left:20px}@media (min-width:1400px){#pageNav{left:40px}}#subNavbar{margin-top:5px;font-size:14px;text-align:center}#subNavbar .nav{display:inline-block}#subNavbar .nav>li>a{padding:8px 12px;line-height:24px;color:#3c495c}#subNavbar .nav>li>a:hover{color:#3c495c;background-color:rgba(0,0,0,.075)}#subNavbar .nav>li.active>a{font-weight:700;color:#0c64eb}#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{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>*{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}@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;border-bottom:1px solid #ddd}#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{position:relative;padding:8px 5px;border:none;border-radius:2px!important}#main .side-col .nav-tabs>li.active>a{font-weight:700;color:#3c4353}#main .side-col .nav-tabs>li.active>a:before{position:absolute;right:0;bottom:-1px;left:0;display:block;height:2px;content:' ';background:#0c64eb}#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:50px}.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>.icon,#prevPage>.icon{display:block;font-size:36px;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 #0c64eb;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:#0c64eb;text-align:center;text-overflow:ellipsis;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:#79cdfb;border-radius:6px}#sidebar>.sidebar-toggle>.icon:before{position:relative;left:-3px}#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:#0c64eb;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:#0c64eb}#contentNav .nav>li.active>a:before{position:absolute;right:10px;bottom:3px;left:10px;display:block;height:2px;content:' ';background:#0c64eb}.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:ellipsis;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:ellipsis;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 #cbd0db;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}.show-help-tab{overflow:hidden}.show-help-tab #main{display:none}.show-help-tab #helpContent{display:block}#navbar .nav>li>a.open-help-tab>.icon-close{display:none;opacity:.5}#navbar .nav>li>a.open-help-tab>.icon-close:hover{background:rgba(0,0,0,.1);opacity:1}.show-help-tab #navbar .nav>li>a.open-help-tab>.icon-close{display:inline}.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:ellipsis;white-space:nowrap}td.c-name,td.c-title{overflow:hidden;text-align:left!important;text-overflow:ellipsis;white-space:nowrap}td.c-actions{position:relative;padding-top:0;padding-bottom:0;overflow:hidden;white-space:nowrap;vertical-align:middle}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#0c64eb;background:#e9f2fb}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:#3c4353}.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:ellipsis;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 tbody>tr:last-child{border-bottom:none}.table caption{margin-bottom:5px;background:#f1f1f1;border:none}.is-firefox .table .btn-icon-left>.icon{line-height:22px}.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:#e9f2fb;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-left:15px}.main-table thead>tr>th{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-bottom:1px solid #ddd}.main-table tbody>tr:nth-child(odd){background-color:#f5f5f5}.main-table tbody>tr:last-child>td{border-bottom:1px solid #ddd}.main-table tbody>tr>td{position:relative;border-bottom:none;border-bottom:1px solid #eee}.main-table tbody>tr>td .label{max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.main-table tbody>tr>td>a{line-height:28px;color:#0c60e1}.main-table tbody>tr>td>a:not(.btn):visited{color:#082999;opacity:.9}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover{color:#0c64eb}.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:#0c64eb;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{-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:#e9f2fb}.main-table .table-grouped tbody>tr:hover{background:#f2f7fd;-webkit-box-shadow:none;box-shadow:none}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f2f7fd}.main-table tbody>tr.checked{background:#fff3e0}.main-table tbody>tr.checked:hover{background:#ffebbc}.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:#3c4353}.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:0;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-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:#00da88!important}.table-footer .btn{padding:3px 10px;line-height:20px}.table-footer .pager{position:absolute;top:0;right:0;z-index:4;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{width:0;height:28px;visibility:hidden;opacity:0;-webkit-transition:opacity cubic-bezier(.175,.885,.32,1) .8s;-o-transition:opacity cubic-bezier(.175,.885,.32,1) .8s;transition:opacity cubic-bezier(.175,.885,.32,1) .8s}.table-actions.show-always{width:auto;pointer-events:none;cursor:not-allowed;visibility:visible;opacity:.75}.has-row-checked .table-actions{width:auto;pointer-events:auto!important;cursor:default;visibility:visible;opacity:1}.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:#3c4353}.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:18px;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:30px;color:#3c495c;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:#0c64eb;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>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 .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:#00da88!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:#0c60e1}.table-data tbody>tr>td>a:not(.btn):visited{color:#082999}.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#0c64eb}.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:#ffebbc}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;margin-right:-4px;font-size:16px;color:#a6aab8;text-align:center;border-radius:4px}.table-nest-toggle:before{line-height:22px;content:"\e6f2"}.table-nest-toggle:hover{color:#0c64eb;background-color:rgba(0,0,0,.1)}.table-nest-child-hide .table-nest-toggle:before{font-size:16px;content:"\e6f1"}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:static!important;font-size:16px!important;line-height:22px!important;content:"\e6f2"!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:16px!important;content:"\e6f1"!important}.is-nest-child .table-nest-icon:before,.no-nest .table-nest-icon:before{position:relative;top:-1px;width:6px;min-width:6px;height:6px;content:' ';background-color:#cbd0db;border-radius:1px}.table-nest-child-hover>td:first-child,.table-nest-hover>td:first-child{-webkit-box-shadow:inset 3px 0 0 #cbd0db;box-shadow:inset 3px 0 0 #cbd0db}.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}.article-content table th{background:#eee}.article-content a{color:#0c64eb}.article-content a:focus,.article-content a:hover{color:#16a8f8}.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:#3c4353}.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:18px;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:#0c64eb}.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 .btn-mini{position:relative;top:1px}.histories-list>li{position:relative}.histories-list>li+li{margin-top:5px}.histories-list>li strong{color:#3c4353}.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>.icon{position:relative;top:-2px;left:-2px}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#0c64eb;border-color:#0c64eb}.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:ellipsis;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:#e9f2fb;background-color:#0c64eb}.list-group>a.active{color:#0c64eb;background-color:#e9f2fb}.list-group>a.active:hover,.list-group>a:hover{color:#fff;background-color:#0c64eb}.list-group>.heading{padding:2px 5px;line-height:20px;color:#838a9d}.list-group>a+.heading{margin-top:4px}.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:#0c64eb;background-color:#e9f2fb}.search-list .list-group>a.active:hover,.search-list.searchbox-focus .list-group>a.active:hover{color:#fff;background-color:#0c64eb}#dropMenu>.search-box{max-width:188px}#dropMenu .input-control-icon-left{top:0}#dropMenu .list-group{width:199px;max-width:199px;max-height:300px;padding-top:0}#dropMenu .table-row .list-group{margin:0 -10px}#dropMenu .col-right{display:none}#dropMenu .col-left{width:100%}#dropMenu .col-left .list-group{max-height:250px;margin-bottom:35px}#dropMenu .col-footer{position:absolute;bottom:10px;left:10px;width:180px;padding-top:10px;margin-top:5px;border-top:1px solid #eee}#dropMenu .col-footer>a{opacity:.8}#dropMenu .col-footer>a:hover{opacity:1}#dropMenu.show-right-col{width:402px;max-width:402px}#dropMenu.show-right-col>.list-group{width:400px;max-width:400px}#dropMenu.show-right-col .col-left,#dropMenu.show-right-col .col-right{display:table-cell;width:50%}#dropMenu.show-right-col .col-left>.list-group{width:200px;max-width:200px;margin-right:0}#dropMenu.show-right-col .col-right{border-left:1px solid #eee}#dropMenu.show-right-col .col-right>.list-group{width:199px;max-height:285px;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{width:200px}#dropMenu.has-search-text .list-group{overflow-x:hidden}#dropMenu.has-search-text>.list-group>.table-row{display:block}#dropMenu.has-search-text>.list-group>.table-row>.table-col{display:block}#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{margin-left:-10px}#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{display:none}.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:#cbe0f6}.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:ellipsis;white-space:nowrap}.release-line>li>a:hover:before{background-color:#e9f2fb}.release-line>li>a:hover:after{background-color:#838a9d}.release-line>li>a:hover .title{color:#0c64eb}.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 #cbe0f6}.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 #cbe0f6}.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:#0c64eb}.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:ellipsis;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:#16a8f8}#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:#3c4353}#poweredBy a:hover{color:#0c64eb}#poweredBy a:hover .icon-zentao{color:#0c64eb}#poweredBy a.text-important{color:#bd7b46}#poweredBy a.text-important:hover{color:#ff5d5d}#poweredBy a.text-primary{color:#0c64eb}#poweredBy a.text-primary:hover{color:#16a8f8}#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-angle-btn{position:relative;padding:8px 0}.header-angle-btn .btn{position:relative;height:34px;padding:1px 2px 1px 8px;margin:0;overflow:visible;font-size:13px;font-weight:400;color:#fff;background-color:transparent;border:rgba(255,255,255,.4) solid 1px;border-right:none;border-radius:0!important;-webkit-transition:none;-o-transition:none;transition:none}.header-angle-btn .btn::after,.header-angle-btn .btn::before{position:absolute;top:-1px;right:-10px;z-index:0;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent rgba(255,255,255,.4);border-style:solid;border-width:17px 0 17px 10px}.header-angle-btn .btn::after{right:-9px;z-index:1;border-width:17px 0 17px 10px;border-left-color:#107df7;border-radius:4px}.header-angle-btn .btn>.caret{margin-left:0;border-width:6px}.header-angle-btn .btn>.text{display:inline-block;max-width:150px;overflow:hidden;text-overflow:ellipsis;vertical-align:middle}#heading>.header-angle-btn:first-child>.btn:first-child{border-radius:4px 0 0 4px!important}.header-angle-btn .btn-span{padding:1px 10px 1px 20px!important;line-height:30px;pointer-events:none;border-right:rgba(255,255,255,.4) solid 1px}.header-angle-btn .btn-span:after,.header-angle-btn .btn-span:before{display:none}.header-angle-btn .btn-span+.btn{padding-left:10px!important}.header-angle-btn .btn:hover,.header-angle-btn.active .btn{color:#fff;background:rgba(0,0,0,.15);border-color:rgba(255,255,255,.8)}.header-angle-btn .btn:hover::before,.header-angle-btn.active .btn::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn .btn:hover::after,.header-angle-btn.active .btn::after{border-left-color:#0e6dd4}.header-angle-btn .btn:hover>.caret,.header-angle-btn.active .btn>.caret{opacity:1}.header-angle-btn.active .btn:hover{background:rgba(0,0,0,.2)}.header-angle-btn.active .btn:hover::after{border-left-color:#0d63c5}.header-angle-btn+.header-angle-btn{margin-left:11px}.header-angle-btn+.header-angle-btn::after,.header-angle-btn+.header-angle-btn::before{position:absolute;top:8px;left:0;z-index:1;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent rgba(255,255,255,.4);border-style:solid;border-width:17px 0 17px 10px}.header-angle-btn+.header-angle-btn::after{left:-1px;z-index:2;border-left-color:#107df7}.header-angle-btn+.header-angle-btn.active::before,.header-angle-btn+.header-angle-btn:hover::before{border-left-color:rgba(255,255,255,.8)}.header-angle-btn+.header-angle-btn>.btn{padding-left:15px}.header-angle-btn .dropdown-menu{margin-top:-8px;border-radius:2px}#swapper{position:relative}#swapper #dropMenu .search-box .icon-search{color:#333}#swapper #dropMenu .list-group>a.active,#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#0c64eb!important}#swapper #dropMenu .tree{margin:0}
\ 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 #b6bdcc;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:#0c64eb;background:#e9f2fb}.chosen-container-single .chosen-single{display:block;width:100%;height:32px;padding:5px 8px;overflow:hidden;line-height:1.42857143;color:#222;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:#0c64eb}.chosen-container-single .chosen-search:before{position:absolute;top:10px;right:10px;display:block;font-family:ZentaoIcon;font-size:18px;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:#0c64eb}.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:18px;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 #cbd0db;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:#adb5c6;-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:18px;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:#0c64eb;-webkit-box-shadow:none,0 0 8px rgba(12,100,235,.6);box-shadow:none,0 0 8px rgba(12,100,235,.6)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #b6bdcc;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:#0c64eb;-webkit-box-shadow:none,0 0 8px rgba(12,100,235,.6);box-shadow:none,0 0 8px rgba(12,100,235,.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}.container,.container-fixed,.container-fluid{position:relative}.container{max-width:1800px!important}body{background-color:#efefef}body.article-content,body.body-modal{background:0 0}body.body-modal{padding:0}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:#3c4353}.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:#ffe066}.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:#16a8f8}a.text-primary{color:#0c64eb}.nav-primary>li>a{min-width:100px;padding:5px 8px;color:#838a9d;border-color:#e7f1fc}.nav-primary>li.active>a{color:#0c64eb;background-color:#e7f1fc;border-color:#e7f1fc}.nav-primary>li.active>a:hover{color:#0c64eb;background-color:#c3dcf7;border-color:#c3dcf7}.end-marker{margin-bottom:20px;color:#cbd0db;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:#ff5d5d!important}.icon-pro-version{font-size:14px!important}.icon-pro-version:before{position:relative;top:-1px;font-size:14px;color:#ff5d5d;content:"\e92b"}.bg-primary{color:#fff;background:#1183fb -webkit-gradient(linear,right top,left top,from(#0a48d1),to(#1183fb));background:#1183fb -webkit-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb -o-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb linear-gradient(-90deg,#0a48d1 0,#1183fb 100%);background-color:#00b1fd}.bg-secondary{color:#fff;background:#16a8f8}.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 2000px rgba(0,0,0,.2)!important;box-shadow:0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 2000px rgba(0,0,0,.2)!important}.btn.tooltip-tutorial,.hl-tutorial.hl-in:hover{-webkit-box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 2000px rgba(0,0,0,.3)!important;box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 2000px 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:ZentaoIcon;font-style:normal;font-weight:400;src:url(../fonts/ZentaoIcon.eot?v=1.9.0);src:url(../fonts/ZentaoIcon.eot?#iefix&v=1.9.0) format('embedded-opentype'),url(../fonts/ZentaoIcon.woff?v=1.9.0) format('woff'),url(../fonts/ZentaoIcon.ttf?v=1.9.0) format('truetype'),url(../fonts/ZentaoIcon.svg#regular?v=1.9.0) format('svg')}.icon,[class*=" icon-"],[class^=icon-]{font-family:ZentaoIcon;font-size:18px;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:18px;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:36px}.icon-3x{font-size:54px}.icon-4x{font-size:72px}.icon-5x{font-size:90px}.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-summary:before{content:"\e9ad"}.icon-estimate:before{content:"\e9ac"}.icon-run:before{content:"\e9a9"}.icon-program:before{content:"\e9aa"}.icon-alter:before{content:"\e9ab"}.icon-test:before{content:"\e956"}.icon-infinite:before{content:"\e9a3"}.icon-devops:before{content:"\e9a3"}.icon-waterfall:before{content:"\e9a4"}.icon-shield-check:before{content:"\e9a5"}.icon-ok:before{content:"\e9a6"}.icon-more-alt:before{content:"\e9a7"}.icon-sprint:before{content:"\e9a2"}.icon-manual:before{content:"\e98d"}.icon-split:before{content:"\e98e"}.icon-lightbulb-alt:before{content:"\e98f"}.icon-product:before{content:"\e98f"}.icon-code1:before{content:"\e990"}.icon-feedback:before{content:"\e991"}.icon-account:before{content:"\e992"}.icon-controls:before{content:"\e993"}.icon-flow:before{content:"\e994"}.icon-about:before{content:"\e995"}.icon-cog-outline:before{content:"\e996"}.icon-backend:before{content:"\e996"}.icon-recent:before{content:"\e997"}.icon-statistic:before{content:"\e999"}.icon-exit:before{content:"\e99a"}.icon-doc:before{content:"\e99b"}.icon-rocket:before{content:"\e99c"}.icon-project:before{content:"\e99c"}.icon-usecase:before{content:"\e99d"}.icon-aiux:before{content:"\e99e"}.icon-ops:before{content:"\e99f"}.icon-theme:before{content:"\e9a0"}.icon-oa:before{content:"\e9a1"}.icon-globe:before{content:"\f0ac"}.icon-lang:before{content:"\f0ac"}.icon-more-circle:before{content:"\e988"}.icon-fields:before{content:"\e989"}.icon-trigger:before{content:"\e98a"}.icon-layout:before{content:"\e98b"}.icon-audit:before{content:"\e98c"}.icon-qc:before{content:"\e986"}.icon-q:before{content:"\e985"}.icon-c:before{content:"\e987"}.icon-menu-report:before{content:"\e974"}.icon-menu-users:before{content:"\e975"}.icon-menu-backend:before{content:"\e976"}.icon-menu-recent:before{content:"\e977"}.icon-menu-doc:before{content:"\e978"}.icon-menu-project:before{content:"\e979"}.icon-menu-my:before{content:"\e97a"}.icon-swap:before{content:"\e97b"}.icon-clock:before{content:"\e97c"}.icon-cost:before{content:"\e97d"}.icon-group:before{content:"\e97e"}.icon-private:before{content:"\e97f"}.icon-menu-collapse:before{content:"\e980"}.icon-menu-expand:before{content:"\e981"}.icon-kanban:before{content:"\e983"}.icon-fullscreen-exit:before{content:"\e972"}.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-pencil-alt:before{content:"\e984"}.icon-list:before{content:"\e9a8"}.icon-format-list-bulleted:before{content:"\e9a8"}.icon-chat:before{content:"\e940"}.icon-message:before{content:"\e940"}.icon-share:before{content:"\f064"}.icon-severity:before{content:"\e973"}.icon-book:before{content:"\f02d"}.icon-treemap-alt:before{content:"\e971"}.icon-collapse-alt:before{content:"\e6f2"}.icon-expand-alt:before{content:"\e6f1"}.icon-more:before{content:"\e744"}.icon-angle-double-right:before{content:"\f101"}.icon-certificate:before{content:"\f0a3"}.icon-bell:before{content:"\e7f5"}.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-fullscreen:before{content:"\e96b"}.icon-image:before{content:"\e96c"}.icon-table-large:before{content:"\e96d"}.icon-columns:before{content:"\f0db"}.icon-cancel:before{content:"\e951"}.icon-ban-circle:before{content:"\e951"}.icon-persons:before{content:"\e94d"}.icon-team:before{content:"\e94d"}.icon-eye:before{content:"\e94e"}.icon-unlock:before{content:"\e94f"}.icon-eye-off:before{content:"\e96e"}.icon-lock:before{content:"\e950"}.icon-move:before{content:"\e94c"}.icon-help:before{content:"\e968"}.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-restart:before{content:"\e95e"}.icon-history:before{content:"\e95f"}.icon-home:before{content:"\e958"}.icon-pencil:before{content:"\e254"}.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-zentao-alt:before{content:"\e900"}.icon-zentao:before{content:"\e901"}.icon-severity-solid:before{content:"\e902"}.icon-chat-line:before{content:"\e998"}.icon-bar-chart:before{content:"\e903"}.icon-import:before{content:"\e904"}.icon-download:before{content:"\e904"}.icon-export:before{content:"\e905"}.icon-printer:before{content:"\e906"}.icon-hand-right:before{content:"\e907"}.icon-hand-right-alt:before{content:"\e96f"}.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-bullhorn:before{content:"\e910"}.icon-bug:before{content:"\e911"}.icon-list-alt:before{content:"\e912"}.icon-fork:before{content:"\e913"}.icon-change:before{content:"\e970"}.icon-glasses:before{content:"\e914"}.icon-sitemap:before{content:"\e915"}.icon-plus-sign:before{content:"\e916"}.icon-pluses:before{content:"\e917"}.icon-flag-alt:before{content:"\e918"}.icon-magic:before{content:"\e919"}.icon-treemap:before{content:"\e91a"}.icon-confirm:before{content:"\e91b"}.icon-lightbulb:before{content:"\e91c"}.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-arrow-up:before{content:"\e923"}.icon-arrow-down:before{content:"\e924"}.icon-arrow-left:before{content:"\e952"}.icon-arrow-right:before{content:"\e93e"}.icon-plus:before{content:"\e925"}.icon-minus:before{content:"\e926"}.icon-exchange:before{content:"\e927"}.icon-search:before{content:"\e928"}.icon-envelope-o:before{content:"\e92a"}.icon-check:before{content:"\e5ca"}.icon-circle:before{content:"\e836"}.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-check-circle:before{content:"\e92f"}.icon-exclamation-sign:before{content:"\e930"}.icon-unfold-all:before{content:"\e931"}.icon-fold-all:before{content:"\e932"}.icon-plus-sm:before{content:"\e933"}.icon-chevron-left:before{content:"\e934"}.icon-chevron-right:before{content:"\e935"}.icon-close:before{content:"\e936"}.icon-flag:before{content:"\e937"}.icon-check-sign:before{content:"\e938"}.icon-minus-sign:before{content:"\e939"}.icon-bars-sign:before{content:"\e93a"}.icon-cog:before{content:"\e93b"}.icon-color:before{content:"\e93c"}.icon-paper-clip:before{content:"\e93d"}.icon-back:before{content:"\e93f"}.icon-person:before{content:"\e941"}.icon-stack:before{content:"\e943"}.icon-cube:before{content:"\e967"}.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-bars:before{content:"\e948"}.icon-cards-view:before{content:"\e949"}.icon-star-empty:before{content:"\e94a"}.icon-star:before{content:"\e94b"}.icon-ellipsis-v:before{content:"\e5d4"}.icon-spinner-indicator:before{content:"\e982"}.icon-text:before{content:"\e929"}.icon-code:before{content:"\e957"}.icon-chevron-double-up:before{content:"\e959"}.icon-chevron-double-down:before{content:"\e95a"}.icon-chart-pie:before{content:"\e95b"}.icon-chart-line:before{content:"\e95c"}.icon-chart-bar:before{content:"\e95d"}.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:18px;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:#ff5d5d;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:#3c4353;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:#3c4353;background-color:#fff;border-color:#d6dae3}.btn.active,.btn.hover,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#3c4353;background-color:rgba(255,255,255,.8);border-color:#b8bfce}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#f2f2f2;background-image:none;border-color:#b8bfce}.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(60,67,83,.3);background-color:#fff;border-color:#d6dae3}.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:#0c64eb;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(12,100,235,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#0b5ad3;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:#0c64eb;border-color:transparent}.btn-secondary{color:#fff;background-color:#16a8f8;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(22,168,248,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#079ced;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:#16a8f8;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9800;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,152,0,.8);border-color:rgba(0,0,0,0)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e68900;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:#ff9800;border-color:transparent}.btn-danger{color:#fff;background-color:#ff5d5d;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(255,93,93,.8);border-color:rgba(0,0,0,0)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#ff4343;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:#ff5d5d;border-color:transparent}.btn-success{color:#fff;background-color:#00da88;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(0,218,136,.8);border-color:rgba(0,0,0,0)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#00c178;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:#00da88;border-color:transparent}.btn-info{color:#0c64eb;background-color:#e9f2fb;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#0c64eb;background-color:rgba(233,242,251,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#d3e5f7;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(12,100,235,.3);background-color:#e9f2fb;border-color:transparent}.btn-link{padding-right:6px;padding-left:6px;font-weight:400;color:#3c495c;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:#222;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:#cbd0db;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:ellipsis;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:#16a8f8;text-align:center;background:#e9f2fb}.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:#0c64eb}.btn-active-line:after{position:absolute;right:5px;bottom:1px;left:5px;display:block;content:' ';border-bottom:2px solid #0c64eb}.btn-active-line:hover{color:#0c64eb}.btn-active-text .text{position:relative;top:-1px;display:inline-block;font-weight:700;color:#0c64eb}.btn-active-text .text:after{position:absolute;bottom:-5px;display:block;width:100%;content:' ';border-bottom:2px solid #0c64eb}.angle-btn{position:relative;padding:1px;background:#fff;border:1px solid #cbd0db;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 #cbd0db;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 #cbd0db;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:#0c64eb}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#0c64eb}.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 #0c64eb}.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 #0c64eb}.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:#cbd0db}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#3c4353}.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 #cbd0db}.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 #cbd0db!important}.nav>li>.btn.btn-primary{color:#fff}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(12,100,235,.8)}.btn.btn-action,.c-actions .btn{display:inline-block;width:26px;padding:2px;overflow:hidden;line-height:20px;color:#16a8f8;background:0 0;border-color:transparent}.btn.btn-action .icon,.c-actions .btn .icon{font-size:18px}.btn.btn-action:hover,.c-actions .btn:hover{color:#0c64eb;background-color:#d3e5f7}.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:#bed8f3!important}.label-badge{border-radius:9px}.label-light{color:#3c4353;background-color:#ddd}.label-primary{background:#0c64eb!important}.label-gray{color:#878da0;background:#e8ebef}.label-outline.label-danger{color:#ff5d5d;background:#ffebee;border-color:rgba(255,93,93,.25)}.label-outline.label-light{color:#838a9d;background:#f2f5fb;border-color:#e1e5ee}.label-primary.label-outline{background:#e9f2fb!important;border-color:rgba(12,100,235,.25)}.label-outline.label-success{background:#e8f5e9;border-color:rgba(0,218,136,.25)}.label-outline.label-info{border-color:rgba(33,150,243,.25)}.label-outline.label-warning{border-color:rgba(255,152,0,.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:#ff5d5d}[class*=" status-"],[class^=status-]{color:#3c4353}.status-changed,.status-delayed,.status-doing,.status-fail,.status-investigate{color:#ff5d5d}.status-changed>.label-dot,.status-delayed>.label-dot,.status-doing>.label-dot,.status-fail>.label-dot,.status-investigate>.label-dot{background-color:#ff5d5d}.status-wait{color:#838a9d}.status-wait>.label-dot{background-color:#7ec5ff}.status-unclosed{color:#838a9d}.status-unclosed>.label-dot{background-color:#0c64eb}.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:#00da88}.status-postpone{color:#838a9d}.status-postpone>.label-dot{background-color:#ff5d5d}.status-blocked{position:relative;left:-5px;display:inline-block;padding:0 5px;line-height:20px;color:#3c4353;background:#fff3e0;border-radius:10px}.status-blocked>.label-dot{background-color:#ff9800}.status-pause,.status-suspended{color:#ff9800}.status-pause>.label-dot,.status-suspended>.label-dot{background-color:#ff9800}.status-active.status-bug,.status-draft{color:#8666b8}.status-active.status-bug>.label-dot,.status-draft>.label-dot{background-color:#8666b8}.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:#cbd0db}.label-pri{display:inline-block;min-width:20px;max-width:67px;height:20px;padding:0 4px;overflow:hidden;line-height:17px;color:#838a9d;text-align:center;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle;border:2px solid #838a9d;border-radius:10px}.label-selector>.label-pri,[class*=label-pri-]{color:#158af1;border-color:#2098ee}.label-pri-1,.label-selector>.label-pri[data-value="1"]{color:#d50000;border-color:#d50000}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#ff9800;border-color:#ff9800}.label-pri-3,.label-selector>.label-pri[data-value="3"]{color:#2098ee;border-color:#2098ee}.label-pri-4,.label-selector>.label-pri[data-value="4"]{color:#009688;border-color:#009688}.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:18px;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="0"]:after,.label-severity[data-value="0"]:after{display:none}.label-severity[data-severity="1"],.label-severity[data-value="1"]{color:#c62828}.label-severity[data-severity="2"],.label-severity[data-value="2"]{color:#ff8f00}.label-severity[data-severity="3"],.label-severity[data-value="3"]{color:#fdd835}.label-severity[data-severity="4"],.label-severity[data-value="4"]{color:#cddc39}.label-severity[data-severity="5"],.label-severity[data-value="5"]{color:#8bc34a}.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>.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:30px;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:1px;right:0;left:0;display:block;width:18px;height:18px;line-height:18px;text-align:center;content:' ';border-radius:3px}.checkbox-primary>label:after,.radio-primary>label:after{z-index:1;border:2px solid #eee;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:18px;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:#00da88;border-color:#00da88;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.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#00da88;-webkit-box-shadow:0 0 0 3px rgba(0,218,136,.2);box-shadow:0 0 0 3px rgba(0,218,136,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#00da88}.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:#00da88;border-width:2px}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#00da88}.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}.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}.panel-actions>li>a:hover{color:#3c495c;text-decoration:initial;background-color:#f1f1f1}.panel-actions .btn-icon{color:#a6aab8}.panel-actions .btn.text-primary{color:#0c64eb}.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;color:#2196f3;-webkit-transform:scale(.7,1);-ms-transform:scale(.7,1);-o-transform:scale(.7,1);transform:scale(.7,1)}.progress-pie-24[data-value="100"] .progress-info{-webkit-transform:scale(.6,1);-ms-transform:scale(.6,1);-o-transform:scale(.6,1);transform:scale(.6,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:#0c64eb;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:#0c64eb;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}.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:#3c4353;background-color:#fff}.messagger-zt .messager-icon>.icon{color:#0c64eb}.messagger-zt .messager-actions>.action{color:#838a9d}.messagger-zt.messager-success .messager-icon>.icon{color:#00da88}.messagger-zt.messager-danger .messager-icon>.icon{color:#ff5d5d}.messagger-zt.messager-warning .messager-icon>.icon{color:#ff9800}.messagger-zt.messager-info .messager-icon>.icon{color:#2196f3}.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:#3c495c}.tree li>a{display:block;max-width:90%;padding:2px 6px;color:#3c495c;word-break:break-all}.tree li>a:hover{color:#3c4353}.tree li>a.tree-toggle:hover{background:0 0}.tree li.active>a{position:relative;font-weight:700;color:#0c64eb}.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:#0c64eb}.tree li.has-active-item>.list-toggle{color:#3c4353}.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:#3c495c;vertical-align:middle}.tree li>.module-name:hover{background-color:#f0f2f5}.tree li>.module-name:hover>a{color:#3c4353}.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.active>a,.dropdown-menu>li.selected>a{position:relative;color:#fff;background-color:#16a8f8}.dropdown-menu>li.selected>a:after{position:absolute;top:2px;right:4px;display:block;font-family:ZentaoIcon;font-size:18px;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:#3c4353;background-color:#e9f2fb}.dropdown-submenu:hover>a:after{border-left-color:#0c64eb}.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:#16a8f8}.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:#222}.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:#3c495c}.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:#cbd0db;border:none;border:1px solid #cbd0db}.timeline>li>a:after,.timeline>li>div:after{top:11px;left:-17px;z-index:3;width:9px;height:9px;background-color:#0c64eb;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(12,100,235,.2);border:none}.timeline>li>a,.timeline>li>div{display:block;padding:5px;line-height:20px}.timeline>li.active>a{color:#3c4353}.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:#3c495c}.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;white-space:normal}.chosen-container-single .chosen-single div b{position:relative;top:1px;color:#cbd0db}.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}.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{top:7px;right:8px}.datetimepicker{padding:10px}.datetimepicker td.day.today{background-color:#f77}.datetimepicker td.day.active{background-color:#16a8f8}.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:18px;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:#0c64eb!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:ellipsis;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:#0c64eb!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:#ff5d5d!important;-webkit-box-shadow:0 0 6px #ffc3c3!important;box-shadow:0 0 6px #ffc3c3!important}.popover-success.popover-form-result{font-weight:700;color:#fff;background:#00da88}.popover-success.popover-form-result.popover.right .arrow:after{border-right-color:#00da88}.form-unsaved{outline:2px solid #ff9800;-webkit-box-shadow:0 1px 12px #ff9800;box-shadow:0 1px 12px #ff9800;-webkit-transition:all .5s;-o-transition:all .5s;transition:all .5s}#mainHeader{height:50px;color:#fff;background:#1183fb -webkit-gradient(linear,right top,left top,from(#0a48d1),to(#1183fb));background:#1183fb -webkit-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb -o-linear-gradient(right,#0a48d1 0,#1183fb 100%);background:#1183fb linear-gradient(-90deg,#0a48d1 0,#1183fb 100%);background-color:#1183fb;border-top-color:#0c64eb;border-bottom-color:#e9f2fb}#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:ellipsis;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:#16a8f8;border-radius:2px}#searchGo:hover{color:#fff!important;background-color:#0c64eb}#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:ellipsis;white-space:nowrap}#userNav>li>a:hover{background-color:rgba(0,0,0,.1);opacity:1}#userNav>li>a span{display:inline-block;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:#ff5d5d;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}}#pageNav{position:absolute;top:8px;left:0;left:20px}@media (min-width:1400px){#pageNav{left:40px}}#subNavbar{margin-top:5px;font-size:14px;text-align:center}#subNavbar .nav{display:inline-block}#subNavbar .nav>li>a{padding:8px 12px;line-height:24px;color:#3c495c}#subNavbar .nav>li>a:hover{color:#3c495c;background-color:rgba(0,0,0,.075)}#subNavbar .nav>li.active>a{font-weight:700;color:#0c64eb}#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{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>*{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;border-bottom:1px solid #ddd}#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{position:relative;padding:8px 5px;border:none;border-radius:2px!important}#main .side-col .nav-tabs>li.active>a{font-weight:700;color:#3c4353}#main .side-col .nav-tabs>li.active>a:before{position:absolute;right:0;bottom:-1px;left:0;display:block;height:2px;content:' ';background:#0c64eb}#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>.icon,#prevPage>.icon{display:block;font-size:36px;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 #0c64eb;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:#0c64eb;text-align:center;text-overflow:ellipsis;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:#79cdfb;border-radius:6px}#sidebar>.sidebar-toggle>.icon:before{position:relative;left:-3px}#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:#0c64eb;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:#0c64eb}#contentNav .nav>li.active>a:before{position:absolute;right:10px;bottom:3px;left:10px;display:block;height:2px;content:' ';background:#0c64eb}.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:ellipsis;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:ellipsis;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 #cbd0db;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}.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:ellipsis;white-space:nowrap}td.c-name,td.c-title{overflow:hidden;text-align:left!important;text-overflow:ellipsis;white-space:nowrap}td.c-actions{position:relative;padding-top:0;padding-bottom:0;overflow:hidden;white-space:nowrap;vertical-align:middle}td.c-actions .btn-link{color:#3c495c;background:0 0}td.c-actions .btn-link:hover{color:#0c64eb;background:#e9f2fb}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:#3c4353}.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:ellipsis;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 tbody>tr:last-child{border-bottom:none}.table caption{margin-bottom:5px;background:#f1f1f1;border:none}.is-firefox .table .btn-icon-left>.icon{line-height:22px}.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:#e9f2fb;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:ellipsis;white-space:nowrap;border-bottom:1px solid #ddd}.main-table tbody>tr:nth-child(odd){background-color:#f5f5f5}.main-table tbody>tr:last-child>td{border-bottom:1px solid #ddd}.main-table tbody>tr>td{position:relative;border-bottom:none;border-bottom:1px solid #eee}.main-table tbody>tr>td .label{max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.main-table tbody>tr>td>a{line-height:28px;color:#0c60e1}.main-table tbody>tr>td>a:not(.btn):visited{color:#082999;opacity:.9}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover{color:#0c64eb}.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:#0c64eb;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{-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:#e9f2fb}.main-table .table-grouped tbody>tr:hover{background:#f2f7fd;-webkit-box-shadow:none;box-shadow:none}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f2f7fd}.main-table tbody>tr.checked{background:#fff3e0}.main-table tbody>tr.checked:hover{background:#ffebbc}.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:#3c4353}.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:0;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-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:#00da88!important}.table-footer .btn{padding:3px 10px;line-height:20px}.table-footer .pager{position:absolute;top:0;right:0;z-index:4;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{width:0;height:28px;visibility:hidden;opacity:0;-webkit-transition:opacity cubic-bezier(.175,.885,.32,1) .8s;-o-transition:opacity cubic-bezier(.175,.885,.32,1) .8s;transition:opacity cubic-bezier(.175,.885,.32,1) .8s}.table-actions.show-always{width:auto;pointer-events:none;cursor:not-allowed;visibility:visible;opacity:.75}.has-row-checked .table-actions{width:auto;pointer-events:auto!important;cursor:default;visibility:visible;opacity:1}.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:#3c4353}.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:18px;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:30px;color:#3c495c;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:#0c64eb;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>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 .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:#00da88!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:#0c60e1}.table-data tbody>tr>td>a:not(.btn):visited{color:#082999}.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#0c64eb}.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:#ffebbc}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;margin-right:-4px;font-size:16px;color:#a6aab8;text-align:center;border-radius:4px}.table-nest-toggle:before{line-height:22px;content:"\e6f2"}.table-nest-toggle:hover{color:#0c64eb;background-color:rgba(0,0,0,.1)}.table-nest-child-hide .table-nest-toggle:before{font-size:16px;content:"\e6f1"}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:static!important;font-size:16px!important;line-height:22px!important;content:"\e6f2"!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:16px!important;content:"\e6f1"!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:#cbd0db;border-radius:1px}.table-nest-child-hover>td:first-child,.table-nest-hover>td:first-child{-webkit-box-shadow:inset 3px 0 0 #cbd0db;box-shadow:inset 3px 0 0 #cbd0db}.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}.article-content table th{background:#eee}.article-content a{color:#0c64eb}.article-content a:focus,.article-content a:hover{color:#16a8f8}.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:#3c4353}.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:18px;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:#0c64eb}.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 .btn-mini{position:relative;top:1px}.histories-list>li{position:relative}.histories-list>li+li{margin-top:5px}.histories-list>li strong{color:#3c4353}.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>.icon{position:relative;top:-2px;left:-2px}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#0c64eb;border-color:#0c64eb}.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:ellipsis;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:#e9f2fb;background-color:#0c64eb}.list-group>a.active{color:#0c64eb;background-color:#e9f2fb}.list-group>a.active:hover,.list-group>a:hover{color:#fff;background-color:#0c64eb}.list-group>.heading{padding:2px 5px;line-height:20px;color:#838a9d}.list-group>a+.heading{margin-top:4px}.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:#0c64eb;background-color:#e9f2fb}.search-list .list-group>a.active:hover,.search-list.searchbox-focus .list-group>a.active:hover{color:#fff;background-color:#0c64eb}#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:0;left:0;padding:5px 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{display:none}#swapper{position:relative}#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu .search-box .list-group>a.active,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#0c64eb!important}#swapper #dropMenu .tree{margin:0}.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:#cbe0f6}.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:ellipsis;white-space:nowrap}.release-line>li>a:hover:before{background-color:#e9f2fb}.release-line>li>a:hover:after{background-color:#838a9d}.release-line>li>a:hover .title{color:#0c64eb}.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 #cbe0f6}.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 #cbe0f6}.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:#0c64eb}.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:ellipsis;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:#16a8f8}#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:#3c4353}#poweredBy a:hover{color:#0c64eb}#poweredBy a:hover .icon-zentao{color:#0c64eb}#poweredBy a.text-important{color:#bd7b46}#poweredBy a.text-important:hover{color:#ff5d5d}#poweredBy a.text-primary{color:#0c64eb}#poweredBy a.text-primary:hover{color:#16a8f8}#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:ellipsis;vertical-align:middle}.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:18px;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}
\ No newline at end of file
diff --git a/www/theme/zui/fonts/ZentaoIcon.eot b/www/theme/zui/fonts/ZentaoIcon.eot
index 956297eb2a..970d985a7f 100644
Binary files a/www/theme/zui/fonts/ZentaoIcon.eot and b/www/theme/zui/fonts/ZentaoIcon.eot differ
diff --git a/www/theme/zui/fonts/ZentaoIcon.svg b/www/theme/zui/fonts/ZentaoIcon.svg
index 65d0e3e259..cdf5db0145 100644
--- a/www/theme/zui/fonts/ZentaoIcon.svg
+++ b/www/theme/zui/fonts/ZentaoIcon.svg
@@ -16,8 +16,8 @@
 <glyph unicode="&#xe5d4;" glyph-name="ellipsis-v" d="M603.025 648.532c0-51.576-39.443-91.024-91.025-91.024-51.576 0-91.024 39.448-91.024 91.024s39.448 91.024 91.024 91.024c51.576 0.003 91.025-39.443 91.025-91.024zM603.025 284.444c0-51.576-39.443-91.024-91.024-91.024s-91.020 39.448-91.020 91.024c0 51.576 39.448 91.024 91.020 91.024s91.024-39.448 91.024-91.024zM603.025-79.644c0-51.576-39.443-91.024-91.024-91.024s-91.024 39.448-91.024 91.024 39.448 91.024 91.024 91.024c51.576 0 91.024-39.443 91.024-91.024z" />
 <glyph unicode="&#xe5dc;" glyph-name="first-page" d="M235.552 551.503h89.714v-534.113h-89.714v534.113zM788.448 79.98l-62.59-62.59-267.059 267.059 267.059 267.059 62.59-62.59-204.464-204.464z" />
 <glyph unicode="&#xe5dd;" glyph-name="last-page" d="M698.73 551.503h89.715v-534.115h-89.715v534.115zM235.552 488.909l62.591 62.591 267.059-267.059-267.059-267.059-62.591 62.591 204.465 204.465z" />
-<glyph unicode="&#xe6f1;" glyph-name="expand-alt" d="M729.208 299.956v-31.026c0-8.73-6.786-15.514-15.514-15.514h-170.668v-170.668c0-8.73-6.786-15.514-15.514-15.514h-31.026c-8.73 0-15.514 6.786-15.514 15.514v170.668h-170.668c-8.73 0-15.514 6.786-15.514 15.514v31.026c0 8.73 6.786 15.514 15.514 15.514h170.668v170.668c0 8.73 6.786 15.514 15.514 15.514h31.026c8.73 0 15.514-6.786 15.514-15.514v-170.668h170.668c8.73 0 15.514-6.786 15.514-15.514zM791.271 82.748v403.391c0 42.666-34.911 77.574-77.574 77.574h-403.391c-42.666 0-77.574-34.911-77.574-77.574v-403.391c0-42.666 34.911-77.574 77.574-77.574h403.391c42.666 0 77.574 34.911 77.574 77.574zM853.335 486.139v-403.391c0-77.094-62.545-139.638-139.638-139.638h-403.391c-77.094 0-139.638 62.545-139.638 139.638v403.391c0 77.094 62.545 139.638 139.638 139.638h403.391c77.094 0 139.638-62.545 139.638-139.638z" />
-<glyph unicode="&#xe6f2;" glyph-name="collapse-alt" d="M729.201 299.963v-31.024c0-8.729-6.788-15.519-15.519-15.519h-403.385c-8.729 0-15.519 6.788-15.519 15.519v31.024c0 8.729 6.788 15.519 15.519 15.519h403.385c8.729 0 15.519-6.788 15.519-15.519zM791.265 82.748v403.385c0 42.664-34.912 77.574-77.574 77.574h-403.385c-42.664 0-77.574-34.912-77.574-77.574v-403.385c0-42.664 34.912-77.574 77.574-77.574h403.385c42.664 0 77.574 34.912 77.574 77.574zM853.329 486.14v-403.385c0-77.089-62.55-139.637-139.637-139.637h-403.385c-77.089 0-139.637 62.55-139.637 139.637v403.385c0 77.089 62.55 139.637 139.637 139.637h403.385c77.089 0 139.637-62.55 139.637-139.637z" />
+<glyph unicode="&#xe6f1;" glyph-name="expand-alt" d="M850.488 682.666v0c32.991 0 59.732-26.744 59.732-59.732v-676.977c0-32.991-26.744-59.732-59.732-59.732h-676.977c-32.991 0-59.732 26.744-59.732 59.732 0 0 0 0 0 0v676.977c0 32.991 26.744 59.732 59.732 59.732h676.977zM850.488 622.932h-676.977v-676.977h676.977v676.977zM512 513.42v0c15.383 0 28.25-11.686 29.729-26.999l0.139-2.866v-169.244h169.244c15.383-0.001 28.25-11.686 29.729-26.999l0.139-2.866v0.002c0-15.383-11.684-28.25-26.999-29.729l-2.868-0.139h-169.244v-169.244c-0.007-16.496-13.387-29.86-29.883-29.854-15.374 0.007-28.23 11.683-29.714 26.985l-0.139 2.866v169.244h-169.244c-15.383 0.001-28.25 11.686-29.729 26.999l-0.139 2.866v-0.002c0 15.383 11.684 28.25 26.999 29.729l2.868 0.139h169.244v169.244c0 16.496 13.372 29.868 29.868 29.868v0z" />
+<glyph unicode="&#xe6f2;" glyph-name="collapse-alt" d="M850.488 682.666v0c32.991 0 59.732-26.744 59.732-59.732v-676.977c0-32.991-26.744-59.732-59.732-59.732h-676.977c-32.991 0-59.732 26.744-59.732 59.732 0 0 0 0 0 0v676.977c0 32.991 26.744 59.732 59.732 59.732h676.977zM850.488 622.932h-676.977v-676.977h676.977v676.977zM541.867 314.312h169.244c15.383-0.001 28.25-11.686 29.729-26.999l0.139-2.866c0-15.381-11.684-28.248-26.999-29.729l-2.868-0.139h-398.222c-15.383 0.001-28.25 11.686-29.729 26.999l-0.139 2.866c0 15.381 11.684 28.248 26.999 29.729l2.868 0.139h228.976z" />
 <glyph unicode="&#xe744;" glyph-name="more" horiz-adv-x="2269" d="M584.076 11.354h-73.155v423.937l-173.013-419.364h-91.81l-172.976 419.364v-423.937h-73.155v549.070h100.662l191.375-463.88 191.375 463.88h100.698zM1880.394 337.848h352.244v-73.155h-352.244v73.155zM934.053 486.829c110.94 0 201.179-90.238 201.179-201.179s-90.238-201.179-201.179-201.179-201.179 90.238-201.179 201.179 90.238 201.179 201.179 201.179zM934.053 559.985c-151.505 0-274.334-122.828-274.334-274.334s122.828-274.334 274.334-274.334 274.334 122.828 274.334 274.334c0 151.505-122.828 274.334-274.334 274.334v0zM1281.066 557.132h73.155v-548.667h-73.155v548.667zM1317.644 557.132h262.335v-73.155h-262.335v73.155zM1317.644 301.088h262.335v-73.155h-262.335v73.155zM1577.31 557.132v-73.155c50.404 0 91.445-41.040 91.445-91.445s-41.040-91.445-91.445-91.445v-73.155c90.896 0 164.6 73.704 164.6 164.6s-73.704 164.6-164.6 164.6zM1765.102 11.318l-239.036 272.321-54.977-48.282 196.679-224.039zM2269.033 11.318h-441.055v545.814h441.055v-73.155h-367.9v-399.502h367.9z" />
 <glyph unicode="&#xe7f5;" glyph-name="bell" d="M697.982 61.265v280.069c0 115.965-70.017 210.052-185.982 210.052s-185.982-94.087-185.982-210.052v-280.069h371.965zM792.069 109.401l94.087-94.087v-45.947h-748.306v45.947l94.087 94.087v231.929c0 144.411 76.581 262.563 210.052 295.384v32.822c0 39.385 30.632 70.017 70.017 70.017s70.017-30.632 70.017-70.017v-32.822c133.472-32.822 210.052-153.162 210.052-295.384v-231.929zM512-170.668c-50.325 0-94.087 41.572-94.087 91.896h188.17c0-50.325-43.762-91.896-94.087-91.896z" />
 <glyph unicode="&#xe836;" glyph-name="circle" d="M512-80.926c200.847 0 365.37 164.523 365.37 365.37s-164.523 365.37-365.37 365.37-365.37-164.523-365.37-365.37 164.523-365.37 365.37-365.37zM512 739.556c252.127 0 455.112-202.984 455.112-455.112s-202.984-455.112-455.112-455.112-455.112 202.984-455.112 455.112 202.984 455.112 455.112 455.112z" />
@@ -143,7 +143,7 @@
 <glyph unicode="&#xe977;" glyph-name="menu-recent" d="M73.143 731.428v-877.715h877.715v877.715h-877.715zM10.971 804.571h1002.057c6.059 0 10.971-4.912 10.971-10.971v-1002.057c0-6.059-4.912-10.971-10.971-10.971h-1002.057c-6.059 0-10.971 4.912-10.971 10.971v1002.057c0 6.059 4.912 10.971 10.971 10.971zM486.4 548.571h51.2c6.059 0 10.971-4.912 10.971-10.971v-343.771c0-6.059-4.912-10.971-10.971-10.971h-51.2c-6.059 0-10.971 4.912-10.971 10.971v343.771c0 6.059 4.912 10.971 10.971 10.971zM522.972 256h197.485c6.059 0 10.971-4.912 10.971-10.971v-51.2c0-6.059-4.912-10.971-10.971-10.971h-197.485c-6.059 0-10.971 4.912-10.971 10.971v51.2c0 6.059 4.912 10.971 10.971 10.971z" />
 <glyph unicode="&#xe978;" glyph-name="menu-doc" horiz-adv-x="951" d="M754.189 804.136l7.973-1.287c31.345-6.879 55.703-34.159 59.043-67.861l0.4-8.3-0.009-463.951 6.919-6.917 51.729-0.047 8.067-0.427 7.975-1.285c31.348-6.879 55.708-34.159 59.049-67.861l0.4-8.3-0.009-319.788-0.417-8.301-1.261-8.211c-6.727-32.269-33.349-57.216-66.092-60.624l-8.059-0.407-812.481 0.435-7.973 1.287c-31.345 6.879-55.701 34.159-59.043 67.861l-0.4 8.3 0.009 547.853 0.417 8.301 1.261 8.211c6.727 32.269 33.349 57.216 66.092 60.624l8.059 0.407 51.377-0.009 6.925 6.919v236.269l0.417 8.301 1.261 8.211c6.727 32.269 33.349 57.216 66.092 60.624l8.059 0.407 544.221-0.435zM283.962 413.227h-208.481l-6.927-6.919v-548.195l6.927-6.919h804.78l6.925 6.919v320.125l-6.925 6.917h-384.507l-12.604 0.464-12.124 1.337c-52.119 7.689-98.423 39.761-124.765 87.233l-5.829 11.455-3.621 8.355-46.429 114.895-6.423 4.329zM746.129 733.948h-536.521l-6.927-6.919v-229.212l6.927-6.917h74.353l8.605-0.46 8.761-1.417c23.039-5.071 43.261-20.321 54.855-41.98l4.087-8.769 46.352-114.681 3.983-8.615 5.503-9.253c15.865-23.677 40.988-39.212 69.023-42.353l10.245-0.577 250.76 0.037 6.925 6.917v457.279l-6.925 6.919zM611.998 445.623l6.103-0.505c17.884-2.995 31.581-18.935 31.581-38.215 0-21.423-16.911-38.72-37.684-38.72h-134.129l-6.103 0.507c-17.884 2.995-31.581 18.933-31.581 38.213 0 21.423 16.911 38.72 37.684 38.72h134.129zM611.998 628.552l6.103-0.507c17.884-2.995 31.581-18.933 31.581-38.213 0-21.423-16.911-38.72-37.684-38.72h-268.26l-6.103 0.505c-17.884 2.995-31.581 18.935-31.581 38.215 0 21.423 16.911 38.72 37.684 38.72h268.26z" />
 <glyph unicode="&#xe979;" glyph-name="menu-project" d="M477.867 173.104c-28.277 0-51.2 22.923-51.2 51.2s22.923 51.2 51.2 51.2c28.277 0 51.2-22.923 51.2-51.2s-22.923-51.2-51.2-51.2zM643.617 173.104c-28.277 0-51.2 22.923-51.2 51.2s22.923 51.2 51.2 51.2c28.277 0 51.2-22.923 51.2-51.2s-22.923-51.2-51.2-51.2zM136.534 668.038v-68.267h-68.267v102.4c0 18.851 15.282 34.133 34.133 34.133h750.934c18.851 0 34.133-15.282 34.133-34.133v-102.4h-68.267v68.267h-682.668zM896.545 394.971v136.534h-827.58v-614.401h827.58v136.534h-589.344c-18.851 0-34.133 15.282-34.133 34.133v273.066c0 18.851 15.282 34.133 34.133 34.133h589.344zM955.036 326.704h-618.039v-204.801h618.039v204.801zM965.51-117.029c0-18.851-15.438-34.133-34.483-34.133h-896.545c-19.044 0-34.482 15.282-34.482 34.133v682.668c0 18.851 15.438 34.133 34.482 34.133h896.545c19.044 0 34.483-15.282 34.483-34.133v-168.406h24.008c19.044 0 34.482-15.282 34.482-34.133v-277.21c0-18.851-15.438-34.133-34.482-34.133h-24.008v-168.785z" />
-<glyph unicode="&#xe97a;" glyph-name="menu-my" d="M68.267 408.89v-560.052h887.467v560.052l-443.733 319.488-443.733-319.488zM14.189 454.074l477.867 344.064c11.913 8.577 27.975 8.577 39.889 0l477.867-344.064c8.909-6.415 14.189-16.721 14.189-27.7v-611.669c0-18.851-15.283-34.133-34.133-34.133h-955.733c-18.851 0-34.133 15.283-34.133 34.133v611.669c0 10.977 5.28 21.285 14.189 27.7zM307.2 292.571h409.6c18.851 0 34.133-15.283 34.133-34.133s-15.283-34.133-34.133-34.133h-409.6c-18.851 0-34.133 15.283-34.133 34.133s15.283 34.133 34.133 34.133zM307.2 87.771h409.6c18.851 0 34.133-15.283 34.133-34.133s-15.283-34.133-34.133-34.133h-409.6c-18.851 0-34.133 15.283-34.133 34.133s15.283 34.133 34.133 34.133z" />
+<glyph unicode="&#xe97a;" glyph-name="menu-my" d="M598.313-217.87c-19.728-0.572-36.183 14.957-36.755 34.685-0.020 0.69-0.020 1.381 0 2.071v179.674c0 31.295-25.37 56.665-56.665 56.665s-56.665-25.37-56.665-56.665v-179.674c0.572-19.728-14.956-36.184-34.684-36.756-0.69-0.016-1.381-0.016-2.071 0h-194.5c-60.853 0.113-110.155 49.415-110.267 110.267v322.125h-20.931c-46.941-0.425-85.339 37.284-85.771 84.225 0 0.513 0 1.026 0 1.54-0.176 22.142 8.457 43.449 24.002 59.218l371.643 393.596c60.793 63.891 161.717 66.853 226.151 6.636 1.204-2.737 3.389-4.922 6.126-6.126l371.644-394.105c32.993-33.59 32.51-87.567-1.081-120.561-16.303-16.013-38.352-24.811-61.199-24.42h-31.652v-322.127c-0.056-60.677-49.081-109.931-109.757-110.267h-197.563zM636.090-144.359h159.276c21.087 0.142 38.148 17.202 38.288 38.29v357.347c-0.572 19.728 14.956 36.184 34.684 36.756 0.691 0.020 1.382 0.020 2.072 0h68.917c5.104 0.043 9.616 3.325 11.23 8.167v0c2.018 4.941 0.803 10.613-3.062 14.294l-373.173 392.064c-32.46 34.803-86.988 36.702-121.792 4.242-0.417-0.389-0.83-0.782-1.24-1.18v0c-1.638-0.122-2.941-1.424-3.062-3.062l-371.642-392.576c-4.59-4.874-4.59-12.48 0-17.356v0c2.603-2.435 6.169-3.561 9.699-3.063h59.219c19.728 0.572 36.184-14.956 36.756-34.684 0.020-0.691 0.020-1.382 0-2.072v-358.88c0.139-21.087 17.199-38.148 38.287-38.288h157.234v176.634c0 40.599 32.912 73.511 73.511 73.511h113.332c40.599 0 73.511-32.912 73.511-73.511 0 0 0 0 0 0l-2.042-176.634h-0.001z" />
 <glyph unicode="&#xe97b;" glyph-name="swap" d="M457.387 758.428h-345.144c-19.556 0-34.927-17.161-34.927-39.012v-336.972c0-21.852 15.371-39.012 34.927-39.012h345.144c19.556 0 34.927 17.161 34.927 39.012v336.972c0 21.852-15.371 39.012-34.927 39.012zM178.929 444.494v207.5h207.5v-207.5h-207.5zM908.473 240.692h-345.265c-19.624 0-34.932-17.164-34.932-38.868v-337.327c0-21.705 15.308-38.803 34.932-38.803h345.199c19.559 0 34.867 17.097 34.867 38.803v337.327c0.065 21.705-16.681 38.868-34.801 38.868zM631.373-69.525v207.5h207.5v-207.5h-207.5zM625.269 684.291c109.041-10.953 196.527-76.597 215.193-189.209h-63.115l101.856-151.651 101.924 151.651h-70.299c-18.667 151.651-133.413 250.22-278.375 264.263-20.076 1.612-38.675-15.589-38.675-37.493 1.344-18.813 14.235-35.945 31.491-37.56zM398.595-99.157c-121.932 10.953-215.193 92.255-219.491 226.769h67.412l-101.789 151.651-101.856-151.651h67.412c2.82-173.623 124.752-286.165 281.195-301.823 20.076-1.544 38.743 15.657 38.743 37.56v0c0.256 18.635-13.227 34.616-31.625 37.493v0z" />
 <glyph unicode="&#xe97c;" glyph-name="clock" d="M950.856 292.571c0 242.373-196.482 438.856-438.856 438.856s-438.856-196.482-438.856-438.856c0-242.373 196.482-438.856 438.856-438.856s438.856 196.482 438.856 438.856zM1023.999 292.571c0-282.769-229.23-512.001-512.001-512.001s-511.999 229.23-511.999 512.001c0 282.771 229.23 511.999 511.999 511.999s512.001-229.23 512.001-511.999zM548.57 307.564l135.682-135.315c14.34-14.34 14.34-37.592 0-51.93s-37.592-14.34-51.93 0l-146.286 146.286c-6.847 6.902-10.661 16.245-10.605 25.965v329.143c0 20.198 16.373 36.57 36.57 36.57s36.57-16.373 36.57-36.57v-314.148z" />
 <glyph unicode="&#xe97d;" glyph-name="cost" d="M950.856 292.571c0 242.373-196.482 438.856-438.856 438.856s-438.856-196.482-438.856-438.856c0-242.373 196.482-438.856 438.856-438.856s438.856 196.482 438.856 438.856zM1023.999 292.571c0-282.769-229.23-512.001-512.001-512.001s-511.999 229.23-511.999 512.001c0 282.771 229.23 511.999 511.999 511.999s512.001-229.23 512.001-511.999zM558.52 28.667h-85.629v108.996h-124.014v44.46h124.014v61.668l-0.737 0.717h-123.276v44.46h97.439l-143.944 251.697h97.439l115.894-220.145 115.894 220.145h97.439l-143.944-251.697h98.177v-44.46h-124.014l-0.737-0.717v-61.668h124.752v-44.46h-124.752v-108.996z" />
@@ -191,8 +191,10 @@
 <glyph unicode="&#xe9a7;" glyph-name="more-alt" d="M36.571 804.571v-1024M73.143 804.571v-1024M109.714 804.571v-1024M146.286 804.571v-1024M182.857 804.571v-1024M219.429 804.571v-1024M256 804.571v-1024M292.571 804.571v-1024M329.143 804.571v-1024M365.714 804.571v-1024M402.286 804.571v-1024M438.857 804.571v-1024M475.429 804.571v-1024M512 804.571v-1024M548.571 804.571v-1024M585.143 804.571v-1024M621.714 804.571v-1024M658.286 804.571v-1024M694.857 804.571v-1024M731.429 804.571v-1024M768 804.571v-1024M804.571 804.571v-1024M841.143 804.571v-1024M877.714 804.571v-1024M914.286 804.571v-1024M950.857 804.571v-1024M987.429 804.571v-1024M0 768h1024M0 731.428h1024M0 694.857h1024M0 658.285h1024M0 621.714h1024M0 585.142h1024M0 548.571h1024M0 512h1024M0 475.428h1024M0 438.857h1024M0 402.285h1024M0 365.714h1024M0 329.142h1024M0 292.571h1024M0 256h1024M0 219.428h1024M0 182.857h1024M0 146.285h1024M0 109.714h1024M0 73.142h1024M0 36.571h1024M0 0h1024M0-36.572h1024M0-73.143h1024M0-109.715h1024M0-146.286h1024M0-182.858h1024M512-219.429c-282.331 0-512 229.669-512 512s229.669 512 512 512c282.331 0 512-229.669 512-512s-229.669-512-512-512zM512 731.428c-242.003 0-438.857-196.854-438.857-438.857s196.854-438.857 438.857-438.857c242.001 0 438.857 196.854 438.857 438.857s-196.854 438.857-438.857 438.857zM742.857 270.107c0-3.707-1.851-7.878-4.626-10.659l-215.59-215.957c-2.776-2.781-6.94-4.634-10.641-4.634s-7.865 1.854-10.641 4.634l-215.59 215.957c-2.776 2.781-4.626 6.951-4.626 10.659s1.851 7.878 4.626 10.659l23.132 23.171c2.776 2.781 6.477 4.634 10.641 4.634 3.701 0 7.865-1.854 10.641-4.634l181.817-182.127 181.817 182.127c2.776 2.781 6.94 4.634 10.641 4.634s7.865-1.854 10.641-4.634l23.132-23.171c2.776-2.781 4.626-6.951 4.626-10.659zM742.857 473.535c0-3.707-1.851-7.878-4.626-10.659l-215.59-215.957c-2.776-2.781-6.94-4.634-10.641-4.634s-7.865 1.854-10.641 4.634l-215.59 215.957c-2.776 2.781-4.626 6.951-4.626 10.659s1.851 7.878 4.626 10.659l23.132 23.171c2.776 2.781 6.477 4.634 10.641 4.634 3.701 0 7.865-1.854 10.641-4.634l181.817-182.127 181.817 182.127c2.776 2.781 6.94 4.634 10.641 4.634s7.865-1.854 10.641-4.634l23.132-23.171c2.776-2.781 4.626-6.951 4.626-10.659z" />
 <glyph unicode="&#xe9a8;" glyph-name="list, format-list-bulleted" d="M74.278 678.363c-41.028 0-74.278-33.069-74.278-73.84s33.25-73.83 74.278-73.83c41.028 0 74.278 33.059 74.278 73.83s-33.25 73.84-74.278 73.84zM993.42 682.6h-730.258c-16.912 0-30.58-13.615-30.58-30.398v-84.171c0-16.793 13.667-30.398 30.58-30.398h730.258c16.89 0 30.58 13.605 30.58 30.398v84.171c0 16.784-13.692 30.398-30.58 30.398zM993.42 360.399h-730.258c-16.912 0-30.58-13.605-30.58-30.408v-84.172c0-16.783 13.667-30.398 30.58-30.398h730.258c16.89 0 30.58 13.615 30.58 30.398v84.172c0 16.806-13.692 30.408-30.58 30.408zM993.42 38.187h-730.258c-16.912 0-30.58-13.604-30.58-30.388v-84.172c0-16.781 13.667-30.407 30.58-30.407h730.258c16.89 0 30.58 13.626 30.58 30.407v84.172c0 16.783-13.692 30.388-30.58 30.388zM74.278 356.161c-41.028 0-74.278-33.058-74.278-73.841 0-40.773 33.25-73.83 74.278-73.83s74.278 33.058 74.278 73.83c0 40.781-33.25 73.841-74.278 73.841v0zM74.278 33.947c-41.028 0-74.278-33.058-74.278-73.828 0-40.773 33.25-73.83 74.278-73.83s74.278 33.058 74.278 73.83c0 40.771-33.25 73.828-74.278 73.828z" />
 <glyph unicode="&#xe9a9;" glyph-name="run" d="M748.118 179.312l-132.404 64.575c44.564 15.435 103.161 50.2 103.048 126.351v7.566c7.566 6.809 15.132 13.58 22.697 20.428 26.48 23.757 23.681 58.9-5.675 78.572-55.231 36.998-110.803 73.465-166.11 110.386v0c-11.761 8.195-26.594 10.641-40.364 6.658-55.534-15.397-111.030-31.021-166.072-48.006v0c-10.618-3.971-19.828-10.985-26.48-20.163-12.030-15.888-10.214-38.737 1.475-54.324v0c12.265-16.322 33.46-23.18 52.962-17.137 44.942 12.522 89.656 25.724 134.636 38.057v0c5.216 1.174 10.682 0.351 15.321-2.308 25.989-16.494 51.486-33.706 77.135-50.73 4.35-2.875 8.511-5.977 13.391-9.419-3.783-3.783-6.771-6.544-9.836-9.306l-43.277-38.587h-416.202v-23.265h390.402c-27.112-24.161-54.21-48.359-81.295-72.595v0c-9.441-7.941-16.149-18.646-19.179-30.604h-452.292v-23.416h453.578c4.274-12.333 14.299-23.379 29.999-31.058 36.821-18.032 73.68-35.988 110.576-53.87 23.114-11.349 46.228-22.697 70.325-34.463-2.572-4.464-4.539-8.020-6.658-11.349-30.491-49.456-60.994-98.912-91.509-148.368-19.709-32.118-4.426-68.093 31.777-75.659 18.688-3.783 37.83 5.41 49.746 24.665 41.184 66.529 82.267 133.11 123.25 199.741 19.974 32.496 11.614 60.754-22.962 77.627v0.001zM585.866 259.058l14.489 13.013c31.423 28.019 62.861 56.038 94.31 84.057-8.209-65.71-73.806-89.165-108.799-97.033v-0.037zM429.857 219.374c-3.405-4.88-5.826-8.209-8.057-11.651-21.639-33.479-43.050-67.109-65.067-100.324v0c-4.152-6.226-9.63-11.459-16.040-15.321-71.385-41.613-143.109-83.035-214.646-124.838-25.081-14.602-32.95-42.937-19.218-66.581s42.672-30.756 67.299-16.645c77.273 44.564 154.433 89.291 231.48 134.181v0c8.396 5.093 15.575 11.962 21.033 20.125 24.703 36.922 48.497 74.449 72.595 111.749 1.551 2.383 2.762 4.956 4.464 8.057-29.621 14.602-61.511 25.119-73.843 61.247v0zM818.329 483.613v0c62.155-0.146 112.662 50.123 112.808 112.279s-50.123 112.662-112.279 112.808c-62.155 0.146-112.662-50.123-112.808-112.279 0-0.164 0-0.328 0-0.491v0.001c0.187-61.938 50.34-112.109 112.278-112.318h0.001zM1022.609 488.985c-4.313 18.461-15.813 31.247-34.274 36.014-19.218 4.956-35.901-0.302-49.481-15.132-31.814-34.954-63.781-69.758-95.747-104.94l-52.28 34.765c1.929-39.267-21.261-61.965-48.46-83.225 29.81-19.861 57.69-39.57 86.705-57.388 18.082-11.122 41.613-6.507 56.291 9.571 42.47 46.001 84.688 92.342 126.654 139.024v0c10.363 11.053 14.358 26.635 10.592 41.31h0.001z" />
-<glyph unicode="&#xe9aa;" glyph-name="program" d="M356.409 332h-236.327c-65.188 0.094-118.023 52.891-118.164 118.078v236.327c0 65.134 53.029 118.164 118.164 118.164h236.327c65.134 0 118.078-53.029 118.078-118.164v-236.327c0-65.134-52.943-118.078-118.078-118.078v0zM120.082 725.879v0c-21.767-0.048-39.388-17.706-39.388-39.473v-236.327c0-21.655 17.648-39.388 39.388-39.388h236.327c21.734 0.046 39.341 17.654 39.388 39.388v236.327c-0.046 21.734-17.654 39.341-39.388 39.388l-236.327 0.086zM356.409-219.429h-236.327c-65.221 0.094-118.070 52.942-118.164 118.164v236.327c0 65.134 53.029 118.164 118.164 118.164h236.327c65.134 0 118.078-53.029 118.078-118.164v-236.327c0-65.134-52.943-118.164-118.078-118.164v0zM120.082 174.535v0c-21.753 0-39.388-17.635-39.388-39.388v-236.327c0-21.74 17.648-39.388 39.388-39.388h236.327c21.753 0 39.388 17.635 39.388 39.388v236.242c0 21.753-17.635 39.388-39.388 39.388l-236.327 0.085zM903.917 332.087h-236.327c-65.188 0.094-118.023 52.891-118.164 118.078v236.242c0 65.134 53.029 118.164 118.164 118.164h236.327c65.134 0 118.164-53.029 118.164-118.164v-236.327c0-65.134-53.029-118.078-118.164-118.078v0.085zM667.59 725.88v0c-21.753 0-39.388-17.635-39.388-39.388 0-0.029 0-0.057 0-0.086v-236.327c0-21.655 17.648-39.388 39.388-39.388h236.327c21.753 0 39.388 17.635 39.388 39.388v236.327c0 21.753-17.635 39.388-39.388 39.388 0 0 0 0 0 0l-236.327 0.086zM903.917-219.428h-236.327c-65.221 0.094-118.070 52.942-118.164 118.164v236.327c0 65.134 53.029 118.164 118.164 118.164h236.327c65.134 0 118.164-53.029 118.164-118.164v-236.327c0-65.134-53.029-118.164-118.164-118.164v0zM667.59 174.536v0c-21.753 0-39.388-17.635-39.388-39.388v-236.327c0-21.74 17.648-39.388 39.388-39.388h236.327c21.753 0 39.388 17.635 39.388 39.388v236.242c0 21.753-17.635 39.388-39.388 39.388l-236.327 0.085z" />
+<glyph unicode="&#xe9aa;" glyph-name="program" d="M378.639 326.367h-202.57c-55.876 0.076-101.163 45.335-101.284 101.21v202.57c0 55.828 45.448 101.284 101.284 101.284h202.57c55.828 0 101.21-45.448 101.21-101.284v-202.57c0-55.828-45.376-101.21-101.21-101.21v0zM176.072 663.975v0c-18.652-0.040-33.76-15.172-33.76-33.832v-202.57c0-18.556 15.124-33.76 33.76-33.76h202.57c18.628 0.040 33.721 15.132 33.76 33.76v202.57c-0.040 18.628-15.132 33.721-33.76 33.76l-202.57 0.074zM378.639-146.288h-202.57c-55.9 0.076-101.205 45.376-101.284 101.284v202.57c0 55.828 45.448 101.284 101.284 101.284h202.57c55.828 0 101.21-45.448 101.21-101.284v-202.57c0-55.828-45.376-101.284-101.21-101.284v0zM176.072 191.396v0c-18.64 0-33.76-15.112-33.76-33.76v-202.57c0-18.634 15.124-33.76 33.76-33.76h202.57c18.64 0 33.76 15.112 33.76 33.76v202.498c0 18.64-15.112 33.76-33.76 33.76l-202.57 0.073zM847.929 326.439h-202.57c-55.876 0.076-101.163 45.335-101.284 101.21v202.498c0 55.828 45.448 101.284 101.284 101.284h202.57c55.828 0 101.284-45.448 101.284-101.284v-202.57c0-55.828-45.448-101.21-101.284-101.21v0.073zM645.361 663.975v0c-18.64 0-33.76-15.112-33.76-33.76 0-0.025 0-0.049 0-0.074v-202.57c0-18.556 15.124-33.76 33.76-33.76h202.57c18.64 0 33.76 15.112 33.76 33.76v202.57c0 18.64-15.112 33.76-33.76 33.76 0 0 0 0 0 0l-202.57 0.074zM847.929-146.286h-202.57c-55.9 0.076-101.205 45.376-101.284 101.284v202.57c0 55.828 45.448 101.284 101.284 101.284h202.57c55.828 0 101.284-45.448 101.284-101.284v-202.57c0-55.828-45.448-101.284-101.284-101.284v0zM645.361 191.397v0c-18.64 0-33.76-15.112-33.76-33.76v-202.57c0-18.634 15.124-33.76 33.76-33.76h202.57c18.64 0 33.76 15.112 33.76 33.76v202.498c0 18.64-15.112 33.76-33.76 33.76l-202.57 0.073z" />
 <glyph unicode="&#xe9ab;" glyph-name="alter" d="M207.461-190.178l200.355 202.59h-148.075v332.852c0 20.361 16.506 36.866 36.866 36.866h371.016v97.533h-425.961c-24.062 0-46.609-11.74-60.406-31.453-4.477-6.398-8.065-12.407-10.762-18.029-6.749-14.067-10.023-30.084-9.823-48.051v0-369.718h-160.671l207.461-202.59zM816.539 775.319l-200.355-202.59h148.075v-332.852c0-20.361-16.506-36.866-36.866-36.866h-371.016v-97.533h443.634c28.279 0 52.263 20.776 56.294 48.767l5.769 40.051c0.836 5.803 1.255 11.658 1.255 17.52v360.913h160.671l-207.461 202.59z" />
+<glyph unicode="&#xe9ac;" glyph-name="estimate" d="M906.777 547.172c62.494-20.419 99-84.768 84.768-148.499l-3.094-11.756-168.299-518.511c-20.419-62.494-84.768-99-148.499-84.768l-11.756 3.094-345.262 111.994c-62.494 20.419-99 84.768-84.768 148.499l3.094 11.756 3.712 11.137 69.299-22.275-3.712-11.137c-8.044-25.369 3.094-53.212 26.606-64.968l8.044-3.712 345.262-111.994c25.369-8.044 53.212 3.094 64.968 26.606l3.712 8.044 168.299 518.511c8.044 25.369-3.094 53.212-26.606 64.968l-8.044 3.712-280.293 90.956 22.275 69.299 280.293-90.956zM520.058 804.571h-363.825c-69.918 0-126.844-56.925-126.844-126.844v-545.118c0-69.918 56.925-126.844 126.844-126.844h363.206c69.918 0 126.849 56.925 126.849 126.844v545.118c0.614 69.918-56.311 126.844-126.23 126.844zM156.235 732.178h363.206c30.318 0 54.45-24.131 54.45-54.45v-545.118c0-30.318-24.131-54.45-54.45-54.45h-363.206c-30.318 0-54.45 24.131-54.45 54.45v545.118c0 29.699 24.75 54.45 54.45 54.45zM338.146 564.496c12.994 0 56.306-77.962 95.288-119.419 42.694-44.55 44.55-84.15 28.463-113.85-14.85-28.463-64.968 1.238-118.181 0-55.688-1.238-110.756-32.175-129.937 0-18.562 30.937-8.044 61.875 28.463 113.85 37.125 51.356 82.912 119.419 95.906 119.419v0zM327.009 346.078h21.038l9.282-56.925 26.606-19.181v-14.85h-90.337v15.469l25.987 19.181 7.425 56.306zM713.727 382.585l83.531 60.019 40.219-92.812-89.718-61.256-34.031 94.050z" />
+<glyph unicode="&#xe9ad;" glyph-name="summary" d="M659.195 733.31h-289.059c-17.315 0.357-31.642-13.39-31.999-30.707 0-0.004 0-0.009 0-0.013v0c0.371-15.846 12.584-28.885 28.373-30.292h292.687c16.907-1.412 31.758 11.148 33.17 28.055s-11.148 31.758-28.055 33.17c-1.702 0.142-3.413 0.142-5.116 0l-0.001-0.213zM684.582 384.092v0c10.306 0.011 20.198-4.053 27.519-11.306v0c13.792-13.715 14.989-35.636 2.774-50.772l-2.774-3.2-221.434-218.234c-7.295-7.293-17.204-11.365-27.519-11.307v0c-8.737 0.013-17.22 2.941-24.106 8.321l-2.56 2.986-126.29 124.797c-14.844 14.646-15.006 38.553-0.36 53.398 0.12 0.121 0.239 0.241 0.361 0.361v0c14.189 14.194 36.771 15.48 52.479 2.986l3.2-2.986 98.558-97.491 193.275 191.996c5.147 5.141 11.664 8.695 18.773 10.239h4.267l3.84 0.214zM270.938 666.326h-103.463c-3.622 0.058-6.845-2.293-7.893-5.761v-801.26c0.205-3.53 2.733-6.494 6.186-7.253h690.756c3.683-0.033 6.925 2.421 7.893 5.974v800.833c-0.205 3.53-2.733 6.494-6.186 7.253h-98.984v-1.92c-16.145-37.137-51.929-61.93-92.371-63.999h-296.738c-41.191-0.331-78.892 23.086-96.851 60.158l-2.347 5.974zM659.195 804.566v0c40.579 0.399 77.87-22.258 96.21-58.458l2.133-5.12 1.493-3.413h2.774l1.28 4.907v-4.907h93.438c40.965 0.968 76.212-28.785 82.131-69.332v-808.939c-0.758-42.499-34.539-77.029-77.011-78.718h-694.169c-42.608-0.826-78.541 31.561-82.131 74.025v804.246c0.863 42.455 34.585 76.924 77.011 78.718h107.944c14.302 37.13 48.298 63.039 87.891 66.991h301.005z" />
 <glyph unicode="&#xf016;" glyph-name="file, file-empty" horiz-adv-x="878" d="M838.857 587.428c21.143-21.143 38.857-63.429 38.857-93.714v-658.286c0-30.286-24.571-54.857-54.857-54.857h-768c-30.286 0-54.857 24.571-54.857 54.857v914.286c0 30.286 24.571 54.857 54.857 54.857h512c30.286 0 72.571-17.714 93.714-38.857zM585.143 726.857v-214.857h214.857c-3.429 9.714-8.571 19.429-12.571 23.429l-178.857 178.857c-4 4-13.714 9.143-23.429 12.571zM804.571-146.286v585.143h-237.714c-30.286 0-54.857 24.571-54.857 54.857v237.714h-438.857v-877.714h731.429z" />
 <glyph unicode="&#xf02d;" glyph-name="book" d="M948.764 510.653c13.529-19.482 17.318-44.918 9.741-69.81l-148.822-490.3c-13.529-45.999-61.152-81.716-107.693-81.716h-499.501c-55.199 0-114.186 43.835-134.21 100.116-8.658 24.352-8.658 48.165-1.083 68.728 1.083 10.823 3.248 21.647 3.789 34.635 0.541 8.658-4.329 15.694-3.248 22.188 2.165 12.988 13.529 22.188 22.188 36.799 16.235 27.058 34.635 70.893 40.587 99.033 2.706 10.281-2.706 22.188 0 31.388 2.706 10.281 12.988 17.859 18.401 27.6 14.612 24.894 33.554 73.058 36.259 98.493 1.083 11.364-4.329 23.811-1.083 32.471 3.789 12.447 15.694 17.859 23.811 28.682 12.988 17.859 34.635 69.269 37.881 97.952 1.083 9.199-4.329 18.401-2.706 28.14 2.165 10.281 15.153 21.106 23.811 33.554 22.728 33.554 27.058 107.693 95.787 88.211l-0.541-1.623c9.199 2.165 18.401 4.871 27.6 4.871h411.831c25.434 0 48.165-11.364 61.694-30.306 14.070-19.482 17.318-44.918 9.741-70.352l-148.281-490.3c-25.434-83.34-39.505-101.74-108.235-101.74h-470.277c-7.035 0-15.694-1.623-20.565-8.117-4.329-6.495-4.871-11.364-0.541-23.269 10.823-31.388 48.165-37.881 77.93-37.881h499.501c20.024 0 43.293 11.364 49.247 30.846l162.352 534.135c3.248 10.281 3.248 21.106 2.706 30.846 12.447-4.871 23.811-12.447 31.929-23.269zM372.959 509.57c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318zM328.043 371.031c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318z" />
 <glyph unicode="&#xf064;" glyph-name="share" d="M960.285 412.526c0-8.506-3.502-16.511-9.505-22.514l-256.163-256.163c-6.003-6.003-14.008-9.505-22.514-9.505-17.512 0-32.020 14.509-32.020 32.020v128.082h-112.072c-215.638 0-357.227-41.527-357.227-280.178 0-20.513 1.001-41.025 2.501-61.54 0.5-8.005 2.501-17.011 2.501-25.015 0-9.505-6.003-17.512-16.010-17.512-7.004 0-10.506 3.502-14.008 8.506-7.505 10.506-13.009 26.518-18.511 38.025-28.517 64.041-63.54 155.598-63.54 225.643 0 56.036 5.504 113.572 26.518 166.606 69.545 172.609 273.673 201.628 437.778 201.628h112.072v128.082c0 17.512 14.509 32.020 32.020 32.020 8.506 0 16.511-3.502 22.514-9.505l256.163-256.163c6.003-6.003 9.505-14.008 9.505-22.514z" />
diff --git a/www/theme/zui/fonts/ZentaoIcon.ttf b/www/theme/zui/fonts/ZentaoIcon.ttf
index a588e0dc3a..d13b4dee6a 100644
Binary files a/www/theme/zui/fonts/ZentaoIcon.ttf and b/www/theme/zui/fonts/ZentaoIcon.ttf differ
diff --git a/www/theme/zui/fonts/ZentaoIcon.woff b/www/theme/zui/fonts/ZentaoIcon.woff
index f3d7856fa4..37a135110e 100644
Binary files a/www/theme/zui/fonts/ZentaoIcon.woff and b/www/theme/zui/fonts/ZentaoIcon.woff differ
diff --git a/xuanxuan/config/ext/maps.php b/xuanxuan/config/ext/maps.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/xuanxuan/config/ext/xuanxuan.php b/xuanxuan/config/ext/xuanxuan.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/xuanxuan/config/ext/xxb.php b/xuanxuan/config/ext/xxb.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/xuanxuan/module/admin/ext/view/xuanxuan.html.php b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
index 92c31d5627..e0a98b25e1 100755
--- a/xuanxuan/module/admin/ext/view/xuanxuan.html.php
+++ b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
@@ -11,9 +11,6 @@
  */
 include "../../../common/view/header.html.php";
 ?>
-<div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('xuanxuan');?></div>
-</div>
 <div id='dashboardWrapper'>
   <div class='panels-container dashboard' id='dashboard'>
     <div class='row'>
diff --git a/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php
index 5de92c78a6..604db89fe1 100644
--- a/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php
@@ -1,4 +1,4 @@
 <?php
-$lang->client->menu = $lang->admin->menu;
+$lang->client->common = '客户端版本更新';
 
 $lang->client->browseVersion = '版本列表';
diff --git a/xuanxuan/module/client/ext/view/browse.html.php b/xuanxuan/module/client/ext/view/browse.html.php
index 3320a76be2..06773c55bf 100644
--- a/xuanxuan/module/client/ext/view/browse.html.php
+++ b/xuanxuan/module/client/ext/view/browse.html.php
@@ -14,9 +14,6 @@ $position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->im->c
 $position[] = $this->lang->client->browse;
 ?>
 <?php include '../../../common/view/header.html.php';?>
-<div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('xuanxuan');?></div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <div class='pull-right'>
diff --git a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
index d5f6e13271..b6303f7842 100644
--- a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
@@ -3,14 +3,17 @@ $lang->xuanxuan = new stdclass();
 $lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting');
 $lang->admin->menuOrder[6]   = 'xuanxuan';
 
-$lang->admin->subMenu->xuanxuan = new stdclass();
-$lang->admin->subMenu->xuanxuan->index   = array('link' => '首页|admin|xuanxuan');
-$lang->admin->subMenu->xuanxuan->setting = array('link' => '参数|setting|xuanxuan');
-$lang->admin->subMenu->xuanxuan->update  = array('link' => '更新|client|browse', 'subModule' => 'client');
-$lang->admin->subMenuOrder->xuanxuan[0]  = 'index';
-$lang->admin->subMenuOrder->xuanxuan[5]  = 'setting';
-$lang->admin->subMenuOrder->xuanxuan[10] = 'update';
+$lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
+$lang->admin->menu->xuanxuan['subMenu']->index   = array('link' => '首页|admin|xuanxuan');
+$lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan');
+$lang->admin->menu->xuanxuan['subMenu']->update  = array('link' => '更新|client|browse', 'subModule' => 'client');
 
-$lang->menugroup->client = 'admin';
+$lang->admin->menu->xuanxuan['menuOrder'][0]  = 'index';
+$lang->admin->menu->xuanxuan['menuOrder'][5]  = 'setting';
+$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update';
+
+$lang->navGroup->im      = 'admin';
+$lang->navGroup->setting = 'admin';
+$lang->navGroup->client  = 'admin';
 
 $lang->confirmDelete = '您确定要执行删除操作吗？';
diff --git a/xuanxuan/module/common/ext/model/xuanxuan.php b/xuanxuan/module/common/ext/model/xuanxuan.php
new file mode 100644
index 0000000000..ee07dc1cf3
--- /dev/null
+++ b/xuanxuan/module/common/ext/model/xuanxuan.php
@@ -0,0 +1,5 @@
+<?php
+public static function getLicensePropertyValue($propertyName)
+{
+    return false;
+}
diff --git a/xuanxuan/module/im/ext/lang/en/xuanxuan.php b/xuanxuan/module/im/ext/lang/en/xuanxuan.php
index cadbe0a5df..e1328f898d 100644
--- a/xuanxuan/module/im/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/im/ext/lang/en/xuanxuan.php
@@ -27,7 +27,7 @@ $lang->im->turnonList[0] = 'Disable';
 
 $lang->im->info            = "ZenTao Desktop is powered by <a href='https://xuan.im/' target='_blank'>Xuanxuan</a>, a secure and open source Instant Messenger by Nature Easy Soft. It is a self-hosted and cross-platform tool with numerous plug-ins and robust features. In Xuanxuan, you can code your own plug-ins. Click <a href='https://xuan.im/' target='_blank'>HERE</a> for more.";
 $lang->im->xxClientConfirm = 'Click Download ZenTao Desktop at the right bottom to download it!';
-$lang->im->xxServerConfirm = 'Go to Admin-Desktop to download the ZenTao Desktop Server!';
+$lang->im->xxServerConfirm = 'Go to User dropmenu  to download the ZenTao Desktop Server!';
 
 $lang->im->xxdServerTip   = 'XXD server address contains protocol, host and port，such as http://192.168.1.35 or http://domain. It should not be 127.0.0.1.';
 $lang->im->xxdServerEmpty = 'XXD server address is empty.';
diff --git a/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php
index 6786b89ae5..3197a8210e 100644
--- a/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php
@@ -26,7 +26,7 @@ $lang->im->turnonList[1] = '是';
 $lang->im->turnonList[0] = '否';
 
 $lang->im->info            = "禅道客户端由易软天创旗下另外一款免费、开源、安全的IM产品<a href='https://xuan.im/' target='_blank'>喧喧</a>驱动，支持私有部署，跨平台操作，内置大量插件，功能丰富，在喧喧里，您甚至还可以为自己编写个性化的插件，<a href='https://xuan.im/' target='_blank'>点击查看</a>。";
-$lang->im->xxClientConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！点击界面右下角下载禅道客户端。';
+$lang->im->xxClientConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！点击界面右上角用户下拉菜单中下载禅道客户端。';
 $lang->im->xxServerConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！进入后台-客户端进行下载配置。';
 
 $lang->im->xxdServerTip    = '禅道服务器地址为完整的协议+地址+端口，示例：http://192.168.1.35 或 http://pms.zentao.com ，不能使用127.0.0.1。';
diff --git a/xuanxuan/module/im/ext/model/class/xuanxuan.class.php b/xuanxuan/module/im/ext/model/class/xuanxuan.class.php
index 746319f63d..47c7ab276c 100644
--- a/xuanxuan/module/im/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/module/im/ext/model/class/xuanxuan.class.php
@@ -20,20 +20,20 @@ class xuanxuanIm extends imModel
         $this->session->set('user', $user);
         $this->app->user = $this->session->user;
 
-        $products  = $this->loadModel('product')->getPairs();
-        $projects  = $this->loadModel('project')->getPairs();
-        $products  = empty($products) ? array() : array_keys($products);
-        $projects  = empty($projects) ? array() : array_keys($projects);
-        $libIdList = array_keys($this->loadModel('doc')->getLibs('all'));
-        $productID = isset($products[0])  ? $products[0]  : 1;
-        $projectID = isset($projects[0])  ? $projects[0]  : 1;
-        $libID     = isset($libIdList[0]) ? $libIdList[0] : 1;
+        $products    = $this->loadModel('product')->getPairs();
+        $executions  = $this->loadModel('execution')->getPairs();
+        $products    = empty($products) ? array() : array_keys($products);
+        $executions  = empty($executions) ? array() : array_keys($executions);
+        $libIdList   = array_keys($this->loadModel('doc')->getLibs('all'));
+        $productID   = isset($products[0])   ? $products[0]   : 1;
+        $executionID = isset($executions[0]) ? $executions[0] : 1;
+        $libID       = isset($libIdList[0])  ? $libIdList[0]  : 1;
 
         $actions = new stdclass();
-        if(common::hasPriv('bug',   'create') and !empty($products) and strpos('full|onlyTest', $this->config->global->flow) !== false)  $actions->createBug   = array('title' => $this->lang->im->createBug,   'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('bug', 'create', "product=$productID", 'xhtml')), 'height' => "600px", 'width' => "800px");
-        if(common::hasPriv('story', 'create') and !empty($products) and strpos('full|onlyStory', $this->config->global->flow) !== false) $actions->createStory = array('title' => $this->lang->im->createStory, 'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('story', 'create', "product=$productID", 'xhtml')), 'height' => "600px", 'width' => "800px");
-        if(common::hasPriv('task',  'create') and !empty($projects) and strpos('full|onlyTask', $this->config->global->flow) !== false)  $actions->createTask  = array('title' => $this->lang->im->createTask,  'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('task', 'create', "project=$projectID", 'xhtml')), 'height' => "600px", 'width' => "800px");
-        if(common::hasPriv('doc',   'create') and !empty($libIdList))$actions->createDoc   = array('title' => $this->lang->im->createDoc,   'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('doc', 'create', "libID=$libID", 'xhtml')), 'height' => "600px", 'width' => "800px");
+        if(common::hasPriv('bug',   'create') and !empty($products))  $actions->createBug   = array('title' => $this->lang->im->createBug,   'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('bug', 'create', "product=$productID", 'xhtml')), 'height' => "600px", 'width' => "800px");
+        if(common::hasPriv('story', 'create') and !empty($products))  $actions->createStory = array('title' => $this->lang->im->createStory, 'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('story', 'create', "product=$productID", 'xhtml')), 'height' => "600px", 'width' => "800px");
+        if(common::hasPriv('task',  'create') and !empty($executions))$actions->createTask  = array('title' => $this->lang->im->createTask,  'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('task', 'create', "execution=$executionID", 'xhtml')), 'height' => "600px", 'width' => "800px");
+        if(common::hasPriv('doc',   'create') and !empty($libIdList)) $actions->createDoc   = array('title' => $this->lang->im->createDoc,   'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('doc', 'create', "objectType=&objectID=0&libID=0", 'xhtml')), 'height' => "600px", 'width' => "800px");
         if(common::hasPriv('todo',  'create')) $actions->createTodo = array('title' => $this->lang->im->createTodo,  'url' => $baseURL . str_replace('/x.php', '/index.php', helper::createLink('todo', 'create', '', 'xhtml')), 'height' => "600px", 'width' => "800px");
 
         $urls = array();
@@ -113,4 +113,31 @@ class xuanxuanIm extends imModel
 
         return $fileID;
     }
+
+    public function chatAddAction($chatId = '', $action = '', $actorId = '', $result = '', $comment = '')
+    {
+        return;
+    }
+
+    public function userAddAction($user, $actionType, $result, $comment = '', $common = false)
+    {
+        if(!zget($this->config->xuanxuan, 'logLevel', 1) && !$common) return;
+
+        $account = '';
+        $userID  = 0;
+        if(is_int($user))
+        {
+            $account = $this->dao->select('account')->from(TABLE_USER)->where('id')->eq($user)->fetch('account');
+            $userID  = $user;
+        }
+        if(is_string($user))
+        {
+            $userID  = $this->dao->select('id')->from(TABLE_USER)->where('account')->eq($user)->fetch('id');
+            $account = $user;
+        }
+
+        $actor   = !empty($account) ? $account : '';
+        $extra   = json_encode(array('actorId' => $userID));
+        $this->loadModel('action')->create('user', $userID, $actionType, $comment, $extra, $actor);
+    }
 }
diff --git a/xuanxuan/module/im/ext/model/xuanxuan.php b/xuanxuan/module/im/ext/model/xuanxuan.php
index 28efa54fdf..d4bb906dc3 100644
--- a/xuanxuan/module/im/ext/model/xuanxuan.php
+++ b/xuanxuan/module/im/ext/model/xuanxuan.php
@@ -18,3 +18,13 @@ public function uploadFile($fileName, $path, $size, $time, $userID, $users, $cha
 {
     return $this->loadExtension('xuanxuan')->uploadFile($fileName, $path, $size, $time, $userID, $users, $chat);
 }
+
+public function chatAddAction($chatId = '', $action = '', $actorId = '', $result = '', $comment = '')
+{
+    return $this->loadExtension('xuanxuan')->chatAddAction($chatId, $action, $actorId, $result, $comment);
+}
+
+public function userAddAction($user, $actionType, $result, $comment = '', $common = false)
+{
+    return $this->loadExtension('xuanxuan')->userAddAction($user, $actionType, $result, $comment, $common);
+}
diff --git a/xuanxuan/module/setting/ext/control/xuanxuan.php b/xuanxuan/module/setting/ext/control/xuanxuan.php
index af584d0d93..bf502b9d95 100644
--- a/xuanxuan/module/setting/ext/control/xuanxuan.php
+++ b/xuanxuan/module/setting/ext/control/xuanxuan.php
@@ -38,8 +38,7 @@ class setting extends control
         $os = 'win';
         if(strpos(strtolower(PHP_OS), 'win') !== 0) $os = strtolower(PHP_OS);
 
-        $this->lang->setting->menu      = $this->lang->admin->menu;
-        $this->lang->menugroup->setting = 'admin';
+        $this->lang->navGroup->im = 'admin';
 
         $this->view->title      = $this->lang->im->common;
         $this->view->position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->im->common);
diff --git a/xuanxuan/module/setting/ext/view/xuanxuan.html.php b/xuanxuan/module/setting/ext/view/xuanxuan.html.php
index ae986babb8..f70c93174f 100644
--- a/xuanxuan/module/setting/ext/view/xuanxuan.html.php
+++ b/xuanxuan/module/setting/ext/view/xuanxuan.html.php
@@ -12,9 +12,6 @@
 ?>
 <?php include '../../../common/view/header.html.php';?>
 <?php $this->app->loadLang('client')?>
-<div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('xuanxuan');?></div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/xuanxuan/module/tree/ext/model/xuanxuan.php b/xuanxuan/module/tree/ext/model/xuanxuan.php
new file mode 100644
index 0000000000..3b61ced816
--- /dev/null
+++ b/xuanxuan/module/tree/ext/model/xuanxuan.php
@@ -0,0 +1,15 @@
+<?php
+public function getFamily($categoryID, $type = '', $root = 0)
+{
+    if($categoryID == 0 and empty($type)) return array();
+    $category = $this->getById($categoryID);
+
+    if($category)
+    {
+        return $this->dao->select('id')->from(TABLE_MODULE)->where('deleted')->eq('0')->andWhere('path')->like($category->path . '%')->fetchPairs();
+    }
+    if(!$category)
+    {
+        return $this->dao->select('id')->from(TABLE_MODULE)->where('deleted')->eq('0')->andWhere('type')->eq($type)->beginIF($root)->andWhere('root')->eq((int)$root)->fi()->fetchPairs();
+    }
+}