diff --git a/.gitignore b/.gitignore index b90aa51640..3ef6b26261 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +config/db.php config/my.php www/data/ www/install.php diff --git a/Makefile b/Makefile index 0d3d8eaa7b..b959bce756 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,8 @@ pms: chmod 777 zentaopms/module chmod 777 zentaopms/www chmod a+rx zentaopms/bin/* + mkdir zentaopms/config/ext + for module in `ls zentaopms/module/`; do mkdir zentaopms/module/$$module/ext; done find zentaopms/ -name ext |xargs chmod -R 777 zip -r -9 ZenTaoPMS.$(VERSION).zip zentaopms rm -fr zentaopms diff --git a/README.md b/README.md index 986ed32761..f855d1538e 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,11 @@ ===================== -ZenTao is an open source project management software, developed by Qingdao Nature Easy Soft Network Technology Co., Ltd. Integrating product management, project management, quality management, document management, organization management and to-do management, ZenTao is a professional development project management tool, covering the core processes of development project management. +ZenTao is an open source project management software, developed by Qingdao Nature Easy Soft Network Technology Co. Ltd. Combining product management, project management, QA management, document management, company management and todo management. It is a professional project management software, covering the core process of software development projects. + + +ZenTao is practical and pragmatic. It has full features and beautiful interfaces, and is easy to use. ZenTao is well structured and can be flexibly extended. It also has powerful search features, various forms of statistical reports and complete API. -ZenTao is practical and pragmatic. It has full features and a beautiful interface, and is easy to operate. Zentao is well structured and can be extended flexibly. It also has powerful search features, various reports and API. ZenTao focuses on development project management! @@ -12,26 +14,26 @@ ZenTao focuses on development project management! ============================ -Zen(禅) and Tao(道) are two Chinese characters that have rich meanings in both religion and culture. ZenTao Project Management Software takes the cutural meaning of Zen and Tao, and is expected to convey our understanding and thinking on management. Inspired by The Tao of Programming and The Zen of Programming, we named our software ZenTao. +Zen(禅) and Tao(道) are the two Chinese characters that have rich meanings in both religion and culture. ZenTao Project Management Software takes the cultural meaning of Zen and Tao, and is expected to convey our understanding and thinking of management. Inspired by The Tao of Programming and The Zen of Programming, we named our software ZenTao. 3. Design philosophy of ZenTao Project Management Software ========================================================== -The main management philosophy of ZenTao Project Management Software is based on Scrum, an internationally popular Agile management methodology. Scrum is very pragmatic and easy to operate, so it fits in the fast iterative software development projects. However, Scrum only defines the core management framework. Therefore, details and workflows have to be extended and developed. Based on the philosophy of Scrum and the observation of the current development situation in China, ZenTao integrates bug management, test management, release management and document management, which covers the entire life cycle of software development. In ZenTao, the concept of product, project and test is clearly defined. Product team, development team and QA team coordinate and check with each other while they function differently. The three teams interact with each other through working on stories, tasks and bugs, and eventually deliver the product with quality. +The main design philosophy of ZenTao Project Management Software is based on Scrum, an internationally popular Agile methodology. Scrum is very pragmatic and easy to operate, so it fits in the fast iterative development of software projects. However, Scrum only defines the core management framework. There are still many details and processes that have to be extended and developed. Based on the philosophy of Scrum and with the observation of the current development situations in China, ZenTao integrates bug management, test case management, release management and document management, and it completely covers the entire lifecycle of software development. In ZenTao, the concepts of product, project and test are clearly defined. Product team, development team and QA team coordinate and check with each other while they function differently. The three teams interact with each other through stories, tasks and bugs, and eventually deliver the product with quality. 4. Why choose ZenTao Project Management Software? =============================================== -* ZenTao is a professional development project management software and canot be replaced by one simple project management software. +* ZenTao is a professional development project management software and cannot be replaced by any simple project management software. * ZenTao has precise and pragmatic management philosphy, which will accelerate Agile development. * ZenTao has full features as a project management software, so you don’t have to integrate several systems together, like mantisbt + trac + testlink. * Open source codes and flexible extension mechanism. It is convenient to use and develop based on ZenTao. -* Underlying framework and front-end UI framework developed independently; robust and stable with beautiful interface and friendly interaction. +* Underlying framework and frontend UI framework are developed independently; robust and stable with beautiful interface and friendly interaction. * Perfect community mechanism; you can get technical support and help in time. -* Zero input, which means you have no risk for choosing ZenTao compared with other commercial software that cost you thousands of dollars. -* Support various ways of deployment, either private deployment or cloud service. +* Zero input, which means you have no risk for choosing ZenTao, compared with other commercial software that cost you thousands of dollars. +* Support various deployments, either private or cloud. 5. Features of ZenTao Project Management Software @@ -39,15 +41,15 @@ The main management philosophy of ZenTao Project Management Software is based on ====================================================== * Product management: including products, stories, plans, releases and roadmaps; -* Project management: including projects, tasks, teams, versions and burn-down charts; +* Project management: including projects, tasks, teams, builds and burn-down charts; * Quality management: including bugs, test cases, test tasks and test results; * Document management: including product document library, project document library and customized document library; * Work management: including to-do management and personal management, such as my tasks, my bugs, my story and my projects; * Organization management: including department, users, groups and privileges; * Statistics: various reports; -* Search: powerful search features to help you find the data you need. -* Extension mechanism: extensible almost anywhere in ZenTao; -* API mechanism, visible API: convenient for integration with other systems. +* Search: powerful search functions to help you find the data you need. +* Extension mechanism: extensible in almost any parts of ZenTao; +* API mechanism: convenient for integration with other systems. 6. Website diff --git a/VERSION b/VERSION index d1c0682f9d..072e6075b0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.6.3 +10.0.beta diff --git a/config/config.php b/config/config.php index b01c02e9c7..29b8779a8b 100644 --- a/config/config.php +++ b/config/config.php @@ -5,7 +5,7 @@ * * The author disclaims copyright to this source code. In place of * a legal notice, here is a blessing: - * + * * May you do good and not evil. * May you find forgiveness for yourself and forgive others. * May you share freely, never taking more than you give. @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '9.6.3'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '10.0.beta'; // 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. @@ -32,12 +32,12 @@ $config->sessionVar = 'zentaosid'; // 请求类型为GET：session变 $config->views = ',html,json,mhtml,'; // 支持的视图类型。 Supported view formats. /* 支持的主题和语言。Supported thems and languages. */ -$config->themes['default'] = 'default'; +$config->themes['default'] = 'default'; $config->langs['zh-cn'] = '简体'; $config->langs['zh-tw'] = '繁體'; $config->langs['en'] = 'English'; -/* 设备类型视图文件前缀。The prefix for view file for different device. */ +/* 设备类型视图文件前缀。The prefix for view file for different device. */ $config->devicePrefix['mhtml'] = ''; /* 默认值设置。Default settings. */ @@ -80,7 +80,7 @@ $config->domainPostfix .= "|rocks|social|co.com|bio|reviews|link|sexy|us.com|con $config->domainPostfix .= "|menu|info|events|webcam|dating|vacations|flights|cruises|global|ca|guru|"; $config->domainPostfix .= "|futbol|rentals|dance|lawyer|attorney|democrat|republican|actor|condos|immobilien|"; $config->domainPostfix .= "|villas|foundation|expert|works|tools|watch|zone|bargains|agency|best|solar|"; -$config->domainPostfix .= "|farm|pics|photo|marketing|holiday|gift|buzz|guitars|trade|construction|"; +$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|"; /* 系统框架配置。Framework settings. */ @@ -103,7 +103,7 @@ $config->framework->detectDevice['zh-tw'] = true; // 在zh-tw语言情况下， $config->framework->detectDevice['en'] = true; // 在en语言情况下，是否启用设备检测功能。 Whether enable device detect or not. /* 文件上传设置。 Upload settings. */ -$config->file = new stdclass(); +$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'; @@ -111,6 +111,14 @@ $config->file->allowed = 'txt,doc,docx,dot,wps,wri,pdf,ppt,pptx,xls,xlsx,ett,xlt $filterConfig = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'filter.php'; if(file_exists($filterConfig)) include $filterConfig; +/* 引用数据库的配置。 Include the database config file. */ +$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; @@ -118,7 +126,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 66e2c6ce16..6b684691fd 100644 --- a/config/filter.php +++ b/config/filter.php @@ -53,6 +53,7 @@ $filter->bug->default = new stdclass(); $filter->bug->create = new stdclass(); $filter->bug->export = new stdclass(); $filter->doc->browse = new stdclass(); +$filter->doc->showfiles = new stdclass(); $filter->doc->default = new stdclass(); $filter->doc->showfiles = new stdclass(); $filter->mail->ztcloud = new stdclass(); @@ -99,6 +100,7 @@ $filter->bug->export->cookie['checkedItem'] = 'reg::checked'; $filter->doc->browse->cookie['browseType'] = 'reg::browseType'; $filter->doc->default->cookie['from'] = 'code'; $filter->doc->default->cookie['product'] = 'int'; +$filter->doc->showfiles->cookie['docFilesViewType'] = 'code'; $filter->file->download->cookie[$config->sessionVar] = 'code'; @@ -203,4 +205,4 @@ $filter->user->edit->get['from'] = 'reg::word'; $filter->git->cat->get['repoUrl'] = 'reg::base64'; $filter->git->diff->get['repoUrl'] = 'reg::base64'; $filter->svn->cat->get['repoUrl'] = 'reg::base64'; -$filter->svn->diff->get['repoUrl'] = 'reg::base64'; \ No newline at end of file +$filter->svn->diff->get['repoUrl'] = 'reg::base64'; diff --git a/config/zentaopms.php b/config/zentaopms.php index a7149c59c1..949a5a8146 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -95,7 +95,6 @@ define('TABLE_FILE', '`' . $config->db->prefix . 'file`'); define('TABLE_HISTORY', '`' . $config->db->prefix . 'history`'); define('TABLE_EXTENSION', '`' . $config->db->prefix . 'extension`'); define('TABLE_CRON', '`' . $config->db->prefix . 'cron`'); -define('TABLE_MAILQUEUE', '`' . $config->db->prefix . 'mailqueue`'); define('TABLE_BLOCK', '`' . $config->db->prefix . 'block`'); define('TABLE_DOCCONTENT', '`' . $config->db->prefix . 'doccontent`'); define('TABLE_TESTSUITE', '`' . $config->db->prefix . 'testsuite`'); @@ -104,9 +103,9 @@ define('TABLE_TESTREPORT', '`' . $config->db->prefix . 'testreport`'); define('TABLE_ENTRY', '`' . $config->db->prefix . 'entry`'); define('TABLE_WEBHOOK', '`' . $config->db->prefix . 'webhook`'); -define('TABLE_WEBHOOKDATAS', '`' . $config->db->prefix . 'webhookdatas`'); define('TABLE_LOG', '`' . $config->db->prefix . 'log`'); define('TABLE_SCORE', '`' . $config->db->prefix . 'score`'); +define('TABLE_NOTIFY', '`' . $config->db->prefix . 'notify`'); if(!defined('TABLE_LANG')) define('TABLE_LANG', '`' . $config->db->prefix . 'lang`'); $config->objectTables['product'] = TABLE_PRODUCT; diff --git a/db/demo.sql b/db/demo.sql index c1979dd99c..cd67150a07 100644 --- a/db/demo.sql +++ b/db/demo.sql @@ -267,21 +267,21 @@ INSERT INTO `zt_task` (`id`, `project`, `story`, `storyVersion`, `fromBug`, `nam 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', '', '售后服务的开发
', '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', '', '售后服务的开发
', '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` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'dev3', '研发', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'productManager', '产品经理', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'tester2', '测试', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'tester1', '测试', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'projectManager', '项目经理', '2013-02-20', 365, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'tester2', '测试', '2013-02-20', 365, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'tester1', '测试', '2013-02-20', 365, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'dev3', '研发', '2013-02-20', 365, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'dev2', '研发', '2013-02-20', 365, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'dev1', '研发', '2013-02-20', 365, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'dev1', '研发', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'dev2', '研发', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'projectManager', '项目经理', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(1, 'testManager', '测试主管', '2013-02-20', 184, 7); -INSERT INTO `zt_team` (`project`, `account`, `role`, `join`, `days`, `hours`) VALUES(2, 'productManager', '产品经理', '2013-02-20', 365, 7); +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'); @@ -295,16 +295,15 @@ INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRu 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`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(2, 5, 'productManager', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, '0'); INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(3, 6, 'projectManager', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865876, '0'); -INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(4, 2, 'dev1', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338863860, '0'); -INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(5, 2, 'dev2', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338864116, '0'); -INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(6, 2, 'dev3', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338864187, '0'); -INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(7, 3, 'tester1', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, '0'); -INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(8, 3, 'tester2', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, '0'); -INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(9, 3, 'tester3', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, '0'); -INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(10, 1, 'testManager', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, '0'); +INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(4, 2, 'dev1', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338863860, '1'); +INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(5, 2, 'dev2', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338864116, '1'); +INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(6, 2, 'dev3', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338864187, '1'); +INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(7, 3, 'tester1', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, '1'); +INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(8, 3, 'tester2', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, '1'); +INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(9, 3, 'tester3', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, '1'); +INSERT INTO `zt_user` (`id`, `dept`, `account`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `yahoo`, `gtalk`, `wangwang`, `mobile`, `phone`, `address`, `zipcode`, `join`, `visits`, `ip`, `last`, `deleted`) VALUES(10, 1, 'testManager', '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); diff --git a/db/endemo.sql b/db/endemo.sql index 236a16b9a6..536c07c535 100644 --- a/db/endemo.sql +++ b/db/endemo.sql @@ -39,15 +39,15 @@ INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, ` (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, 'theQS', 'login', '2017-12-12 15:22:36', '', '', '0'), -(37, 'user', 12, ',0,', 0, 'theQS', 'logout', '2017-12-12 15:22:48', '', '', '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, 'qa1', 'login', '2017-12-12 15:23:34', '', '', '0'), -(41, 'build', 1, ',1,', 1, 'qa1', 'opened', '2017-12-12 15:25:13', '', '', '0'), -(42, 'bug', 1, ',1,', 1, 'qa1', 'opened', '2017-12-12 15:27:56', '', '', '0'), -(43, 'bug', 2, ',1,', 1, 'qa1', 'opened', '2017-12-12 15:30:32', '', '', '0'), -(44, 'user', 11, ',0,', 0, 'qa1', 'logout', '2017-12-12 15:32:26', '', '', '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'), @@ -80,54 +80,54 @@ INSERT INTO `zt_action` (`id`, `objectType`, `objectID`, `product`, `project`, ` (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, 'pg1', 'login', '2017-12-12 23:46:35', '', '', '0'), -(78, 'task', 9, ',2,', 2, 'pg1', 'started', '2017-12-12 23:46:58', '', '', '0'), -(79, 'task', 5, ',2,', 2, 'pg1', 'started', '2017-12-12 23:47:03', '', '', '0'), -(80, 'task', 5, ',2,', 2, 'pg1', 'finished', '2017-12-12 23:47:37', 'Finished general setup at backend', '', '0'), -(81, 'user', 5, ',0,', 0, 'pg1', 'logout', '2017-12-12 23:48:31', '', '', '0'), -(82, 'user', 7, ',0,', 0, 'pg3', 'login', '2017-12-12 23:48:39', '', '', '0'), -(83, 'build', 2, ',2,', 2, 'pg3', 'opened', '2017-12-12 23:49:31', '', '', '0'), -(84, 'task', 9, ',2,', 2, 'pg3', 'recordestimate', '2017-12-12 23:51:14', 'Finished page design.', '8', '0'), -(85, 'user', 7, ',0,', 0, 'pg3', 'logout', '2017-12-12 23:52:27', '', '', '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, 'pg3', 'login', '2017-12-12 23:55:49', '', '', '0'), -(92, 'testtask', 1, ',2,', 2, 'pg3', 'opened', '2017-12-12 23:56:59', '', '', '0'), -(93, 'user', 7, ',0,', 0, 'pg3', 'logout', '2017-12-12 23:57:22', '', '', '0'), -(94, 'user', 11, ',0,', 0, 'qa1', 'login', '2017-12-12 23:57:33', '', '', '0'), -(95, 'case', 1, ',2,', 0, 'qa1', 'opened', '2017-12-13 00:00:29', '', '', '0'), -(96, 'case', 2, ',2,', 0, 'qa1', 'opened', '2017-12-13 00:04:09', '', '', '0'), -(97, 'testsuite', 1, ',0,', 0, 'qa1', 'opened', '2017-12-13 00:05:13', '', '', '0'), -(98, 'bug', 3, ',2,', 2, 'qa1', 'opened', '2017-12-13 00:09:48', '', '', '0'), -(99, 'case', 3, ',2,', 0, 'qa1', 'opened', '2017-12-13 00:13:25', '', '', '0'), -(100, 'case', 2, ',2,', 0, 'qa1', 'edited', '2017-12-13 00:18:17', '', '', '0'), -(101, 'bug', 4, ',2,', 2, 'qa1', 'opened', '2017-12-13 00:30:07', '', '', '0'), -(102, 'bug', 4, ',2,', 2, 'qa1', 'edited', '2017-12-13 00:30:41', '', '', '0'), -(103, 'bug', 3, ',2,', 2, 'qa1', 'edited', '2017-12-13 00:31:10', '', '', '0'), -(104, 'bug', 5, ',2,', 2, 'qa1', 'opened', '2017-12-13 00:32:08', '', '', '0'), -(105, 'user', 11, ',0,', 0, 'qa1', 'logout', '2017-12-13 00:34:34', '', '', '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', '', '', '', '

[Steps]Switch desktops three times.

\r\n

[Results]The order of desktops is different from that was before.

\r\n

[Expectations]The order of desktops is the same as that was before.

', 'active', '', 0, 0, '0000-00-00 00:00:00', ',pm1', 'qa1', '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', '', '', '', '', '

[Steps]Enter “禅道(ZenTao)” in a Word and serach “禅道”.

\r\n

[Results] “禅道” is not found.

\r\n

[Expectations] “禅道” is found.

', 'active', '', 0, 0, '0000-00-00 00:00:00', '', 'qa1', '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', '', '', '', '', '

[Steps]

\r\n1. Click “400 page”

[Results]

\r\n1. Not all 400 page is displayed.

[Expectations]

\r\n1. List all 400 error pages.
', 'active', '', 0, 0, '0000-00-00 00:00:00', '', 'qa1', '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, 'qa1', '2017-12-13 00:31:10', '0'), -(4, 2, 0, 8, 2, 0, 10, 1, 0, 0, 0, 'Generate sitemap.', '', 3, 0, 'codeerror', '', '', '', '', '

[Steps]

\r\n1. Click “Generate sitemap”.

[Results]

\r\n1. ‘Contact Us’ page is missing in sitemap.

[Expectations]

\r\n1. Generate sitemap.
', 'active', '', 0, 0, '0000-00-00 00:00:00', '', 'qa1', '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, 'qa1', '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', '', '', '', '', '

[Steps]

\r\n1. Add ”www.zentao.pm\"

[Results]

\r\n1. It cannot be added, and database error prompts.

[Expectations]

1. In database form ‘friend link’, add ”www.zentao.pm\"
', 'active', '', 0, 0, '0000-00-00 00:00:00', '', 'qa1', '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'); +(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', '', '', '', '

[Steps]Switch desktops three times.

\r\n

[Results]The order of desktops is different from that was before.

\r\n

[Expectations]The order of desktops is the same as that was before.

', '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', '', '', '', '', '

[Steps]Enter “禅道(ZenTao)” in a Word and serach “禅道”.

\r\n

[Results] “禅道” is not found.

\r\n

[Expectations] “禅道” is found.

', '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', '', '', '', '', '

[Steps]

\r\n1. Click “400 page”

[Results]

\r\n1. Not all 400 page is displayed.

[Expectations]

\r\n1. List all 400 error pages.
', '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', '', '', '', '', '

[Steps]

\r\n1. Click “Generate sitemap”.

[Results]

\r\n1. ‘Contact Us’ page is missing in sitemap.

[Expectations]

\r\n1. Generate sitemap.
', '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', '', '', '', '', '

[Steps]

\r\n1. Add ”www.zentao.pm\"

[Results]

\r\n1. It cannot be added, and database error prompts.

[Expectations]

1. In database form ‘friend link’, add ”www.zentao.pm\"
', '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', '', '', 'qa1', '', '0'), -(2, 2, 0, 2, 'blog v0.1', '', '', '2017-12-12', '', '', 'pg3', 'build for inner test
', '0'); +(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
', '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, 'qa1', '2017-12-13 00:00:29', '', '0000-00-00', '', '0000-00-00 00:00:00', 1, '', 0, 0, '0', 'qa1', '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, 'qa1', '2017-12-13 00:04:09', '', '0000-00-00', 'qa1', '2017-12-13 00:18:17', 2, '', 0, 0, '0', 'qa1', '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, 'qa1', '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', ''); +(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_casestep` (`id`, `parent`, `case`, `version`, `type`, `desc`, `expect`) VALUES (1, 0, 1, 1, 'step', 'Switch on cache.', 'Cache is on.'), @@ -159,15 +159,15 @@ 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- Finish developing system drive program.\n001+ Add advanced features such as remote desktop.'), (2, 8, 'desc', 'Finish developing general features.
', 'Finish developing general features for users.
', '001- Finish developing features that are often used.
\n001+ Finish developing general features for users.
'), (3, 27, 'realStarted', '0000-00-00', '2017-12-12', ''), -(4, 27, 'assignedTo', 'pg2', 'pm1', ''), +(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', 'pg2', 'pm1', ''), +(9, 29, 'assignedTo', 'pm1', 'pm1', ''), (10, 29, 'status', 'wait', 'doing', ''), (11, 30, 'realStarted', '0000-00-00', '2017-12-12', ''), -(12, 30, 'assignedTo', 'pg3', 'pm1', ''), +(12, 30, 'assignedTo', 'pm1', 'pm1', ''), (13, 30, 'status', 'wait', 'doing', ''), (14, 31, 'left', '60', '0', ''), (15, 31, 'consumed', '0', '60', ''), @@ -183,11 +183,11 @@ INSERT INTO `zt_history` (`id`, `action`, `field`, `old`, `new`, `diff`) VALUES (25, 79, 'realStarted', '0000-00-00', '2017-12-12', ''), (26, 79, 'status', 'wait', 'doing', ''), (27, 80, 'consumed', '0', '30', ''), -(28, 80, 'assignedTo', 'pg1', 'pm1', ''), +(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', '', 'pg1', ''), +(32, 80, 'finishedBy', '', 'pm1', ''), (33, 84, 'left', '60', '50', ''), (34, 84, 'consumed', '0', '8', ''), (35, 87, 'pri', '3', '2', ''), @@ -215,8 +215,8 @@ INSERT INTO `zt_module` (`id`, `root`, `branch`, `name`, `parent`, `path`, `grad (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', 'thePM', 'pg3', 'open', '', 'thePO', '2017-12-12 14:44:55', '9.6.3', 5, '0'), -(2, 'Blog', 'blog', 0, 'normal', 'normal', 'A blogging system
', 'thePO', 'theQS', 'pg3', 'open', '', 'admin', '2017-12-12 23:28:29', '9.6.3', 10, '0'); +(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
', '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.
', '2017-12-30', '2018-07-03', '0'), @@ -285,13 +285,13 @@ INSERT INTO `zt_task` (`id`, `parent`, `project`, `module`, `story`, `storyVersi (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', 'pg3', '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', 'pg1', '2017-12-12 23:47:37', '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', '', 'pg1', '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', 'pg2', '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'), +(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', 'pg1', '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', '', 'pg3', '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', 'pg2', '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'); +(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'); INSERT INTO `zt_taskestimate` (`id`, `task`, `date`, `left`, `consumed`, `account`, `work`) VALUES (1, 1, '2017-12-12', 100, 0, 'pm1', NULL), @@ -301,55 +301,37 @@ INSERT INTO `zt_taskestimate` (`id`, `task`, `date`, `left`, `consumed`, `accoun (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, 'pg1', NULL), -(9, 5, '2017-12-12', 40, 0, 'pg1', NULL), -(10, 5, '2017-12-12', 0, 30, 'pg1', NULL), -(11, 9, '2017-12-13', 50, 8, 'pg3', 'Finish page design'); +(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` (`project`, `task`, `account`, `role`, `limited`, `join`, `days`, `hours`, `estimate`, `consumed`, `left`, `order`) VALUES -(1, 0, 'thePO', 'Product Owner', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(1, 0, 'pm1', 'Project Manager', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(1, 0, 'pg2', 'Developer', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(1, 0, 'pg3', 'Developer', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(1, 0, 'qa1', 'Tester', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(2, 0, 'pm1', 'Project Manager', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(2, 0, 'pg1', 'Developer', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(2, 0, 'pg2', 'Developer', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0), -(2, 0, 'pg3', 'Developer', 'no', '2017-12-12', 10, 7.0, 0.00, 0.00, 0.00, 0); +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:\"\";}}', 'qa1', '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:\"\";}}', 'qa1', '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.\";}}', 'qa1', '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.\";}}', 'qa1', '2017-12-13 00:23:48'); +(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'); INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRunner`, `lastRunDate`, `lastRunResult`, `status`) VALUES -(1, 1, 2, 2, 'theQS', 'qa1', '2017-12-13 00:08:52', 'fail', 'done'), -(2, 1, 1, 1, 'qa1', 'qa1', '2017-12-13 00:10:24', 'pass', 'done'); +(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', 'qa1', '2017-12-13 00:05:13', '', '0000-00-00 00:00:00', '0'); +(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`, `yahoo`, `gtalk`, `wangwang`, `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'), -(6, 'pm2', 'e10adc3949ba59abbe56e057f20f883e', 'pm', 'Matthew', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 0, '', 0, 0, '0000-00-00 00:00:00', '', 0, 0, '0'), -(5, 'pg1', 'e10adc3949ba59abbe56e057f20f883e', 'dev', 'Mark', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '127.0.0.1', 1513093595, 0, '0000-00-00 00:00:00', '', 0, 0, '0'), -(5, 'pg2', 'e10adc3949ba59abbe56e057f20f883e', 'dev', 'Andrew', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 0, '', 0, 0, '0000-00-00 00:00:00', '', 0, 0, '0'), -(5, 'pg3', 'e10adc3949ba59abbe56e057f20f883e', 'dev', 'Jean', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '127.0.0.1', 1513094149, 0, '0000-00-00 00:00:00', '', 0, 0, '0'), -(3, 'thePM', 'e10adc3949ba59abbe56e057f20f883e', 'qd', 'Tracy', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 0, '', 0, 0, '0000-00-00 00:00:00', '', 0, 0, '1'), -(3, 'qa1', 'e10adc3949ba59abbe56e057f20f883e', 'qa', 'Robert', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', 'admin', '0000-00-00', 2, '127.0.0.1', 1513094253, 0, '0000-00-00 00:00:00', '', 0, 0, '0'), -(3, 'theQS', 'e10adc3949ba59abbe56e057f20f883e', 'qd', 'Hannah', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '127.0.0.1', 1513063356, 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 -('pg1', 2), -('pg2', 2), -('pg3', 2), ('pm1', 4), -('pm2', 4), -('qa1', 3), -('thePM', 8), ('thePO', 5); diff --git a/db/update9.7.sql b/db/update9.7.sql new file mode 100644 index 0000000000..0757cd8f41 --- /dev/null +++ b/db/update9.7.sql @@ -0,0 +1,33 @@ +ALTER TABLE `zt_story` CHANGE `stage` `stage` ENUM('','wait','planned','projected','developing','developed','testing','tested','verified','released','closed') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'wait'; +ALTER TABLE `zt_todo` ADD `config` varchar(255) NOT NULL; +ALTER TABLE `zt_todo` ADD `cycle` tinyint unsigned NOT NULL DEFAULT '0' AFTER `type`; +ALTER TABLE `zt_todo` ADD `assignedTo` VARCHAR(30) NOT NULL DEFAULT '' AFTER `config`; +ALTER TABLE `zt_todo` ADD `assignedBy` VARCHAR(30) NOT NULL DEFAULT '' AFTER `assignedTo`; +ALTER TABLE `zt_todo` ADD `assignedDate` DATETIME NOT NULL AFTER `assignedBy`; +ALTER TABLE `zt_todo` ADD `finishedBy` VARCHAR(30) NOT NULL DEFAULT '' AFTER `assignedDate`; +ALTER TABLE `zt_todo` ADD `finishedDate` DATETIME NOT NULL AFTER `finishedBy`; +ALTER TABLE `zt_todo` ADD `closedBy` VARCHAR(30) NOT NULL DEFAULT '' AFTER `finishedDate`; +ALTER TABLE `zt_todo` ADD `closedDate` DATETIME NOT NULL AFTER `closedBy`; +ALTER TABLE `zt_todo` CHANGE `status` `status` ENUM('wait','doing','done','closed') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'wait'; + +INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES +('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); + + +ALTER TABLE `zt_projectproduct` ADD `plan` MEDIUMINT(8) UNSIGNED NOT NULL AFTER `branch`; + +CREATE TABLE IF NOT EXISTS `zt_notify` ( + `id` mediumint unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY, + `objectType` varchar(50) NOT NULL, + `objectID` mediumint unsigned NOT NULL, + `action` mediumint 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 +) ENGINE='MyISAM' COLLATE 'utf8_general_ci'; diff --git a/db/zentao.sql b/db/zentao.sql index bafc633bfb..c3180eb72f 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -407,12 +407,28 @@ CREATE TABLE IF NOT EXISTS `zt_module` ( PRIMARY KEY (`id`), KEY `module` (`root`,`type`,`path`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_notify`; +CREATE TABLE IF NOT EXISTS `zt_notify` ( + `id` mediumint unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY, + `objectType` varchar(50) NOT NULL, + `objectID` mediumint unsigned NOT NULL, + `action` mediumint 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 +) ENGINE='MyISAM' COLLATE 'utf8_general_ci'; -- DROP TABLE IF EXISTS `zt_product`; CREATE TABLE IF NOT EXISTS `zt_product` ( `id` mediumint(8) unsigned NOT NULL auto_increment, `name` varchar(90) NOT NULL, `code` varchar(45) NOT NULL, - `line` mediumint(8) NOT NULL, + `line` mediumint(8) NOT NULL, `type` varchar(30) NOT NULL default 'normal', `status` varchar(30) NOT NULL default '', `desc` text NOT NULL, @@ -483,6 +499,7 @@ 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`; @@ -528,7 +545,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` ( `estimate` float unsigned NOT NULL, `status` enum('','changed','active','draft','closed') NOT NULL default '', `color` char(7) NOT NULL, - `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released') NOT NULL DEFAULT 'wait', + `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released', 'closed') NOT NULL DEFAULT 'wait', `mailto` text, `openedBy` varchar(30) NOT NULL default '', `openedDate` datetime NOT NULL, @@ -627,8 +644,8 @@ CREATE TABLE IF NOT EXISTS `zt_taskestimate` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_team`; CREATE TABLE IF NOT EXISTS `zt_team` ( - `project` mediumint(8) unsigned NOT NULL default '0', - `task` mediumint(8) NOT NULL DEFAULT '0', + `root` mediumint(8) unsigned NOT NULL default '0', + `type` enum('project','task') NOT NULL DEFAULT 'project', `account` char(30) NOT NULL default '', `role` char(30) NOT NULL default '', `limited` char(8) NOT NULL default 'no', @@ -638,9 +655,8 @@ CREATE TABLE IF NOT EXISTS `zt_team` ( `estimate` DECIMAL(12,2) UNSIGNED NOT NULL DEFAULT '0', `consumed` DECIMAL(12,2) UNSIGNED NOT NULL DEFAULT '0', `left` DECIMAL(12,2) UNSIGNED NOT NULL DEFAULT '0', - `order` TINYINT(3) NOT NULL DEFAULT '0', - PRIMARY KEY (`project`, `task`, `account`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; + `order` TINYINT(3) NOT NULL DEFAULT '0' + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_testreport`; CREATE TABLE IF NOT EXISTS `zt_testreport` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, @@ -699,11 +715,11 @@ CREATE TABLE IF NOT EXISTS `zt_testsuite` ( `desc` text NOT NULL, `type` varchar(20) NOT NULL, `addedBy` char(30) NOT NULL, - `addedDate` datetime NOT NULL, + `addedDate` datetime NOT NULL, `lastEditedBy` char(30) NOT NULL, - `lastEditedDate` datetime NOT NULL, + `lastEditedDate` datetime NOT NULL, `deleted` enum('0','1') NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_testtask`; CREATE TABLE IF NOT EXISTS `zt_testtask` ( @@ -726,19 +742,28 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_todo`; CREATE TABLE IF NOT EXISTS `zt_todo` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, + `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, - `idvalue` mediumint(8) unsigned NOT NULL default '0', + `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') NOT NULL DEFAULT 'wait', + `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait', `private` tinyint(1) NOT NULL, - PRIMARY KEY (`id`), + `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, + PRIMARY KEY (`id`), KEY `todo` (`account`,`date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_user`; @@ -771,7 +796,7 @@ CREATE TABLE IF NOT EXISTS `zt_user` ( `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(12) NOT NULL DEFAULT '0', + `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`), @@ -903,7 +928,8 @@ INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type ('30', '0', '*', '*', '*', 'moduleName=backup&methodName=backup', '备份数据和附件', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('*/5', '*', '*', '*', '*', 'moduleName=mail&methodName=asyncSend', '异步发信', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('*/5', '*', '*', '*', '*', 'moduleName=webhook&methodName=asyncSend', '异步发送Webhook', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=admin&methodName=deleteLog', '删除过期日志', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); +('*/5', '*', '*', '*', '*', 'moduleName=admin&methodName=deleteLog', '删除过期日志', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), +('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES (1, 'ADMIN', 'admin', 'for administrator'), @@ -1062,6 +1088,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'mail', 'reset'), (1, 'mail', 'save'), (1, 'mail', 'test'), +(1, 'message', 'index'), +(1, 'message', 'setting'), (1, 'misc', 'ping'), (1, 'my', 'bug'), (1, 'my', 'changePassword'), @@ -1129,6 +1157,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'project', 'index'), (1, 'project', 'all'), (1, 'project', 'linkStory'), +(1, 'project', 'importPlanStories'), (1, 'project', 'manageMembers'), (1, 'project', 'manageProducts'), (1, 'project', 'order'), @@ -1292,6 +1321,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'todo', 'batchEdit'), (1, 'todo', 'batchFinish'), (1, 'todo', 'create'), +(1, 'todo', 'createCycle'), (1, 'todo', 'delete'), (1, 'todo', 'edit'), (1, 'todo', 'export'), @@ -1486,12 +1516,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'todo', 'batchEdit'), (2, 'todo', 'batchFinish'), (2, 'todo', 'create'), +(2, 'todo', 'createCycle'), (2, 'todo', 'delete'), (2, 'todo', 'edit'), (2, 'todo', 'export'), (2, 'todo', 'finish'), (2, 'todo', 'import2Today'), (2, 'todo', 'view'), +(2, 'todo', 'assignTo'), +(2, 'todo', 'activate'), +(2, 'todo', 'close'), (2, 'user', 'bug'), (2, 'user', 'deleteContacts'), (2, 'user', 'dynamic'), @@ -1701,6 +1735,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'todo', 'batchEdit'), (3, 'todo', 'batchFinish'), (3, 'todo', 'create'), +(3, 'todo', 'createCycle'), (3, 'todo', 'delete'), (3, 'todo', 'edit'), (3, 'todo', 'export'), @@ -1838,6 +1873,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'project', 'index'), (4, 'project', 'all'), (4, 'project', 'linkStory'), +(4, 'project', 'importPlanStories'), (4, 'project', 'manageMembers'), (4, 'project', 'manageProducts'), (4, 'project', 'order'), @@ -1925,12 +1961,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'todo', 'batchEdit'), (4, 'todo', 'batchFinish'), (4, 'todo', 'create'), +(4, 'todo', 'createCycle'), (4, 'todo', 'delete'), (4, 'todo', 'edit'), (4, 'todo', 'export'), (4, 'todo', 'finish'), (4, 'todo', 'import2Today'), (4, 'todo', 'view'), +(4, 'todo', 'assignTo'), +(4, 'todo', 'activate'), +(4, 'todo', 'close'), (4, 'tree', 'browse'), (4, 'tree', 'browseTask'), (4, 'tree', 'delete'), @@ -2078,6 +2118,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'project', 'index'), (5, 'project', 'all'), (5, 'project', 'linkStory'), +(5, 'project', 'importPlanStories'), (5, 'project', 'manageMembers'), (5, 'project', 'manageProducts'), (5, 'project', 'order'), @@ -2182,12 +2223,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'todo', 'batchEdit'), (5, 'todo', 'batchFinish'), (5, 'todo', 'create'), +(5, 'todo', 'createCycle'), (5, 'todo', 'delete'), (5, 'todo', 'edit'), (5, 'todo', 'export'), (5, 'todo', 'finish'), (5, 'todo', 'import2Today'), (5, 'todo', 'view'), +(5, 'todo', 'assignTo'), +(5, 'todo', 'activate'), +(5, 'todo', 'close'), (5, 'tree', 'browse'), (5, 'tree', 'browseTask'), (5, 'tree', 'delete'), @@ -2326,6 +2371,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'project', 'index'), (6, 'project', 'all'), (6, 'project', 'linkStory'), +(6, 'project', 'importPlanStories'), (6, 'project', 'manageMembers'), (6, 'project', 'manageProducts'), (6, 'project', 'order'), @@ -2411,12 +2457,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'todo', 'batchEdit'), (6, 'todo', 'batchFinish'), (6, 'todo', 'create'), +(6, 'todo', 'createCycle'), (6, 'todo', 'delete'), (6, 'todo', 'edit'), (6, 'todo', 'export'), (6, 'todo', 'finish'), (6, 'todo', 'import2Today'), (6, 'todo', 'view'), +(6, 'todo', 'assignTo'), +(6, 'todo', 'activate'), +(6, 'todo', 'close'), (6, 'tree', 'browse'), (6, 'tree', 'browseTask'), (6, 'tree', 'delete'), @@ -2554,6 +2604,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'project', 'index'), (7, 'project', 'all'), (7, 'project', 'linkStory'), +(7, 'project', 'importPlanStories'), (7, 'project', 'manageProducts'), (7, 'project', 'story'), (7, 'project', 'task'), @@ -2652,12 +2703,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'todo', 'batchEdit'), (7, 'todo', 'batchFinish'), (7, 'todo', 'create'), +(7, 'todo', 'createCycle'), (7, 'todo', 'delete'), (7, 'todo', 'edit'), (7, 'todo', 'export'), (7, 'todo', 'finish'), (7, 'todo', 'import2Today'), (7, 'todo', 'view'), +(7, 'todo', 'assignTo'), +(7, 'todo', 'activate'), +(7, 'todo', 'close'), (7, 'tree', 'browse'), (7, 'tree', 'browseTask'), (7, 'tree', 'delete'), @@ -2905,12 +2960,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'todo', 'batchEdit'), (8, 'todo', 'batchFinish'), (8, 'todo', 'create'), +(8, 'todo', 'createCycle'), (8, 'todo', 'delete'), (8, 'todo', 'edit'), (8, 'todo', 'export'), (8, 'todo', 'finish'), (8, 'todo', 'import2Today'), (8, 'todo', 'view'), +(8, 'todo', 'assignTo'), +(8, 'todo', 'activate'), +(8, 'todo', 'close'), (8, 'tree', 'browse'), (8, 'tree', 'browseTask'), (8, 'tree', 'delete'), @@ -3071,12 +3130,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'todo', 'batchEdit'), (9, 'todo', 'batchFinish'), (9, 'todo', 'create'), +(9, 'todo', 'createCycle'), (9, 'todo', 'delete'), (9, 'todo', 'edit'), (9, 'todo', 'export'), (9, 'todo', 'finish'), (9, 'todo', 'import2Today'), (9, 'todo', 'view'), +(9, 'todo', 'assignTo'), +(9, 'todo', 'activate'), +(9, 'todo', 'close'), (9, 'user', 'batchCreate'), (9, 'user', 'batchEdit'), (9, 'user', 'bug'), @@ -3185,12 +3248,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10, 'todo', 'batchEdit'), (10, 'todo', 'batchFinish'), (10, 'todo', 'create'), +(10, 'todo', 'createCycle'), (10, 'todo', 'delete'), (10, 'todo', 'edit'), (10, 'todo', 'export'), (10, 'todo', 'finish'), (10, 'todo', 'import2Today'), (10, 'todo', 'view'), +(10, 'todo', 'assignTo'), +(10, 'todo', 'activate'), +(10, 'todo', 'close'), (10, 'user', 'bug'), (10, 'user', 'dynamic'), (10, 'user', 'profile'), diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 4d553aefc7..1bfeea193e 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,4 +1,169 @@ -2017-11-06 9.6 +2017-01-17 9.8.stable +完成的需求 +683 todo增加转需求，bug或者任务的功能 +1678 todo增加评论功能。 +1680 todo增加处理流程 +1681 待办实现周期性待办功能 +1923 报表可以选择显示的方式 +1952 移植然之里面的消息通知功能 +2001 调整导出页面的格式 +2037 测试用例关联需求时候关闭需求也列出 +2103 禅道中所有创建编辑页面的下拉框都增加搜索定位功能 +2120 需求任务bug编辑页面抄送给字段可以选择联系人 +2151 加强计划和项目之间的关系 +2243 测试版本的用例列表增加按照指派给分组。 +2245 统计-组织-员工负载表显示未安排任务的人员信息 +2339 增加指派给我的区块 +2369 处理下目标服务器积极拒绝链接的错误提示 +2380 生成测试报告时可以选择多个测试单 +2401 利用浏览器的消息提醒机制实现消息提醒 +2409 每日提醒邮件增加任务和bug的超时提醒内容 +2426 优化文档详情页面的排版 +2428 邮件中需求任务bug用例标题显示设置的颜色 +2460 Bug导入模版中增加截止日期字段的导入 +2479 zt_mailqueue 和 zt_webhookdatas 合并成zt_notify +2484 zt_team增加type和root字段，project和task 改成 root +2499 实现集中的消息处理机制 +2523 补充最近的修改记录 +2566 config下面的配置文件，应该最后加载my.php +2568 搜索表单的字段也可以支持搜索 +2572 通过编辑修改需求plan的时候，计算需求的stage字段。 +2573 计划的日期可以设置为待定 +2574 需求关闭之后，stage也都改成closed。 +2575 丰富计划列表页面的信息 +2591 help/changeLog的页面中，显示最新的changeLog +2592 修改‘个人档案’中的翻译 + +修复的Bug +1331 项目需求下，如果需求排序权限处于未开启的情况；在选择多个复选框是会出问题 +1341 点击任务开始剩余工时选择0点击确定完成任务的时候没有把指派人更换成创建人 +1343 待评审状态用例，批量编辑后，状态会更新为空 +1347 bug编辑日期可以输入汉字且被保存 +1355 zentaopms/module/dev/model.php 代码优化 +1359 看板，未开始的任务，不能拖拽到进行中。 +1360 未完全修改#2518需求中的所有项目 +1362 创建子任务使用粘贴文本，保存超过10条时，10条以上的数据不保存 +1363 后台自定义日期必填项无效 +1365 后台-安全，设置密码安全为强时，满足安全强度，登录时也会提示密码强度小 +1367 我的地盘-任务，子任务在任务列表中不显示标签 +1369 备注权限（action comment）,取消视图维护，后台权限验证。 +1371 文件格式附件预览的时候报错 +1373 编辑多人任务，可以选择出了项目团队成员之外的其他成员。 +1374 多人任务，完成，转交，指派人，可以选择非项目团队成员 +1377 用例内容包含特殊字符时，导出内容不正确 +1378 编辑用户信息，填写邮箱有空格会提示email不合法 +1379 任务列表，任务条数大于每页显示条数时，新建子任务会显示在最后一页 +1382 php7 打开项目中的树状图报错 字符串转数组问题 +1384 项目-测试 操作栏中的测试报告按钮点击后跳转到创建报告页面 +1385 测试-用例 从用例库导入用例的搜索中所属模块显示的不是用例库中的模块 +1386 项目任务列表的优先级显示错误 +1387 后台-自定义-需求-评审流程，设置强制评审人员，保存不上 +1388 修改父子任务的所属项目无法整体移动 + +2017-12-22 9.7.stable +完成的需求 +2475 批量操作时增加列中切换快捷键支持 +2496 英文专业版中部分画面带有中文字符 +2515 调整国际版的发信功能 +2514 打包一个国际版的安装包 +2537 The report of bug resolve里面没有做翻译 +2532 英文版一键安装包里面需要跳转 +2530 翻译国际版一键安装包的英文界面 +2558 修正两个画面的翻译 +2557 修正五个画面的排版细节 +2556 修正 “修改密码”画面的排版问题 +2555 修正 “产品动态”和“项目动态“的中的汉字 +2547 修正 “查看项目画面”的排版问题 +2546 修正 “BUG的自定义画面“的排版问题 +2545 修正 “创建项目文档库”画面的提示框翻译 +2544 修正一键安装包中“ 报表/自定义/项目 ”的空缺内容 +2543 调整报表模块界面的列显示，消除列名显示不全 +2542 调整添加用户界面，输入提示显示不全 +2541 调整一键安装包英文界面下，做系统备份成功时的英文翻译 +2524 将国际版筛选标签里面和我相关的菜单折叠到一个My标签里面 +2520 需求详情的用例按钮中间增加空格 +2519 调整国际版下面的每个表单保证控件组的对齐 +2518 调整后台首页国际版下面的内容和链接 +2509 测试视图主页，点击待测版本区块more，可以跳转到测试-测试单下 +2506 受限操作分组维护分组描述 +2493 需求、任务、bug、用例、日志列表勾选左下方全选，导出数据时选择选中记录，可以导出全选的数据 +2492 任务列表下方统计信息，显示子任务的统计信息 +2474 需求的批量编辑画面，布局有问题，未利用所有的屏幕宽度 +2355 自定义列表字段把能够展示的字段都梳理一遍 +2351 调整后台首页和关于页面的链接 +2297 计划或者项目创建需求的时候可以批量创建 +2527 bug状态已解决翻译有误 +2516 精简一级导航菜单的单词 +2513 创建英文版本的demo +2487 编辑webhook页面，把类型字段显示出来 +2463 后台增加对 tmp和session目录读写权限检查和结果展示的功能 +2553 历史记录里面的旧记录翻译需要修改 +2552 优化国际版下面页脚统计信息的翻译 +2551 创建计划时日期选择翻译错了 +2550 计划关联需求的翻译弄反了 +2549 需求关闭页面closed reaseon换行 +2540 调整需求创建时推荐模板的翻译 +2539 各个统计报表的翻译需要调整 +2538 公司视图的统计需要调整翻译。 +2536 国际版去掉用不到的bug类型 +2535 调整国际版里面的网站链接 +2534 调整权限分组里面的翻译和排版 +2531 需求变更页面翻译需要调整 +2529 bug详情页面的create应当是Copy +2528 bug创建表单keywords空间需要去掉空格 +2488 项目 任务视图，增加由我参与的任务按钮，展示由我参与的任务（多人任务）。 + +修复的BUG +1008 我的地盘首页的待办点击后跳转到组织-用户-待办页面 +1214 项目起止时间显示优化 +1219 从桌面客户端查看待办，页面显示不对。 +1221 任务报表统计中没有显示自定义的值 +1224 非多平台产品，在测试管理工作方式中，测试视图显示异常。 +1225 调用api反馈 nogdlib实际是有gd库的 +1228 手机浏览器访问开源版报错 +1232 任务、用例、bug，直接在列表下进行编辑操作，操作后底部统计栏不再固定显示 +1234 需求评审结果显示错误 +1240 提交需求会列出没有权限查看的产品名称 +1244 组织-日志中，选择本月或上月时，结束日期显示准确。 +1251 测试用例导出csv文件，报文格式数据不显示 +1255 zbox一键安装包，建议安装 aria_chk +1256 搜索条件为日期介于时间段时，搜索后点击重置，搜索条件还在，需要重新点击搜索，条件才会重置。 +1261 批量分解任务无法分配相同名称的任务 +1264 没有产品的时候打开debug，进入以下页面会产生大量警告性的错误 +1268 需求细分功能如果没有填写任何数据被细分的需求也会关闭 +1273 测试视图，bug列表，单选框无法正常单选。 +1274 开源版集成svn/git查看显示403 +1275 文档维护分类，把模块和子模块改为分类。 +1280 后台-备份在直线还原操作的时候先检查备份文件的权限是否可以正常执行还原动作 +1283 列表页面，批操作菜单，会被遮盖。建议优化。 +1292 子任务指派给用户时，用户登陆后，不会在指派给我中显示 +1305 修复邮件发送公司信息没有及时更新的问题 +1309 开启测试管理工具（产品-项目流程），多分支产品，版本根据分支筛选功能异常。 +1314 产品-需求 无法批量关闭需求 +1324 产品-需求-编辑，删除所属计划后保存不生效 +1325 windows一键安装包9.0升9.6.3，admin登录提示没首页权限 +1326 子任务关闭或删除后，父任务预计工时还会统计 +1327 任务全选，导出数据，不能导出子任务. +1328 项目概况预计工时，与燃尽图不符。 +1329 多人任务，按照指派给分组，显示优化。 +1330 项目任务，编辑任务，更换所属项目，顶部弹出窗口，点击取消；选中内容还是目标内容 +1332 保持登录功能可能失效 +1335 测试管理工具，产品--版本产品下载地址显示有问题 +1336 测试管理工具，项目--迭代，添加项目页面报错。 +1337 项目-任务按照模块和产品筛选数据有问题 +1338 后台-二次开发-数据库 --其他模块，显示英文字段 +1340 编辑bug解决日期会显示被修改 +1341 点击任务开始剩余工时选择0点击确定完成任务的时候没有把指派人更换成创建人 +1342 产品-需求列表在某个分支下无法显示所属计划 +1343 待评审状态用例，批量编辑后，状态会更新为空 +1344 测试bug，解决bug与激活bug功能，版本下拉，没有根据项目进行过滤。 +1345 多人任务都完成后没有指派给创建人 +1347 bug编辑日期可以输入汉字且被保存 +1348 子任务工时在所有项目页面，工时会统计为双倍 +1349 测试-用例列表，用例选择多个适用阶段，列表显示错行 +1350 项目任务列表，高级表格，延期任务，选中，鼠标放置上去，显示异常。 + +2017-11-06 9.6.stable 完成的需求 1988 需求，任务，bug，用例，待办都可以选择看板模式。 2004 运维性的项目支持多人任务和子任务功能 diff --git a/doc/LICENSE b/doc/LICENSE deleted file mode 100644 index ad1d7c53f5..0000000000 --- a/doc/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ -Z PUBLIC LICENSE 1.2 - -许可 - -Z PUBLIC LICENSE 由青岛易软天创网络科技有限公司（www.cnezsoft.com）起草，简称ZPL协议。 -任何人均可使用该协议来发布开源软件，并可对下面协议正文中以下划线标注的空白部分做相应修改， -除此之外的任何内容不得做任何修改。青岛易软天创网络科技有限公司拥有对该协议条款的最终解释权。 - -前言： - -禅道项目管理软件（以下简称该软件）由 青岛易软天创网络科技有限公司（www.cnezsoft.com）开发（以下简称我）。我依法拥有该软件的所有版权。 -本着共享开放的角度，我以开放源代码的形式发布该软件。您可以在遵守该协议的前提下使用该软件。 -自您安装该软件开始，您和我之间的合同关系自动成立。除非您停止使用该软件或与我有签署额外合同， -您须认真遵循该授权协议约定的每一条款。 - -我的联系方式： -联系人：徐先生 -电话： 4006-8899-23 -Email： co@cnezsoft.com -QQ： 1492153927 -地址： 青岛开发区武夷山路167号千禧龙花园 9-1-101室 - -约定: - -下述条款中所指该软件的标志包括如下方面： - - 该软件源代码及文档中关于该软件的版权提示、文字、图片和链接。 - 该软件运行时界面上呈现出来的有关该软件的文字、图片和链接。 - -不包括如下方面： - - 该软件提供的演示数据中关于该软件的文字、图片和链接。 - -一、免责 - -该软件是以开放源代码的方式发行，您使用该软件无需任何费用，因此在使用该软件前，您须知晓： - - 1.1 我没有对该软件提供任何技术支持的义务，您可联系我购买商业的技术支持。 - 1.2 我对因使用该软件而产生直接或间接的任何问题不负任何责任。 - 1.3 开源不等于免费，开源不等于无版权，开源软件的发展需要您我共同的努力。 - -二、自用该软件 - -2.1 您个人或您就职的公司（组织）可自由使用该软件，我不对您或您就职公司（组织）的性质做任何限制。 -2.2 您可以在您个人或您就职公司（组织）任意数量的电脑上运行该软件，我不对电脑的数量做任何限制。 -2.3 您可以对该软件源代码进行修改以适应您个人或您所在公司（组织）使用的要求，您做的改动无需对外发布。 -2.4 您个人或您就职公司（组织）使用该软件时，必须保留该软件的所有标志，不得以任何方式隐藏或遮掩任一标志。 - -三、为用户定制 - -3.1 您可以使用该软件为您的用户部署各种形式的应用，我不对应用的性质做任何限制。 -3.2 您可以使用该软件为您的用户部署任意数量的应用，我不对应用的数量做任何限制。 -3.3 您可以对该软件源代码进行修改以适应您的用户的要求，您做的改动无需对外发布。 -3.4 您对该软件源代码所做的修改可以源代码或二进制的方式提供给您的用户。 -3.5 您使用该软件为您的任一用户部署的任一应用都必须保留该软件所有的标志。 -3.6 您使用该软件为您的任一用户部署的任一应用都不得以任何方式隐藏或遮掩该软件任一标志。 - -四、提供在线服务 - -4.1 您可以使用该软件搭建在线服务，为您的用户提供服务，我不对该服务及该服务用户的性质做任何限制。 -4.2 您可以使用该软件搭建在线服务，为您的用户提供服务，我不对该服务的用户数量做任何限制。 -4.3 您可以对该软件源代码进行修改以适应在线服务的要求，您做的改动无需对外发布。 -4.4 您使用该软件搭建在线服务时，必须以明确的方式告知您的用户该服务是基于该软件搭建的。 -4.5 您使用该软件搭建在线服务为您的任一用户部署的任一应用必须保留该软件所有的标志。 -4.6 您使用该软件搭建在线服务为您的任一用户部署的任一应用不得以任何方式隐藏或遮掩该软件任一标志。 -4.7 您使用该软件搭建在线服务时，不得为您的用户提供去除、隐藏或遮掩该软件任一标志的功能。 - -五、无改动发布或集成该软件 - -5.1 我欢迎并感谢您将该软件发布在您的个人网站、企业官网或者其他的第三方网站。 -5.2 我欢迎并感谢您将该软件集成在其他系统中一起发布，比如云服务镜像、操作系统发行版等。 -5.3 您在发布或者集成该软件的时候，不得对该软件源码做任何改动。 -5.4 您在发布或者集成该软件的时候，须保留该软件的所有标志。 - -六、发布基于该软件的衍生作品 - -6.1 我欢迎并感谢您为该软件开发衍生作品。 -6.2 您开发的衍生作品中涉及到对该软件源代码改动的地方，须遵循如下条款： - - 6.2.1 如修改了该软件的源代码，须依据本协议发布修改后的源代码。 - 6.2.2 如修改了该软件的源代码，须保留代码里面该软件原有的所有标志。 - 6.2.3 您可以在代码中追加您自己的标志。 - 6.2.4 您可以对您开发的衍生作品进行收费。 - 6.2.5 第三方的用户可在遵循6.2所有条款下可继续在您开发的衍生作品基础上进行修改并发布。 - -6.3 您开发的衍生作品中独立于本软件开发的代码，可以源代码或二进制的方式进行发布，可免费或收费发布。 -6.4 您开发的衍生作品不得以任何方式去除、隐藏或遮掩该软件的任一标志。 - -七、发布基于该软件API的应用 - -7.1 我欢迎并感谢您为该软件开发基于API的各种应用，比如客户端软件等。 -7.2 您基于该软件API机制开发的应用，可以源代码或者二进制的方式进行发布，我对此没有任何限制。 -7.3 您基于该软件API机制开发的应用，授权协议可以自行约定，我对此没有任何限制。 -7.4 您基于该软件API机制开发的应用，可以免费或者收费发布，我对此没有任何限制。 - -八、授权例外 - -如果上述条款无法满足您使用该软件的要求，可联系我签署额外的合同以获得更灵活的授权许可。 - -九、合同约束 - -9.1 如果您违反了该协议的任一条款，该授权协议将自动终止，我保留通过法律手段追究责任的权利。 - -Z PUBLIC LICENSE 1.2 - -Authorization - -Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by QingDao Nature Easy Soft Network Technology Co,LTD. (,www.cnezsoft.com). -Anyone can use the agreement to publish open source software, and modify the blank underlined part of the following text of the agreement accordingly. -No other text of the agreement shall be changed. QingDao Nature Easy Soft Network Technology Co,LTD has the final authority to interpret the terms of the agreement. - -Preface - -ZenTaoPMS (Hereinafter referred to as "the software") developed by Nature EasySoft Network Tecnology Co.ltd, QingDao, China (www.cnezsoft.com) (hereinafter referred to I). I'm entitled to all copyright of the software. -The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement. -By installation of the software, you agree that a contractual relationship between you and me is automatically established. -You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional contracts with me. - -My Contact: -Contact: Mr. Xu -Phone: 4006-8899-23 -Email: co@cnezsoft.com -QQ: 1492153927 -Address: 9-1-101, 167 Wuyishan Lu, Kai Fa Qu, Qingdao - -We agree: - -Indications of the software include: - - Notes, texts, pictures and links showing copyright attribution of the software in the source code and related documentation. - and texts, picture and links on the interface of the software when running. - -Excluding - - texts, picture and links on the interface of the demo versions of the software. - -1. Disclaimer - -The software is an open-source software, so you are authorized to use the software without paying a fee. Before you start to use it, please note: - - 1.1 I do not have any obligation to provide technical support for the software. You can contact me to purchase technical support service. - 1.2 I'm not responsible for any liability caused by your using the software directly or indirectly. - 1.3 Open source software does not mean it's free of charge, neither does it mean the software does not enjoy copyright. - -2. For personal use - -2.1 You or your company/organization are authorized to use the software for your internal use for both commercial and non-commercial purposes.. -2.2 You or your company/organization are authorized to run the software on any number of computers. -2.3 You or your company/organization are authorized to modify the source code of the software to meet your requirements. You do not need to release the modified codes. -2.4 You or your company/organization must keep all the indications of the software when using it. None of the indications can be removed, hidden or obscured in any way. - -3. For customized software - -3.1 You are authorized to use the software to deploy various forms of application for your users in any way you like. -3.2 You are authorized to use the software to deploy any number of applications for your users. -3.3 You are authorized to modify the source code to meet your user's requirements without releasing the modified codes. -3.4 You are authorized to provide the modified codes to your users in either source code form or binary. -3.5 You must keep all the indications of the software when providing applications to your users. -3.6 None of the indications of the software may be removed, hidden or obscured in any way when you provide applications to your users. - -4. Online service - -4.1 You are authorized to use the software to build your online service for your users in any way you like. -4.2 You are authorized to use the software to build your online service for any number of your users. -4.3 You are authorized to modify the source codes of the software to meet your user's requirements on online service without releasing the modified codes. -4.4 You must notify your users clearly that your service is based on the software when you use it to build your online service. -4.5 You must keep all the indications of the software when providing online service to your users. -4.6 You must keep all the indications of the software in any application you make for your users. None of the indications can be hidden or obscured in any way. -4.7 You are forbidden from assisting your users by providing tools for your users to remove, hide or obscure any indication of the software when you use the software to build your online service. - -5. Publish or integrate the software without modification - -5.1 You are authorized to publish the software on your personal sites, corporate official website or other third-party sites. -5.2 You are authorized to integrate the software with other systems, such as cloud virtual machine images, operating system images and so on. -5.3 Do not modify the source code of the software when you publish or integrate it. -5.4 All indications of the software must be kept the same when you publish or integrate the software. - -6. Publish derived work based on the software - -6.1 You are authorized to develop derived work based on the software. -6.2 The modified codes of the software in your derived work must follow the following terms: - - 6.2.1 The source codes must be released if you make any modification to the software. - 6.2.2 All indications of the software must be kept the same. - 6.2.3 You are entitled to add your indications to the modified codes. - 6.2.4 You are entitled to charge fees for the derived work you developed based on the software. - 6.2.5 You agree to authorize third party users to modify and release the derived work in compliance with 6.2. - -6.3 If the codes of the work are independently developed by yourself, You are authorized to release the work in either source code form or binary. You are entitled to charge your users or make it free. -6.4 None of the indications of the software can be removed, hidden or obscured in any way in the derived work you developed. - -7. Publish applications based on API of the software - -7.1 You are authorized to develop your applications based on the API of the software, for example, client software. -7.2 You are authorized to publish applications you developed based on the API in either source code form or binary. -7.3 You are authorized to use your own license to release applications you developed based on the API. -7.4 You are entitled to release applications you developed based on the API either free or with a charge. - -8. Exceptions - -If the terms above do not meet your requirements when using the software, please contact me for a more flexible license. - -9. Termination - -9.1 Violation of any of the terms of the agreement will result in immediate termination of this license. I reserve all rights to take legal actions in case of dispute. diff --git a/doc/LICENSE.CN b/doc/LICENSE.CN new file mode 100644 index 0000000000..8baab2b794 --- /dev/null +++ b/doc/LICENSE.CN @@ -0,0 +1,102 @@ +Z PUBLIC LICENSE 1.2 + +许可 + +Z PUBLIC LICENSE 由青岛易软天创网络科技有限公司（www.cnezsoft.com）起草，简称ZPL协议。 +任何人均可使用该协议来发布开源软件，并可对下面协议正文中以下划线标注的空白部分做相应修改， +除此之外的任何内容不得做任何修改。青岛易软天创网络科技有限公司拥有对该协议条款的最终解释权。 + +前言： + +禅道项目管理软件（以下简称该软件）由 青岛易软天创网络科技有限公司（www.cnezsoft.com）开发（以下简称我）。我依法拥有该软件的所有版权。 +本着共享开放的角度，我以开放源代码的形式发布该软件。您可以在遵守该协议的前提下使用该软件。 +自您安装该软件开始，您和我之间的合同关系自动成立。除非您停止使用该软件或与我有签署额外合同， +您须认真遵循该授权协议约定的每一条款。 + +我的联系方式： +联系人：徐先生 +电话： 4006-8899-23 +Email： co@cnezsoft.com +QQ： 1492153927 +地址： 青岛开发区武夷山路167号千禧龙花园 9-1-101室 + +约定: + +下述条款中所指该软件的标志包括如下方面： + + 该软件源代码及文档中关于该软件的版权提示、文字、图片和链接。 + 该软件运行时界面上呈现出来的有关该软件的文字、图片和链接。 + +不包括如下方面： + + 该软件提供的演示数据中关于该软件的文字、图片和链接。 + +一、免责 + +该软件是以开放源代码的方式发行，您使用该软件无需任何费用，因此在使用该软件前，您须知晓： + +1.1 我没有对该软件提供任何技术支持的义务，您可联系我购买商业的技术支持。 +1.2 我对因使用该软件而产生直接或间接的任何问题不负任何责任。 +1.3 开源不等于免费，开源不等于无版权，开源软件的发展需要您我共同的努力。 + +二、自用该软件 + +2.1 您个人或您就职的公司（组织）可自由使用该软件，我不对您或您就职公司（组织）的性质做任何限制。 +2.2 您可以在您个人或您就职公司（组织）任意数量的电脑上运行该软件，我不对电脑的数量做任何限制。 +2.3 您可以对该软件源代码进行修改以适应您个人或您所在公司（组织）使用的要求，您做的改动无需对外发布。 +2.4 您个人或您就职公司（组织）使用该软件时，必须保留该软件的所有标志，不得以任何方式隐藏或遮掩任一标志。 + +三、为用户定制 + +3.1 您可以使用该软件为您的用户部署各种形式的应用，我不对应用的性质做任何限制。 +3.2 您可以使用该软件为您的用户部署任意数量的应用，我不对应用的数量做任何限制。 +3.3 您可以对该软件源代码进行修改以适应您的用户的要求，您做的改动无需对外发布。 +3.4 您对该软件源代码所做的修改可以源代码或二进制的方式提供给您的用户。 +3.5 您使用该软件为您的任一用户部署的任一应用都必须保留该软件所有的标志。 +3.6 您使用该软件为您的任一用户部署的任一应用都不得以任何方式隐藏或遮掩该软件任一标志。 + +四、提供在线服务 + +4.1 您可以使用该软件搭建在线服务，为您的用户提供服务，我不对该服务及该服务用户的性质做任何限制。 +4.2 您可以使用该软件搭建在线服务，为您的用户提供服务，我不对该服务的用户数量做任何限制。 +4.3 您可以对该软件源代码进行修改以适应在线服务的要求，您做的改动无需对外发布。 +4.4 您使用该软件搭建在线服务时，必须以明确的方式告知您的用户该服务是基于该软件搭建的。 +4.5 您使用该软件搭建在线服务为您的任一用户部署的任一应用必须保留该软件所有的标志。 +4.6 您使用该软件搭建在线服务为您的任一用户部署的任一应用不得以任何方式隐藏或遮掩该软件任一标志。 +4.7 您使用该软件搭建在线服务时，不得为您的用户提供去除、隐藏或遮掩该软件任一标志的功能。 + +五、无改动发布或集成该软件 + +5.1 我欢迎并感谢您将该软件发布在您的个人网站、企业官网或者其他的第三方网站。 +5.2 我欢迎并感谢您将该软件集成在其他系统中一起发布，比如云服务镜像、操作系统发行版等。 +5.3 您在发布或者集成该软件的时候，不得对该软件源码做任何改动。 +5.4 您在发布或者集成该软件的时候，须保留该软件的所有标志。 + +六、发布基于该软件的衍生作品 + +6.1 我欢迎并感谢您为该软件开发衍生作品。 +6.2 您开发的衍生作品中涉及到对该软件源代码改动的地方，须遵循如下条款： + + 6.2.1 如修改了该软件的源代码，须依据本协议发布修改后的源代码。 + 6.2.2 如修改了该软件的源代码，须保留代码里面该软件原有的所有标志。 + 6.2.3 您可以在代码中追加您自己的标志。 + 6.2.4 您可以对您开发的衍生作品进行收费。 + 6.2.5 第三方的用户可在遵循6.2所有条款下可继续在您开发的衍生作品基础上进行修改并发布。 + +6.3 您开发的衍生作品中独立于本软件开发的代码，可以源代码或二进制的方式进行发布，可免费或收费发布。 +6.4 您开发的衍生作品不得以任何方式去除、隐藏或遮掩该软件的任一标志。 + +七、发布基于该软件API的应用 + +7.1 我欢迎并感谢您为该软件开发基于API的各种应用，比如客户端软件等。 +7.2 您基于该软件API机制开发的应用，可以源代码或者二进制的方式进行发布，我对此没有任何限制。 +7.3 您基于该软件API机制开发的应用，授权协议可以自行约定，我对此没有任何限制。 +7.4 您基于该软件API机制开发的应用，可以免费或者收费发布，我对此没有任何限制。 + +八、授权例外 + +如果上述条款无法满足您使用该软件的要求，可联系我签署额外的合同以获得更灵活的授权许可。 + +九、合同约束 + +9.1 如果您违反了该协议的任一条款，该授权协议将自动终止，我保留通过法律手段追究责任的权利。 diff --git a/doc/LICENSE.EN b/doc/LICENSE.EN new file mode 100644 index 0000000000..16cc3a8dce --- /dev/null +++ b/doc/LICENSE.EN @@ -0,0 +1,99 @@ +Z PUBLIC LICENSE 1.2 + +Authorization + +Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by QingDao Nature Easy Soft Network Technology Co,LTD. (,www.cnezsoft.com). +Anyone can use the agreement to publish open source software, and modify the blank underlined part of the following text of the agreement accordingly. +No other text of the agreement shall be changed. QingDao Nature Easy Soft Network Technology Co,LTD has the final authority to interpret the terms of the agreement. + +Preface + +ZenTaoPMS (Hereinafter referred to as "the software") developed by Nature EasySoft Network Tecnology Co.ltd, QingDao, China (www.cnezsoft.com) (hereinafter referred to I). I'm entitled to all copyright of the software. +The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement. +By installation of the software, you agree that a contractual relationship between you and me is automatically established. +You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional contracts with me. + +My Contact: +Email: co@easysoft.ltd +Site: http://www.zentao.pm + +We agree: + +Indications of the software include: + + Notes, texts, pictures and links showing copyright attribution of the software in the source code and related documentation. + and texts, picture and links on the interface of the software when running. + +Excluding + + texts, picture and links on the interface of the demo versions of the software. + +1. Disclaimer + +The software is an open-source software, so you are authorized to use the software without paying a fee. Before you start to use it, please note: + +1.1 I do not have any obligation to provide technical support for the software. You can contact me to purchase technical support service. +1.2 I'm not responsible for any liability caused by your using the software directly or indirectly. +1.3 Open source software does not mean it's free of charge, neither does it mean the software does not enjoy copyright. + +2. For personal use + +2.1 You or your company/organization are authorized to use the software for your internal use for both commercial and non-commercial purposes.. +2.2 You or your company/organization are authorized to run the software on any number of computers. +2.3 You or your company/organization are authorized to modify the source code of the software to meet your requirements. You do not need to release the modified codes. +2.4 You or your company/organization must keep all the indications of the software when using it. None of the indications can be removed, hidden or obscured in any way. + +3. For customized software + +3.1 You are authorized to use the software to deploy various forms of application for your users in any way you like. +3.2 You are authorized to use the software to deploy any number of applications for your users. +3.3 You are authorized to modify the source code to meet your user's requirements without releasing the modified codes. +3.4 You are authorized to provide the modified codes to your users in either source code form or binary. +3.5 You must keep all the indications of the software when providing applications to your users. +3.6 None of the indications of the software may be removed, hidden or obscured in any way when you provide applications to your users. + +4. Online service + +4.1 You are authorized to use the software to build your online service for your users in any way you like. +4.2 You are authorized to use the software to build your online service for any number of your users. +4.3 You are authorized to modify the source codes of the software to meet your user's requirements on online service without releasing the modified codes. +4.4 You must notify your users clearly that your service is based on the software when you use it to build your online service. +4.5 You must keep all the indications of the software when providing online service to your users. +4.6 You must keep all the indications of the software in any application you make for your users. None of the indications can be hidden or obscured in any way. +4.7 You are forbidden from assisting your users by providing tools for your users to remove, hide or obscure any indication of the software when you use the software to build your online service. + +5. Publish or integrate the software without modification + +5.1 You are authorized to publish the software on your personal sites, corporate official website or other third-party sites. +5.2 You are authorized to integrate the software with other systems, such as cloud virtual machine images, operating system images and so on. +5.3 Do not modify the source code of the software when you publish or integrate it. +5.4 All indications of the software must be kept the same when you publish or integrate the software. + +6. Publish derived work based on the software + +6.1 You are authorized to develop derived work based on the software. +6.2 The modified codes of the software in your derived work must follow the following terms: + + 6.2.1 The source codes must be released if you make any modification to the software. + 6.2.2 All indications of the software must be kept the same. + 6.2.3 You are entitled to add your indications to the modified codes. + 6.2.4 You are entitled to charge fees for the derived work you developed based on the software. + 6.2.5 You agree to authorize third party users to modify and release the derived work in compliance with 6.2. + +6.3 If the codes of the work are independently developed by yourself, You are authorized to release the work in either source code form or binary. You are entitled to charge your users or make it free. +6.4 None of the indications of the software can be removed, hidden or obscured in any way in the derived work you developed. + +7. Publish applications based on API of the software + +7.1 You are authorized to develop your applications based on the API of the software, for example, client software. +7.2 You are authorized to publish applications you developed based on the API in either source code form or binary. +7.3 You are authorized to use your own license to release applications you developed based on the API. +7.4 You are entitled to release applications you developed based on the API either free or with a charge. + +8. Exceptions + +If the terms above do not meet your requirements when using the software, please contact me for a more flexible license. + +9. Termination + +9.1 Violation of any of the terms of the agreement will result in immediate termination of this license. I reserve all rights to take legal actions in case of dispute. diff --git a/framework/base/router.class.php b/framework/base/router.class.php index d700da5fc4..fddd0fc42b 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -1485,8 +1485,8 @@ class baseRouter if(!method_exists($tmpModelClass, $method)) continue; $methodRelfection = new reflectionMethod($tmpModelClass, $method); $definedFile = $methodRelfection->getFileName(); - $startLine = $methodRelfection->getStartLine() . ' '; - $endLine = $methodRelfection->getEndLine() . ' '; + $startLine = $methodRelfection->getStartLine(); + $endLine = $methodRelfection->getEndLine(); /* 将Hook脚本和老的代码合并在一起，并替换原来的定义。Merge hook codes with old codes and replace back. */ $oldCodes = $definedFile == $tmpModelFile ? $mergedModelCodes : $mainModelCodes; @@ -2184,6 +2184,7 @@ class baseRouter { /* 设置错误信息(Set the error info) */ $message = htmlspecialchars($message); + if(preg_match('/[^\x00-\x80]/', $message)) $message = helper::convertEncoding($message, 'gbk'); $log = "ERROR: $message in $file on line $line"; if(isset($_SERVER['SCRIPT_URI'])) $log .= ", request: $_SERVER[SCRIPT_URI]";; $trace = debug_backtrace(); @@ -2236,6 +2237,7 @@ class baseRouter * 设置错误信息。 * Set the error info. **/ + if(preg_match('/[^\x00-\x80]/', $message)) $message = helper::convertEncoding($message, 'gbk'); $errorLog = "\n" . date('H:i:s') . " $message in $file on line $line "; $errorLog .= "when visiting " . htmlspecialchars($this->getURI()) . "\n"; diff --git a/framework/helper.class.php b/framework/helper.class.php index 39a7629714..e54e60d459 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -5,7 +5,7 @@ * * The author disclaims copyright to this source code. In place of * a legal notice, here is a blessing: - * + * * May you do good and not evil. * May you find forgiveness for yourself and forgive others. * May you share freely, never taking more than you give. @@ -43,7 +43,7 @@ class helper extends baseHelper { if(isset($_GET[$config->viewVar])) { - $viewType = $_GET[$config->viewVar]; + $viewType = $_GET[$config->viewVar]; } else { @@ -59,9 +59,9 @@ class helper extends baseHelper /** * Encode json for $.parseJSON - * - * @param array $data - * @param int $options + * + * @param array $data + * @param int $options * @static * @access public * @return string @@ -78,10 +78,10 @@ class helper extends baseHelper /** * Convert encoding. - * - * @param string $string - * @param string $fromEncoding - * @param string $toEncoding + * + * @param string $string + * @param string $fromEncoding + * @param string $toEncoding * @static * @access public * @return string @@ -111,12 +111,33 @@ class helper extends baseHelper return $string; } + + /** + * Calculate two working days. + * + * @param string $begin + * @param string $end + * + * @return bool|float + */ + static public function workDays($begin, $end) + { + $begin = strtotime($begin); + $end = strtotime($end); + if($end < $begin) return false; + + $double = floor(($end - $begin) / (7 * 24 * 3600)); + $begin = date('w', $begin); + $end = date('w', $end); + $end = $begin > $end ? $end + 5 : $end; + return $double * 5 + $end - $begin; + } } /** * 检查是否是onlybody模式。 * Check exist onlybody param. - * + * * @access public * @return void */ @@ -140,4 +161,4 @@ function formatTime($time, $format = '') if(trim($time) == '') return ; if($format) return date($format, strtotime($time)); return trim($time); -} \ No newline at end of file +} diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php index de4318b9f7..cffee28715 100644 --- a/lib/base/dao/dao.class.php +++ b/lib/base/dao/dao.class.php @@ -1356,6 +1356,10 @@ class baseDAO { $field['rule'] = 'date'; } + elseif($type == 'datetime') + { + $field['rule'] = 'datetime'; + } else { $field['rule'] = 'skip'; @@ -1993,11 +1997,16 @@ class baseSQL $pos = stripos($order, 'limit'); $orders = $pos ? substr($order, 0, $pos) : $order; $limit = $pos ? substr($order, $pos) : ''; - if($limit and !preg_match('/^[0-9]+ *(, *[0-9]+)?$/', $limit)) $limit = ''; + if(!empty($limit)) + { + $trimedLimit = trim(str_replace('limit', '', $limit)); + if(!preg_match('/^[0-9]+ *(, *[0-9]+)?$/', $trimedLimit)) die("Limit is bad query, The limit is " . htmlspecialchars($limit)); + } + $orders = trim($orders); if(empty($orders)) return $this; - if(!preg_match('/^(\w+\.)?(`\w+`|\w+)( +(desc|asc))?( *(, *(\w+\.)?(`\w+`|\w+)( +(desc|asc))?)?)*$/i', $orders)) die("Order is bad request, The order is $orders"); + if(!preg_match('/^(\w+\.)?(`\w+`|\w+)( +(desc|asc))?( *(, *(\w+\.)?(`\w+`|\w+)( +(desc|asc))?)?)*$/i', $orders)) die("Order is bad request, The order is " . htmlspecialchars($orders)); $orders = explode(',', $orders); foreach($orders as $i => $order) diff --git a/lib/base/filter/filter.class.php b/lib/base/filter/filter.class.php index a4491fc604..ceaacadb8b 100644 --- a/lib/base/filter/filter.class.php +++ b/lib/base/filter/filter.class.php @@ -262,12 +262,31 @@ class baseValidater */ public static function checkDate($date) { + 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)); } + /** + * Check datetime. + * + * @param string $datetime + * @static + * @access public + * @return bool + */ + public static function checkDatetime($datetime) + { + 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)); + } + /** * 检查正则表达式。 * REG checking. diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php index ea12a7ddb6..441109e7b3 100644 --- a/lib/dao/dao.class.php +++ b/lib/dao/dao.class.php @@ -22,7 +22,7 @@ class dao extends baseDAO { public function exec($sql = '') { - if(isset($_SESSION['tutorialMode']) and $_SESSION['tutorialMode']) die(js::alert($this->lang->error->tutorialData)); + if(isset($_SESSION['tutorialMode']) and $_SESSION['tutorialMode']) die(); return parent::exec($sql); } diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 8c6a881a13..99dedc8632 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -124,6 +124,24 @@ class html extends baseHTML /* End. */ return $string .= "\n"; } + + /** + * Create input tag that type is number. + * + * @param string $name + * @param string $value + * @param string $attrib + * @static + * @access public + * @return string + */ + static public function number($name, $value = '', $attrib = '') + { + $id = "id='$name'"; + if(strpos($attrib, 'id=') !== false) $id = ''; + $value = str_replace("'", ''', $value); + return "\n"; + } } /** diff --git a/lib/pager/pager.class.php b/lib/pager/pager.class.php index b315d1e949..6431fd349f 100644 --- a/lib/pager/pager.class.php +++ b/lib/pager/pager.class.php @@ -20,4 +20,30 @@ helper::import(dirname(dirname(__FILE__)) . '/base/pager/pager.class.php'); */ class pager extends basePager { + /** + * Show pager. + * + * @param string $align + * @param string $type + * @access public + * @return void + */ + public function show($align = 'right', $type = 'full') + { + if($type == 'pagerjs') + { + $this->setParams(); + $params = $this->params; + foreach($params as $key => $value) + { + if(strtolower($key) == 'recperpage') $params[$key] = '{recPerPage}'; + if(strtolower($key) == 'pageid') $params[$key] = '{page}'; + } + echo ""; + } + else + { + parent::show($align, $type); + } + } } diff --git a/module/action/control.php b/module/action/control.php index 5916f33db9..be3f932140 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -115,9 +115,6 @@ class action extends control public function comment($objectType, $objectID) { $actionID = $this->action->create($objectType, $objectID, 'Commented', $this->post->comment); - - $moduleName = $objectType == 'case' ? 'testcase' : $objectType; - $this->loadModel($moduleName)->sendmail($objectID, $actionID); die(js::reload('parent')); } diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 34e6c6c784..6a988dc0a6 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -12,10 +12,10 @@ $lang->action->common = 'Log'; $lang->action->product = $lang->productCommon; $lang->action->project = $lang->projectCommon; -$lang->action->objectType = 'Object'; +$lang->action->objectType = 'Object Type'; $lang->action->objectID = 'ID'; -$lang->action->objectName = 'Name'; -$lang->action->actor = 'Done by'; +$lang->action->objectName = 'Object Name'; +$lang->action->actor = 'Operator'; $lang->action->action = 'Action'; $lang->action->actionID = 'Action ID'; $lang->action->date = 'Date'; @@ -27,7 +27,7 @@ $lang->action->hideAll = 'Hide All'; $lang->action->editComment = 'Edit'; $lang->action->comment = 'Comment'; -$lang->action->trashTips = 'Note: Delete in ZenTao is logic.'; +$lang->action->trashTips = 'Note: All Deletion in ZenTao are logical.'; $lang->action->textDiff = 'Text Format'; $lang->action->original = 'Original Format'; $lang->action->confirmHideAll = 'Do you want to hide all the records?'; @@ -44,11 +44,11 @@ $lang->action->history->diff = 'Diff'; $lang->action->dynamic = new stdclass(); $lang->action->dynamic->today = 'Today'; $lang->action->dynamic->yesterday = 'Yesterday'; -$lang->action->dynamic->twoDaysAgo = 'Two Days Ago'; -$lang->action->dynamic->thisWeek = 'This Week'; -$lang->action->dynamic->lastWeek = 'Last Week'; -$lang->action->dynamic->thisMonth = 'This Month'; -$lang->action->dynamic->lastMonth = 'Last Month'; +$lang->action->dynamic->twoDaysAgo = 'TwoDaysAgo'; +$lang->action->dynamic->thisWeek = 'ThisWeek'; +$lang->action->dynamic->lastWeek = 'LastWeek'; +$lang->action->dynamic->thisMonth = 'ThisMonth'; +$lang->action->dynamic->lastMonth = 'LastMonth'; $lang->action->dynamic->all = 'All'; $lang->action->dynamic->hidden = 'Hidden'; $lang->action->dynamic->search = 'Search'; @@ -68,7 +68,7 @@ $lang->action->objectTypes['testtask'] = 'Test Build'; $lang->action->objectTypes['user'] = 'User'; $lang->action->objectTypes['doc'] = 'Doc'; $lang->action->objectTypes['doclib'] = 'Doc Lib'; -$lang->action->objectTypes['todo'] = 'To-Dos'; +$lang->action->objectTypes['todo'] = 'Todo'; $lang->action->objectTypes['branch'] = 'Branch'; $lang->action->objectTypes['module'] = 'Module'; $lang->action->objectTypes['testsuite'] = 'Suite'; @@ -143,7 +143,7 @@ $lang->action->label->blocked = 'Blocked'; $lang->action->label->resolved = 'Resolved'; $lang->action->label->reviewed = 'Reviewed'; $lang->action->label->moved = 'Moved'; -$lang->action->label->confirmed = 'Confirm a Story, '; +$lang->action->label->confirmed = 'Confirm a Story'; $lang->action->label->bugconfirmed = 'Confirmed'; $lang->action->label->tostory = 'Convert to Story'; $lang->action->label->frombug = 'Converted from Bug'; @@ -197,7 +197,7 @@ $lang->action->label->case = 'Case|testcase|view|caseID=%s'; $lang->action->label->testtask = 'Test Task|testtask|view|caseID=%s'; $lang->action->label->testsuite = 'Test Suite|testsuite|view|suiteID=%s'; $lang->action->label->caselib = 'Case Library|testsuite|libview|libID=%s'; -$lang->action->label->todo = 'To-Do|todo|view|todoID=%s'; +$lang->action->label->todo = 'Todo|todo|view|todoID=%s'; $lang->action->label->doclib = 'Doc Lib|doc|browse|libID=%s'; $lang->action->label->doc = 'Doc|doc|view|docID=%s'; $lang->action->label->user = 'User|user|view|account=%s'; @@ -220,7 +220,7 @@ $lang->action->search->objectTypeList['testtask'] = 'Test Task'; $lang->action->search->objectTypeList['user'] = 'User'; $lang->action->search->objectTypeList['doc'] = 'Doc'; $lang->action->search->objectTypeList['doclib'] = 'Doc Lib'; -$lang->action->search->objectTypeList['todo'] = 'To-Dos'; +$lang->action->search->objectTypeList['todo'] = 'Todo'; $lang->action->search->objectTypeList['build'] = 'Build'; $lang->action->search->objectTypeList['release'] = 'Release'; $lang->action->search->objectTypeList['productplan'] = 'Plan'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 7021b27d0d..0982cb1fee 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -191,13 +191,13 @@ $lang->action->label->release = '发布|release|view|productID=%s'; $lang->action->label->story = '需求|story|view|storyID=%s'; $lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s"; $lang->action->label->task = '任务|task|view|taskID=%s'; -$lang->action->label->build = 'Build|build|view|buildID=%s'; +$lang->action->label->build = '版本|build|view|buildID=%s'; $lang->action->label->bug = 'Bug|bug|view|bugID=%s'; $lang->action->label->case = '用例|testcase|view|caseID=%s'; $lang->action->label->testtask = '测试单|testtask|view|caseID=%s'; $lang->action->label->testsuite = '测试套件|testsuite|view|suiteID=%s'; $lang->action->label->caselib = '测试库|testsuite|libview|libID=%s'; -$lang->action->label->todo = 'todo|todo|view|todoID=%s'; +$lang->action->label->todo = '待办|todo|view|todoID=%s'; $lang->action->label->doclib = '文档库|doc|browse|libID=%s'; $lang->action->label->doc = '文档|doc|view|docID=%s'; $lang->action->label->user = '用户|user|view|account=%s'; diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 673315df31..638d10c6ee 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -25,6 +25,7 @@ $lang->action->undelete = '還原'; $lang->action->hideOne = '隱藏'; $lang->action->hideAll = '全部隱藏'; $lang->action->editComment = '修改備註'; +$lang->action->comment = '備註'; $lang->action->trashTips = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。'; $lang->action->textDiff = '文本格式'; @@ -190,13 +191,13 @@ $lang->action->label->release = '發佈|release|view|productID=%s'; $lang->action->label->story = '需求|story|view|storyID=%s'; $lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s"; $lang->action->label->task = '任務|task|view|taskID=%s'; -$lang->action->label->build = 'Build|build|view|buildID=%s'; +$lang->action->label->build = '版本|build|view|buildID=%s'; $lang->action->label->bug = 'Bug|bug|view|bugID=%s'; $lang->action->label->case = '用例|testcase|view|caseID=%s'; $lang->action->label->testtask = '測試單|testtask|view|caseID=%s'; $lang->action->label->testsuite = '測試套件|testsuite|view|suiteID=%s'; $lang->action->label->caselib = '測試庫|testsuite|libview|libID=%s'; -$lang->action->label->todo = 'todo|todo|view|todoID=%s'; +$lang->action->label->todo = '待辦|todo|view|todoID=%s'; $lang->action->label->doclib = '文檔庫|doc|browse|libID=%s'; $lang->action->label->doc = '文檔|doc|view|docID=%s'; $lang->action->label->user = '用戶|user|view|account=%s'; diff --git a/module/action/model.php b/module/action/model.php index 1907cb753d..4aff2f30df 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -61,7 +61,7 @@ class actionModel extends model $this->file->updateObjectID($this->post->uid, $objectID, $objectType); - $this->loadModel('webhook')->send($objectType, $objectID, $actionType, $actionID); + $this->loadModel('message')->send($objectType, $objectID, $actionType, $actionID); return $actionID; } @@ -325,6 +325,22 @@ class actionModel extends model } } } + elseif($actionName == 'finished' and $objectType == 'todo') + { + $action->appendLink = ''; + if(strpos($action->extra, ':')!== false) + { + list($extra, $id) = explode(':', $action->extra); + $action->extra = strtolower($extra); + if($id) + { + $table = $this->config->objectTables[$action->extra]; + $field = $this->config->action->objectNameFields[$action->extra]; + $name = $this->dao->select($field)->from($table)->where('id')->eq($id)->fetch($field); + if($name) $action->appendLink = html::a(helper::createLink($action->extra, 'view', "id=$id"), "#$id " . $name); + } + } + } $action->history = isset($histories[$actionID]) ? $histories[$actionID] : array(); $actionName = strtolower($action->action); @@ -691,7 +707,7 @@ class actionModel extends model $objectIds = array_unique($objectIds); $table = $this->config->objectTables[$objectType]; $field = $this->config->action->objectNameFields[$objectType]; - if($table != '`zt_todo`') + if($table != TABLE_TODO) { $objectNames[$objectType] = $this->dao->select("id, $field AS name")->from($table)->where('id')->in($objectIds)->fetchPairs(); } diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index a4f9a569c5..b09a3818d8 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -23,7 +23,7 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> - action->objectType);?> + action->objectType);?> idAB);?> action->objectName;?> action->actor);?> diff --git a/module/admin/control.php b/module/admin/control.php index c4a23b65ec..db0f309c6a 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -331,6 +331,9 @@ class admin extends control $this->send(array('result' => 'success', 'message' => $this->lang->admin->saveSuccess, 'locate' => 'reload')); } + $this->loadModel('message'); + $this->loadModel('webhook'); + $this->view->title = $this->lang->admin->log; $this->view->position[] = html::a($this->createLink('webhook', 'browse'), $this->lang->admin->api); $this->view->position[] = $this->lang->admin->log; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index f7c4e122d0..643e542eff 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -29,23 +29,23 @@ $lang->admin->saveSuccess = 'Saved.'; $lang->admin->info = new stdclass(); $lang->admin->info->version = 'Current Version is %s. '; -$lang->admin->info->links = 'You can visit '; +$lang->admin->info->links = 'You can visit links below'; $lang->admin->info->account = 'Your ZenTao account is %s.'; $lang->admin->info->log = 'Logs that is beyond valid days will be deleted and it has to run cron.'; $lang->admin->notice = new stdclass(); -$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm). Register %s and get the latest ZenTao news."; +$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm). %s then get the Latest ZenTao Upgrades and News."; $lang->admin->notice->ignore = "Ignore"; $lang->admin->notice->int = "『%s』should be a positive integer."; $lang->admin->register = new stdclass(); -$lang->admin->register->common = 'Account Binding'; -$lang->admin->register->caption = 'Register'; -$lang->admin->register->click = 'Click Here'; -$lang->admin->register->lblAccount = 'at least 3 characters; must contain letters and numbers.'; -$lang->admin->register->lblPasswd = 'at least 6 characters; must contain letters and numbers.'; +$lang->admin->register->common = 'Binding New Account'; +$lang->admin->register->caption = 'Register in Zentao Community'; +$lang->admin->register->click = 'Please Register here'; +$lang->admin->register->lblAccount = 'at least 3 characters pls; contains letters and numbers.'; +$lang->admin->register->lblPasswd = 'at least 6 characters pls; contains letters and numbers.'; $lang->admin->register->submit = 'Register'; -$lang->admin->register->bind = "If you have already registered an account, link your account %s."; +$lang->admin->register->bind = "Binding Exsit Account"; $lang->admin->register->success = "You have registered with us!"; $lang->admin->bind = new stdclass(); @@ -54,20 +54,20 @@ $lang->admin->bind->success = "Account has been linked!"; $lang->admin->safe = new stdclass(); $lang->admin->safe->common = 'Security Policy'; -$lang->admin->safe->set = 'Password Security Settings'; -$lang->admin->safe->password = 'Password Security'; -$lang->admin->safe->weak = 'Weak Password'; +$lang->admin->safe->set = 'PasswordStrength'; +$lang->admin->safe->password = 'Password Strength'; +$lang->admin->safe->weak = 'Weak Passwords'; $lang->admin->safe->reason = 'Type'; -$lang->admin->safe->checkWeak = 'Weak Password Check'; -$lang->admin->safe->changeWeak = 'Change weak password'; +$lang->admin->safe->checkWeak = 'WeakPasswords'; +$lang->admin->safe->changeWeak = 'Weak password must be strengthen'; $lang->admin->safe->modifyPasswordFirstLogin = 'Change password when first login'; $lang->admin->safe->modeList[0] = 'N/A'; $lang->admin->safe->modeList[1] = 'Medium'; $lang->admin->safe->modeList[2] = 'Strong'; -$lang->admin->safe->modeRuleList[1] = 'must contain letters and numbers, at least six characters.'; -$lang->admin->safe->modeRuleList[2] = 'must contain letters, numbers and special characters, at least 10 characters.'; +$lang->admin->safe->modeRuleList[1] = 'Contains upper and lower case, numbers. Length >= 6'; +$lang->admin->safe->modeRuleList[2] = 'Contains upper and lower case, numbers and special characters. Length >= 10.'; $lang->admin->safe->reasonList['weak'] = 'Common Weak Password'; $lang->admin->safe->reasonList['account'] = 'Same as your account'; @@ -78,5 +78,5 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as your DOB'; $lang->admin->safe->modifyPasswordList[1] = 'Yes'; $lang->admin->safe->modifyPasswordList[0] = 'No'; -$lang->admin->safe->noticeMode = 'User password will be checked when login, add/edit user password.'; -$lang->admin->safe->noticeStrong = 'The more uppercase letters and numbers a password has, the more secure it is!'; +$lang->admin->safe->noticeMode = 'Password will be checked when login, add/edit user.'; +$lang->admin->safe->noticeStrong = ''; diff --git a/module/admin/view/log.html.php b/module/admin/view/log.html.php index 0e14808819..58573316b4 100644 --- a/module/admin/view/log.html.php +++ b/module/admin/view/log.html.php @@ -10,16 +10,9 @@ * @link http://www.zentao.net */ ?> - +app->getModuleRoot() . 'webhook/view/header.html.php';?>
-
-
- createLink('webhook', 'browse'), $lang->admin->api);?> - admin->log;?> - admin->setting;?> -
-
diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index f197def427..d3df0e55ca 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -5,18 +5,18 @@ $lang->backup->history = 'History'; $lang->backup->delete = 'Delete'; $lang->backup->backup = 'Backup'; $lang->backup->restore = 'Restore'; -$lang->backup->change = 'Save Interval'; +$lang->backup->change = 'Modify days'; $lang->backup->changeAB = 'Modify'; -$lang->backup->time = 'Time'; +$lang->backup->time = 'Backup Time'; $lang->backup->files = 'Files'; $lang->backup->size = 'Size'; -$lang->backup->waitting = 'In Progree. Please wait...'; +$lang->backup->waitting = ' In Progress. Please wait...'; $lang->backup->confirmDelete = 'Do you want to delete the backup？'; $lang->backup->confirmRestore = 'Do you want to restore the backup？'; -$lang->backup->holdDays = 'Backup the latest %s days.'; -$lang->backup->restoreTip = 'Only files and databases will be restored when you click Restore. If you want to restore the code, restore it manually.'; +$lang->backup->holdDays = 'Reserve latest %s days of backups'; +$lang->backup->restoreTip = 'Only files and databases can be restored when you click Restore. Code can be restored manually.'; $lang->backup->success = new stdclass(); $lang->backup->success->backup = 'Done!'; diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php index 14b9f79c9e..6ab73fe450 100644 --- a/module/backup/view/index.html.php +++ b/module/backup/view/index.html.php @@ -33,7 +33,7 @@ - + diff --git a/module/block/config.php b/module/block/config.php index 16b7ffefad..4d42c10ddc 100644 --- a/module/block/config.php +++ b/module/block/config.php @@ -12,10 +12,3 @@ $config->block = new stdclass(); $config->block->editor = new stdclass(); $config->block->editor->set = array('id' => 'html', 'tools' => 'simple'); - -$config->block->gridOptions[6] = '1/2'; -$config->block->gridOptions[4] = '1/3'; -$config->block->gridOptions[8] = '2/3'; -$config->block->gridOptions[3] = '1/4'; -$config->block->gridOptions[9] = '3/4'; -$config->block->gridOptions[12] = '100%'; diff --git a/module/block/control.php b/module/block/control.php index f41958fba4..805faf2520 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -54,9 +54,11 @@ class block extends control if($this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest') unset($modules['project']); $closedBlock = isset($this->config->block->closed) ? $this->config->block->closed : ''; - if(strpos(",$closedBlock,", ",|dynamic,") === false) $modules['dynamic'] = $this->lang->block->dynamic; + if(strpos(",$closedBlock,", ",|assigntome,") === false) $modules['assigntome'] = $this->lang->block->assignToMe; + if(strpos(",$closedBlock,", ",|dynamic,") === false) $modules['dynamic'] = $this->lang->block->dynamic; if(strpos(",$closedBlock,", ",|flowchart,") === false and $this->config->global->flow == 'full') $modules['flowchart'] = $this->lang->block->lblFlowchart; - if(strpos(",$closedBlock,", ",|html,") === false) $modules['html'] = 'HTML'; + if(strpos(",$closedBlock,", ",|welcome,") === false and $this->config->global->flow == 'full') $modules['welcome'] = $this->lang->block->welcome; + if(strpos(",$closedBlock,", ",|html,") === false) $modules['html'] = 'HTML'; $modules = array('' => '') + $modules; $hiddenBlocks = $this->block->getHiddenBlocks(); @@ -72,7 +74,6 @@ class block extends control $this->view->title = $title; $this->view->block = $this->block->getByID($id); $this->view->blockID = $id; - $this->view->title = $title; $this->display(); } @@ -103,6 +104,11 @@ class block extends control $params = $this->block->$func($source); $this->view->params = json_decode($params, true); } + elseif($type == 'assigntome') + { + $params = $this->block->getAssignToMeParams(); + $this->view->params = json_decode($params, true); + } $this->view->source = $source; $this->view->type = $type; @@ -209,6 +215,7 @@ class block extends control if($this->block->initBlock($module)) die(js::reload()); } + $shortBlocks = $longBlocks = array(); foreach($blocks as $key => $block) { if($this->config->global->flow == 'onlyStory' and $block->source != 'product' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]); @@ -230,15 +237,22 @@ class block extends control { $block->moreLink = $this->createLink('company', 'dynamic'); } + + if($this->block->isLongBlock($block)) + { + $longBlocks[$key] = $block; + } + else + { + $shortBlocks[$key] = $block; + } } - $this->view->blocks = $blocks; - $this->view->module = $module; + $this->view->longBlocks = $longBlocks; + $this->view->shortBlocks = $shortBlocks; + $this->view->module = $module; - if($this->app->getViewType() == 'json') - { - die(json_encode($blocks)); - } + if($this->app->getViewType() == 'json') die(json_encode($blocks)); $this->display(); } @@ -256,6 +270,39 @@ class block extends control $this->display(); } + /** + * Welcome block. + * + * @access public + * @return void + */ + public function welcome() + { + $projects = $this->loadModel('project')->getPairs(); + $products = $this->loadModel('product')->getPairs(); + + $this->view->tutorialed = $this->loadModel('tutorial')->getTutorialed(); + $this->view->tasks = (int)$this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->fetch('count'); + $this->view->bugs = (int)$this->dao->select('count(*) AS count')->from(TABLE_BUG)->where('assignedTo')->eq($this->app->user->account)->fetch('count'); + $this->view->stories = (int)$this->dao->select('count(*) AS count')->from(TABLE_STORY)->where('assignedTo')->eq($this->app->user->account)->fetch('count'); + $this->view->projects = (int)$this->dao->select('count(*) AS count')->from(TABLE_PROJECT)->where('id')->in(array_keys($projects))->andWhere("(status='wait' or status='doing')")->fetch('count'); + $this->view->products = (int)$this->dao->select('count(*) AS count')->from(TABLE_PRODUCT)->where('status')->ne('closed')->andWhere('id')->in(array_keys($products))->fetch('count'); + + $today = date('Y-m-d'); + $this->view->delay['task'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->andWhere('deadline')->ne('0000-00-00')->andWhere('deadline')->lt($today)->fetch('count'); + $this->view->delay['bug'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_BUG)->where('assignedTo')->eq($this->app->user->account)->andWhere('deadline')->ne('0000-00-00')->andWhere('deadline')->lt($today)->fetch('count'); + $this->view->delay['project'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_PROJECT)->where('id')->in(array_keys($projects))->andWhere("(status='wait' or status='doing')")->andWhere('end')->lt($today)->fetch('count'); + + $time = date('H:i'); + $welcomeType = '19:00'; + foreach($this->lang->block->welcomeList as $type => $name) + { + if($time >= $type) $welcomeType = $type; + } + $this->view->welcomeType = $welcomeType; + $this->display(); + } + /** * Print block. * @@ -272,7 +319,7 @@ class block extends control $html = ''; if($block->block == 'html') { - $html = "
" . htmlspecialchars_decode($block->params->html) .'
'; + $html = "
" . htmlspecialchars_decode($block->params->html) .'
'; } elseif($block->source != '') { @@ -281,7 +328,7 @@ class block extends control $this->get->set('module', $block->module); $this->get->set('source', $block->source); $this->get->set('blockid', $block->block); - $this->get->set('param',base64_encode(json_encode($block->params))); + $this->get->set('param', base64_encode(json_encode($block->params))); $html = $this->fetch('block', 'main', "module={$block->source}&id=$id"); } elseif($block->block == 'dynamic') @@ -292,8 +339,17 @@ class block extends control { $html = $this->fetch('block', 'flowchart'); } + elseif($block->block == 'assigntome') + { + $this->get->set('param', base64_encode(json_encode($block->params))); + $html = $this->fetch('block', 'printAssignToMeBlock', 'longBlock=' . $this->block->isLongBlock($block)); + } + elseif($block->block == 'welcome') + { + $html = $this->fetch('block', 'welcome'); + } - die($html); + echo $html; } /** @@ -327,9 +383,11 @@ class block extends control $block = $this->block->getByID($id); - echo ""; - echo ''; - if(isset($block->source)) echo ""; + echo '
'; + echo ''; + echo '
'; + echo html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control chosen'"); + echo '
'; } elseif($mode == 'getblockform') { @@ -358,6 +416,9 @@ class block extends control $this->view->sign = strpos($sso, '?') === false ? '?' : '&'; } + $block = $this->block->getByID($id); + $this->view->longBlock = $this->block->isLongBlock($block); + $this->viewType = (isset($params->viewType) and $params->viewType == 'json') ? 'json' : 'html'; $this->params = $params; $this->view->code = $this->get->blockid; @@ -611,7 +672,18 @@ class block extends control $num = isset($this->params->num) ? (int)$this->params->num : 0; $type = isset($this->params->type) ? $this->params->type : ''; $pager = pager::init(0, $num , 1); - $this->view->productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type); + + $productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type); + $productIdList = array(); + foreach($productStats as $product) $productIdList[] = $product->id; + + $this->view->projects = $this->dao->select('t1.product,t2.name')->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) + ->orderBy('t1.project') + ->fetchPairs('product', 'name'); + $this->view->productStats = $productStats; } /** @@ -630,6 +702,75 @@ class block extends control $this->view->projectStats = $this->loadModel('project')->getProjectStats($type, $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $this->viewType != 'json' ? $pager : ''); } + /** + * Print assign to me block. + * + * @access public + * @return void + */ + public function printAssignToMeBlock($longBlock = true) + { + if(common::hasPriv('todo', 'view')) $hasViewPriv['todo'] = true; + if(common::hasPriv('task', 'view')) $hasViewPriv['task'] = true; + if(common::hasPriv('bug', 'view')) $hasViewPriv['bug'] = true; + + $params = $this->get->param; + $params = json_decode(base64_decode($params)); + + if(isset($hasViewPriv['todo'])) + { + $this->app->loadClass('date'); + $this->app->loadLang('todo'); + $stmt = $this->dao->select('*')->from(TABLE_TODO) + ->where("(assignedTo = '{$this->app->user->account}' or (assignedTo = '' and account='{$this->app->user->account}'))") + ->andWhere('status')->ne('done') + ->andWhere('cycle')->eq(0) + ->orderBy('`date`'); + if(isset($params->todoNum)) $stmt->limit($params->todoNum); + $todos = $stmt->fetchAll(); + + foreach($todos as $todo) + { + $todo->begin = date::formatTime($todo->begin); + $todo->end = date::formatTime($todo->end); + } + if(empty($todos)) unset($hasViewPriv['todo']); + $this->view->todos = $todos; + } + if(isset($hasViewPriv['task'])) + { + $this->app->loadLang('task'); + $stmt = $this->dao->select('*')->from(TABLE_TASK) + ->where('assignedTo')->eq($this->app->user->account) + ->andWhere('deleted')->eq('0') + ->andWhere('status')->ne('closed') + ->orderBy('id_desc'); + if(isset($params->taskNum)) $stmt->limit($params->taskNum); + $tasks = $stmt->fetchAll(); + + if(empty($tasks)) unset($hasViewPriv['task']); + $this->view->tasks = $tasks; + } + if(isset($hasViewPriv['bug'])) + { + $this->app->loadLang('bug'); + $stmt = $this->dao->select('*')->from(TABLE_BUG) + ->where('assignedTo')->eq($this->app->user->account) + ->andWhere('deleted')->eq('0') + ->andWhere('status')->ne('closed') + ->orderBy('id_desc'); + if(isset($params->bugNum)) $stmt->limit($params->bugNum); + $bugs = $stmt->fetchAll(); + + if(empty($bugs)) unset($hasViewPriv['bug']); + $this->view->bugs = $bugs; + } + + $this->view->hasViewPriv = $hasViewPriv; + $this->view->longBlock = $longBlock; + $this->display(); + } + /** * Print flow chart block * @access public diff --git a/module/block/css/admin.css b/module/block/css/admin.css index 31ad83a92c..4da9ab98db 100644 --- a/module/block/css/admin.css +++ b/module/block/css/admin.css @@ -1,8 +1,3 @@ -.input-group-btn .dropdown-toggle {border-radius: 4px;} -.dropdown-menu {min-width: 120px;} -.dropdown-menu.colors {padding: 5px; width: 205px} -.dropdown-menu.buttons {padding: 5px; padding-bottom: 0; padding-right: 0;} -.dropdown-menu.buttons > li {margin-bottom: 5px; display: block; float: left; width: 33.333333%; padding-right: 5px} -.table.table-form{margin-bottom:0px;} -#blockParam{padding-right:100px;} -#blockParam .table td, #blockParam .table th{border-bottom:0px;} +#blockAdmin {min-height: 280px;} +#blockAdmin .form-actions {visibility: hidden;} +#blockAdmin.form-inited .form-actions {visibility: visible;} diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css index e6a24741c1..e69de29bb2 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -1,90 +0,0 @@ -body {background: #fafafa;} - -.page-content {margin-top: -19px; border-top: 1px solid #3280fc;} - -.dashboard {position: relative;} -.dashboard .row {margin: 0 auto;} -.dashboard .panel-actions {margin-top: 0; margin-right: 0;} -.dashboard .panel-heading {line-height: 17px; height: 30px; position: relative;} -.dashboard .panel-actions {position: absolute; top: 0; right: 0; height: 30px;} -.dashboard .panel-action {display: block; float: left; height: 30px; min-width: 26px; text-align: center; line-height: 30px; padding-left: 3px; padding-right: 3px;} -.dashboard .panel-actions > a {color: #666} -.dashboard .panel-action-more {font-size: 12px; font-weight: 200} -.dashboard .panel-action:hover, .dashboard .panel-actions > .dropdown > a:hover {color: #333; background-color: #ddd; background-color: rgba(0,0,0,0.1)} -.dashboard .panel-title {font-size: 13px; color: #333} -.dashboard a.panel-title > .icon-double-angle-right {position: relative; filter: alpha(opacity=0); opacity: 0; transition: opacity .2s, left .2s; left: -5px} -.dashboard .panel:hover a.panel-title > .icon-double-angle-right {filter: alpha(opacity=100); opacity: 1; left: 0} -.dashboard a.panel-title:hover {color: #1a53ff} -.dashboard .panel {box-shadow: 0 1px 3px rgba(0,0,0,.05); position: relative; overflow-x: hidden;} -.dashboard .panel.with-fixed-header {overflow-x: hidden;} -.dashboard .panel-heading + .panel-body {position: absolute; left: 0; top: 30px; right: 0; bottom: 0} -.dashboard .panel-dragging-shadow {position: absolute;} -.dashboard-empty-message {text-align: center; margin-top: 100px;} -.dashboard-empty-message > h5 {margin-bottom: 20px;} -.dashboard-actions {position: absolute; top:-20px; right:-10px;} -.dashboard-actions > a {display: inline-block; width: 40px; height: 20px; text-align: center; color: #999; border: 1px solid #999; line-height: 20px; background: #1a4f85; color: #fff} -.dashboard-actions > a:hover {background: #2e6dad; border-color: #2e6dad} - -#wrap .outer {background-color: #fafafa;} -#wrap .outer > .dashboard {margin-left: -10px; margin-right: -10px;} - -/* panel style */ -.panel-block .table th {background-color: #fafafa} -.panel-primary {border-color: transparent;!important;} -.panel-success > .panel-heading, -.panel-warning > .panel-heading, -.panel-primary > .panel-heading, -.panel-info > .panel-heading, -.panel-danger > .panel-heading {color: #333; border: none; border-bottom: 1px solid rgba(0,0,0,.04);} -.panel-success, .panel-success .table-header-fixed th {background: #d1fecb!important; border-color: #b0e4ac!important} -.panel-success > .panel-heading {background: #c5f7c1!important; } -.panel-warning, .panel-warning .table-header-fixed th {background: #fdfdc7!important; border-color: #e1e09a!important} -.panel-warning > .panel-heading {background: #f8f7b6!important;} -.panel-primary, .panel-primary .table-header-fixed th {background: #d8f2fa!important; border-color: #badfeb!important} -.panel-primary > .panel-heading {background: #c9ecf8!important; color: #333!important; border:none!important;} -.panel-info, .panel-info .table-header-fixed th {background: #dcd8fe!important; border-color: #d0c9ee!important} -.panel-info > .panel-heading {background: #d4cdf3!important;} -.panel-danger, .panel-danger .table-header-fixed th {background: #f5d0f5!important; border-color: #e9b9e9!important} -.panel-danger > .panel-heading {background: #f1c3f1!important;} -.panel-success .table td, .panel-success .table th, -.panel-warning .table td, .panel-warning .table th, -.panel-primary .table td, .panel-primary .table th, -.panel-info .table td, .panel-info .table th, -.panel-danger .table td, .panel-danger .table th {border: none; background-color: transparent} -.panel-success .table tr:nth-child(even) > td, .panel-success .table th, -.panel-warning .table tr:nth-child(even) > td, .panel-warning .table th, -.panel-primary .table tr:nth-child(even) > td, .panel-primary .table th, -.panel-info .table tr:nth-child(even) > td, .panel-info .table th, -.panel-danger .table tr:nth-child(even) > td, .panel-danger .table th {background: rgba(255,255,255,.25);} -.panel-success .table tr:nth-child(odd) > td, -.panel-warning .table tr:nth-child(odd) > td, -.panel-primary .table tr:nth-child(odd) > td, -.panel-info .table tr:nth-child(odd) > td, -.panel-danger .table tr:nth-child(odd) > td {background: rgba(0,0,0,.03);} -.panel-success .table tr:last-child > td, -.panel-warning .table tr:last-child > td, -.panel-primary .table tr:last-child > td, -.panel-info .table tr:last-child > td -.panel-danger .table tr:last-child > td {border-bottom: 1px solid rgba(0,0,0,0.05)} -.panel-success .table tr:hover > th, -.panel-warning .table tr:hover > th, -.panel-primary .table tr:hover > th, -.panel-info .table tr:hover > th, -.panel-danger .table tr:hover > th {background: none;} -.panel-success .table.table-hover tr:hover > td, -.panel-warning .table.table-hover tr:hover > td, -.panel-primary .table.table-hover tr:hover > td, -.panel-info .table.table-hover tr:hover > td, -.panel-danger .table.table-hover tr:hover > td {background: rgba(255,255,255,.4);} - -.block.input-group-btn .btn-success {background: #d1fecb; color: #333; text-shadow: none; border-color: #ccc} -.block.input-group-btn .btn-warning {background: #fdfdc7; color: #333; text-shadow: none; border-color: #ccc} -.block.input-group-btn .btn-info {background: #dcd8fe; color: #333; text-shadow: none; border-color: #ccc} -.block.input-group-btn .btn-danger {background: #f5d0f5; color: #333; text-shadow: none; border-color: #ccc} -.block.input-group-btn .btn-primary, .block.input-group-btn .btn-primary:focus {background: #d8f2fa; color: #333; text-shadow: none; border-color: #ccc} -.block.input-group-btn .btn-success:hover {border-color: #aaa} -.block.input-group-btn .btn-warning:hover {border-color: #aaa} -.block.input-group-btn .btn-primary:hover {border-color: #aaa} -.block.input-group-btn .btn-info:hover {border-color: #aaa} -.block.input-group-btn .btn-danger:hover {border-color: #aaa} -.block.input-group-btn .btn-primary .caret, .block.input-group-btn .btn-success .caret, .block.input-group-btn .btn-warning .caret, .block.input-group-btn .btn-danger .caret, .block.input-group-btn .btn-info .caret {border-top-color: #333} diff --git a/module/block/js/admin.js b/module/block/js/admin.js index 39aec0f8ec..d5e5408db9 100644 --- a/module/block/js/admin.js +++ b/module/block/js/admin.js @@ -1,85 +1,92 @@ -/** - * Get all blocks. - * - * @param string|int $moduleID - * @access public - * @return void - */ -function getBlocks(moduleID) -{ - var moduleBlock = $('#modules').parent().parent().next(); - $(moduleBlock).hide(); - - $('#blockParam').empty(); - if(moduleID == '') return false; - - if(moduleID.indexOf('hiddenBlock') != -1) - { - getNotSourceParams('html', moduleID.replace('hiddenBlock', '')); - return true; - } - if(moduleID == 'html' || moduleID == 'dynamic' || moduleID == 'flowchart') - { - getNotSourceParams(moduleID, blockID); - return true; - } - - $.get(createLink('block', 'main', 'module=' + moduleID + '&id=' + blockID), {mode:'getblocklist'}, function(data) - { - $(moduleBlock).html(data); - $(moduleBlock).show(); - $.ajustModalPosition(); - }) -} - -/** - * Get rss and html params. - * - * @param string $type - * @access public - * @return void - */ -function getNotSourceParams(type, blockID) -{ - blockID = typeof(blockID) == 'undefined' ? 0 : blockID; - $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type), function(data) - { - $('#blockParam').html(data); - $.ajustModalPosition(); - }); -} - -/** - * Get block params. - * - * @param string $type - * @param int $moduleID - * @access public - * @return void - */ -function getBlockParams(type, moduleID) -{ - $('#blockParam').empty(); - - if(type == '') return; - - $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type + '&source=' + moduleID), function(data) - { - $('#blockParam').html(data); - $.ajustModalPosition(); - }); -} - $(function() { - $('#modules').change(function(){getBlocks($(this).val())}); - if($('#modules').size() > 0) getBlocks($('#modules').val()); + var $form = $('#blockAdminForm'); + $form.find('.chosen').chosen(); - $(document).on('click', '.dropdown-menu.buttons .btn', function() + // 用于动态加载区块列表及设置参数 + var $blocksList = $('#blocksList'); + var $blockParams = $('#blockParams'); + + var updateParams = function(data) { - var $this = $(this); - var group = $this.closest('.input-group-btn'); - group.find('.dropdown-toggle').removeClass().addClass('btn dropdown-toggle btn-' + $this.data('id')); - group.find('input[name^="params[color]"]').val($this.data('id')); + $blockParams.html(data); + $blockParams.find('.chosen').chosen(); + $.zui.ajustModalPosition(); + $form.removeClass('loading'); + $form.addClass('form-inited'); + $blockParams.find('input:first').focus(); + if($blockParams.find('#actionLink').size() > 0) $form.attr('action', $blockParams.find('#actionLink').val()); + }; + + // 获取 html 和 rss 区块参数 + var getNotSourceParams = function(type, blockID) + { + if (blockID === undefined) blockID = 0; + + $blockParams.empty(); + $form.removeClass('form-inited'); + + $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type), updateParams); + }; + + // 用于获取指定区块的设置参数 + var getBlockParams = function(type, moduleID) + { + $blockParams.empty(); + $form.removeClass('form-inited'); + + if(type == '') return; + $form.addClass('loading'); + $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type + '&source=' + moduleID), updateParams); + }; + + // 获取指定模块下所有可用的区块 + var getBlocks = function(moduleID) + { + $blocksList.data('module', moduleID).empty(); + $form.removeClass('form-inited'); + $blockParams.empty(); + if(!moduleID) return; + + $form.addClass('loading'); + + var onFinish = function() + { + $form.removeClass('loading'); + if($blocksList.find('#moduleBlock').val() != '') getBlockParams($blocksList.find('#moduleBlock').val(), $blocksList.data('module')); + }; + + if(moduleID.indexOf('hiddenBlock') != -1) + { + getNotSourceParams('html', moduleID.replace('hiddenBlock', ''), onFinish); + return true; + } + + if(moduleID == 'html' || moduleID == 'dynamic' || moduleID == 'flowchart' || moduleID == 'assigntome' || moduleID == 'welcome') + { + getNotSourceParams(moduleID, blockID, onFinish); + return true; + } + + $.get(createLink('block', 'main', 'module=' + moduleID + '&id=' + blockID), {mode:'getblocklist'}, function(data) + { + $blocksList.html(data); + $blocksList.find('.chosen').chosen(); + onFinish(); + $.zui.ajustModalPosition(); + }); + }; + + // 当模块选择变更时，刷新参数列表 + $('#modules').on('change', function() + { + getBlocks($(this).val()); }); -}) + + $blocksList.on('change', '#moduleBlock', function() + { + getBlockParams($(this).val(), $blocksList.data('module')); + }); + + if(blockID) setTimeout(function(){getBlocks($('#modules').val());}, 200); +}); diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index cc7d3f9861..cad8d173c9 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -7,16 +7,21 @@ */ function deleteBlock(index) { - $.getJSON(createLink('block', 'delete', 'index=' + index + '&module=' + module), function(data) - { - if(data.result != 'success') - { - alert(data.message); - return false; - } - - checkEmpty(); - }) + if(confirm(config.confirmRemoveBlock)) + { + $.getJSON(createLink('block', 'delete', 'index=' + index + '&module=' + module), function(data) + { + if(data.result != 'success') + { + alert(data.message); + return false; + } + else + { + $('#block' + index).remove(); + } + }); + } } /** @@ -40,19 +45,6 @@ function sortBlocks(orders) }); } -/** - * Check dashboard wether is empty - * @access public - * @return void - */ -function checkEmpty() -{ - var $dashboard = $('#dashboard'); - var hasBlocks = !!$dashboard.children('.row').children().length; - $dashboard.find('.dashboard-empty-message').toggleClass('hide', hasBlocks); - if(!hasBlocks) $dashboard.find('.dashboard-actions').addClass('hide'); -} - /** * Resize block * @param object $event @@ -168,28 +160,27 @@ function hiddenBlock(index) $(function() { - var $dashboard = $('#dashboard').dashboard( - { - height : 240, - draggable : !useGuest, - shadowType : false, - afterOrdered : sortBlocks, - afterPanelRemoved : deleteBlock, - sensitive : true, - panelRemovingTip : config.confirmRemoveBlock, - resizable : !useGuest, - onResize : resizeBlock, - afterRefresh : function(e) - { - var $sortTable = e.$panel.find('.tablesorter'); - if($sortTable.length) $sortTable.sortTable(); - initTableHeader(); - } - }); +// var $dashboard = $('#dashboard').dashboard( +// { +// height : 240, +// draggable : !useGuest, +// shadowType : false, +// afterOrdered : sortBlocks, +// afterPanelRemoved : deleteBlock, +// sensitive : true, +// panelRemovingTip : config.confirmRemoveBlock, +// resizable : !useGuest, +// onResize : resizeBlock, +// afterRefresh : function(e) +// { +// var $sortTable = e.$panel.find('.tablesorter'); +// if($sortTable.length) $sortTable.sortTable(); +// initTableHeader(); +// } +// }); +// +// // $dashboard.find('ul.dashboard-actions').addClass('hide').children('li').addClass('right').appendTo($('#modulemenu > .nav')); +// $dashboard.find('[data-toggle=tooltip]').tooltip({container: 'body'}); - // $dashboard.find('ul.dashboard-actions').addClass('hide').children('li').addClass('right').appendTo($('#modulemenu > .nav')); - $dashboard.find('[data-toggle=tooltip]').tooltip({container: 'body'}); - - checkEmpty(); - initTableHeader(); +// initTableHeader(); }); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index c34dbae5b6..aa74dd0005 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -29,7 +29,17 @@ $lang->block->lblBlock = 'Block'; $lang->block->lblNum = 'Number'; $lang->block->lblHtml = 'HTML'; $lang->block->dynamic = 'Dynamic'; +$lang->block->assignToMe = 'Assign To Me'; $lang->block->lblFlowchart = 'Workflow'; +$lang->block->welcome = 'Welcome'; + +$lang->block->leftToday = 'The rest of the work today'; +$lang->block->myTask = 'My Task'; +$lang->block->myStory = 'My Story'; +$lang->block->myBug = 'My Bug'; +$lang->block->myProject = 'My ' . $lang->projectCommon; +$lang->block->myProduct = 'My ' . $lang->productCommon; +$lang->block->delayed = 'Delayed'; $lang->block->params = new stdclass(); $lang->block->params->name = 'Name'; @@ -38,15 +48,15 @@ $lang->block->params->value = 'Value'; $lang->block->createBlock = 'Add'; $lang->block->editBlock = 'Edit'; $lang->block->ordersSaved = 'Order is saved.'; -$lang->block->confirmRemoveBlock = 'Do you want to remove Block【{0}】?'; +$lang->block->confirmRemoveBlock = 'Do you want to remove Block?'; $lang->block->closeForever = 'Permanent Close'; $lang->block->confirmClose = 'Do you want to permanently close this block? Once done, it is not available to anyone. It can be activiated at Admin->Custom.'; $lang->block->remove = 'Remove'; $lang->block->refresh = 'Refresh'; $lang->block->hidden = 'Hide'; -$lang->block->dynamicInfo = "%s, %s %s %s %s."; +$lang->block->dynamicInfo = "%s, %s %s %s %s"; -$lang->block->default['product']['1']['title'] = 'Open' . $lang->productCommon; +$lang->block->default['product']['1']['title'] = 'Open ' . $lang->productCommon . 's'; $lang->block->default['product']['1']['block'] = 'list'; $lang->block->default['product']['1']['grid'] = 8; @@ -61,7 +71,7 @@ $lang->block->default['product']['2']['params']['num'] = 15; $lang->block->default['product']['2']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['2']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = 'Doing' . $lang->projectCommon; +$lang->block->default['project']['1']['title'] = 'Active ' . $lang->projectCommon . 's'; $lang->block->default['project']['1']['block'] = 'list'; $lang->block->default['project']['1']['grid'] = 8; @@ -101,31 +111,33 @@ $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['3']['params']['type'] = 'wait'; -$lang->block->default['full']['my']['1']['title'] = 'Flowchart'; -$lang->block->default['full']['my']['1']['block'] = 'flowchart'; +$lang->block->default['full']['my']['1']['title'] = 'Welcome'; +$lang->block->default['full']['my']['1']['block'] = 'welcome'; $lang->block->default['full']['my']['1']['grid'] = 8; $lang->block->default['full']['my']['1']['source'] = ''; $lang->block->default['full']['my']['2']['title'] = 'Dynamic'; $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; -$lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = 'My To-Dos'; -$lang->block->default['full']['my']['4']['block'] = 'list'; -$lang->block->default['full']['my']['4']['grid'] = 4; -$lang->block->default['full']['my']['4']['source'] = 'todo'; -$lang->block->default['full']['my']['4']['params']['num'] = '20'; -$lang->block->default['full']['my']['5'] = $lang->block->default['product']['1']; -$lang->block->default['full']['my']['5']['source'] = 'product'; -$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2']; +$lang->block->default['full']['my']['3']['title'] = 'Flowchart'; +$lang->block->default['full']['my']['3']['block'] = 'flowchart'; +$lang->block->default['full']['my']['3']['grid'] = 8; +$lang->block->default['full']['my']['3']['source'] = ''; +$lang->block->default['full']['my']['5']['title'] = 'My Todos'; +$lang->block->default['full']['my']['5']['block'] = 'list'; +$lang->block->default['full']['my']['5']['grid'] = 4; +$lang->block->default['full']['my']['5']['source'] = 'todo'; +$lang->block->default['full']['my']['5']['params']['num'] = '20'; +$lang->block->default['full']['my']['6'] = $lang->block->default['project']['1']; $lang->block->default['full']['my']['6']['source'] = 'project'; -$lang->block->default['full']['my']['7'] = $lang->block->default['qa']['1']; -$lang->block->default['full']['my']['7']['source'] = 'qa'; -$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2']; +$lang->block->default['full']['my']['7'] = $lang->block->default['project']['2']; +$lang->block->default['full']['my']['7']['source'] = 'project'; +$lang->block->default['full']['my']['8'] = $lang->block->default['product']['1']; $lang->block->default['full']['my']['8']['source'] = 'product'; -$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['9']['source'] = 'qa'; +$lang->block->default['full']['my']['9'] = $lang->block->default['product']['2']; +$lang->block->default['full']['my']['9']['source'] = 'product'; +$lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2']; +$lang->block->default['full']['my']['10']['source'] = 'qa'; $lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; $lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; @@ -134,7 +146,7 @@ $lang->block->default['onlyTest']['my']['2']['title'] = 'Dynamic'; $lang->block->default['onlyTest']['my']['2']['block'] = 'dynamic'; $lang->block->default['onlyTest']['my']['2']['grid'] = 4; $lang->block->default['onlyTest']['my']['2']['source'] = ''; -$lang->block->default['onlyTest']['my']['3']['title'] = 'My To-Dos'; +$lang->block->default['onlyTest']['my']['3']['title'] = 'My Todo'; $lang->block->default['onlyTest']['my']['3']['block'] = 'list'; $lang->block->default['onlyTest']['my']['3']['grid'] = 6; $lang->block->default['onlyTest']['my']['3']['source'] = 'todo'; @@ -150,7 +162,7 @@ $lang->block->default['onlyStory']['my']['2']['title'] = 'Dynamic'; $lang->block->default['onlyStory']['my']['2']['block'] = 'dynamic'; $lang->block->default['onlyStory']['my']['2']['grid'] = 4; $lang->block->default['onlyStory']['my']['2']['source'] = ''; -$lang->block->default['onlyStory']['my']['3']['title'] = 'My To-Dos'; +$lang->block->default['onlyStory']['my']['3']['title'] = 'My Todo'; $lang->block->default['onlyStory']['my']['3']['block'] = 'list'; $lang->block->default['onlyStory']['my']['3']['grid'] = 6; $lang->block->default['onlyStory']['my']['3']['source'] = 'todo'; @@ -166,7 +178,7 @@ $lang->block->default['onlyTask']['my']['2']['title'] = 'Dynamic'; $lang->block->default['onlyTask']['my']['2']['block'] = 'dynamic'; $lang->block->default['onlyTask']['my']['2']['grid'] = 4; $lang->block->default['onlyTask']['my']['2']['source'] = ''; -$lang->block->default['onlyTask']['my']['3']['title'] = 'My To-Dos'; +$lang->block->default['onlyTask']['my']['3']['title'] = 'My Todo'; $lang->block->default['onlyTask']['my']['3']['block'] = 'list'; $lang->block->default['onlyTask']['my']['3']['grid'] = 6; $lang->block->default['onlyTask']['my']['3']['source'] = 'todo'; @@ -181,7 +193,7 @@ $lang->block->orderBy = 'Order by'; $lang->block->availableBlocks = new stdclass(); -$lang->block->availableBlocks->todo = 'My To-Dos'; +$lang->block->availableBlocks->todo = 'My Todo'; $lang->block->availableBlocks->task = 'My Tasks'; $lang->block->availableBlocks->bug = 'My Bugs'; $lang->block->availableBlocks->case = 'My Cases'; @@ -196,7 +208,7 @@ $lang->block->availableBlocks->testtask = 'Test Builds'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; $lang->block->moduleList['qa'] = 'QA'; -$lang->block->moduleList['todo'] = 'To-Dos'; +$lang->block->moduleList['todo'] = 'Todo'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); @@ -216,7 +228,7 @@ $lang->block->modules['qa']->availableBlocks->case = 'Cases'; $lang->block->modules['qa']->availableBlocks->testtask = 'Test Builds'; $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); -$lang->block->modules['todo']->availableBlocks->list = 'To-Dos'; +$lang->block->modules['todo']->availableBlocks->list = 'Todo'; $lang->block->orderByList = new stdclass(); @@ -256,6 +268,10 @@ $lang->block->orderByList->story['status_desc'] = 'Status Descending'; $lang->block->orderByList->story['stage_asc'] = 'Stage Ascending'; $lang->block->orderByList->story['stage_desc'] = 'Stage Descending'; +$lang->block->todoNum = 'Todo Number'; +$lang->block->taskNum = 'Task Number'; +$lang->block->bugNum = 'Bug Number'; + $lang->block->typeList = new stdclass(); $lang->block->typeList->task['assignedTo'] = 'Assigned to Me'; @@ -282,7 +298,7 @@ $lang->block->typeList->product['closed'] = 'Closed'; $lang->block->typeList->product['all'] = 'All'; $lang->block->typeList->product['involved'] = 'Involved'; -$lang->block->typeList->project['undone'] = 'Undone'; +$lang->block->typeList->project['undone'] = 'Unfinished'; $lang->block->typeList->project['isdoing'] = 'Doing'; $lang->block->typeList->project['all'] = 'All'; $lang->block->typeList->project['involved'] = 'Involved'; @@ -309,6 +325,14 @@ $lang->block->modules['common'] = new stdclass(); $lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; +$lang->block->welcomeList['06:00'] = 'Good morning, %s'; +$lang->block->welcomeList['11:30'] = 'Good noon, %s'; +$lang->block->welcomeList['13:30'] = 'Good afternoon, %s'; +$lang->block->welcomeList['19:00'] = 'Good evening, %s'; + +$lang->block->gridOptions[8] = 'Left'; +$lang->block->gridOptions[4] = 'Right'; + $lang->block->flowchart = array(); $lang->block->flowchart[] = array('Administration', 'Manage a Company', 'Add Users', 'Maintain Privileges'); $lang->block->flowchart[] = array($lang->productCommon . ' Manager', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Release'); diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index ce3758f2a0..622c452691 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -13,7 +13,7 @@ $lang->block = new stdclass(); $lang->block->common = '区块'; $lang->block->name = '区块名称'; $lang->block->style = '外观'; -$lang->block->grid = '宽度'; +$lang->block->grid = '位置'; $lang->block->color = '颜色'; $lang->block->account = '所属用户'; @@ -29,7 +29,17 @@ $lang->block->lblBlock = '区块'; $lang->block->lblNum = '条数'; $lang->block->lblHtml = 'HTML内容'; $lang->block->dynamic = '最新动态'; +$lang->block->assignToMe = '指派给我'; $lang->block->lblFlowchart = '流程图'; +$lang->block->welcome = '欢迎总览'; + +$lang->block->leftToday = '今天剩余工作总计'; +$lang->block->myTask = '我的任务'; +$lang->block->myStory = '我的需求'; +$lang->block->myBug = '我的BUG'; +$lang->block->myProject = '进行中的' . $lang->projectCommon; +$lang->block->myProduct = '未关闭的' . $lang->productCommon; +$lang->block->delayed = '已延期'; $lang->block->params = new stdclass(); $lang->block->params->name = '参数名称'; @@ -38,13 +48,13 @@ $lang->block->params->value = '参数值'; $lang->block->createBlock = '添加区块'; $lang->block->editBlock = '编辑区块'; $lang->block->ordersSaved = '排序已保存'; -$lang->block->confirmRemoveBlock = '确定移除区块【{0}】吗？'; +$lang->block->confirmRemoveBlock = '确定移除区块吗？'; $lang->block->closeForever = '永久关闭'; $lang->block->confirmClose = '确定永久关闭该区块吗？闭后所有人都将无法使用该区块，可以在后台自定义中打开'; $lang->block->remove = '移除'; $lang->block->refresh = '刷新'; $lang->block->hidden = '隐藏'; -$lang->block->dynamicInfo = "%s, %s %s %s %s。"; +$lang->block->dynamicInfo = "%s, %s %s %s %s"; $lang->block->default['product']['1']['title'] = '未关闭的' . $lang->productCommon; $lang->block->default['product']['1']['block'] = 'list'; @@ -101,31 +111,33 @@ $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['3']['params']['type'] = 'wait'; -$lang->block->default['full']['my']['1']['title'] = '流程图'; -$lang->block->default['full']['my']['1']['block'] = 'flowchart'; +$lang->block->default['full']['my']['1']['title'] = '欢迎'; +$lang->block->default['full']['my']['1']['block'] = 'welcome'; $lang->block->default['full']['my']['1']['grid'] = 8; $lang->block->default['full']['my']['1']['source'] = ''; $lang->block->default['full']['my']['2']['title'] = '最新动态'; $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; -$lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = '我的待办'; -$lang->block->default['full']['my']['4']['block'] = 'list'; -$lang->block->default['full']['my']['4']['grid'] = 4; -$lang->block->default['full']['my']['4']['source'] = 'todo'; -$lang->block->default['full']['my']['4']['params']['num'] = '20'; -$lang->block->default['full']['my']['5'] = $lang->block->default['product']['1']; -$lang->block->default['full']['my']['5']['source'] = 'product'; -$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2']; +$lang->block->default['full']['my']['3']['title'] = '流程图'; +$lang->block->default['full']['my']['3']['block'] = 'flowchart'; +$lang->block->default['full']['my']['3']['grid'] = 8; +$lang->block->default['full']['my']['3']['source'] = ''; +$lang->block->default['full']['my']['5']['title'] = '我的待办'; +$lang->block->default['full']['my']['5']['block'] = 'list'; +$lang->block->default['full']['my']['5']['grid'] = 4; +$lang->block->default['full']['my']['5']['source'] = 'todo'; +$lang->block->default['full']['my']['5']['params']['num'] = '20'; +$lang->block->default['full']['my']['6'] = $lang->block->default['project']['1']; $lang->block->default['full']['my']['6']['source'] = 'project'; -$lang->block->default['full']['my']['7'] = $lang->block->default['qa']['1']; -$lang->block->default['full']['my']['7']['source'] = 'qa'; -$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2']; +$lang->block->default['full']['my']['7'] = $lang->block->default['project']['2']; +$lang->block->default['full']['my']['7']['source'] = 'project'; +$lang->block->default['full']['my']['8'] = $lang->block->default['product']['1']; $lang->block->default['full']['my']['8']['source'] = 'product'; -$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['9']['source'] = 'qa'; +$lang->block->default['full']['my']['9'] = $lang->block->default['product']['2']; +$lang->block->default['full']['my']['9']['source'] = 'product'; +$lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2']; +$lang->block->default['full']['my']['10']['source'] = 'qa'; $lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; $lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; @@ -256,6 +268,10 @@ $lang->block->orderByList->story['status_desc'] = '状态倒序'; $lang->block->orderByList->story['stage_asc'] = '阶段正序'; $lang->block->orderByList->story['stage_desc'] = '阶段倒序'; +$lang->block->todoNum = '待办数'; +$lang->block->taskNum = '任务数'; +$lang->block->bugNum = 'Bug数'; + $lang->block->typeList = new stdclass(); $lang->block->typeList->task['assignedTo'] = '指派给我'; @@ -309,6 +325,14 @@ $lang->block->modules['common'] = new stdclass(); $lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; +$lang->block->welcomeList['06:00'] = '%s，早上好！'; +$lang->block->welcomeList['11:30'] = '%s，中文好！'; +$lang->block->welcomeList['13:30'] = '%s，下午好！'; +$lang->block->welcomeList['19:00'] = '%s，晚上好！'; + +$lang->block->gridOptions[8] = '左侧'; +$lang->block->gridOptions[4] = '右侧'; + $lang->block->flowchart = array(); $lang->block->flowchart[] = array('管理员', '维护公司', '添加用户', '维护权限'); $lang->block->flowchart[] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', '维护计划', '维护需求', '创建发布'); diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index f81409d8af..3a302336cf 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -13,7 +13,7 @@ $lang->block = new stdclass(); $lang->block->common = '區塊'; $lang->block->name = '區塊名稱'; $lang->block->style = '外觀'; -$lang->block->grid = '寬度'; +$lang->block->grid = '位置'; $lang->block->color = '顏色'; $lang->block->account = '所屬用戶'; @@ -29,7 +29,17 @@ $lang->block->lblBlock = '區塊'; $lang->block->lblNum = '條數'; $lang->block->lblHtml = 'HTML內容'; $lang->block->dynamic = '最新動態'; +$lang->block->assignToMe = '指派給我'; $lang->block->lblFlowchart = '流程圖'; +$lang->block->welcome = '歡迎總覽'; + +$lang->block->leftToday = '今天剩餘工作總計'; +$lang->block->myTask = '我的任務'; +$lang->block->myStory = '我的需求'; +$lang->block->myBug = '我的BUG'; +$lang->block->myProject = '進行中的' . $lang->projectCommon; +$lang->block->myProduct = '未關閉的' . $lang->productCommon; +$lang->block->delayed = '已延期'; $lang->block->params = new stdclass(); $lang->block->params->name = '參數名稱'; @@ -38,13 +48,13 @@ $lang->block->params->value = '參數值'; $lang->block->createBlock = '添加區塊'; $lang->block->editBlock = '編輯區塊'; $lang->block->ordersSaved = '排序已保存'; -$lang->block->confirmRemoveBlock = '確定移除區塊【{0}】嗎？'; +$lang->block->confirmRemoveBlock = '確定移除區塊嗎？'; $lang->block->closeForever = '永久關閉'; $lang->block->confirmClose = '確定永久關閉該區塊嗎？閉後所有人都將無法使用該區塊，可以在後台自定義中打開'; $lang->block->remove = '移除'; $lang->block->refresh = '刷新'; $lang->block->hidden = '隱藏'; -$lang->block->dynamicInfo = "%s, %s %s %s %s。"; +$lang->block->dynamicInfo = "%s, %s %s %s %s"; $lang->block->default['product']['1']['title'] = '未關閉的' . $lang->productCommon; $lang->block->default['product']['1']['block'] = 'list'; @@ -101,31 +111,33 @@ $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['3']['params']['type'] = 'wait'; -$lang->block->default['full']['my']['1']['title'] = '流程圖'; -$lang->block->default['full']['my']['1']['block'] = 'flowchart'; +$lang->block->default['full']['my']['1']['title'] = '歡迎'; +$lang->block->default['full']['my']['1']['block'] = 'welcome'; $lang->block->default['full']['my']['1']['grid'] = 8; $lang->block->default['full']['my']['1']['source'] = ''; $lang->block->default['full']['my']['2']['title'] = '最新動態'; $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; -$lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = '我的待辦'; -$lang->block->default['full']['my']['4']['block'] = 'list'; -$lang->block->default['full']['my']['4']['grid'] = 4; -$lang->block->default['full']['my']['4']['source'] = 'todo'; -$lang->block->default['full']['my']['4']['params']['num'] = '20'; -$lang->block->default['full']['my']['5'] = $lang->block->default['product']['1']; -$lang->block->default['full']['my']['5']['source'] = 'product'; -$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2']; +$lang->block->default['full']['my']['3']['title'] = '流程圖'; +$lang->block->default['full']['my']['3']['block'] = 'flowchart'; +$lang->block->default['full']['my']['3']['grid'] = 8; +$lang->block->default['full']['my']['3']['source'] = ''; +$lang->block->default['full']['my']['5']['title'] = '我的待辦'; +$lang->block->default['full']['my']['5']['block'] = 'list'; +$lang->block->default['full']['my']['5']['grid'] = 4; +$lang->block->default['full']['my']['5']['source'] = 'todo'; +$lang->block->default['full']['my']['5']['params']['num'] = '20'; +$lang->block->default['full']['my']['6'] = $lang->block->default['project']['1']; $lang->block->default['full']['my']['6']['source'] = 'project'; -$lang->block->default['full']['my']['7'] = $lang->block->default['qa']['1']; -$lang->block->default['full']['my']['7']['source'] = 'qa'; -$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2']; +$lang->block->default['full']['my']['7'] = $lang->block->default['project']['2']; +$lang->block->default['full']['my']['7']['source'] = 'project'; +$lang->block->default['full']['my']['8'] = $lang->block->default['product']['1']; $lang->block->default['full']['my']['8']['source'] = 'product'; -$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['9']['source'] = 'qa'; +$lang->block->default['full']['my']['9'] = $lang->block->default['product']['2']; +$lang->block->default['full']['my']['9']['source'] = 'product'; +$lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2']; +$lang->block->default['full']['my']['10']['source'] = 'qa'; $lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; $lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; @@ -256,6 +268,10 @@ $lang->block->orderByList->story['status_desc'] = '狀態倒序'; $lang->block->orderByList->story['stage_asc'] = '階段正序'; $lang->block->orderByList->story['stage_desc'] = '階段倒序'; +$lang->block->todoNum = '待辦數'; +$lang->block->taskNum = '任務數'; +$lang->block->bugNum = 'Bug數'; + $lang->block->typeList = new stdclass(); $lang->block->typeList->task['assignedTo'] = '指派給我'; @@ -302,13 +318,21 @@ $lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; $lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; $lang->block->modules['qa']->moreLinkList->case = 'my|testcase|type=%s'; -$lang->block->modules['qa']->moreLinkList->testtask = 'my|testtask|type=%s'; +$lang->block->modules['qa']->moreLinkList->testtask = 'testtask|browse|type=%s'; $lang->block->modules['todo']->moreLinkList = new stdclass(); $lang->block->modules['todo']->moreLinkList->list = 'my|todo|type=all'; $lang->block->modules['common'] = new stdclass(); $lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; +$lang->block->welcomeList['06:00'] = '%s，早上好！'; +$lang->block->welcomeList['11:30'] = '%s，中文好！'; +$lang->block->welcomeList['13:30'] = '%s，下午好！'; +$lang->block->welcomeList['19:00'] = '%s，晚上好！'; + +$lang->block->gridOptions[8] = '左側'; +$lang->block->gridOptions[4] = '右側'; + $lang->block->flowchart = array(); $lang->block->flowchart[] = array('管理員', '維護公司', '添加用戶', '維護權限'); $lang->block->flowchart[] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', '維護計劃', '維護需求', '創建發佈'); diff --git a/module/block/model.php b/module/block/model.php index b05b516e77..20054b403a 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -35,7 +35,7 @@ class blockModel extends model ->setDefault('source', $source) ->setDefault('block', $type) ->setDefault('params', array()) - ->remove('uid') + ->remove('uid,actionLink,modules,moduleBlock') ->get(); if($block) $data->height = $block->height; @@ -408,6 +408,23 @@ class blockModel extends model return json_encode($this->onlyNumParams($module, $params)); } + public function getAssignToMeParams() + { + $params->todoNum['name'] = $this->lang->block->todoNum; + $params->todoNum['default'] = 20; + $params->todoNum['control'] = 'input'; + + $params->taskNum['name'] = $this->lang->block->taskNum; + $params->taskNum['default'] = 20; + $params->taskNum['control'] = 'input'; + + $params->bugNum['name'] = $this->lang->block->bugNum; + $params->bugNum['default'] = 20; + $params->bugNum['control'] = 'input'; + + return json_encode($params); + } + /** * Get closed block pairs. * @@ -457,4 +474,16 @@ class blockModel extends model $params->num['control'] = 'input'; return $params; } + + /** + * Check whether long block. + * + * @param object $block + * @access public + * @return book + */ + public function isLongBlock($block) + { + return $block->grid >= 6; + } } diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 463ebbff46..9cac5bec90 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -10,21 +10,36 @@ * @link http://www.ranzhico.com */ ?> +app->getWebRoot(); +$jsRoot = $webRoot . "js/"; +include '../../common/view/chosen.html.php'; +?> + +
+ +
+ source != '' ? $block->source : $block->block; + ?> + +
+
+ + +
+ + +
+ +
+
+   + +
+
+ -
backup->time?> backup->files?> backup->size?>actions?>actions?>
{$this->lang->block->lblBlock}' . html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control' onchange='getBlockParams(this.value, \"$module\")'") . '
- - - - - source != '' ? $block->source : $block->block; - ?> - - - - -
block->lblModule; ?>
-
diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index aaa394eed3..8490075177 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -10,30 +10,40 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - - get->entry}'" : ''; - $viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}"); - ?> - > - - - - - - - -
idAB?>priAB?> bug->title;?>bug->severityAB?>bug->statusAB;?>
id;?>bug->priList, $bug->pri, $bug->pri)?>title?>bug->severityList, $bug->severity, $bug->severity)?>bug->statusList, $bug->status, $bug->status)?>
- +
+ '> + + + + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}"); + ?> + > + + + + + + + + + + +
idAB?>priAB?>bug->severityAB?>bug->title;?>bug->statusAB;?>
id;?>bug->priList, $bug->pri, $bug->pri)?>title?> + + + bug->statusList, $bug->status);?> + +
+
diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index 520cb61b87..4d8cdf916f 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -10,28 +10,29 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - get->entry}'" : ''; - $viewLink = $this->createLink('build', 'view', "buildID={$build->id}"); - ?> - > - - - - - - -
idAB?> build->product;?> build->name;?>build->date;?>
id;?>productName?>name?>date?>
- +
+ + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('build', 'view', "buildID={$build->id}"); + ?> + > + + + + + + + +
idAB?> build->product;?> build->name;?>build->date;?>
id;?>productName?>name?>date?>
+
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index b19e9cf3b2..e7a5e9a6a5 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -10,32 +10,56 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - - - get->entry}'" : ''; - $viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}"); - ?> - > - - - - - - - - -
idAB?>priAB?> case->title;?> testtask->lastRunTime;?> testtask->lastRunResult;?>statusAB;?>
id;?>case->priList, $case->pri, $case->pri)?>title?>lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?>lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?>testcase->statusList[$case->status];?>
- +
+ + '> + + + + + + + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}"); + ?> + > + + + + + + + + + + + + + +
idAB?>priAB?>case->title;?> testtask->lastRunTime;?> testtask->lastRunResult;?>statusAB;?>
id;?>case->priList, $case->pri, $case->pri)?>title?>lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?>lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> + + + testcase->statusList, $case->status);?> + +
+
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 7e491e96b8..8d472a632b 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -18,45 +18,87 @@ $useGuest = $this->app->user->account == 'guest'; ?>
- -
-
- block->createBlock?> -
- -
- $block):?> - block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?> -
-
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>' data-url='blockLink?>' height) echo "data-height='$block->height'";?>> -
-
- moreLink)):?> - moreLink, " ", null, "class='panel-action drag-disabled panel-action-more'"); ?> - -
- - +
+
+ $block):?> + block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?> +
+
+
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>'> + block != 'welcome' and $block->block != 'flowchart');?> + +
+
title;?>
+ + +
+ + fetch('block', 'printBlock', "id=$block->id&module=$module")?>
- title;?>
-
+ +
+
+ $block):?> + block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?> +
+
+
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>'> + block != 'welcome' and $block->block != 'flowchart');?> + +
+
title;?>
+ + + +
+ + fetch('block', 'printBlock', "id=$block->id&module=$module")?> +
+
+
+
-
getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> - \ No newline at end of file + diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php index 6e85881708..d2d0eff58d 100644 --- a/module/block/view/dynamic.html.php +++ b/module/block/view/dynamic.html.php @@ -1,12 +1,17 @@ - - actor]) ? $users[$action->actor] : $action->actor; - if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = ''; - echo ""; - } - ?> -
"; - printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName); - echo "
+
+
    + actor]) ? $users[$action->actor] : $action->actor; + if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = ''; + $class = $i % 3 == 0 ? "class='active'" : ''; + echo "
  • "; + printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName); + echo "
    • "; + $i++; + } + ?> +
+
diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php index 51e9d9976e..934414cee4 100644 --- a/module/block/view/flowchart.html.php +++ b/module/block/view/flowchart.html.php @@ -1,43 +1,26 @@ -
-block->flowchart as $flow):?> - -
- -
- -
- -
- + + + + + + + + + + + + + + block->flowchart as $flowchart):?> + + + + + + + + + + + +
block->lblFlowchart?>
diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php index 5d5a56c8b4..f7ef59f194 100644 --- a/module/block/view/planblock.html.php +++ b/module/block/view/planblock.html.php @@ -10,30 +10,31 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - - get->entry}'" : ''; - $viewLink = $this->createLink('productplan', 'view', "planID={$plan->id}"); - ?> - > - - - - - - - -
idAB?> productplan->product;?> productplan->title;?>productplan->begin;?>productplan->end;?>
id;?>productName?>title?>begin?>end?>
- +
+ + + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('productplan', 'view', "planID={$plan->id}"); + ?> + > + + + + + + + + +
idAB?> productplan->product;?> productplan->title;?>productplan->begin;?>productplan->end;?>
id;?>productName?>title?>begin?>end?>
+
diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php new file mode 100644 index 0000000000..a320f0fdb4 --- /dev/null +++ b/module/block/view/printassigntomeblock.html.php @@ -0,0 +1,35 @@ + + * @package block + * @version $Id$ + * @link http://www.zentao.net + */ +?> +
+ $bool):?> +
+ +
+ +
+ diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 09386e9293..3e8661b5e4 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -10,38 +10,37 @@ * @link http://www.zentao.net */ ?> - - - - - - - - - - - - - - - - get->entry}'" : "class='text-center'"; - $viewLink = $this->createLink('product', 'browse', 'productID=' . $product->id); - ?> - > - - - - - - - - - - - -
product->name;?>story->statusList['active'];?>story->statusList['changed'];?>story->statusList['draft'];?>product->plans;?>product->releases;?>product->bugs;?>bug->unResolved;?>
name?>stories['active']?>stories['changed']?>stories['draft']?>plans?>releases?>bugs?>unResolved?>
- +
+ + + + + + + + + + + + + + + + get->entry}'" : ""; + $viewLink = $this->createLink('product', 'browse', 'productID=' . $product->id); + ?> + > + + + + + + + + + + + +
product->name;?>product->plans;?>product->releases;?>product->currentProject;?>story->statusList['active'];?>bug->unResolved;?>
name?>plans?>releases?>id, '');?>stories['active']?>unResolved?>
+
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index e6858c71e0..b1f7597733 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -10,21 +10,22 @@ * @link http://www.zentao.net */ ?> -config->webRoot . 'js/';?> - - -
- +
+
- - - - - - - - + + + + + + + + + + + + @@ -35,57 +36,32 @@ $viewLink = $this->createLink('project', 'task', 'project=' . $project->id); ?> > - - - delay)):?> - - - - - - - - + + + - + + + + + + + +
project->name;?>project->end;?>statusAB;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progress;?>project->burn;?>project->name;?>project->end;?>statusAB;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progress;?>project->burn;?>
createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title='$project->name'");?>end;?>project->delayed;?>project->statusList[$project->status];?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> - - hours->progress;?>% + createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title='$project->name'");?>end;?> + delay)):?> + project->delayed;?> + + project->statusList[$project->status];?> + burns);?>'>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> +
+
+ hours->progress;?>% +
+
+ 		burns);?>'>
- diff --git a/module/block/view/publicform.html.php b/module/block/view/publicform.html.php index 1750271339..333f079bfd 100644 --- a/module/block/view/publicform.html.php +++ b/module/block/view/publicform.html.php @@ -10,17 +10,16 @@ * @link http://www.zentao.net */ ?> - - block->name?> - title : '', "class='form-control' autocomplete='off'")?> - - - block->style;?> - -
+
+ +
title : '', "class='form-control' autocomplete='off'")?>
+
+
+ +
block->grid;?> - block->gridOptions, $block ? $block->grid : 4, "class='form-control'")?> + block->gridOptions, $block ? $block->grid : 8, "class='form-control chosen'")?>
params->color) ? 'btn-' . $block->params->color : 'btn-default'?>
-
- - +
+
diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index d26e1e478d..f3e089cc49 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -10,32 +10,33 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - - - get->entry}'" : ''; - $viewLink = $this->createLink('release', 'view', "releaseID={$release->id}"); - ?> - > - - - - - - - - -
idAB?> release->product;?> release->name;?> release->build;?>release->date;?>release->status;?>
id;?>productName?>name?>buildName?>date?>release->statusList[$release->status]?>
- +
+ + + + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('release', 'view', "releaseID={$release->id}"); + ?> + > + + + + + + + + + +
idAB?> release->product;?> release->name;?> release->build;?>release->date;?>release->status;?>
id;?>productName?>name?>buildName?>date?>release->statusList[$release->status]?>
+
diff --git a/module/block/view/set.html.php b/module/block/view/set.html.php index ca3295ec99..4ba840919a 100644 --- a/module/block/view/set.html.php +++ b/module/block/view/set.html.php @@ -11,7 +11,7 @@ */ ?> block->moduleList[$source])) +if(!empty($params)) { include 'setmodule.html.php'; die(); @@ -24,20 +24,14 @@ if($type == 'html') include '../../common/view/kindeditor.html.php'; } ?> -
'> - - - - - - - - - - - -
block->lblHtml;?>params->html : '', "class='form-control' rows='10'")?>
-
+ +createLink('block', 'set', "id=$id&type=$type&source=$source"));?> + +
+ +
params->html : '', "class='form-control' rows='10'")?>
+
+ +
+ '> + + + + + + + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('story', 'view', "storyID={$story->id}"); + ?> + > + + story->priList, $story->pri, $story->pri);?> + + + + + + + + + + + + +
idAB?>priAB?>story->title;?>story->estimateAB;?>statusAB;?>story->stageAB;?>
id;?>title?>estimate?> + + story->statusList, $story->status);?> + + + + story->stageList, $story->stage, $story->stage);?> + +
+
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 3ab4b05f0b..38104dd9ec 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -10,35 +10,42 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - - - - get->entry}'" : ''; - $viewLink = $this->createLink('task', 'view', "taskID={$task->id}"); - ?> - > - - - - - - - -
idAB?>priAB?> task->name;?>task->estimateAB;?>task->deadline;?>statusAB;?>
id;?>task->priList, $task->pri, $task->pri)?>name?>estimate?>'>deadline, 0, 4) > 0) echo $task->deadline;?>task->statusList, $task->status, $task->status);?> -
- +
+ '> + + + + + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('task', 'view', "taskID={$task->id}"); + ?> + > + + + + + + + + + + + +
idAB?>priAB?> task->name;?>task->estimateAB;?>task->deadline;?>statusAB;?>
id;?>task->priList, $task->pri, $task->pri)?>name?>estimate?>deadline, 0, 4) > 0) echo $task->deadline;?> + + + task->statusList, $task->status);?> + +
+
diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index 90b8a2a2ad..896c450e46 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -10,32 +10,33 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - - - get->entry}'" : ''; - $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); - ?> - > - - - - - - - - -
idAB?> testtask->product;?> testtask->name;?> testtask->project . '/' . $lang->testtask->build;?>testtask->begin;?>testtask->end;?>
id;?>productName?>name?>buildName?>'>projectName . '/' . $testtask->buildName?>begin?>end?>
- +
+ + + + + + + + + + + + + + get->entry}'" : ''; + $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); + ?> + > + + + + + + + + + +
idAB?>testtask->product;?> testtask->name;?>testtask->project . '/' . $lang->testtask->build;?>testtask->begin;?>testtask->end;?>
id;?>productName?>name?>buildName?>'>projectName . '/' . $testtask->buildName?>begin?>end?>
+
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 1bb55b5a37..e508e91628 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -10,30 +10,115 @@ * @link http://www.ranzhi.org */ ?> - - - - - - - - - - - $todo):?> - get->entry}'" : ''; - $viewLink = $this->createLink('todo', 'view', "todoID={$todo->id}&from=my"); - ?> - > - - - - - - - -
todo->date?>priAB?> todo->name;?>todo->beginAB;?>todo->endAB;?>
date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?>todo->priList, $todo->pri, $todo->pri)?>name?>begin?>end?>
- +
+
+
+
+
'> +

todo->create . $lang->todo->common;?>

+
+
+
+
+ +
todo->priList, '', "class='form-control chosen'");?>
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+ +
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ + save, "onclick='ajaxCreateTodo(this)'", "btn btn-primary btn-wide");?> + +
+
+
+
+ +
+ +
diff --git a/module/block/view/welcome.html.php b/module/block/view/welcome.html.php new file mode 100644 index 0000000000..73333c6b8e --- /dev/null +++ b/module/block/view/welcome.html.php @@ -0,0 +1,71 @@ + + * @package block + * @version $Id$ + * @link http://www.zentao.net + */ +?> +
+
+
+

block->welcomeList[$welcomeType], $app->user->realname)?>

+
    + tutorial->tasks as $taskKey => $task) + { + if($i > 3) break; + $class = strpos(",$tutorialed,", ",$taskKey,") !== false ? "class='active'" : ''; + echo "
  • " . html::a($this->createLink('tutorial', 'index', "referer=&task=$taskKey"), $i . '. ' . $task['title']) . "
    • "; + $i++; + } + ?> +
+
+
+

block->leftToday?>

+
+
+
block->myTask?>
+
+ +
+ block->delayed . ' ' . $delay['task']?> +
+ +
+
+
block->myBug?>
+
+ +
+ block->delayed . ' ' . $delay['bug']?> +
+ +
+
+
block->myStory?>
+
+
+
+
block->myProject?>
+
+ +
+ block->delayed . ' ' . $delay['project']?> +
+ +
+
+
block->myProduct?>
+
+
+
+
+
+
diff --git a/module/bug/config.php b/module/bug/config.php index 190b518f2d..6ac9bc0717 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -267,7 +267,7 @@ $config->bug->datatable->fieldList['openedBuild']['fixed'] = 'no'; $config->bug->datatable->fieldList['openedBuild']['width'] = '120'; $config->bug->datatable->fieldList['openedBuild']['required'] = 'no'; -$config->bug->datatable->fieldList['assignedTo']['title'] = 'assignedTo'; +$config->bug->datatable->fieldList['assignedTo']['title'] = 'assignedToAB'; $config->bug->datatable->fieldList['assignedTo']['fixed'] = 'no'; $config->bug->datatable->fieldList['assignedTo']['width'] = '80'; $config->bug->datatable->fieldList['assignedTo']['required'] = 'no'; diff --git a/module/bug/control.php b/module/bug/control.php index 7abd9c2b1c..aecb04362d 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -179,7 +179,7 @@ class bug extends control * @access public * @return void */ - public function report($productID, $browseType, $branchID, $moduleID) + public function report($productID, $browseType, $branchID, $moduleID, $chartType = '') { $this->loadModel('report'); $this->view->charts = array(); @@ -191,6 +191,7 @@ class bug extends control $chartFunc = 'getDataOf' . $chart; $chartData = $this->bug->$chartFunc(); $chartOption = $this->lang->bug->report->$chart; + if(!empty($chartType)) $chartOption->type = $chartType; $this->bug->mergeChartOption($chart); $this->view->charts[$chart] = $chartOption; @@ -204,7 +205,9 @@ class bug extends control $this->view->position[] = $this->lang->bug->reportChart; $this->view->productID = $productID; $this->view->browseType = $browseType; + $this->view->branchID = $branchID; $this->view->moduleID = $moduleID; + $this->view->chartType = $chartType; $this->view->checkedCharts = $this->post->charts ? join(',', $this->post->charts) : ''; $this->display(); } @@ -245,7 +248,14 @@ class bug extends control } $actionID = $this->action->create('bug', $bugID, 'Opened'); - $this->bug->sendmail($bugID, $actionID); + + $extras = str_replace(array(',', ' '), array('&', ''), $extras); + parse_str($extras, $output); + if(isset($output['todoID'])) + { + $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq($output['todoID'])->exec(); + $this->action->create('todo', $output['todoID'], 'finished', '', "BUG:$bugID"); + } $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&type=byModule¶m={$this->post->module}"); $response['locate'] = isset($_SESSION['bugList']) ? $this->session->bugList : $location; @@ -304,6 +314,13 @@ class bug extends control $deadline = $bug->deadline; $color = $bug->color; } + if(isset($todoID)) + { + $todo = $this->loadModel('todo')->getById($todoID); + $title = $todo->name; + $steps = $todo->desc; + $pri = $todo->pri; + } /* If projectID is setted, get builds and stories of this project. */ if($projectID) @@ -388,7 +405,6 @@ class bug extends control if(!empty($_POST)) { $actions = $this->bug->batchCreate($productID, $branch); - foreach($actions as $bugID => $actionID) $this->bug->sendmail($bugID, $actionID); die(js::locate($this->session->bugList, 'parent')); } @@ -530,7 +546,6 @@ class bug extends control if(!empty($files)) $fileAction = $this->lang->addFiles . join(',', $files) . "\n" ; $actionID = $this->action->create('bug', $bugID, $action, $fileAction . $this->post->comment); $this->action->logHistory($actionID, $changes); - $this->bug->sendmail($bugID, $actionID); } $bug = $this->bug->getById($bugID); @@ -625,7 +640,6 @@ class bug extends control $actionID = $this->action->create('bug', $bugID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->bug->sendmail($bugID, $actionID); $bug = $this->bug->getById($bugID); if($bug->toTask != 0) @@ -750,7 +764,6 @@ class bug extends control if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('bug', $bugID, 'Assigned', $this->post->comment, $this->post->assignedTo); $this->action->logHistory($actionID, $changes); - $this->bug->sendmail($bugID, $actionID); if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); @@ -787,7 +800,6 @@ class bug extends control $this->loadModel('action'); $actionID = $this->action->create('bug', $bugID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->bug->sendmail($bugID, $actionID); } } $this->loadModel('score')->create('ajax', 'batchOther'); @@ -815,7 +827,6 @@ class bug extends control $this->loadModel('action'); $actionID = $this->action->create('bug', $bugID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->bug->sendmail($bugID, $actionID); } } $this->loadModel('score')->create('ajax', 'batchOther'); @@ -843,11 +854,10 @@ class bug extends control if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('bug', $bugID, 'Assigned', $this->post->comment, $this->post->assignedTo); $this->action->logHistory($actionID, $changes); - $this->bug->sendmail($bugID, $actionID); } $this->loadModel('score')->create('ajax', 'batchOther'); } - if($type == 'product') die(js::locate($this->createLink('bug', 'browse', "productID=$projectID"))); + if($type == 'product') die(js::locate($this->createLink('bug', 'browse', "productID=$projectID"), 'parent')); if($type == 'my') die(js::locate($this->createLink('my', 'bug'))); die(js::locate($this->createLink('project', 'bug', "projectID=$projectID"))); } @@ -867,7 +877,6 @@ class bug extends control if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('bug', $bugID, 'bugConfirmed', $this->post->comment); $this->action->logHistory($actionID, $changes); - $this->bug->sendmail($bugID, $actionID); if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } @@ -898,11 +907,7 @@ class bug extends control $bugIDList = array_unique($bugIDList); $this->bug->batchConfirm($bugIDList); if(dao::isError()) die(js::error(dao::getError())); - foreach($bugIDList as $bugID) - { - $actionID = $this->action->create('bug', $bugID, 'bugConfirmed'); - $this->bug->sendmail($bugID, $actionID); - } + foreach($bugIDList as $bugID) $this->action->create('bug', $bugID, 'bugConfirmed'); $this->loadModel('score')->create('ajax', 'batchOther'); die(js::locate($this->session->bugList, 'parent')); } @@ -924,7 +929,6 @@ class bug extends control $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : ''; $actionID = $this->action->create('bug', $bugID, 'Resolved', $fileAction . $this->post->comment, $this->post->resolution . ($this->post->duplicateBug ? ':' . (int)$this->post->duplicateBug : '')); - $this->bug->sendmail($bugID, $actionID); $bug = $this->bug->getById($bugID); if($bug->toTask != 0) @@ -960,7 +964,7 @@ class bug extends control $this->view->users = $users; $this->view->assignedTo = $assignedTo; $this->view->projects = $this->loadModel('product')->getProjectPairs($productID, $bug->branch ? "0,{$bug->branch}" : 0, $params = 'nodeleted'); - $this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, 'all', true , $bug->project); + $this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, 'all'); $this->view->actions = $this->action->getList('bug', $bugID); $this->display(); } @@ -979,11 +983,7 @@ class bug extends control $bugIDList = array_unique($bugIDList); $bugIDList = $this->bug->batchResolve($bugIDList, $resolution, $resolvedBuild); if(dao::isError()) die(js::error(dao::getError())); - foreach($bugIDList as $bugID) - { - $actionID = $this->action->create('bug', $bugID, 'Resolved', '', $resolution); - $this->bug->sendmail($bugID, $actionID); - } + foreach($bugIDList as $bugID) $this->action->create('bug', $bugID, 'Resolved', '', $resolution); $this->loadModel('score')->create('ajax', 'batchOther'); die(js::locate($this->session->bugList, 'parent')); } @@ -1002,8 +1002,7 @@ class bug extends control $this->bug->activate($bugID); if(dao::isError()) die(js::error(dao::getError())); $files = $this->loadModel('file')->saveUpload('bug', $bugID); - $actionID = $this->action->create('bug', $bugID, 'Activated', $this->post->comment); - $this->bug->sendmail($bugID, $actionID); + $this->action->create('bug', $bugID, 'Activated', $this->post->comment); if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } @@ -1018,7 +1017,7 @@ class bug extends control $this->view->bug = $bug; $this->view->users = $this->user->getPairs('nodeleted', $bug->resolvedBy); - $this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $bug->branch, 'noempty', true, $bug->project); + $this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $bug->branch, 'noempty'); $this->view->actions = $this->action->getList('bug', $bugID); $this->display(); @@ -1037,8 +1036,7 @@ class bug extends control { $this->bug->close($bugID); if(dao::isError()) die(js::error(dao::getError())); - $actionID = $this->action->create('bug', $bugID, 'Closed', $this->post->comment); - $this->bug->sendmail($bugID, $actionID); + $this->action->create('bug', $bugID, 'Closed', $this->post->comment); if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } @@ -1170,8 +1168,7 @@ class bug extends control $this->bug->close($bugID); - $actionID = $this->action->create('bug', $bugID, 'Closed'); - $this->bug->sendmail($bugID, $actionID); + $this->action->create('bug', $bugID, 'Closed'); } $this->loadModel('score')->create('ajax', 'batchOther'); if(isset($skipBugs)) echo js::alert(sprintf($this->lang->bug->skipClose, join(',', $skipBugs))); @@ -1190,11 +1187,7 @@ class bug extends control if($this->post->statusList) { $activateBugs = $this->bug->batchActivate(); - foreach($activateBugs as $bugID => $bug) - { - $actionID = $this->action->create('bug', $bugID, 'Activated', $bug['comment']); - $this->bug->sendmail($bugID, $actionID); - } + foreach($activateBugs as $bugID => $bug) $this->action->create('bug', $bugID, 'Activated', $bug['comment']); $this->loadModel('score')->create('ajax', 'batchOther'); die(js::locate($this->session->bugList, 'parent')); } diff --git a/module/bug/js/create.js b/module/bug/js/create.js index f44d38b6df..0b407a1f5e 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -123,7 +123,7 @@ $(function() { var $group = $('#bugTypeInputGroup'); var width = $group.width(), addonWidth = 0; - var $controls = $group.children('.form-control'); + var $controls = $group.find('.chosen-single'); $group.children('.input-group-addon').each(function() { addonWidth += $(this).outerWidth(); diff --git a/module/bug/js/report.js b/module/bug/js/report.js index 38276947f3..5c00682a61 100644 --- a/module/bug/js/report.js +++ b/module/bug/js/report.js @@ -12,3 +12,9 @@ $(function() fixedTableHead('.table-wrapper'); $(window).resize(resizeChartTable); }); + +function changeChartType(type) +{ + $('form').attr('action', createLink('bug', 'report', 'productID=' + productID + '&browseType=' + browseType + '&branchID=' + branchID + '&moduleID=' + moduleID + '&chartType=' + type)); + $('form').find('#submit').click(); +} diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index dad314be53..d11e141768 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -21,9 +21,9 @@ $lang->bug->project = $lang->projectCommon; $lang->bug->story = 'Story'; $lang->bug->task = 'Task'; $lang->bug->title = 'Title'; -$lang->bug->severity = 'Severity'; +$lang->bug->severity = 'Severity(S)'; $lang->bug->severityAB = 'S'; -$lang->bug->pri = 'Priority'; +$lang->bug->pri = 'Priority(P)'; $lang->bug->type = 'Type'; $lang->bug->os = 'OS'; $lang->bug->browser = 'Browser'; @@ -37,26 +37,28 @@ $lang->bug->confirmed = 'Confirmed'; $lang->bug->toTask = 'Convert to Task'; $lang->bug->toStory = 'Convert to Story'; $lang->bug->mailto = 'Mail To'; -$lang->bug->openedBy = 'Open By'; -$lang->bug->openedDate = 'Open On'; -$lang->bug->openedDateAB = 'Created on'; +$lang->bug->openedBy = 'Creator'; +$lang->bug->openedDate = 'Created on'; +$lang->bug->openedDateAB = 'Created'; $lang->bug->openedBuild = 'Open Build'; -$lang->bug->assignedTo = 'Assigned To'; +$lang->bug->assignedTo = 'To'; +$lang->bug->assignBug = 'Assign To'; +$lang->bug->assignedToAB = 'To'; $lang->bug->assignedDate = 'Assigned On'; -$lang->bug->resolvedBy = 'Resolved By'; +$lang->bug->resolvedBy = 'Resolved'; $lang->bug->resolvedByAB = 'Resolved'; $lang->bug->resolution = 'Solution'; $lang->bug->resolutionAB = 'Solution'; $lang->bug->resolvedBuild = 'Resolved Build'; -$lang->bug->resolvedDate = 'Resolved On'; -$lang->bug->resolvedDateAB = 'Resolved On'; +$lang->bug->resolvedDate = 'Resolved on'; +$lang->bug->resolvedDateAB = 'Resolved'; $lang->bug->deadline = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed On'; $lang->bug->duplicateBug = 'Duplicate'; -$lang->bug->lastEditedBy = 'Last Edited By'; -$lang->bug->linkBug = 'linked'; +$lang->bug->lastEditedBy = 'Edited By'; +$lang->bug->linkBug = 'Linked Bug'; $lang->bug->linkBugs = 'Link Bug'; $lang->bug->unlinkBug = 'Unlink'; $lang->bug->case = 'Case'; @@ -77,7 +79,8 @@ $lang->bug->confirmBug = 'Confirm'; $lang->bug->batchConfirm = 'Batch Confirm'; $lang->bug->edit = 'Edit'; $lang->bug->batchEdit = 'Batch Edit'; -$lang->bug->batchChangeModule = 'Batch Modify'; +$lang->bug->batchChangeModule = 'Batch Modify Module'; +$lang->bug->batchChangeBranch = 'Batch Modify Branch'; $lang->bug->batchClose = 'Batch Close'; $lang->bug->assignTo = 'Assign'; $lang->bug->batchAssignTo = 'Batch Assign'; @@ -87,35 +90,40 @@ $lang->bug->resolve = 'Resolve'; $lang->bug->batchResolve = 'Batch Resolve'; $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; -$lang->bug->batchActivate = 'batchActivate'; +$lang->bug->batchActivate = 'Batch Activate'; $lang->bug->reportChart = 'Report'; $lang->bug->export = 'Export'; $lang->bug->delete = 'Delete'; $lang->bug->deleted = 'Deleted'; $lang->bug->saveTemplate = 'Save as Template'; -$lang->bug->setPublic = 'Set as Public'; +$lang->bug->setPublic = 'Set as Public Template'; $lang->bug->deleteTemplate = 'Delete Template'; $lang->bug->confirmStoryChange = 'Confirm Story Change'; $lang->bug->copy = 'Copy'; /* 查询条件列表。*/ -$lang->bug->assignToMe = 'Assigned to Me'; -$lang->bug->openedByMe = 'Created by Me'; -$lang->bug->resolvedByMe = 'Resolved by Me'; -$lang->bug->closedByMe = 'Closed by Me'; +$lang->bug->assignToMe = 'AssignedToMe'; +$lang->bug->openedByMe = 'CreatedByMe'; +$lang->bug->resolvedByMe = 'ResolvedByMe'; +$lang->bug->closedByMe = 'ClosedByMe'; $lang->bug->assignToNull = 'Unassigned'; $lang->bug->unResolved = 'Unresolved'; -$lang->bug->toClosed = 'To Be Closed'; -$lang->bug->unclosed = 'Open'; +$lang->bug->toClosed = 'WaitForClose'; +$lang->bug->unclosed = 'Active'; +$lang->bug->unconfirmed = 'UnConfirmed'; $lang->bug->longLifeBugs = 'Pending'; $lang->bug->postponedBugs = 'Postponed'; $lang->bug->overdueBugs = 'Overdue'; $lang->bug->allBugs = 'All'; $lang->bug->byQuery = 'Search'; -$lang->bug->needConfirm = 'Story Change'; +$lang->bug->needConfirm = 'StoryChanged'; $lang->bug->allProduct = 'All' . $lang->productCommon; $lang->bug->my = 'My'; +$lang->bug->assignToMeAB = 'Assigned To Me'; +$lang->bug->openedByMeAB = 'Created By Me'; +$lang->bug->resolvedByMeAB = 'Resolved By Me'; + $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; @@ -136,7 +144,7 @@ $lang->bug->lblTypeAndSeverity = 'Type/Priority Level'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; $lang->bug->legendSteps = 'Repro Steps'; $lang->bug->legendComment = 'Note'; -$lang->bug->legendLife = 'Lifecycle'; +$lang->bug->legendLife = 'Life of Bug'; $lang->bug->legendMisc = 'Misc'; $lang->bug->legendRelated = 'Related Info'; @@ -216,7 +224,7 @@ $lang->bug->browserList['other'] = 'Other'; $lang->bug->typeList[''] = ''; $lang->bug->typeList['codeerror'] = 'Code Error'; -$lang->bug->typeList['interface'] = 'Interface Optimization'; +$lang->bug->typeList['interface'] = 'UI Optimization'; $lang->bug->typeList['config'] = 'Configuration'; $lang->bug->typeList['install'] = 'Install/Deploy'; $lang->bug->typeList['security'] = 'Security'; @@ -238,22 +246,22 @@ $lang->bug->confirmedList[1] = 'Yes'; $lang->bug->confirmedList[0] = 'No'; $lang->bug->resolutionList[''] = ''; -$lang->bug->resolutionList['bydesign'] = 'Design Issue'; +$lang->bug->resolutionList['bydesign'] = 'By Design'; $lang->bug->resolutionList['duplicate'] = 'Duplicated'; $lang->bug->resolutionList['external'] = 'External'; $lang->bug->resolutionList['fixed'] = 'Resolved'; $lang->bug->resolutionList['notrepro'] = 'Irreproducible'; $lang->bug->resolutionList['postponed'] = 'Postponed'; $lang->bug->resolutionList['willnotfix'] = "Not to Resolve"; -$lang->bug->resolutionList['tostory'] = 'Convert to Story'; +$lang->bug->resolutionList['tostory'] = 'Converted to Story'; /* 统计报表。*/ $lang->bug->report = new stdclass(); $lang->bug->report->common = 'Report'; $lang->bug->report->select = 'Select Report Type '; -$lang->bug->report->create = 'Generate a Report'; +$lang->bug->report->create = 'Generate Report'; -$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . 'Bugs'; +$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . ' Bugs'; $lang->bug->report->charts['bugsPerBuild'] = 'Bugs Per Build'; $lang->bug->report->charts['bugsPerModule'] = 'Bugs Per Module'; $lang->bug->report->charts['openedBugsPerDay'] = 'Reported Bugs Per Day'; @@ -361,14 +369,17 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = 'Choose Build...'; $lang->bug->placeholder->newBuildName = 'The name of new build'; -$lang->bug->mySelects['assigntome'] = $lang->bug->assignToMe; -$lang->bug->mySelects['openedbyme'] = $lang->bug->openedByMe; -$lang->bug->mySelects['resolvedbyme'] = $lang->bug->resolvedByMe; +$lang->bug->mySelects['assigntome'] = $lang->bug->assignToMeAB; +$lang->bug->mySelects['openedbyme'] = $lang->bug->openedByMeAB; +$lang->bug->mySelects['resolvedbyme'] = $lang->bug->resolvedByMeAB; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; + + + $lang->bug->featureBar['browse']['my'] = $lang->bug->my; -$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->confirmedList[0]; +$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->unconfirmed; $lang->bug->featureBar['browse']['assigntonull'] = $lang->bug->assignToNull; $lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved; $lang->bug->featureBar['browse']['toclosed'] = $lang->bug->toClosed; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 90b0fc7337..d04c8a23da 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -42,6 +42,8 @@ $lang->bug->openedDate = '创建日期'; $lang->bug->openedDateAB = '创建日期'; $lang->bug->openedBuild = '影响版本'; $lang->bug->assignedTo = '指派给'; +$lang->bug->assignBug = '指派给'; +$lang->bug->assignedToAB = '指派给'; $lang->bug->assignedDate = '指派日期'; $lang->bug->resolvedBy = '解决者'; $lang->bug->resolvedByAB = '解决'; @@ -78,6 +80,7 @@ $lang->bug->batchConfirm = '批量确认'; $lang->bug->edit = '编辑'; $lang->bug->batchEdit = '批量编辑'; $lang->bug->batchChangeModule = '批量修改模块'; +$lang->bug->batchChangeBranch = '批量修改分支'; $lang->bug->batchClose = '批量关闭'; $lang->bug->assignTo = '指派'; $lang->bug->batchAssignTo = '批量指派'; @@ -107,6 +110,7 @@ $lang->bug->assignToNull = '未指派'; $lang->bug->unResolved = '未解决'; $lang->bug->toClosed = '待关闭'; $lang->bug->unclosed = '未关闭'; +$lang->bug->unconfirmed = '未确认'; $lang->bug->longLifeBugs = '久未处理'; $lang->bug->postponedBugs = '被延期'; $lang->bug->overdueBugs = '过期Bug'; @@ -116,6 +120,10 @@ $lang->bug->needConfirm = '需求变动'; $lang->bug->allProduct = '所有' . $lang->productCommon; +$lang->bug->assignToMeAB = '指派给我'; +$lang->bug->openedByMeAB = '由我创建'; +$lang->bug->resolvedByMeAB = '由我解决'; + $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！'; @@ -154,8 +162,8 @@ $lang->bug->confirmDeleteTemplate = '您确认要删除该模板吗？'; /* 模板。*/ $lang->bug->tplStep = "

[步骤]

"; -$lang->bug->tplResult = "

[结果]

"; -$lang->bug->tplExpect = "

[期望]

"; +$lang->bug->tplResult = "

[结果]

"; +$lang->bug->tplExpect = "

[期望]

"; /* 各个字段取值列表。*/ $lang->bug->severityList[3] = '3'; @@ -361,12 +369,17 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '选择相关版本...'; $lang->bug->placeholder->newBuildName = '新版本名称'; + + + + $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe; $lang->bug->featureBar['browse']['openedbyme'] = $lang->bug->openedByMe; $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe; -$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->confirmedList[0]; + +$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->unconfirmed; $lang->bug->featureBar['browse']['assigntonull'] = $lang->bug->assignToNull; $lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved; $lang->bug->featureBar['browse']['toclosed'] = $lang->bug->toClosed; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 0e144dc698..7051f98f04 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -42,6 +42,8 @@ $lang->bug->openedDate = '創建日期'; $lang->bug->openedDateAB = '創建日期'; $lang->bug->openedBuild = '影響版本'; $lang->bug->assignedTo = '指派給'; +$lang->bug->assignBug = '指派給'; +$lang->bug->assignedToAB = '指派給'; $lang->bug->assignedDate = '指派日期'; $lang->bug->resolvedBy = '解決者'; $lang->bug->resolvedByAB = '解決'; @@ -72,12 +74,13 @@ $lang->bug->colorTag = '顏色標籤'; /* 方法列表。*/ $lang->bug->index = '首頁'; $lang->bug->create = '提Bug'; -$lang->bug->batchCreate = '批量添加'; +$lang->bug->batchCreate = '批量提Bug'; $lang->bug->confirmBug = '確認'; $lang->bug->batchConfirm = '批量確認'; $lang->bug->edit = '編輯'; $lang->bug->batchEdit = '批量編輯'; $lang->bug->batchChangeModule = '批量修改模組'; +$lang->bug->batchChangeBranch = '批量修改分支'; $lang->bug->batchClose = '批量關閉'; $lang->bug->assignTo = '指派'; $lang->bug->batchAssignTo = '批量指派'; @@ -107,6 +110,7 @@ $lang->bug->assignToNull = '未指派'; $lang->bug->unResolved = '未解決'; $lang->bug->toClosed = '待關閉'; $lang->bug->unclosed = '未關閉'; +$lang->bug->unconfirmed = '未確認'; $lang->bug->longLifeBugs = '久未處理'; $lang->bug->postponedBugs = '被延期'; $lang->bug->overdueBugs = '過期Bug'; @@ -115,6 +119,11 @@ $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求變動'; $lang->bug->allProduct = '所有' . $lang->productCommon; + +$lang->bug->assignToMeAB = '指派給我'; +$lang->bug->openedByMeAB = '由我創建'; +$lang->bug->resolvedByMeAB = '由我解決'; + $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！'; @@ -153,8 +162,8 @@ $lang->bug->confirmDeleteTemplate = '您確認要刪除該模板嗎？'; /* 模板。*/ $lang->bug->tplStep = "

[步驟]

"; -$lang->bug->tplResult = "

[結果]

"; -$lang->bug->tplExpect = "

[期望]

"; +$lang->bug->tplResult = "

[結果]

"; +$lang->bug->tplExpect = "

[期望]

"; /* 各個欄位取值列表。*/ $lang->bug->severityList[3] = '3'; @@ -216,17 +225,17 @@ $lang->bug->browserList['other'] = '其他'; $lang->bug->typeList[''] = ''; $lang->bug->typeList['codeerror'] = '代碼錯誤'; $lang->bug->typeList['interface'] = '界面優化'; -$lang->bug->typeList['designchange'] = '設計變更'; -$lang->bug->typeList['newfeature'] = '新增需求'; -$lang->bug->typeList['designdefect'] = '設計缺陷'; $lang->bug->typeList['config'] = '配置相關'; $lang->bug->typeList['install'] = '安裝部署'; $lang->bug->typeList['security'] = '安全相關'; $lang->bug->typeList['performance'] = '性能問題'; $lang->bug->typeList['standard'] = '標準規範'; $lang->bug->typeList['automation'] = '測試腳本'; -$lang->bug->typeList['trackthings'] = '事務跟蹤'; $lang->bug->typeList['others'] = '其他'; +$lang->bug->typeList['designchange'] = '設計變更'; +$lang->bug->typeList['newfeature'] = '新增需求'; +$lang->bug->typeList['designdefect'] = '設計缺陷'; +$lang->bug->typeList['trackthings'] = '事務跟蹤'; $lang->bug->statusList[''] = ''; $lang->bug->statusList['active'] = '激活'; @@ -360,12 +369,17 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '選擇相關版本...'; $lang->bug->placeholder->newBuildName = '新版本名稱'; + + + + $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe; $lang->bug->featureBar['browse']['openedbyme'] = $lang->bug->openedByMe; $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe; -$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->confirmedList[0]; + +$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->unconfirmed; $lang->bug->featureBar['browse']['assigntonull'] = $lang->bug->assignToNull; $lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved; $lang->bug->featureBar['browse']['toclosed'] = $lang->bug->toClosed; diff --git a/module/bug/model.php b/module/bug/model.php index 9e3a8bbd18..d812de7b2d 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2400,12 +2400,12 @@ class bugModel extends model case 'title': $class = 'confirm' . $bug->confirmed; echo "[{$this->lang->bug->confirmedList[$bug->confirmed]}] "; - if($bug->branch)echo "{$branches[$bug->branch]} "; - if($modulePairs and $bug->module)echo "{$modulePairs[$bug->module]} "; + if($bug->branch and isset($branches[$bug->branch])) echo "{$branches[$bug->branch]} "; + if($bug->module and isset($modulePairs[$bug->module])) echo "{$modulePairs[$bug->module]} "; echo $canView ? html::a($bugLink, $bug->title, null, "style='color: $bug->color'") : "{$bug->title}"; break; case 'branch': - echo $branches[$bug->branch]; + echo zget($branches, $bug->branch, ''); break; case 'project': echo zget($projects, $bug->project, ''); @@ -2467,7 +2467,23 @@ class bugModel extends model echo substr($bug->openedDate, 5, 11); break; case 'openedBuild': - foreach(explode(',', $bug->openedBuild) as $build) echo zget($builds, $build) . ' '; + $builds = array_flip($builds); + foreach(explode(',', $bug->openedBuild) as $build) + { + $buildID = zget($builds, $build, ''); + if($buildID == 'trunk') + { + echo $build; + } + elseif($buildID and common::hasPriv('build', 'view')) + { + echo html::a(helper::createLink('build', 'view', "buildID=$buildID"), $build, '', "title='$bug->openedBuild'"); + } + else + { + echo $build; + } + } break; case 'assignedTo': echo zget($users, $bug->assignedTo, $bug->assignedTo); @@ -2527,9 +2543,8 @@ class bugModel extends model public function sendmail($bugID, $actionID) { $this->loadModel('mail'); - $bug = $this->getByID($bugID); - $productName = $this->loadModel('product')->getById($bug->product)->name; - $users = $this->loadModel('user')->getPairs('noletter'); + $bug = $this->getByID($bugID); + $users = $this->loadModel('user')->getPairs('noletter'); /* Get action info. */ $action = $this->loadModel('action')->getById($actionID); @@ -2564,12 +2579,44 @@ class bugModel extends model ob_end_clean(); chdir($oldcwd); + $sendUsers = $this->getToAndCcList($bug); + if(!$sendUsers) return; + list($toList, $ccList) = $sendUsers; + $subject = $this->getSubject($bug); + + /* Send it. */ + $this->mail->send($toList, $subject, $mailContent, $ccList); + if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError())); + } + + /** + * Get subject. + * + * @param object $bug + * @access public + * @return string + */ + public function getSubject($bug) + { + $productName = $this->loadModel('product')->getById($bug->product)->name; + return 'BUG #'. $bug->id . ' ' . $bug->title . ' - ' . $productName; + } + + /** + * Get toList and ccList. + * + * @param object $bug + * @access public + * @return bool|array + */ + public function getToAndCcList($bug) + { /* Set toList and ccList. */ $toList = $bug->assignedTo; $ccList = trim($bug->mailto, ','); if(empty($toList)) { - if(empty($ccList)) return; + if(empty($ccList)) return false; if(strpos($ccList, ',') === false) { $toList = $ccList; @@ -2587,8 +2634,6 @@ class bugModel extends model $toList = $bug->resolvedBy; } - /* Send it. */ - $this->mail->send($toList, 'BUG #'. $bug->id . ' ' . $bug->title . ' - ' . $productName, $mailContent, $ccList); - if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError())); + return array($toList, $ccList); } } diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php index a4279e4d1e..b06b1b2330 100644 --- a/module/bug/view/assignto.html.php +++ b/module/bug/view/assignto.html.php @@ -20,14 +20,14 @@ js::set('page', 'assignedto');
icons['bug']);?> id;?> createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?> - bug->assignedTo;?> icons['assignTo']);?> + bug->assignBug;?> icons['assignTo']);?>
- + diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index 4b6dda944d..8e61ff3e94 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -39,7 +39,7 @@ foreach(explode(',', $showFields) as $field) - + @@ -77,9 +77,9 @@ foreach(explode(',', $showFields) as $field) $os = $i == 0 ? '' : 'ditto'; $browser = $i == 0 ? '' : 'ditto'; ?> - + - + @@ -90,11 +90,11 @@ foreach(explode(',', $showFields) as $field) - - - - - + + + + + @@ -110,9 +110,9 @@ foreach(explode(',', $showFields) as $field) $os = $i - $nextStart == 0 ? '' : 'ditto'; $browser = $i - $nextStart == 0 ? '' : 'ditto'; ?> - + - + @@ -123,11 +123,11 @@ foreach(explode(',', $showFields) as $field) - - - - - + + + + + @@ -139,9 +139,9 @@ foreach(explode(',', $showFields) as $field)
bug->assignedTo;?>bug->assignBug;?> assignedTo, "class='form-control chosen'");?>
idAB;?> '> product->branch;?>'> bug->module;?> bug->module;?> '>bug->project;?> bug->openedBuild;?> bug->title;?>
'>' style='overflow:visible'> ' style='overflow:visible'> ' style='overflow:visible'> '> '> bug->typeList, $type, "class='form-control'");?>'> bug->priList, $pri, "class='form-control'");?>'>bug->severityList, '', "class='form-control'");?>'> bug->osList, $os, "class='form-control'");?>'> bug->browserList, $browser, "class='form-control'");?>' style='overflow:visible'> bug->typeList, $type, "class='form-control chosen'");?>' style='overflow:visible'> bug->priList, $pri, "class='form-control chosen'");?>' style='overflow:visible'>bug->severityList, '', "class='form-control chosen'");?>' style='overflow:visible'> bug->osList, $os, "class='form-control chosen'");?>' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?> '>
'>' style='overflow:visible'> ' style='overflow:visible'> ' style='overflow:visible'> '> '> bug->typeList, $type, "class='form-control'");?>'> bug->priList, $pri, "class='form-control'");?>'>bug->severityList, '', "class='form-control'");?>'> bug->osList, $os, "class='form-control'");?>'> bug->browserList, $browser, "class='form-control'");?>' style='overflow:visible'> bug->typeList, $type, "class='form-control chosen'");?>' style='overflow:visible'> bug->priList, $pri, "class='form-control chosen'");?>' style='overflow:visible'>bug->severityList, '', "class='form-control chosen'");?>' style='overflow:visible'> bug->osList, $os, "class='form-control chosen'");?>' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?> '>
- + - + @@ -152,11 +152,11 @@ foreach(explode(',', $showFields) as $field) - - - - - + + + + + diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index d96aed6646..c81ee70997 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -87,22 +87,22 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow moduleName, $this->methodName) as $menuItem):?> hidden)) continue;?> config->global->flow == 'onlyTest' and $menuItem->name == 'needconfirm') continue;?> - name, 'QUERY' === 0) ? 'bySearch' : $menuItem->name;?> + name, 'QUERY' === 0) ? 'bySearch' : $menuItem->name;?> name, 'QUERY' === 0) ? (int)substr($menuItem->name, 5) : 0;?> name == 'my'):?> "; - echo html::a('javascript:;', $menuItem->text . " ", '', "data-toggle='dropdown'"); - echo "
    "; - foreach ($lang->bug->mySelects as $key => $value) - { - echo ''; - echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$key¶m=$param"), $value); - } - echo '
'; + echo "
  • "; + echo html::a('javascript:;', $menuItem->text . " ", '', "data-toggle='dropdown'"); + echo "
      "; + foreach ($lang->bug->mySelects as $key => $value) + { + echo ''; + echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$key¶m=$param"), $value); + } + echo '
    • '; ?> -
  • createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$browseType¶m=$param"), $menuItem->text)?>
    • +
  • createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType¶m=$param"), $menuItem->text)?>
  •  bug->byQuery;?>
    • @@ -137,7 +137,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow else { $misc = common::hasPriv('bug', 'create') ? "class='btn btn-primary'" : "class='btn btn-primary disabled'"; - $link = common::hasPriv('bug', 'create') ? $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID") : '#'; + $link = common::hasPriv('bug', 'create') ? $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID") : '#'; echo html::a($link, "" . $lang->bug->create, '', $misc); } @@ -330,7 +330,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow foreach ($memberPairs as $key => $value) { if(empty($key)) continue; - echo "
  • " . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '
    • '; + echo "
  • " . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', '') . '
    • '; } echo ""; if($withSearch) echo "
    "; diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index a1ba83fc4f..6936c712b5 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -74,15 +74,15 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); unset($lang->bug->typeList['designchange']); unset($lang->bug->typeList['newfeature']); unset($lang->bug->typeList['trackthings']); - echo html::select('type', $lang->bug->typeList, $type, "class='form-control'"); + echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'"); ?> bug->os?> - bug->osList, $os, "class='form-control'");?> + bug->osList, $os, "class='form-control chosen'");?> bug->browser?> - bug->browserList, $browser, "class='form-control'");?> + bug->browserList, $browser, "class='form-control chosen'");?> @@ -129,15 +129,15 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); unset($lang->bug->typeList['designchange']); unset($lang->bug->typeList['newfeature']); unset($lang->bug->typeList['trackthings']); - echo html::select('type', $lang->bug->typeList, $type, "class='form-control'"); + echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'"); ?> bug->os?> - bug->osList, $os, "class='form-control'");?> + bug->osList, $os, "class='form-control chosen'");?> bug->browser?> - bug->browserList, $browser, "class='form-control'");?> + bug->browserList, $browser, "class='form-control chosen'");?> @@ -165,7 +165,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); $hasCustomSeverity = false; foreach($lang->bug->severityList as $severityKey => $severityValue) { - if($severityKey != $severityValue) + if($severityKey != $severityValue or strlen($severityKey) != strlen($severityValue)) { $hasCustomSeverity = true; break; @@ -173,7 +173,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); } ?> - bug->severityList, $severity, "class='form-control minw-80px'");?> + bug->severityList, $severity, "class='form-control minw-80px chosen'");?>
    - + - + - + @@ -151,11 +151,11 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - + - + @@ -163,7 +163,10 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - +
    %s'>' style='overflow:visible'> ' style='overflow:visible'> ' style='overflow:visible'> '> '> bug->typeList, $type, "class='form-control'");?>'> bug->priList, '', "class='form-control'");?>'>bug->severityList, '', "class='form-control'");?>'> bug->osList, $os, "class='form-control'");?>'> bug->browserList, $browser, "class='form-control'");?>' style='overflow:visible'> bug->typeList, $type, "class='form-control'");?>' style='overflow:visible'> bug->priList, '', "class='form-control'");?>' style='overflow:visible'>bug->severityList, '', "class='form-control'");?>' style='overflow:visible'> bug->osList, $os, "class='form-control'");?>' style='overflow:visible'> bug->browserList, $browser, "class='form-control'");?> '>
    bug->severity;?>bug->severityList, $bug->severity, "class='form-control'");?>bug->severityList, $bug->severity, "class='form-control chosen'");?>
    bug->pri;?>bug->priList, $bug->pri, "class='form-control'");?>bug->priList, $bug->pri, "class='form-control chosen'");?>
    bug->status;?>bug->statusList, $bug->status, "class='form-control'");?>bug->statusList, $bug->status, "class='form-control chosen'");?>
    bug->confirmed;?>
    bug->os;?>bug->osList, $bug->os, "class='form-control'");?>bug->osList, $bug->os, "class='form-control chosen'");?>
    bug->browser;?>bug->browserList, $bug->browser, "class='form-control'");?>bug->browserList, $bug->browser, "class='form-control chosen'");?>
    bug->keywords;?>
    bug->mailto;?>mailto), 'class="form-control chosen" multiple');?> + mailto), 'class="form-control chosen" multiple');?> + fetch('my', 'buildContactLists');?> +
    diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php index 2b3242d339..99d13ee63a 100644 --- a/module/bug/view/report.html.php +++ b/module/bug/view/report.html.php @@ -40,8 +40,13 @@
    - bug->report->common;?> - report->notice->help?> + bug->report->common;?> +
    + report->typeList as $type => $typeName):?> + + +
    + report->notice->help?>
    @@ -81,4 +86,8 @@ + + + + diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index 8b4bde42fc..f2efd953d5 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -28,7 +28,7 @@ js::set('productID' , $bug->product);
    - + diff --git a/module/bug/view/sendmail.html.php b/module/bug/view/sendmail.html.php index bd70d8ee20..f949c6399e 100644 --- a/module/bug/view/sendmail.html.php +++ b/module/bug/view/sendmail.html.php @@ -16,7 +16,10 @@ diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 1f26194dbf..1cfa6ae009 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -107,7 +107,7 @@
    bug->resolution;?>bug->resolution;?> bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?>
    - +
    config->mail, 'domain', common::getSysURL()) . helper::createLink('bug', 'view', "bugID=$bug->id"), $mailTitle, '', "style='color: #333; text-decoration: underline;'");?> + color) ? '#333' : $bug->color;?> + config->mail, 'domain', common::getSysURL()) . helper::createLink('bug', 'view', "bugID=$bug->id"), $mailTitle, '', "style='color: {$color}; text-decoration: underline;'");?> +
    - + session->currentProductType != 'normal'):?> @@ -239,7 +239,7 @@
    bug->product;?>bug->product;?> product", $productName)) echo $productName;?>
    - + @@ -288,7 +288,7 @@
    bug->openedBy;?>bug->openedBy;?> openedBy) . $lang->at . $bug->openedDate;?>
    - + - + - + diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 2a5406e30f..e4ad7a3649 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -102,7 +102,7 @@ tfoot tr td .table-actions .btn{display:none;} - + @@ -162,7 +162,7 @@ tfoot tr td .table-actions .btn{display:none;} - + diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 2946a1b829..7329269936 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -27,9 +27,10 @@ $lang->aboutZenTao = 'ZenTao'; $lang->profile = 'Profile'; $lang->changePassword = 'Password'; $lang->runInfo = "
    Time %s MS, Memory %s KB, Query %s.
    "; -$lang->agreement = "I have read and agreed to the terms and conditions of Z PUBLIC LICENSE 1.2 . Without authorization, I should not remove, hide, or cover any logos/links of ZenTao."; +$lang->agreement = "I have read and agreed to the terms and conditions of Z PUBLIC LICENSE 1.2 . Without authorization, I should not remove, hide or cover any logos/links of ZenTao."; $lang->reset = 'Reset'; +$lang->cancel = 'Cancel'; $lang->refresh = 'Refresh'; $lang->edit = 'Edit'; $lang->delete = 'Delete'; @@ -46,7 +47,7 @@ $lang->goback = 'Back'; $lang->goPC = 'PC'; $lang->more = 'More'; $lang->day = 'Day'; -$lang->customConfig = 'Custom'; +$lang->customConfig = 'Custom Configuration'; $lang->public = 'Public'; $lang->trunk = 'Trunk'; $lang->sort = 'Order'; @@ -93,7 +94,7 @@ $lang->workingHour = 'Hour'; $lang->idAB = 'ID'; $lang->priAB = 'P'; $lang->statusAB = 'Status'; -$lang->openedByAB = 'Created by'; +$lang->openedByAB = 'Creator'; $lang->assignedToAB = 'Assignee'; $lang->typeAB = 'Type'; @@ -102,14 +103,17 @@ $lang->common->common = 'Common Module'; /* 主导航菜单。*/ $lang->menu = new stdclass(); -$lang->menu->my = 'Dashboard|my|index'; -$lang->menu->product = $lang->productCommon . '|product|index'; -$lang->menu->project = $lang->projectCommon . '|project|index'; -$lang->menu->qa = 'QA|qa|index'; -$lang->menu->doc = 'Doc|doc|index'; -$lang->menu->report = 'Report|report|index'; -$lang->menu->company = 'Company|company|index'; -$lang->menu->admin = 'Admin|admin|index'; +$lang->menu->my = 'Dashboard|my|index'; +$lang->menu->product = $lang->productCommon . '|product|index'; +$lang->menu->project = $lang->projectCommon . '|project|index'; +$lang->menu->qa = 'QA|qa|index'; +$lang->menu->doc = 'Doc|doc|index'; +$lang->menu->report = 'Report|report|index'; +$lang->menu->company = 'Company|company|index'; + +$lang->adminMenu = 'Admin|admin|index'; + +$lang->dividerMenu = ',qa,'; /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; @@ -163,9 +167,8 @@ $lang->index->menu->project = "{$lang->projectCommon}|project|browse"; $lang->my = new stdclass(); $lang->my->menu = new stdclass(); -$lang->my->menu->account = array('link' => ' %s' . $lang->arrow . '', 'fixed' => true); $lang->my->menu->index = 'Home|my|index'; -$lang->my->menu->todo = array('link' => 'To-Do|my|todo|', 'subModule' => 'todo'); +$lang->my->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->task = array('link' => 'Task|my|task|', 'subModule' => 'task'); $lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); $lang->my->menu->testtask = array('link' => 'Test Task|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); @@ -337,16 +340,15 @@ $lang->user->menu = $lang->company->menu; $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->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom'); -$lang->admin->menu->mail = array('link' => 'Email|mail|index', 'subModule' => 'mail'); +$lang->admin->menu->message = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook'); $lang->admin->menu->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup'); $lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' => 'checkweak'); $lang->admin->menu->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron'); $lang->admin->menu->trashes = array('link' => 'Recycle|action|trash', 'subModule' => 'action'); $lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); -$lang->admin->menu->api = array('link' => 'API|webhook|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook'); $lang->admin->menu->sso = 'RangerTeam|admin|sso'; -//$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension'); $lang->convert = new stdclass(); $lang->upgrade = new stdclass(); @@ -360,6 +362,7 @@ $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->convert->menu = $lang->admin->menu; @@ -374,6 +377,7 @@ $lang->mail->menu = $lang->admin->menu; $lang->dev->menu = $lang->admin->menu; $lang->entry->menu = $lang->admin->menu; $lang->webhook->menu = $lang->admin->menu; +$lang->message->menu = $lang->admin->menu; /* 菜单分组。*/ $lang->menugroup = new stdclass(); @@ -407,6 +411,7 @@ $lang->menugroup->mail = 'admin'; $lang->menugroup->dev = 'admin'; $lang->menugroup->entry = 'admin'; $lang->menugroup->webhook = 'admin'; +$lang->menugroup->message = 'admin'; /* 错误提示信息。*/ $lang->error = new stdclass(); @@ -423,6 +428,7 @@ $lang->error->int = array("『%s』should be numbers", "『%s』shou $lang->error->float = "『%s』should be numbers, decimals included."; $lang->error->email = "『%s』should be valid Email."; $lang->error->date = "『%s』should be valid date."; +$lang->error->datetime = "『%s』should be valid date."; $lang->error->code = "『%s』should be letters or numbers."; $lang->error->account = "『%s』should be valid account."; $lang->error->passwordsame = "Two passwords should be consistent."; @@ -433,28 +439,9 @@ $lang->error->noData = 'No Data'; $lang->error->editedByOther = 'This record might have been changed. Please refresh and try to edit again!'; $lang->error->tutorialData = 'No data can be imported in tutorial mode. Please exit tutorial first!'; -if(!defined('PARAM_CODE_MISSING')) define('PARAM_CODE_MISSING', 301); -if(!defined('PARAM_TOKEN_MISSING')) define('PARAM_TOKEN_MISSING', 302); -if(!defined('INVALID_ENTRY')) define('INVALID_ENTRY', 311); -if(!defined('EMPTY_KEY')) define('EMPTY_KEY', 312); -if(!defined('IP_DENIED')) define('IP_DENIED', 321); -if(!defined('INVALID_TOKEN')) define('INVALID_TOKEN', 331); -if(!defined('SESSION_CODE_MISSING')) define('SESSION_CODE_MISSING', 341); -if(!defined('SESSION_VERIFY_FAILED')) define('SESSION_VERIFY_FAILED', 342); - -$lang->error->entry = array(); -$lang->error->entry['PARAM_CODE_MISSING'] = 'Param code is missing.'; -$lang->error->entry['PARAM_TOKEN_MISSING'] = 'Param token is missing.'; -$lang->error->entry['INVALID_ENTRY'] = 'Entry does not exist.'; -$lang->error->entry['EMPTY_KEY'] = 'Key of entry is missing.'; -$lang->error->entry['IP_DENIED'] = 'IP is denied.'; -$lang->error->entry['INVALID_TOKEN'] = 'Invalid token.'; -$lang->error->entry['SESSION_CODE_MISSING'] = 'Session code is missing.'; -$lang->error->entry['SESSION_VERIFY_FAILED'] = 'Session verification failed.'; - /* 分页信息。*/ $lang->pager = new stdclass(); -$lang->pager->noRecord = "No History"; +$lang->pager->noRecord = "No Records"; $lang->pager->digest = " %s in total. %s %s/%s   "; $lang->pager->recPerPage = " %s per page"; $lang->pager->first = ""; @@ -468,17 +455,18 @@ $lang->pager->summery = "%s-%s of %s."; $lang->proVersion = "ZenTao Pro   "; $lang->downNotify = "Download Desktop Notification"; +$lang->website = "http://www.zentao.pm"; $lang->suhosinInfo = "Warning! Data is reaching the limit. Please change sohusin.post.max_vars and sohusin.request.max_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; $lang->maxVarsInfo = "Warning! Data is reaching the limit. Please change max_input_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; -$lang->pasteTextInfo = "Paste text here. Each line will be a header of each data record. "; +$lang->pasteTextInfo = "Paste text here. Each line will be the title of each record. "; $lang->noticeImport = "

    Imported data contains data that has already existed in system. Please confirm you actions on the date

    Override New Insertion

    "; $lang->noResultsMatch = "No results match!"; $lang->searchMore = "More results："; $lang->chooseUsersToMail = "Choose users that will be notified."; $lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.'; -$lang->noticePasteImg = "Paste image here."; +$lang->noticePasteImg = "Support pasting images."; /* 时间格式设置。*/ if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); @@ -551,8 +539,8 @@ $lang->icons['post'] = 'edit'; $lang->icons['batchCreate'] = 'plus-sign'; $lang->icons['batchEdit'] = 'edit-sign'; $lang->icons['batchClose'] = 'off'; -$lang->icons['edit'] = 'pencil'; -$lang->icons['delete'] = 'remove'; +$lang->icons['edit'] = 'edit'; +$lang->icons['delete'] = 'trash'; $lang->icons['copy'] = 'copy'; $lang->icons['report'] = 'bar-chart'; $lang->icons['export'] = 'download-alt'; diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 482565d152..e6edf25c96 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -16,7 +16,7 @@ $lang->index->menuOrder[10] = 'project'; /* my menu order. */ $lang->my->menuOrder[5] = 'account'; $lang->my->menuOrder[10] = 'index'; -$lang->my->menuOrder[15] = 'todo'; +$lang->my->menuOrder[15] = 'calendar'; $lang->my->menuOrder[20] = 'task'; $lang->my->menuOrder[25] = 'bug'; $lang->my->menuOrder[30] = 'testtask'; @@ -112,6 +112,7 @@ $lang->user->menuOrder = $lang->company->menuOrder; $lang->admin->menuOrder[5] = 'index'; $lang->admin->menuOrder[10] = 'extension'; $lang->admin->menuOrder[15] = 'custom'; +$lang->admin->menuOrder[19] = 'message'; $lang->admin->menuOrder[20] = 'mail'; $lang->admin->menuOrder[25] = 'custom'; $lang->admin->menuOrder[30] = 'convert'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 7a19df6df4..86461e1c18 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -23,13 +23,14 @@ $lang->welcome = "%s项目管理系统"; $lang->logout = '退出'; $lang->login = '登录'; $lang->help = '帮助'; -$lang->aboutZenTao = '关于'; +$lang->aboutZenTao = '关于禅道'; $lang->profile = '个人档案'; $lang->changePassword = '更改密码'; $lang->runInfo = "
    时间: %s 毫秒, 内存: %s KB, 查询: %s.
    "; $lang->agreement = "已阅读并同意《Z PUBLIC LICENSE授权协议1.2》。未经许可，不得去除、隐藏或遮掩禅道软件的任何标志及链接。"; $lang->reset = '重填'; +$lang->cancel = '取消'; $lang->refresh = '刷新'; $lang->edit = '编辑'; $lang->delete = '删除'; @@ -86,9 +87,9 @@ $lang->loading = '稍候...'; $lang->notFound = '抱歉，您访问的对象并不存在！'; $lang->showAll = '[[全部显示]]'; -$lang->future = '未来'; -$lang->year = '年'; -$lang->workingHour = '工时'; +$lang->future = '未来'; +$lang->year = '年'; +$lang->workingHour = '工时'; $lang->idAB = 'ID'; $lang->priAB = 'P'; @@ -102,14 +103,17 @@ $lang->common->common = '公有模块'; /* 主导航菜单。*/ $lang->menu = new stdclass(); -$lang->menu->my = ' 我的地盘|my|index'; -$lang->menu->product = $lang->productCommon . '|product|index'; -$lang->menu->project = $lang->projectCommon . '|project|index'; -$lang->menu->qa = '测试|qa|index'; -$lang->menu->doc = '文档|doc|index'; -$lang->menu->report = '统计|report|index'; -$lang->menu->company = '组织|company|index'; -$lang->menu->admin = '后台|admin|index'; +$lang->menu->my = ' 我的地盘|my|index'; +$lang->menu->product = $lang->productCommon . '|product|index'; +$lang->menu->project = $lang->projectCommon . '|project|index'; +$lang->menu->qa = '测试|qa|index'; +$lang->menu->doc = '文档|doc|index'; +$lang->menu->report = '统计|report|index'; +$lang->menu->company = '组织|company|index'; + +$lang->adminMenu = '后台|admin|index'; + +$lang->dividerMenu = ',qa,'; /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; @@ -145,12 +149,12 @@ $lang->exportTypeList['selected'] = '选中记录'; $lang->lang = 'Language'; /* 风格列表。*/ -$lang->theme = '主题'; -$lang->themes['default'] = '默认'; -$lang->themes['green'] = '绿色'; -$lang->themes['red'] = '红色'; -$lang->themes['lightblue'] = '亮蓝'; -$lang->themes['blackberry'] = '黑莓'; +$lang->theme = '主题'; +$lang->themes['default'] = '默认'; +$lang->themes['green'] = '绿色'; +$lang->themes['red'] = '红色'; +$lang->themes['lightblue'] = '亮蓝'; +$lang->themes['blackberry'] = '黑莓'; /* 首页菜单设置。*/ $lang->index = new stdclass(); @@ -163,9 +167,8 @@ $lang->index->menu->project = "浏览{$lang->projectCommon}|project|browse"; $lang->my = new stdclass(); $lang->my->menu = new stdclass(); -$lang->my->menu->account = array('link' => ' %s' . $lang->arrow . '', 'fixed' => true); $lang->my->menu->index = '首页|my|index'; -$lang->my->menu->todo = array('link' => '待办|my|todo|', 'subModule' => 'todo'); +$lang->my->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->task = array('link' => '任务|my|task|', 'subModule' => 'task'); $lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); $lang->my->menu->testtask = array('link' => '测试|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); @@ -187,20 +190,20 @@ $lang->score->menu = $lang->my->menu; $lang->product = new stdclass(); $lang->product->menu = new stdclass(); -$lang->product->menu->list = array('link' => '%s', 'fixed' => true); -$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); -$lang->product->menu->dynamic = '动态|product|dynamic|productID=%s'; -$lang->product->menu->plan = array('link' => '计划|productplan|browse|productID=%s', 'subModule' => 'productplan'); -$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); -$lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s'; -$lang->product->menu->doc = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; -$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story'; -$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); -$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; -$lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); -$lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); -$lang->product->menu->index = array('link' => "{$lang->productCommon}主页|product|index|locate=no", 'float' => 'right'); +$lang->product->menu->list = array('link' => '%s', 'fixed' => true); +$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->dynamic = '动态|product|dynamic|productID=%s'; +$lang->product->menu->plan = array('link' => '计划|productplan|browse|productID=%s', 'subModule' => 'productplan'); +$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); +$lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s'; +$lang->product->menu->doc = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); +$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; +$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story'; +$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); +$lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); +$lang->product->menu->index = array('link' => "{$lang->productCommon}主页|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); @@ -216,20 +219,20 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->list = array('link' => '%s', 'fixed' => true); -$lang->project->menu->task = array('link' => '任务|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); -$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; -$lang->project->menu->dynamic = '动态|project|dynamic|projectID=%s'; -$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); -$lang->project->menu->testtask = array('link' => '测试单|project|testtask|projectID=%s'); -$lang->project->menu->team = array('link' => '团队|project|team|projectID=%s', 'alias' => 'managemembers'); -$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->view = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); -$lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); -$lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); -$lang->project->menu->index = array('link' => "{$lang->projectCommon}主页|project|index|locate=no", 'float' => 'right'); +$lang->project->menu->list = array('link' => '%s', 'fixed' => true); +$lang->project->menu->task = array('link' => '任务|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); +$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); +$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; +$lang->project->menu->dynamic = '动态|project|dynamic|projectID=%s'; +$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); +$lang->project->menu->testtask = array('link' => '测试单|project|testtask|projectID=%s'); +$lang->project->menu->team = array('link' => '团队|project|team|projectID=%s', 'alias' => 'managemembers'); +$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->view = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); +$lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); +$lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); +$lang->project->menu->index = array('link' => "{$lang->projectCommon}主页|project|index|locate=no", 'float' => 'right'); $lang->task = new stdclass(); $lang->build = new stdclass(); @@ -296,9 +299,9 @@ $lang->caselib->menu->index = array('link' => "测 $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); -$lang->doc->menu->list = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->create = array('link' => ' 添加文档库|doc|createLib', 'float' => 'right'); +$lang->doc->menu->list = array('link' => '%s', 'fixed' => true); +$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); +$lang->doc->menu->create = array('link' => ' 添加文档库|doc|createLib', 'float' => 'right'); /* 统计视图菜单设置。*/ $lang->report = new stdclass(); @@ -339,13 +342,12 @@ $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => '首页|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); $lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension'); $lang->admin->menu->custom = array('link' => '自定义|custom|set', 'subModule' => 'custom'); -$lang->admin->menu->mail = array('link' => '发信|mail|index', 'subModule' => 'mail'); +$lang->admin->menu->message = array('link' => '消息|message|index', 'subModule' => 'message,mail,webhook'); $lang->admin->menu->backup = array('link' => '备份|backup|index', 'subModule' => 'backup'); $lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' => 'checkweak'); $lang->admin->menu->cron = array('link' => '计划任务|cron|index', 'subModule' => 'cron'); $lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action'); $lang->admin->menu->dev = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); -$lang->admin->menu->api = array('link' => '接口|webhook|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook'); $lang->admin->menu->sso = '然之集成|admin|sso'; $lang->convert = new stdclass(); @@ -360,6 +362,7 @@ $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->convert->menu = $lang->admin->menu; @@ -374,6 +377,7 @@ $lang->mail->menu = $lang->admin->menu; $lang->dev->menu = $lang->admin->menu; $lang->entry->menu = $lang->admin->menu; $lang->webhook->menu = $lang->admin->menu; +$lang->message->menu = $lang->admin->menu; /* 菜单分组。*/ $lang->menugroup = new stdclass(); @@ -407,6 +411,7 @@ $lang->menugroup->mail = 'admin'; $lang->menugroup->dev = 'admin'; $lang->menugroup->entry = 'admin'; $lang->menugroup->webhook = 'admin'; +$lang->menugroup->message = 'admin'; /* 错误提示信息。*/ $lang->error = new stdclass(); @@ -423,6 +428,7 @@ $lang->error->int = array("『%s』应当是数字。", "『%s』应 $lang->error->float = "『%s』应当是数字，可以是小数。"; $lang->error->email = "『%s』应当为合法的EMAIL。"; $lang->error->date = "『%s』应当为合法的日期。"; +$lang->error->datetime = "『%s』应当为合法的日期。"; $lang->error->code = "『%s』应当为字母或数字的组合。"; $lang->error->account = "『%s』应当为合法的用户名。"; $lang->error->passwordsame = "两次密码应当相等。"; @@ -433,25 +439,6 @@ $lang->error->noData = '没有数据'; $lang->error->editedByOther = '该记录可能已经被改动。请刷新页面重新编辑！'; $lang->error->tutorialData = '新手模式下不会插入数据，请退出新手模式操作'; -if(!defined('PARAM_CODE_MISSING')) define('PARAM_CODE_MISSING', 301); -if(!defined('PARAM_TOKEN_MISSING')) define('PARAM_TOKEN_MISSING', 302); -if(!defined('INVALID_ENTRY')) define('INVALID_ENTRY', 311); -if(!defined('EMPTY_KEY')) define('EMPTY_KEY', 312); -if(!defined('IP_DENIED')) define('IP_DENIED', 321); -if(!defined('INVALID_TOKEN')) define('INVALID_TOKEN', 331); -if(!defined('SESSION_CODE_MISSING')) define('SESSION_CODE_MISSING', 341); -if(!defined('SESSION_VERIFY_FAILED')) define('SESSION_VERIFY_FAILED', 342); - -$lang->error->entry = array(); -$lang->error->entry['PARAM_CODE_MISSING'] = '缺少code参数'; -$lang->error->entry['PARAM_TOKEN_MISSING'] = '缺少token参数'; -$lang->error->entry['INVALID_ENTRY'] = '应用不存在'; -$lang->error->entry['EMPTY_KEY'] = '应用未设置密钥'; -$lang->error->entry['IP_DENIED'] = '该IP访问被限制访问'; -$lang->error->entry['INVALID_TOKEN'] = '不合法的token参数'; -$lang->error->entry['SESSION_CODE_MISSING'] = '缺少session code'; -$lang->error->entry['SESSION_VERIFY_FAILED'] = 'session验证失败'; - /* 分页信息。*/ $lang->pager = new stdclass(); $lang->pager->noRecord = "暂时没有记录"; @@ -466,31 +453,32 @@ $lang->pager->previousPage = "上一页"; $lang->pager->nextPage = "下一页"; $lang->pager->summery = "第 %s-%s 项，共 %s 项"; -$lang->proVersion = "专业版   "; -$lang->downNotify = "下载桌面提醒"; +$lang->proVersion = "专业版   "; +$lang->downNotify = "下载桌面提醒"; +$lang->website = "http://www.zentao.net"; $lang->suhosinInfo = "警告：数据太多，请在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars（大于%s的数）。 保存并重新启动apache或php-fpm，否则会造成部分数据无法保存。"; $lang->maxVarsInfo = "警告：数据太多，请在php.ini中修改max_input_vars（大于%s的数）。 保存并重新启动apache或php-fpm，否则会造成部分数据无法保存。"; $lang->pasteTextInfo = "粘贴文本到文本域中，每行文字作为一条数据的标题。"; $lang->noticeImport = "

    导入数据中，含有已经存在系统的数据，请确认这些数据要覆盖或者全新插入

    覆盖 全新插入

    "; -$lang->noResultsMatch = "没有匹配结果"; -$lang->searchMore = "搜索此关键字的更多结果："; -$lang->chooseUsersToMail = "选择要发信通知的用户..."; -$lang->browserNotice = '你目前使用的浏览器可能无法得到最佳浏览效果，建议使用Chrome、火狐、IE9+、Opera、Safari浏览器。'; -$lang->noticePasteImg = "可以在编辑器直接贴图。"; +$lang->noResultsMatch = "没有匹配结果"; +$lang->searchMore = "搜索此关键字的更多结果："; +$lang->chooseUsersToMail = "选择要发信通知的用户..."; +$lang->browserNotice = '你目前使用的浏览器可能无法得到最佳浏览效果，建议使用Chrome、火狐、IE9+、Opera、Safari浏览器。'; +$lang->noticePasteImg = "可以在编辑器直接贴图。"; /* 时间格式设置。*/ -if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); -if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i'); -if(!defined('DT_MONTHTIME1'))define('DT_MONTHTIME1', 'n/d H:i'); -if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n月d日 H:i'); -if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); -if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); -if(!defined('DT_DATE3')) define('DT_DATE3', 'Y年m月d日'); -if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日'); -if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); -if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); +if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); +if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i'); +if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i'); +if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n月d日 H:i'); +if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); +if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); +if(!defined('DT_DATE3')) define('DT_DATE3', 'Y年m月d日'); +if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日'); +if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); +if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); /* datepicker 时间*/ $lang->datepicker = new stdclass(); @@ -551,8 +539,8 @@ $lang->icons['post'] = 'edit'; $lang->icons['batchCreate'] = 'plus-sign'; $lang->icons['batchEdit'] = 'edit-sign'; $lang->icons['batchClose'] = 'off'; -$lang->icons['edit'] = 'pencil'; -$lang->icons['delete'] = 'remove'; +$lang->icons['edit'] = 'edit'; +$lang->icons['delete'] = 'trash'; $lang->icons['copy'] = 'copy'; $lang->icons['report'] = 'bar-chart'; $lang->icons['export'] = 'download-alt'; @@ -608,7 +596,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyStory') /* Adjust sub menu of product module. */ unset($lang->product->menu->project); unset($lang->product->menu->doc); - + /* Rename product module. */ $lang->menu->product = "{$lang->productCommon}|product|index"; @@ -761,15 +749,15 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->testtask->menu->report = array('link' => '报告|testreport|browse', 'alias' => 'view,create,edit'); $lang->testtask->menu->create = array('link' => " 提交测试|testtask|create|productID=%s", 'float' => 'right'); - $lang->testtask->menuOrder[5] = 'product'; - $lang->testtask->menuOrder[10] = 'scope'; - $lang->testtask->menuOrder[15] = 'wait'; - $lang->testtask->menuOrder[20] = 'doing'; - $lang->testtask->menuOrder[25] = 'blocked'; - $lang->testtask->menuOrder[30] = 'done'; - $lang->testtask->menuOrder[35] = 'totalStatus'; - $lang->testtask->menuOrder[40] = 'report'; - $lang->testtask->menuOrder[45] = 'create'; + $lang->testtask->menuOrder[5] = 'product'; + $lang->testtask->menuOrder[10] = 'scope'; + $lang->testtask->menuOrder[15] = 'wait'; + $lang->testtask->menuOrder[20] = 'doing'; + $lang->testtask->menuOrder[25] = 'blocked'; + $lang->testtask->menuOrder[30] = 'done'; + $lang->testtask->menuOrder[35] = 'totalStatus'; + $lang->testtask->menuOrder[40] = 'report'; + $lang->testtask->menuOrder[45] = 'create'; $lang->testreport->menu = $lang->testtask->menu; $lang->testreport->menuOrder = $lang->testtask->menuOrder; @@ -806,7 +794,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->build->menu = $lang->product->menu; $lang->build->menuOrder = $lang->product->menuOrder; - + /* Adjust menu group. */ $lang->menugroup->bug = 'bug'; $lang->menugroup->testcase = 'testcase'; @@ -814,8 +802,8 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->menugroup->testsuite = 'testsuite'; $lang->menugroup->testreport = 'testtask'; $lang->menugroup->build = 'product'; - - /* Adjust search objects. */ + + /* Adjust search objects. */ unset($lang->searchObjects['story']); unset($lang->searchObjects['task']); unset($lang->searchObjects['release']); diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 3c1df43da5..8b36dffa47 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -23,7 +23,7 @@ $lang->welcome = "%s項目管理系統"; $lang->logout = '退出'; $lang->login = '登錄'; $lang->help = '幫助'; -$lang->aboutZenTao = '關於'; +$lang->aboutZenTao = '關於禪道'; $lang->profile = '個人檔案'; $lang->changePassword = '更改密碼'; $lang->runInfo = "
    時間: %s 毫秒, 內存: %s KB, 查詢: %s.
    "; @@ -86,9 +86,9 @@ $lang->loading = '稍候...'; $lang->notFound = '抱歉，您訪問的對象並不存在！'; $lang->showAll = '[[全部顯示]]'; -$lang->future = '未來'; -$lang->year = '年'; -$lang->workingHour = '工時'; +$lang->future = '未來'; +$lang->year = '年'; +$lang->workingHour = '工時'; $lang->idAB = 'ID'; $lang->priAB = 'P'; @@ -102,14 +102,17 @@ $lang->common->common = '公有模組'; /* 主導航菜單。*/ $lang->menu = new stdclass(); -$lang->menu->my = ' 我的地盤|my|index'; -$lang->menu->product = $lang->productCommon . '|product|index'; -$lang->menu->project = $lang->projectCommon . '|project|index'; -$lang->menu->qa = '測試|qa|index'; -$lang->menu->doc = '文檔|doc|index'; -$lang->menu->report = '統計|report|index'; -$lang->menu->company = '組織|company|index'; -$lang->menu->admin = '後台|admin|index'; +$lang->menu->my = ' 我的地盤|my|index'; +$lang->menu->product = $lang->productCommon . '|product|index'; +$lang->menu->project = $lang->projectCommon . '|project|index'; +$lang->menu->qa = '測試|qa|index'; +$lang->menu->doc = '文檔|doc|index'; +$lang->menu->report = '統計|report|index'; +$lang->menu->company = '組織|company|index'; + +$lang->adminMenu = '後台|admin|index'; + +$lang->dividerMenu = ',qa,'; /* 查詢條中可以選擇的對象列表。*/ $lang->searchObjects['bug'] = 'Bug'; @@ -145,12 +148,12 @@ $lang->exportTypeList['selected'] = '選中記錄'; $lang->lang = 'Language'; /* 風格列表。*/ -$lang->theme = '主題'; -$lang->themes['default'] = '預設'; -$lang->themes['green'] = '綠色'; -$lang->themes['red'] = '紅色'; -$lang->themes['lightblue'] = '亮藍'; -$lang->themes['blackberry'] = '黑莓'; +$lang->theme = '主題'; +$lang->themes['default'] = '預設'; +$lang->themes['green'] = '綠色'; +$lang->themes['red'] = '紅色'; +$lang->themes['lightblue'] = '亮藍'; +$lang->themes['blackberry'] = '黑莓'; /* 首頁菜單設置。*/ $lang->index = new stdclass(); @@ -163,7 +166,6 @@ $lang->index->menu->project = "瀏覽{$lang->projectCommon}|project|browse"; $lang->my = new stdclass(); $lang->my->menu = new stdclass(); -$lang->my->menu->account = array('link' => ' %s' . $lang->arrow . '', 'fixed' => true); $lang->my->menu->index = '首頁|my|index'; $lang->my->menu->todo = array('link' => '待辦|my|todo|', 'subModule' => 'todo'); $lang->my->menu->task = array('link' => '任務|my|task|', 'subModule' => 'task'); @@ -187,20 +189,20 @@ $lang->score->menu = $lang->my->menu; $lang->product = new stdclass(); $lang->product->menu = new stdclass(); -$lang->product->menu->list = array('link' => '%s', 'fixed' => true); -$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); -$lang->product->menu->dynamic = '動態|product|dynamic|productID=%s'; -$lang->product->menu->plan = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan'); -$lang->product->menu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release'); -$lang->product->menu->roadmap = '路線圖|product|roadmap|productID=%s'; -$lang->product->menu->doc = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; -$lang->product->menu->module = '模組|tree|browse|productID=%s&view=story'; -$lang->product->menu->view = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit'); -$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; -$lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); -$lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); -$lang->product->menu->index = array('link' => "{$lang->productCommon}主頁|product|index|locate=no", 'float' => 'right'); +$lang->product->menu->list = array('link' => '%s', 'fixed' => true); +$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->dynamic = '動態|product|dynamic|productID=%s'; +$lang->product->menu->plan = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan'); +$lang->product->menu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release'); +$lang->product->menu->roadmap = '路線圖|product|roadmap|productID=%s'; +$lang->product->menu->doc = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); +$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; +$lang->product->menu->module = '模組|tree|browse|productID=%s&view=story'; +$lang->product->menu->view = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit'); +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); +$lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); +$lang->product->menu->index = array('link' => "{$lang->productCommon}主頁|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); @@ -216,20 +218,20 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->list = array('link' => '%s', 'fixed' => true); -$lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); -$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; -$lang->project->menu->dynamic = '動態|project|dynamic|projectID=%s'; -$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); -$lang->project->menu->testtask = array('link' => '測試單|project|testtask|projectID=%s'); -$lang->project->menu->team = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers'); -$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->view = array('link' => '概況|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); -$lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); -$lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); -$lang->project->menu->index = array('link' => "{$lang->projectCommon}主頁|project|index|locate=no", 'float' => 'right'); +$lang->project->menu->list = array('link' => '%s', 'fixed' => true); +$lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); +$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); +$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; +$lang->project->menu->dynamic = '動態|project|dynamic|projectID=%s'; +$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); +$lang->project->menu->testtask = array('link' => '測試單|project|testtask|projectID=%s'); +$lang->project->menu->team = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers'); +$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->view = array('link' => '概況|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); +$lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); +$lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); +$lang->project->menu->index = array('link' => "{$lang->projectCommon}主頁|project|index|locate=no", 'float' => 'right'); $lang->task = new stdclass(); $lang->build = new stdclass(); @@ -296,9 +298,9 @@ $lang->caselib->menu->index = array('link' => "測 $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); -$lang->doc->menu->list = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->create = array('link' => ' 添加文檔庫|doc|createLib', 'float' => 'right'); +$lang->doc->menu->list = array('link' => '%s', 'fixed' => true); +$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); +$lang->doc->menu->create = array('link' => ' 添加文檔庫|doc|createLib', 'float' => 'right'); /* 統計視圖菜單設置。*/ $lang->report = new stdclass(); @@ -339,13 +341,12 @@ $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => '首頁|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); $lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension'); $lang->admin->menu->custom = array('link' => '自定義|custom|set', 'subModule' => 'custom'); -$lang->admin->menu->mail = array('link' => '發信|mail|index', 'subModule' => 'mail'); +$lang->admin->menu->message = array('link' => '消息|message|index', 'subModule' => 'message,mail,webhook'); $lang->admin->menu->backup = array('link' => '備份|backup|index', 'subModule' => 'backup'); $lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' => 'checkweak'); $lang->admin->menu->cron = array('link' => '計劃任務|cron|index', 'subModule' => 'cron'); $lang->admin->menu->trashes = array('link' => '資源回收筒|action|trash', 'subModule' => 'action'); $lang->admin->menu->dev = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); -$lang->admin->menu->api = array('link' => '介面|webhook|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook'); $lang->admin->menu->sso = '然之整合|admin|sso'; $lang->convert = new stdclass(); @@ -360,6 +361,7 @@ $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->convert->menu = $lang->admin->menu; @@ -374,6 +376,7 @@ $lang->mail->menu = $lang->admin->menu; $lang->dev->menu = $lang->admin->menu; $lang->entry->menu = $lang->admin->menu; $lang->webhook->menu = $lang->admin->menu; +$lang->message->menu = $lang->admin->menu; /* 菜單分組。*/ $lang->menugroup = new stdclass(); @@ -407,6 +410,7 @@ $lang->menugroup->mail = 'admin'; $lang->menugroup->dev = 'admin'; $lang->menugroup->entry = 'admin'; $lang->menugroup->webhook = 'admin'; +$lang->menugroup->message = 'admin'; /* 錯誤提示信息。*/ $lang->error = new stdclass(); @@ -423,6 +427,7 @@ $lang->error->int = array("『%s』應當是數字。", "『%s』應 $lang->error->float = "『%s』應當是數字，可以是小數。"; $lang->error->email = "『%s』應當為合法的EMAIL。"; $lang->error->date = "『%s』應當為合法的日期。"; +$lang->error->datetime = "『%s』應當為合法的日期。"; $lang->error->code = "『%s』應當為字母或數字的組合。"; $lang->error->account = "『%s』應當為合法的用戶名。"; $lang->error->passwordsame = "兩次密碼應當相等。"; @@ -466,31 +471,32 @@ $lang->pager->previousPage = "上一頁"; $lang->pager->nextPage = "下一頁"; $lang->pager->summery = "第 %s-%s 項，共 %s 項"; -$lang->proVersion = "專業版   "; -$lang->downNotify = "下載桌面提醒"; +$lang->proVersion = "專業版   "; +$lang->downNotify = "下載桌面提醒"; +$lang->website = "http://www.zentao.net"; $lang->suhosinInfo = "警告：數據太多，請在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars（大於%s的數）。 保存並重新啟動apache或php-fpm，否則會造成部分數據無法保存。"; $lang->maxVarsInfo = "警告：數據太多，請在php.ini中修改max_input_vars（大於%s的數）。 保存並重新啟動apache或php-fpm，否則會造成部分數據無法保存。"; $lang->pasteTextInfo = "粘貼文本到文本域中，每行文字作為一條數據的標題。"; $lang->noticeImport = "

    導入數據中，含有已經存在系統的數據，請確認這些數據要覆蓋或者全新插入

    覆蓋 全新插入

    "; -$lang->noResultsMatch = "沒有匹配結果"; -$lang->searchMore = "搜索此關鍵字的更多結果："; -$lang->chooseUsersToMail = "選擇要發信通知的用戶..."; -$lang->browserNotice = '你目前使用的瀏覽器可能無法得到最佳瀏覽效果，建議使用Chrome、火狐、IE9+、Opera、Safari瀏覽器。'; -$lang->noticePasteImg = "可以在編輯器直接貼圖。"; +$lang->noResultsMatch = "沒有匹配結果"; +$lang->searchMore = "搜索此關鍵字的更多結果："; +$lang->chooseUsersToMail = "選擇要發信通知的用戶..."; +$lang->browserNotice = '你目前使用的瀏覽器可能無法得到最佳瀏覽效果，建議使用Chrome、火狐、IE9+、Opera、Safari瀏覽器。'; +$lang->noticePasteImg = "可以在編輯器直接貼圖。"; /* 時間格式設置。*/ -if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); -if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i'); -if(!defined('DT_MONTHTIME1'))define('DT_MONTHTIME1', 'n/d H:i'); -if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n月d日 H:i'); -if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); -if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); -if(!defined('DT_DATE3')) define('DT_DATE3', 'Y年m月d日'); -if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日'); -if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); -if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); +if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); +if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i'); +if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i'); +if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n月d日 H:i'); +if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); +if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); +if(!defined('DT_DATE3')) define('DT_DATE3', 'Y年m月d日'); +if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日'); +if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); +if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); /* datepicker 時間*/ $lang->datepicker = new stdclass(); @@ -608,7 +614,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyStory') /* Adjust sub menu of product module. */ unset($lang->product->menu->project); unset($lang->product->menu->doc); - + /* Rename product module. */ $lang->menu->product = "{$lang->productCommon}|product|index"; @@ -761,15 +767,15 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->testtask->menu->report = array('link' => '報告|testreport|browse', 'alias' => 'view,create,edit'); $lang->testtask->menu->create = array('link' => " 提交測試|testtask|create|productID=%s", 'float' => 'right'); - $lang->testtask->menuOrder[5] = 'product'; - $lang->testtask->menuOrder[10] = 'scope'; - $lang->testtask->menuOrder[15] = 'wait'; - $lang->testtask->menuOrder[20] = 'doing'; - $lang->testtask->menuOrder[25] = 'blocked'; - $lang->testtask->menuOrder[30] = 'done'; - $lang->testtask->menuOrder[35] = 'totalStatus'; - $lang->testtask->menuOrder[40] = 'report'; - $lang->testtask->menuOrder[45] = 'create'; + $lang->testtask->menuOrder[5] = 'product'; + $lang->testtask->menuOrder[10] = 'scope'; + $lang->testtask->menuOrder[15] = 'wait'; + $lang->testtask->menuOrder[20] = 'doing'; + $lang->testtask->menuOrder[25] = 'blocked'; + $lang->testtask->menuOrder[30] = 'done'; + $lang->testtask->menuOrder[35] = 'totalStatus'; + $lang->testtask->menuOrder[40] = 'report'; + $lang->testtask->menuOrder[45] = 'create'; $lang->testreport->menu = $lang->testtask->menu; $lang->testreport->menuOrder = $lang->testtask->menuOrder; @@ -806,7 +812,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->build->menu = $lang->product->menu; $lang->build->menuOrder = $lang->product->menuOrder; - + /* Adjust menu group. */ $lang->menugroup->bug = 'bug'; $lang->menugroup->testcase = 'testcase'; @@ -814,8 +820,8 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->menugroup->testsuite = 'testsuite'; $lang->menugroup->testreport = 'testtask'; $lang->menugroup->build = 'product'; - - /* Adjust search objects. */ + + /* Adjust search objects. */ unset($lang->searchObjects['story']); unset($lang->searchObjects['task']); unset($lang->searchObjects['release']); diff --git a/module/common/model.php b/module/common/model.php index 0208b25cfb..c53db915f2 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -228,7 +228,7 @@ class commonModel extends model * @access public * @return void */ - public static function printTopBar() + public static function printUserBar() { global $lang, $app; @@ -236,37 +236,44 @@ class commonModel extends model { $isGuest = $app->user->account == 'guest'; - echo "'; - + echo '
  • '; + echo '
  • '; if($isGuest) { echo html::a(helper::createLink('user', 'login'), $lang->login); @@ -275,19 +282,30 @@ class commonModel extends model { echo html::a(helper::createLink('user', 'logout'), $lang->logout); } + echo '
    • '; } + } - if($app->company->website) echo html::a($app->company->website, $lang->company->website, '_blank'); - if($app->company->backyard) echo html::a($app->company->backyard, $lang->company->backyard, '_blank'); - - echo "
    "; - echo "" . $lang->help . " "; - echo "
      "; - echo '
    • ' . html::a('javascript:;', $lang->manual, '', "class='open-help-tab'") . '
      • '; + /** + * Print about bar. + * + * @static + * @access public + * @return void + */ + public static function printAboutBar() + { + global $app, $lang; + echo "
    "; - echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'"); + echo "\n"; + echo '
  • ' . html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'") . '
    • '; + echo ''; } /** @@ -340,16 +358,19 @@ class commonModel extends model $menu = customModel::getMainMenu(); $activeName = 'active'; - echo "
      \n"; + echo "
        \n"; foreach($menu as $menuItem) { - if(isset($menuItem->hidden) && $menuItem->hidden) continue; - $active = $menuItem->name == $mainMenu ? "class='$activeName'" : ''; - $link = commonModel::createMenuLink($menuItem); - echo "
      • $menuItem->text
        • \n"; + if(empty($menuItem->hidden)) + { + $active = $menuItem->name == $mainMenu ? "class='$activeName'" : ''; + $link = commonModel::createMenuLink($menuItem); + echo "
      • $menuItem->text
        • \n"; + } + if(strpos($lang->dividerMenu, ",{$menuItem->name},") !== false) echo "
      • "; } $customLink = helper::createLink('custom', 'ajaxMenu', "module={$app->getModuleName()}&method={$app->getMethodName()}", '', true); - if(!commonModel::isTutorialMode() and $app->viewType != 'mhtml' and $app->user->account != 'guest') echo "
        • "; + if(!commonModel::isTutorialMode() and $app->viewType != 'mhtml' and $app->user->account != 'guest') echo "
        • "; echo "
      \n"; } @@ -386,18 +407,21 @@ class commonModel extends model if($config->global->flow == 'onlyTask') $searchObject = 'task'; } - echo " -
    bug->linkBug;?>bug->linkBug;?> linkBugTitles)) diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 8ddec86168..f5d21f084b 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->build->common = "Build"; -$lang->build->create = "Create"; +$lang->build->create = "Create Build"; $lang->build->edit = "Edit"; $lang->build->linkStory = "Link Story"; $lang->build->linkBug = "Link Bug"; @@ -44,7 +44,7 @@ $lang->build->unlinkStory = 'Unlink Story'; $lang->build->unlinkBug = 'Unlink Bug'; $lang->build->stories = 'Finished Story'; $lang->build->bugs = 'Resolved Bug'; -$lang->build->generatedBugs = 'Remained Bug'; +$lang->build->generatedBugs = 'Left Bug'; $lang->build->noProduct = " This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first link {$lang->productCommon}"; $lang->build->finishStories = ' %s Story(ies) have been finished.'; diff --git a/module/build/model.php b/module/build/model.php index 33dea5c83d..f40a24ddf4 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -15,8 +15,8 @@ class buildModel extends model { /** * Get build info. - * - * @param int $buildID + * + * @param int $buildID * @param bool $setImgSize * @access public * @return object @@ -39,8 +39,8 @@ class buildModel extends model /** * Get by ID list. - * - * @param array $idList + * + * @param array $idList * @access public * @return array */ @@ -51,8 +51,8 @@ class buildModel extends model /** * Get builds of a project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return array */ @@ -70,10 +70,10 @@ class buildModel extends model } /** - * Get builds of a project in pairs. - * - * @param int $projectID - * @param int $productID + * Get builds of a project in pairs. + * + * @param int $projectID + * @param int $productID * @param string $params noempty|notrunk, can be a set of them * @access public * @return array @@ -122,25 +122,22 @@ class buildModel extends model * @param int $branch * @param string $params noempty|notrunk, can be a set of them * @param bool $replace - * @param int $project * * @access public * @return array */ - public function getProductBuildPairs($products, $branch = 0, $params = 'noterminate, nodone', $replace = true, $project = 0) + public function getProductBuildPairs($products, $branch = 0, $params = 'noterminate, nodone', $replace = true) { $sysBuilds = array(); if(strpos($params, 'noempty') === false) $sysBuilds = array('' => ''); if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => $this->lang->trunk); - /* Add project for Bug#1344. */ $productBuilds = $this->dao->select('t1.id, t1.name, t1.project, t2.status as projectStatus, t3.id as releaseID, t3.status as releaseStatus, t4.name as branchName')->from(TABLE_BUILD)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->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($branch)->andWhere('t1.branch')->in("0,$branch")->fi() - ->beginIF($project)->andWhere('t1.project')->eq($project)->fi() ->andWhere('t1.deleted')->eq(0) ->orderBy('t1.date desc, t1.id desc')->fetchAll('id'); @@ -172,14 +169,14 @@ class buildModel extends model /** * Get last build. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return bool | object */ public function getLast($projectID) { - return $this->dao->select('id, name')->from(TABLE_BUILD) + return $this->dao->select('id, name')->from(TABLE_BUILD) ->where('project')->eq((int)$projectID) ->orderBy('date DESC,id DESC') ->limit(1) @@ -188,8 +185,8 @@ class buildModel extends model /** * Create a build - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -226,8 +223,8 @@ class buildModel extends model /** * Update a build. - * - * @param int $buildID + * + * @param int $buildID * @access public * @return void */ @@ -256,8 +253,8 @@ class buildModel extends model /** * Update linked bug to resolved. - * - * @param object $build + * + * @param object $build * @access public * @return void */ @@ -299,8 +296,8 @@ class buildModel extends model /** * Link stories - * - * @param int $buildID + * + * @param int $buildID * @access public * @return void */ @@ -317,10 +314,10 @@ class buildModel extends model } /** - * Unlink story - * - * @param int $buildID - * @param int $storyID + * Unlink story + * + * @param int $buildID + * @param int $storyID * @access public * @return void */ @@ -334,8 +331,8 @@ class buildModel extends model /** * Batch unlink story. - * - * @param int $buildID + * + * @param int $buildID * @access public * @return void */ @@ -357,8 +354,8 @@ class buildModel extends model /** * Link bugs. - * - * @param int $buildID + * + * @param int $buildID * @access public * @return void */ @@ -376,10 +373,10 @@ class buildModel extends model } /** - * Unlink bug. - * - * @param int $buildID - * @param int $bugID + * Unlink bug. + * + * @param int $buildID + * @param int $bugID * @access public * @return void */ @@ -393,8 +390,8 @@ class buildModel extends model /** * Batch unlink bug. - * - * @param int $buildID + * + * @param int $buildID * @access public * @return void */ diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index e62a058945..cb56ed2cf9 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -26,9 +26,9 @@ include '../../common/view/tablesorter.html.php'; story->title;?> openedByAB;?> assignedToAB;?> story->estimateAB;?> story->estimateAB;?> statusAB;?> story->stageAB;?> story->stageAB;?>
    story->estimateAB);?> statusAB);?> story->stageAB);?> actions?> actions?>
    bug->openedDateAB);?> bug->resolvedByAB);?> bug->resolvedDateAB);?> actions?> actions?>
    - + diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php index cad834d888..2694dec2f0 100644 --- a/module/company/view/view.html.php +++ b/module/company/view/view.html.php @@ -20,7 +20,7 @@
    company->name;?>company->name;?> name, "class='form-control' autocomplete='off'");?>
    - + diff --git a/module/convert/converter/redmine1.1.php b/module/convert/converter/redmine1.1.php index 0d7c93071a..563a1f5026 100644 --- a/module/convert/converter/redmine1.1.php +++ b/module/convert/converter/redmine1.1.php @@ -34,7 +34,7 @@ class redmine11ConvertModel extends redmineConvertModel } /** * Execute the converter. - * + * * @access public * @return array */ @@ -74,11 +74,11 @@ class redmine11ConvertModel extends redmineConvertModel $result['docs'] = self::$convertDocCount; $result['files'] = self::$convertFileCount; return $result; - } - - /** - * Set table names. - * + } + + /** + * Set table names. + * * @access public * @return void */ @@ -137,9 +137,9 @@ class redmine11ConvertModel extends redmineConvertModel /** * Convert groups. - * + * * @access public - * @return void + * @return void */ public function convertGroup() { @@ -176,9 +176,9 @@ class redmine11ConvertModel extends redmineConvertModel /** * Convert users. - * + * * @access public - * @return void + * @return void */ public function convertUser() { @@ -217,8 +217,8 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert relationship between user and group. - * + * convert relationship between user and group. + * * @access public * @return void */ @@ -255,10 +255,10 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert products. - * + * convert products. + * * @access public - * @return void + * @return void */ public function convertProduct() { @@ -280,9 +280,9 @@ class redmine11ConvertModel extends redmineConvertModel /** * Convert projects. - * + * * @access public - * @return void + * @return void */ public function convertProject() { @@ -313,12 +313,12 @@ class redmine11ConvertModel extends redmineConvertModel $convertCount = count($projects) + count($this->map['projectOfProduct']); self::$convertProjectCount += $convertCount; } - + /** - * convert builds and releases - * + * convert builds and releases + * * @access public - * @return void + * @return void */ public function convertBuildAndRelease() { @@ -370,10 +370,10 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert productPlans - * + * convert productPlans + * * @access public - * @return void + * @return void */ public function convertProductPlan() { @@ -401,11 +401,11 @@ class redmine11ConvertModel extends redmineConvertModel } $convertCount = count($this->map['products']) + count($productPlans); self::$convertProductPlanCount += $convertCount; - } + } /** - * convert relationship between project and product. - * + * convert relationship between project and product. + * * @access public * @return void */ @@ -424,8 +424,8 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert teams. - * + * convert teams. + * * @access public * @return void */ @@ -454,10 +454,10 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert docLibs. - * + * convert docLibs. + * * @access public - * @return void + * @return void */ public function convertDocLib() { @@ -478,10 +478,10 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert docs. - * + * convert docs. + * * @access public - * @return void + * @return void */ public function convertDoc() { @@ -507,10 +507,10 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert news. - * + * convert news. + * * @access public - * @return void + * @return void */ public function convertNews() { @@ -541,12 +541,12 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert issue - * + * convert issue + * * @param array $aimTypes //aimTypes['issueTypeID'] = aimtype eg. aimTypes[1] = 'bug'; * @param array $statusTypes //statusTypes['task']['statusTypeID'] = statusType eg. statusTypes['task'][1] = 'wait'; * //statusTypes['bug']['statusTypeID'] = statusType eg. statusTypes['bug'][1] = 'active'; - * @param array $priTypes //priTypes['task']['priTypeID'] = priType; eg. priTypes['task'][1] = 1; + * @param array $priTypes //priTypes['task']['priTypeID'] = priType; eg. priTypes['task'][1] = 1; * @access public * @return void */ @@ -574,13 +574,13 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert story - * - * @param array $issueType - * @param array $statusTypes - * @param array $priTypes + * convert story + * + * @param array $issueType + * @param array $statusTypes + * @param array $priTypes * @access public - * @return void + * @return void */ public function convertStory($issueType, $statusTypes, $priTypes) { @@ -623,13 +623,13 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert task - * - * @param array $issueType - * @param array $statusTypes - * @param array $priTypes + * convert task + * + * @param array $issueType + * @param array $statusTypes + * @param array $priTypes * @access public - * @return void + * @return void */ public function convertTask($issueType, $statusTypes, $priTypes) { @@ -651,7 +651,7 @@ class redmine11ConvertModel extends redmineConvertModel $task->pri = $priTypes['task'][$task->pri]; $task->status = $statusTypes['task'][$task->status]; if($task->project == 0) - { + { $task->project = $this->map['projectOfProduct'][$task->product]; } else @@ -668,13 +668,13 @@ class redmine11ConvertModel extends redmineConvertModel } /** - * convert bug - * - * @param array $issueType - * @param array $statusTypes - * @param array $priTypes + * convert bug + * + * @param array $issueType + * @param array $statusTypes + * @param array $priTypes * @access public - * @return void + * @return void */ public function convertBug($issueType, $statusTypes, $priTypes) { @@ -704,7 +704,7 @@ class redmine11ConvertModel extends redmineConvertModel $bug->caseVersion = 1; $bug->result = 0; if($bug->project == 0) - { + { $bug->project = $this->map['projectOfProduct'][$bug->product]; } else @@ -712,7 +712,7 @@ class redmine11ConvertModel extends redmineConvertModel $bug->project = $this->map['project'][$bug->project]; } unset($bug->id); - $this->dao->dbh($this->dbh)->insert(TABLE_BUG)->data($bug)->exec(); + $this->dao->dbh($this->dbh)->insert(TABLE_BUG)->data($bug)->exec(); $this->map['issueID'][$issueID] = $this->dao->lastInsertID(); $this->map['issueType'][$issueID] = 'bug'; } @@ -721,9 +721,9 @@ class redmine11ConvertModel extends redmineConvertModel /** * Convert attachments. - * + * * @access public - * @return void + * @return void */ public function convertFile() { @@ -752,7 +752,7 @@ class redmine11ConvertModel extends redmineConvertModel /* Transform objectType and objectID */ if($file->objectType == 'Issue') { - $file->objectType = $this->map['issueType'][$file->objectID]; + $file->objectType = $this->map['issueType'][$file->objectID]; $file->objectID = $this->map['issueID'][$file->objectID]; } elseif($file->objectType == 'Document') @@ -808,7 +808,7 @@ class redmine11ConvertModel extends redmineConvertModel /** * Clear the converted records. - * + * * @access public * @return void */ diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php index 9e60f3d542..23dd843cb6 100644 --- a/module/cron/lang/en.php +++ b/module/cron/lang/en.php @@ -1,5 +1,5 @@ cron->common = 'Cron'; +$lang->cron->common = 'Scheduled Task'; $lang->cron->index = 'Home'; $lang->cron->list = 'Tasks'; $lang->cron->create = 'Add'; @@ -21,7 +21,7 @@ $lang->cron->remark = 'Remark'; $lang->cron->lastTime = 'Last Executed'; $lang->cron->turnonList['1'] = 'On'; -$lang->cron->turnonList['0'] = 'Off'; +$lang->cron->turnonList['0'] = 'Shutdown'; $lang->cron->statusList['normal'] = 'Normal'; $lang->cron->statusList['running'] = 'Running'; @@ -33,14 +33,14 @@ $lang->cron->typeList['system'] = 'System Command'; $lang->cron->toggleList['start'] = 'Activate'; $lang->cron->toggleList['stop'] = 'Deactivate'; -$lang->cron->confirmDelete = 'Do you want to delete the Planned Task?'; +$lang->cron->confirmDelete = 'Do you want to delete the Scheduled Task?'; $lang->cron->confirmTurnon = 'Do you want to truncoff the Cron?'; $lang->cron->introduction = <<Planned Task can do scheduled execution, such as update burndown chart, backup, etc.

    +

    Scheduled Task can do scheduled execution, such as update burndown chart, backup, etc.

    This function need to be improved, so it is turned off by default.

    EOD; $lang->cron->confirmOpen = <<Do you want to turn it on?Turn On Planned Task

    +

    Do you want to turn it on?Turn On Scheduled Task

    EOD; $lang->cron->notice = new stdclass(); @@ -49,5 +49,5 @@ $lang->cron->notice->h = 'Range:0-23'; $lang->cron->notice->dom = 'Range:1-31'; $lang->cron->notice->mon = 'Range:1-12'; $lang->cron->notice->dow = 'Range:0-6'; -$lang->cron->notice->help = 'Note：If the server is restarted, or Planned Task is not working, it means Planned Task has stopped working. You have to click 【Create】 or refresh the page to start the Planned Task. If the last execution time in Task List has changed, it means the Task is started.'; +$lang->cron->notice->help = 'Note：If server restarted, or Scheduled Task is not working, it means Scheduled Task has stopped. You can restart it by clicking 【Restart】 or reload this page. If the last execution time in changed, it means the Task is running.'; $lang->cron->notice->errorRule = '"%s" is not valid'; diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php index 901c8a0f45..88fd9a75a6 100644 --- a/module/cron/view/index.html.php +++ b/module/cron/view/index.html.php @@ -30,13 +30,13 @@
    company->name;?>company->name;?> name;?>
    - - - - - + + + + + - + diff --git a/module/custom/control.php b/module/custom/control.php index 07e09e6b71..353a7f6a5c 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -81,7 +81,12 @@ class custom extends control if(strtolower($_SERVER['REQUEST_METHOD']) == "post") { - if(($module == 'story' or $module == 'testcase') and $field == 'review') + if($module == 'story' and $field == 'review') + { + $data = fixer::input('post')->join('forceReview', ',')->get(); + $this->loadModel('setting')->setItems("system.$module", $data); + } + elseif($module == 'testcase' and $field == 'review') { $review = fixer::input('post')->get(); if($review->needReview) $data = fixer::input('post')->join('forceNotReview', ',')->remove('forceReview')->get(); diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 07ab03f68a..7bea454f8b 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -5,9 +5,9 @@ $lang->custom->set = 'Customize'; $lang->custom->restore = 'Reset to Default'; $lang->custom->key = 'Key'; $lang->custom->value = 'Value'; -$lang->custom->flow = 'Process'; -$lang->custom->working = 'Working'; -$lang->custom->select = 'Select Process'; +$lang->custom->flow = 'Workflow'; +$lang->custom->working = 'WorkStyle'; +$lang->custom->select = 'Select Workflow'; $lang->custom->branch = 'Multi Branch'; $lang->custom->owner = 'Owner'; $lang->custom->module = 'Module'; @@ -23,35 +23,35 @@ $lang->custom->object['task'] = 'Task'; $lang->custom->object['bug'] = 'Bug'; $lang->custom->object['testcase'] = 'Case'; $lang->custom->object['testtask'] = 'Build'; -$lang->custom->object['todo'] = 'To-Dos'; +$lang->custom->object['todo'] = 'Todo'; $lang->custom->object['user'] = 'User'; -$lang->custom->object['block'] = 'Block'; +$lang->custom->object['block'] = 'ClosedBlock'; $lang->custom->story = new stdClass(); $lang->custom->story->fields['priList'] = 'Priority'; $lang->custom->story->fields['sourceList'] = 'Source'; -$lang->custom->story->fields['reasonList'] = 'Reason'; +$lang->custom->story->fields['reasonList'] = 'Close Reason'; $lang->custom->story->fields['stageList'] = 'Stage'; $lang->custom->story->fields['statusList'] = 'Status'; -$lang->custom->story->fields['reviewResultList'] = 'Result'; -$lang->custom->story->fields['review'] = 'Review'; +$lang->custom->story->fields['reviewResultList'] = 'Review Result'; +$lang->custom->story->fields['review'] = 'Review Required'; $lang->custom->task = new stdClass(); $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; -$lang->custom->task->fields['reasonList'] = 'Reason'; +$lang->custom->task->fields['reasonList'] = 'Close Reason'; $lang->custom->task->fields['statusList'] = 'Status'; -$lang->custom->task->fields['hours'] = 'Working hours'; +$lang->custom->task->fields['hours'] = 'Man-hours'; $lang->custom->bug = new stdClass(); $lang->custom->bug->fields['priList'] = 'Priority'; -$lang->custom->bug->fields['severityList'] = 'Priority'; +$lang->custom->bug->fields['severityList'] = 'Severity'; $lang->custom->bug->fields['osList'] = 'OS'; $lang->custom->bug->fields['browserList'] = 'Browser'; $lang->custom->bug->fields['typeList'] = 'Type'; $lang->custom->bug->fields['resolutionList'] = 'Solution'; $lang->custom->bug->fields['statusList'] = 'Status'; -$lang->custom->bug->fields['longlife'] = 'Long Life Days'; +$lang->custom->bug->fields['longlife'] = 'Shelved Days'; $lang->custom->testcase = new stdClass(); $lang->custom->testcase->fields['priList'] = 'Priority'; @@ -59,7 +59,7 @@ $lang->custom->testcase->fields['typeList'] = 'Type'; $lang->custom->testcase->fields['stageList'] = 'Stage'; $lang->custom->testcase->fields['resultList'] = 'Result'; $lang->custom->testcase->fields['statusList'] = 'Status'; -$lang->custom->testcase->fields['review'] = 'Review'; +$lang->custom->testcase->fields['review'] = 'Review Required'; $lang->custom->testtask = new stdClass(); $lang->custom->testtask->fields['priList'] = 'Priority'; @@ -84,10 +84,10 @@ $lang->custom->confirmRestore = 'Do you want to reset to Default?'; $lang->custom->notice = new stdclass(); $lang->custom->notice->userRole = 'Key must be no more than 20 characters!'; -$lang->custom->notice->canNotAdd = 'This item will be processed, so customized feature is not enabled.'; -$lang->custom->notice->forceReview = 'Review is required for %s submitted by certain assignee.'; -$lang->custom->notice->forceNotReview = "Not review is required for %s submitted by certain assignee."; -$lang->custom->notice->longlife = 'List "Undone" bugs that are older than hold days from "Longlife" bugs.'; +$lang->custom->notice->canNotAdd = 'These items are parameters of calculation, so customized creation is not enabled.'; +$lang->custom->notice->forceReview = '%s Review is required for certain submitters.'; +$lang->custom->notice->forceNotReview = "%s Review is NOT required for certain submitters."; +$lang->custom->notice->longlife = 'Define shelved bugs.'; $lang->custom->notice->priListKey = 'Priority list key should be numbers！'; $lang->custom->notice->keyList = 'key should be English or digital!'; $lang->custom->notice->severityListKey = 'Bug severity list key should be numbers.'; @@ -96,7 +96,7 @@ $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. $lang->custom->notice->indexPage['qa'] = "ZenTao 8.2+ has QA Homepage. Do you want to go to QA Homepage?"; $lang->custom->storyReview = 'Review'; -$lang->custom->forceReview = 'Review Required'; +$lang->custom->forceReview = 'Selective Review'; $lang->custom->forceNotReview = 'No review'; $lang->custom->reviewList[1] = 'On'; $lang->custom->reviewList[0] = 'Off'; @@ -116,10 +116,10 @@ $lang->custom->productProject->relation['1_1'] = 'Project - Sprint'; $lang->custom->productProject->notice = 'Please select according to your team.'; -$lang->custom->workingList['full'] = 'Full'; -$lang->custom->workingList['onlyTest'] = 'Test'; -$lang->custom->workingList['onlyStory'] = 'Story'; -$lang->custom->workingList['onlyTask'] = 'Task'; +$lang->custom->workingList['full'] = 'Full Management of Dev'; +$lang->custom->workingList['onlyTest'] = 'Test Management'; +$lang->custom->workingList['onlyStory'] = 'Story Management'; +$lang->custom->workingList['onlyTask'] = 'Task Management'; $lang->custom->menuTip = 'Click to show/hide navigation bar. Drag to swtich display order.'; $lang->custom->saveFail = 'Failed to save!'; diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 726474c997..6176e3fa87 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -50,20 +50,20 @@ EOT;
    cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?>cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?> cron->command?>cron->remark?>cron->remark?> cron->lastTime?> cron->status?> actions;?>
    - + - + > - + > - + @@ -115,7 +115,7 @@ EOT;
    custom->storyReview;?>custom->storyReview;?> custom->reviewList, $needReview);?>
    custom->forceReview;?> custom->notice->forceReview, $lang->$module->common);?>custom->notice->forceReview, $lang->$module->common);?>
    custom->forceNotReview;?> custom->notice->forceNotReview, $lang->$module->common);?>custom->notice->forceNotReview, $lang->$module->common);?>
    - + diff --git a/module/datatable/lang/en.php b/module/datatable/lang/en.php index 099a89c79e..27e72fcff3 100644 --- a/module/datatable/lang/en.php +++ b/module/datatable/lang/en.php @@ -8,8 +8,8 @@ $lang->datatable->reset = 'Reset'; $lang->datatable->custom = 'Custom Columns'; $lang->datatable->customTip = 'Check Columns to Display'; -$lang->datatable->switchToTable = 'Switch to Table'; -$lang->datatable->switchToDatatable = 'Switch to Datatable'; +$lang->datatable->switchToTable = 'Switch to Common Table'; +$lang->datatable->switchToDatatable = 'Switch to Advanced Table'; $lang->datatable->required = 'Required'; $lang->datatable->confirmReset = 'Do you want to restore the default settings?'; $lang->datatable->setGlobal = 'Global'; @@ -18,7 +18,7 @@ $lang->datatable->resetGlobal = 'Reset Global Default'; $lang->datatable->branch = 'Branch'; $lang->datatable->platform = 'Platform'; -$lang->datatable->showModule = 'Show/Hide Module Name'; +$lang->datatable->showModule = 'Show/Hide module name'; $lang->datatable->showModuleList[] = 'N/A'; $lang->datatable->showModuleList['base'] = 'Base Node'; $lang->datatable->showModuleList['end'] = 'End Node'; diff --git a/module/datatable/model.php b/module/datatable/model.php index afd6e2f33c..577ad6b7a2 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -127,10 +127,11 @@ class datatableModel extends model { $fixed = $col->fixed == 'no' ? 'true': 'false'; $width = is_numeric($col->width) ? "{$col->width}px" : $col->width; - $sorter = (isset($col->sort) and $col->sort == 'no') ? '' : '{sorter:false}'; $title = isset($col->name) ? "title='$col->name'" : ''; + if($id == 'id' and (int)$width < 90) $width = '90px'; + $width = $id != 'actions' ? "data-width='$width' style='width:$width'" : ''; - echo "'; diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php index 03b8a8327e..c27d2484c9 100644 --- a/module/datatable/view/ajaxcustom.html.php +++ b/module/datatable/view/ajaxcustom.html.php @@ -60,12 +60,12 @@ $autoWidth = $col['width'] == 'auto'; ?>
    ' data-key='' data-fixed='' data-width=''> -   ({$lang->datatable->required})"?>
    datatable->width?> '>
    +   ({$lang->datatable->required})"?>
    diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 3b8801e1a4..b35d0c2bb6 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,15 +10,15 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->manageChild = "Children"; +$lang->dept->manageChild = "Child Department"; $lang->dept->edit = "Edit"; $lang->dept->delete = "Delete"; $lang->dept->parent = "Parent"; $lang->dept->manager = "Manager"; $lang->dept->name = "Dept Name"; -$lang->dept->browse = "Departments"; +$lang->dept->browse = "Manage"; $lang->dept->manage = "Maintain Dept"; -$lang->dept->updateOrder = "Update/Order"; +$lang->dept->updateOrder = "Sort"; $lang->dept->add = "Add Dept"; $lang->dept->dragAndSort = "Drag and Sort"; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index c50930a5c1..92ac52554e 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -53,7 +53,7 @@ $lang->dev->tableList['team'] = 'Team'; $lang->dev->tableList['testresult'] = 'Testing Result'; $lang->dev->tableList['testrun'] = 'Run Testing '; $lang->dev->tableList['testtask'] = 'Test Task'; -$lang->dev->tableList['todo'] = 'To-Do'; +$lang->dev->tableList['todo'] = 'Todo'; $lang->dev->tableList['user'] = 'User'; $lang->dev->tableList['usercontact'] = 'User Contact'; $lang->dev->tableList['usergroup'] = 'User Group'; @@ -93,6 +93,8 @@ $lang->dev->tableList['suitecase'] = 'Suite Case'; $lang->dev->tableList['score'] = 'Score'; $lang->dev->tableList['entry'] = 'Entry'; $lang->dev->tableList['webhook'] = 'WebHook'; +$lang->dev->tableList['webhookdatas'] = 'WebHookDatas'; +$lang->dev->tableList['log'] = 'Log'; $lang->dev->groupList['my'] = 'Dashboard'; $lang->dev->groupList['product'] = $lang->productCommon; diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php index dc44c5b126..fc9ae49d9b 100644 --- a/module/dev/lang/zh-cn.php +++ b/module/dev/lang/zh-cn.php @@ -93,6 +93,8 @@ $lang->dev->tableList['suitecase'] = '套件用例'; $lang->dev->tableList['score'] = '积分'; $lang->dev->tableList['entry'] = '应用'; $lang->dev->tableList['webhook'] = 'WebHook'; +$lang->dev->tableList['webhookdatas'] = 'WebHook数据'; +$lang->dev->tableList['log'] = '接口日志'; $lang->dev->groupList['my'] = '我的地盘'; $lang->dev->groupList['product'] = $lang->productCommon; diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php index 8652c239a8..a0d2f6394c 100644 --- a/module/dev/lang/zh-tw.php +++ b/module/dev/lang/zh-tw.php @@ -90,6 +90,11 @@ $lang->dev->tableList['doccontent'] = '文檔內容'; $lang->dev->tableList['storystage'] = '需求階段'; $lang->dev->tableList['tutorial'] = '新手教程'; $lang->dev->tableList['suitecase'] = '套件用例'; +$lang->dev->tableList['score'] = '積分'; +$lang->dev->tableList['entry'] = '應用'; +$lang->dev->tableList['webhook'] = 'WebHook'; +$lang->dev->tableList['webhookdatas'] = 'WebHook數據'; +$lang->dev->tableList['log'] = '介面日誌'; $lang->dev->groupList['my'] = '我的地盤'; $lang->dev->groupList['product'] = $lang->productCommon; diff --git a/module/dev/model.php b/module/dev/model.php index 7bbdd1ab47..f4049a8f0a 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -16,7 +16,7 @@ class devModel extends model foreach($datatables as $table) { $table = current($table); - if(strpos($table, $this->config->db->prefix) !== false) + if(empty($this->config->db->prefix) or strpos($table, $this->config->db->prefix) !== false) { $subTable = substr($table, strpos($table, '_') + 1); $group = zget($this->config->dev->group, $subTable, 'other'); diff --git a/module/doc/control.php b/module/doc/control.php index 0523918d42..3a577564e6 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -601,13 +601,16 @@ class doc extends control * @access public * @return void */ - public function showFiles($type, $objectID, $viewType='card', $orderBy='t1.id_desc', $recTotal=0, $recPerPage=20, $pageID=1) + public function showFiles($type, $objectID, $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); + $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT; $object = $this->dao->select('id,name')->from($table)->where('id')->eq($objectID)->fetch(); @@ -658,6 +661,7 @@ class doc extends control $this->view->type = $type; $this->view->object = $object; $this->view->files = $this->doc->getLibFiles($type, $objectID, $orderBy, $pager); + $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->pager = $pager; $this->view->viewType = $viewType; $this->view->orderBy = $orderBy; diff --git a/module/doc/css/view.css b/module/doc/css/view.css index 66d52c908e..d15fdf60ef 100644 --- a/module/doc/css/view.css +++ b/module/doc/css/view.css @@ -6,3 +6,4 @@ fieldset > .content table tr th { border-top: 1px solid #BBB; background-color: #F7F7F7; } fieldset > .content table tr th, fieldset > .content table tr td{ padding: 5px 10px; } +.col-main{width:100%} diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 3d17d4127c..66d46a32dc 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -24,10 +24,10 @@ $lang->doc->content = 'Text'; $lang->doc->keywords = 'Keywords'; $lang->doc->url = 'URL'; $lang->doc->files = 'File'; -$lang->doc->addedBy = 'Added By'; -$lang->doc->addedDate = 'Added Date'; -$lang->doc->editedBy = 'Edited By'; -$lang->doc->editedDate = 'Edited Date'; +$lang->doc->addedBy = 'Creator'; +$lang->doc->addedDate = 'Create Date'; +$lang->doc->editedBy = 'Edit By'; +$lang->doc->editedDate = 'Edit Date'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basic Info'; $lang->doc->deleted = 'Deleted'; @@ -45,22 +45,22 @@ $lang->doc->groups = 'Groups'; $lang->doc->users = 'Users'; $lang->doc->moduleDoc = 'By Module'; -$lang->doc->searchDoc = 'By Search'; +$lang->doc->searchDoc = 'Search'; $lang->doc->allDoc = 'All'; -$lang->doc->openedByMe = 'Opened By Me'; +$lang->doc->openedByMe = 'My'; $lang->doc->orderByOpen = 'Recently Added'; $lang->doc->orderByEdit = 'Recently Modifie'; /* 方法列表。*/ $lang->doc->index = 'Home'; -$lang->doc->create = 'Create'; +$lang->doc->create = 'Create Doc'; $lang->doc->edit = 'Edit'; $lang->doc->delete = 'Delete'; $lang->doc->browse = 'List'; $lang->doc->view = 'Details'; $lang->doc->diff = 'Diff'; $lang->doc->sort = 'Sort'; -$lang->doc->manageType = 'Manage Category'; +$lang->doc->manageType = 'Manage category'; $lang->doc->editType = 'Edit'; $lang->doc->deleteType = 'Delete'; $lang->doc->addType = 'Add'; @@ -74,8 +74,8 @@ $lang->doc->createLib = 'Create Library'; $lang->doc->allLibs = 'Libraries'; $lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Library List"; $lang->doc->showFiles = 'File Library'; -$lang->doc->editLib = 'Edit'; -$lang->doc->deleteLib = 'Delete'; +$lang->doc->editLib = 'Edit Library'; +$lang->doc->deleteLib = 'Delete Library'; $lang->doc->fixedMenu = 'Fixed In Menu'; $lang->doc->removeMenu = 'Remove From Menu'; $lang->doc->search = 'Search'; @@ -84,8 +84,8 @@ $lang->doc->search = 'Search'; $lang->doc->allProduct = 'All' . $lang->productCommon; $lang->doc->allProject = 'All' . $lang->projectCommon; -$lang->doc->libTypeList['product'] = $lang->productCommon . ' Library'; -$lang->doc->libTypeList['project'] = $lang->projectCommon . ' Library'; +$lang->doc->libTypeList['product'] = $lang->productCommon . ' Scope'; +$lang->doc->libTypeList['project'] = $lang->projectCommon . ' Scope'; $lang->doc->libTypeList['custom'] = 'Custom Library'; $lang->doc->systemLibs['product'] = $lang->productCommon . 'Doc Lib'; @@ -127,14 +127,14 @@ $lang->doc->placeholder->url = 'Url'; $lang->doclib = new stdclass(); $lang->doclib->name = 'Name'; -$lang->doclib->control = 'Privilege'; +$lang->doclib->control = 'Access Control'; $lang->doclib->group = 'Group'; $lang->doclib->user = 'User'; $lang->doclib->files = 'Files'; -$lang->doclib->all = 'All'; +$lang->doclib->all = 'All Library'; $lang->doclib->select = 'Select'; $lang->doclib->project = $lang->projectCommon . ' Library'; $lang->doclib->product = $lang->productCommon . ' Library'; -$lang->doclib->main['product'] = $lang->productCommon . ' Main'; -$lang->doclib->main['project'] = $lang->projectCommon . ' Main'; +$lang->doclib->main['product'] = 'Main Lib'; +$lang->doclib->main['project'] = 'Main Lib'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 47903d006e..9f18df2444 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -64,6 +64,7 @@ $lang->doc->manageType = '維護分類'; $lang->doc->editType = '編輯分類'; $lang->doc->deleteType = '刪除分類'; $lang->doc->addType = '增加分類'; +$lang->doc->childType = '子分類'; $lang->doc->libName = '文檔庫名稱'; $lang->doc->libType = '文檔庫類型'; diff --git a/module/doc/model.php b/module/doc/model.php index 9345c10628..574f7ec20a 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -15,10 +15,10 @@ class docModel extends model { /** * Set menus - * - * @param array $libs - * @param int $libID - * @param string $moduleID + * + * @param array $libs + * @param int $libID + * @param string $moduleID * @access public * @return void */ @@ -80,8 +80,8 @@ class docModel extends model /** * Get library by id. - * - * @param int $libID + * + * @param int $libID * @access public * @return object */ @@ -92,7 +92,7 @@ class docModel extends model /** * Get libraries. - * + * * @access public * @return array */ @@ -127,7 +127,7 @@ class docModel extends model /** * Create a library. - * + * * @access public * @return void */ @@ -151,8 +151,8 @@ class docModel extends model /** * Update a library. - * - * @param int $libID + * + * @param int $libID * @access public * @return void */ @@ -373,7 +373,7 @@ class docModel extends model /** * Create a doc. - * + * * @access public * @return void */ @@ -438,8 +438,8 @@ class docModel extends model /** * Update a doc. - * - * @param int $docID + * + * @param int $docID * @access public * @return void */ @@ -541,7 +541,7 @@ class docModel extends model /** * Get pairs of project modules. - * + * * @access public * @return array */ @@ -556,9 +556,9 @@ class docModel extends model /** * Get doc menu. - * - * @param int $libID - * @param int $parent + * + * @param int $libID + * @param int $parent * @access public * @return array */ @@ -576,8 +576,8 @@ class docModel extends model * Extract css styles for tables created in kindeditor. * * Like this:
    custom->user->fields['deleted'];?>custom->user->fields['deleted'];?> custom->deletedList, $showDeleted);?>
    "; + echo ""; if($id == 'actions') { echo $this->lang->actions; @@ -141,6 +142,7 @@ class datatableModel extends model } else { + if($id == 'id') echo "
    "; common::printOrderLink($id, $orderBy, $vars, $col->title); } echo '
    - * - * @param string $content + * + * @param string $content * @access public * @return void */ @@ -611,8 +611,8 @@ class docModel extends model /** * Check priv. - * - * @param object $object + * + * @param object $object * @access public * @return bool */ @@ -639,13 +639,13 @@ class docModel extends model if(strpos(",$object->groups,", ",$groupID,") !== false) return true; } } - + if(isset($object->lib)) { static $libs; if(empty($libs)) $libs = $this->getLibs('all'); if(!isset($libs[$object->lib])) return false; - + } if($object->project) @@ -667,10 +667,10 @@ class docModel extends model /** * Get all libs by type. - * - * @param string $type - * @param int $pager - * @param string $extra + * + * @param string $type + * @param int $pager + * @param string $extra * @access public * @return array */ @@ -708,7 +708,7 @@ class docModel extends model /** * Get all lib groups. - * + * * @access public * @return array */ @@ -792,9 +792,9 @@ class docModel extends model /** * Get limit libs. - * - * @param string $type - * @param int $limit + * + * @param string $type + * @param int $limit * @access public * @return array */ @@ -836,11 +836,11 @@ class docModel extends model } /** - * Get project or product libs groups. - * - * @param string $type - * @param array $idList - * @param int $limit + * Get project or product libs groups. + * + * @param string $type + * @param array $idList + * @param int $limit * @access public * @return array */ @@ -879,10 +879,10 @@ class docModel extends model /** * Get libs by object. - * - * @param string $type - * @param int $objectID - * @param string $mode + * + * @param string $type + * @param int $objectID + * @param string $mode * @access public * @return array */ @@ -983,8 +983,8 @@ class docModel extends model /** * Get doc tree. - * - * @param int $libID + * + * @param int $libID * @access public * @return array */ @@ -1003,9 +1003,9 @@ class docModel extends model /** * Fill docs in tree. - * - * @param object $node - * @param int $libID + * + * @param object $node + * @param int $libID * @access public * @return array */ @@ -1063,11 +1063,11 @@ class docModel extends model } /** - * Get crumbs. - * - * @param int $libID - * @param int $moduleID - * @param int $docID + * Get crumbs. + * + * @param int $libID + * @param int $moduleID + * @param int $docID * @access public * @return string */ @@ -1076,7 +1076,7 @@ class docModel extends model if(empty($libID)) return ''; $lib = $this->getLibById($libID); - if(!$this->checkPriv($lib)) + if(!$this->checkPriv($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"; @@ -1116,9 +1116,9 @@ class docModel extends model /** * Get product crumb. - * - * @param int $productID - * @param int $projectID + * + * @param int $productID + * @param int $projectID * @access public * @return string */ @@ -1147,9 +1147,9 @@ class docModel extends model /** * Set lib users. - * - * @param string $type - * @param int $objectID + * + * @param string $type + * @param int $objectID * @access public * @return bool */ @@ -1159,15 +1159,16 @@ class docModel extends model if($type == 'product') { $teams = $this->dao->select('t1.account')->from(TABLE_TEAM)->alias('t1') - ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.project=t2.project') - ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project=t3.id') + ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.root=t2.project') + ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.root=t3.id') ->where('t2.product')->eq($objectID) + ->andWhere('t1.type')->eq('project') ->andWhere('t3.deleted')->eq('0') ->fetchPairs('account', 'account'); } elseif($type == 'project') { - $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('project')->eq($objectID)->fetchPairs('account', 'account'); + $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('root')->eq($objectID)->andWhere('type')->eq('project')->fetchPairs('account', 'account'); } return $teams; diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 69974b50ad..34ae349d3c 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -24,7 +24,7 @@
    - + - +
    doc->module;?>doc->module;?> diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php index 0d190921c9..4892ad6917 100644 --- a/module/doc/view/showfiles.html.php +++ b/module/doc/view/showfiles.html.php @@ -72,7 +72,7 @@ pathname;?> extension;?> size / 1024 , 1) . 'K';?>addedBy) ? $file->addedBy : '';?>addedBy) ? zget($users, $file->addedBy) : '';?> addedDate) ? substr($file->addedDate, 0, 10) : '';?>
    -
    - doc->content;?> -
    - content; - if($doc->type == 'url') - { - $url = $doc->content; - if(!preg_match('/^https?:\/\//', $doc->content)) $url = 'http://' . $url; - $content = html::a($url, $doc->content, '_blank'); - } - echo $content; - ?> -
    - files as $file):?> - extension, $config->file->imageExtensions)):?> - file->uploadDate . substr($file->addedDate, 0, 10);?> -
  • - - id}");?>" alt="title?>"> - - - ", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");?> - -
    • - files[$file->id]);?> - - -
    - -
    fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'false'));?>
    +
    + content; + if($doc->type == 'url') + { + $url = $doc->content; + if(!preg_match('/^https?:\/\//', $doc->content)) $url = 'http://' . $url; + $content = html::a($url, $doc->content, '_blank'); + } + echo $content; + ?> +
    + files as $file):?> + extension, $config->file->imageExtensions)):?> + file->uploadDate . substr($file->addedDate, 0, 10);?> +
  • + + id}");?>" alt="title?>"> + + + ", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");?> + +
    • + files[$file->id]);?> + +
    -
    + +
    fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'false'));?>
    +
    deleted) echo $actionLinks;?>
    - +
    comment;?> id")?>' target='hiddenwin'> @@ -133,7 +130,7 @@
    -
    +
    +
    diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php index a6bd08f16d..d8bb227313 100644 --- a/module/editor/lang/en.php +++ b/module/editor/lang/en.php @@ -69,7 +69,7 @@ $lang->editor->modules['story'] = 'Story'; $lang->editor->modules['task'] = 'Task'; $lang->editor->modules['testcase'] = 'Case'; $lang->editor->modules['testtask'] = 'Test Task'; -$lang->editor->modules['todo'] = 'To-Do'; +$lang->editor->modules['todo'] = 'Todo'; $lang->editor->modules['tree'] = 'Module'; $lang->editor->modules['upgrade'] = 'Upgrade'; $lang->editor->modules['user'] = 'User'; diff --git a/module/entry/config.php b/module/entry/config.php index 051b241f36..7f529f1375 100644 --- a/module/entry/config.php +++ b/module/entry/config.php @@ -6,3 +6,12 @@ $config->entry->edit = new stdclass(); $config->entry->edit->requiredFields = 'name, code, key'; $config->entry->help = 'http://www.zentao.net/book/zentaopmshelp/integration-287.html'; + +$config->entry->errcode['PARAM_CODE_MISSING'] = 401; +$config->entry->errcode['PARAM_TOKEN_MISSING'] = 401; +$config->entry->errcode['SESSION_CODE_MISSING'] = 401; +$config->entry->errcode['EMPTY_KEY'] = 401; +$config->entry->errcode['INVALID_TOKEN'] = 401; +$config->entry->errcode['SESSION_VERIFY_FAILED'] = 401; +$config->entry->errcode['IP_DENIED'] = 403; +$config->entry->errcode['EMPTY_ENTRY'] = 404; diff --git a/module/entry/lang/en.php b/module/entry/lang/en.php index f7ded928be..d99fbc11b7 100644 --- a/module/entry/lang/en.php +++ b/module/entry/lang/en.php @@ -34,3 +34,12 @@ $lang->entry->note->name = 'Name'; $lang->entry->note->code = 'Code, should be english and number.'; $lang->entry->note->ip = "Use comma between two IPs. IP segment is supported, e.g. 192.168.1.*"; $lang->entry->note->allIP = 'All'; + +$lang->entry->errmsg['PARAM_CODE_MISSING'] = 'Param code is missing.'; +$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = 'Param token is missing.'; +$lang->entry->errmsg['SESSION_CODE_MISSING'] = 'Session code is missing.'; +$lang->entry->errmsg['EMPTY_KEY'] = 'Key of entry is missing.'; +$lang->entry->errmsg['INVALID_TOKEN'] = 'Invalid token.'; +$lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'Session verification failed.'; +$lang->entry->errmsg['IP_DENIED'] = 'IP is denied.'; +$lang->entry->errmsg['EMPTY_ENTRY'] = 'Key of entry is missing.'; diff --git a/module/entry/lang/zh-cn.php b/module/entry/lang/zh-cn.php index af5ce13432..c2afc09d0d 100644 --- a/module/entry/lang/zh-cn.php +++ b/module/entry/lang/zh-cn.php @@ -34,3 +34,12 @@ $lang->entry->note->name = '授权应用名称'; $lang->entry->note->code = '授权应用代号，必须为字母或数字的组合'; $lang->entry->note->ip = "允许访问API的应用ip，多个ip用逗号隔开。支持IP段，如192.168.1.*"; $lang->entry->note->allIP = '无限制'; + +$lang->entry->errmsg['PARAM_CODE_MISSING'] = '缺少code参数'; +$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = '缺少token参数'; +$lang->entry->errmsg['SESSION_CODE_MISSING'] = '缺少session code'; +$lang->entry->errmsg['EMPTY_KEY'] = '应用未设置密钥'; +$lang->entry->errmsg['INVALID_TOKEN'] = '无效的token参数'; +$lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'session验证失败'; +$lang->entry->errmsg['IP_DENIED'] = '该IP被限制访问'; +$lang->entry->errmsg['EMPTY_ENTRY'] = '应用不存在'; diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php index d4a863996c..661f560f6f 100644 --- a/module/extension/lang/zh-tw.php +++ b/module/extension/lang/zh-tw.php @@ -46,6 +46,7 @@ $lang->extension->downloads = '下載量'; $lang->extension->compatible = '兼容性'; $lang->extension->grade = '評分'; $lang->extension->depends = '依賴'; +$lang->extension->expireDate = '到期日期'; $lang->extension->zentaoCompatible = '適用版本'; $lang->extension->installedTime = '安裝時間'; diff --git a/module/file/control.php b/module/file/control.php index 6ba97d5fd7..3dbdaf656b 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -13,9 +13,9 @@ class file extends control { /** * Build the upload form. - * - * @param int $fileCount - * @param float $percent + * + * @param int $fileCount + * @param float $percent * @param string $filesName * @param string $labelsName * @access public @@ -23,7 +23,7 @@ class file extends control */ public function buildForm($fileCount = 1, $percent = 0.9, $filesName = 'files', $labelsName = 'labels') { - if(!file_exists($this->file->savePath)) + if(!file_exists($this->file->savePath)) { printf($this->lang->file->errorNotExists, $this->file->savePath); return false; @@ -43,7 +43,7 @@ class file extends control /** * AJAX: get upload request from the web editor. - * + * * @access public * @return void */ @@ -79,7 +79,7 @@ class file extends control /** * AJAX: get upload request from the web editor. - * + * * @access public * @return void */ @@ -120,9 +120,9 @@ class file extends control /** * Down a file. - * - * @param int $fileID - * @param string $mouse + * + * @param int $fileID + * @param string $mouse * @access public * @return void */ @@ -142,7 +142,7 @@ class file extends control /* Judge the mode, down or open. */ $mode = 'down'; $fileTypes = 'txt|jpg|jpeg|gif|png|bmp|xml|html'; - if(stripos($fileTypes, $file->extension) !== false and $mouse == 'left') $mode = 'open'; + if(stripos($fileTypes, $file->extension) !== false && $mouse == 'left') $mode = 'open'; if(file_exists($file->realPath)) { @@ -177,7 +177,7 @@ class file extends control /** * Export as csv format. - * + * * @access public * @return void */ @@ -193,28 +193,28 @@ class file extends control /** * export as xml format - * + * * @access public * @return void */ - public function export2XML() - { + public function export2XML() + { $this->view->fields = $this->post->fields; $this->view->rows = $this->post->rows; - + $output = $this->parse('file', 'export2XML'); $this->sendDownHeader($this->post->fileName, 'xml', $output); - } + } /** * export as html format - * + * * @access public * @return void */ - public function export2HTML() - { + public function export2HTML() + { $this->view->fields = $this->post->fields; $this->view->rows = $this->post->rows; $this->host = common::getSysURL(); @@ -224,25 +224,25 @@ class file extends control case 'task': foreach($this->view->rows as $row) { - $row->name = html::a($this->host . $this->createLink('task', 'view', "taskID=$row->id"), $row->name); + $row->name = html::a($this->host . $this->createLink('task', 'view', "taskID=$row->id"), $row->name); } break; case 'story': foreach($this->view->rows as $row) { - $row->title= html::a($this->host . $this->createLink('story', 'view', "storyID=$row->id"), $row->title); + $row->title= html::a($this->host . $this->createLink('story', 'view', "storyID=$row->id"), $row->title); } break; case 'bug': foreach($this->view->rows as $row) { - $row->title= html::a($this->host . $this->createLink('bug', 'view', "bugID=$row->id"), $row->title); + $row->title= html::a($this->host . $this->createLink('bug', 'view', "bugID=$row->id"), $row->title); } break; case 'testcase': foreach($this->view->rows as $row) { - $row->title= html::a($this->host . $this->createLink('testcase', 'view', "caseID=$row->id"), $row->title); + $row->title= html::a($this->host . $this->createLink('testcase', 'view', "caseID=$row->id"), $row->title); } break; } @@ -250,13 +250,13 @@ class file extends control $output = $this->parse('file', 'export2Html'); $this->sendDownHeader($this->post->fileName, 'html', $output); - } + } /** * Send the download header to the client. - * - * @param string $fileName - * @param string $extension + * + * @param string $fileName + * @param string $extension * @access public * @return void */ @@ -289,8 +289,8 @@ class file extends control /** * Delete a file. - * - * @param int $fileID + * + * @param int $fileID * @param string $confirm yes|no * @access public * @return void @@ -312,10 +312,10 @@ class file extends control } /** - * Print files. - * - * @param array $files - * @param string $fieldset + * Print files. + * + * @param array $files + * @param string $fieldset * @access public * @return void */ @@ -327,9 +327,9 @@ class file extends control } /** - * Edit file's name. - * - * @param int $fileID + * Edit file's name. + * + * @param int $fileID * @access public * @return void */ @@ -355,8 +355,8 @@ class file extends control } /** - * Paste image in kindeditor at firefox and chrome. - * + * Paste image in kindeditor at firefox and chrome. + * * @access public * @return void */ @@ -370,9 +370,9 @@ class file extends control /** * Upload Images. - * - * @param string $module - * @param string $params + * + * @param string $module + * @param string $params * @access public * @return void */ @@ -424,9 +424,9 @@ class file extends control /** * Build export tpl. - * - * @param string $module - * @param int $templateID + * + * @param string $module + * @param int $templateID * @access public * @return void */ @@ -444,8 +444,8 @@ class file extends control /** * Ajax save template. - * - * @param string $module + * + * @param string $module * @access public * @return void */ @@ -462,8 +462,8 @@ class file extends control /** * Ajax delete template. - * - * @param int $templateID + * + * @param int $templateID * @access public * @return void */ @@ -474,9 +474,9 @@ class file extends control } /** - * Read file. - * - * @param int $fileID + * Read file. + * + * @param int $fileID * @access public * @return void */ diff --git a/module/file/lang/en.php b/module/file/lang/en.php index 48ee394ecc..9e5a8fa7ea 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->file = new stdclass(); -$lang->file->common = 'Attachment'; +$lang->file->common = 'File'; $lang->file->uploadImages = 'Batch Upload Images'; $lang->file->download = 'Download Files'; $lang->file->uploadDate = 'Uploaded on'; @@ -26,16 +26,16 @@ $lang->file->exportFields = "Fileds to be Exported"; $lang->file->defaultTPL = "Default Template"; $lang->file->setExportTPL = "Settings"; $lang->file->preview = "Preview"; -$lang->file->addFile = 'Add File'; -$lang->file->beginUpload = 'Start uploading'; -$lang->file->uploadSuccess = 'uploaded Successfully'; +$lang->file->addFile = 'Add'; +$lang->file->beginUpload = 'Upload'; +$lang->file->uploadSuccess = 'Uploaded!'; $lang->file->pathname = 'Path Name'; $lang->file->title = 'Title'; $lang->file->extension = 'Extension'; $lang->file->size = 'Size'; $lang->file->addedBy = 'Added By'; -$lang->file->addedDate = 'Added Date'; +$lang->file->addedDate = 'Added On'; $lang->file->downloads = 'Downloads'; $lang->file->extra = 'Extra'; @@ -50,4 +50,4 @@ $lang->file->errorFileMove = " Uploading failed, there was an error when movi $lang->file->dangerFile = " File has been rejected to upload for security issues."; $lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!'; $lang->file->errorExtract = 'Extracting file failed. File might be damaged or invalid files in the zip package.'; -$lang->file->uploadImagesExplain = 'Note: please upload "jpg, jpeg, gif, png" format of the picture, the program will use the file name as the title, the picture as content.'; +$lang->file->uploadImagesExplain = 'Note: upload .jpg, .jpeg, .gif, and .png images. The image name will be taken as the title of the story and the image as its content.'; diff --git a/module/file/view/download.html.php b/module/file/view/download.html.php index 551102445e..6a7f742e8c 100644 --- a/module/file/view/download.html.php +++ b/module/file/view/download.html.php @@ -29,9 +29,9 @@ } else { - if(!extension_loaded('mbstring')) + if(extension_loaded('mbstring')) { - $encoding = mb_detect_encoding($fileContent, array('ASCII','UTF-8','GB2312','GBK','BIG5')); + $encoding = mb_detect_encoding($fileContent, array('ASCII', 'UTF-8', 'GB2312', 'GBK', 'BIG5')); if($encoding != 'UTF-8') $fileContent = helper::convertEncoding($fileContent, $encoding, $config->charset); } else diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index 904b1916d8..d37e25bbf2 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -167,7 +167,6 @@ $(document).ready(function() if(!$hasDefaultField)$selectedFields[] = $field; } ?> -
    +
    + diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 96cd9268b8..cc85fd9bf8 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -13,95 +13,100 @@ todo->confirmDelete)?> -
    -
      - todo->periods as $period => $label) - { +
      +
      +
    -
    - " . $lang->todo->export, '', "class='btn export'") ?> - " . $lang->todo->batchCreate, '', "class='btn'") ?> - " . $lang->todo->create, '', "class='btn'") ?> -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    idAB);?> todo->date);?> todo->type);?> priAB);?> todo->name);?> todo->beginAB);?> todo->endAB);?>todo->status);?>actions;?>
    - - - - id; ?> - date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?>todo->typeList[$todo->type];?>todo->priList, $todo->pri, $todo->pri);?>'>todo->priList, $todo->pri, $todo->pri)?>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'");?>begin;?>end;?>todo->statusList[$todo->status];?> - id", $todo, 'list', 'ok-sign', 'hiddenwin'); - common::printIcon('todo', 'edit', "id=$todo->id", '', 'list', 'pencil', '', 'iframe', true); - - if(common::hasPriv('todo', 'delete')) - { - $deleteURL = $this->createLink('todo', 'delete', "todoID=$todo->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='btn-icon' title='{$lang->todo->delete}'"); - } + $label = $period == 'all' ? "$label {$todoCount}" : "$label"; + $active = $period == $type ? 'btn-active-text' : ''; + echo html::a(inlink('todo', $vars), $label, '', "class='btn btn-link $active' id='{$period}'") ?> -
    -
    - "; + +
    + + +
    +
    +
    + " . $lang->todo->export, '', "class='btn btn-link iframe'");?> + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    + + idAB);?> +     		todo->date);?> todo->type);?> priAB);?> todo->name);?> todo->beginAB);?> todo->endAB);?>todo->status);?>actions;?>
    +
    + + + + + id?> +
    +     		date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?>todo->typeList[$todo->type];?> pri;?>'>todo->priList, $todo->pri, $todo->pri)?>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'");?>begin;?>end;?>todo->statusList[$todo->status];?> + status != 'done') common::printIcon('todo', 'assignto', "todoID=$todo->id", $todo, 'list', 'hand-right', '', "btn-icon", '', "data-toggle='assigntoModal'", $lang->todo->assignTo); + if($todo->status == 'done') common::printIcon('todo', 'activate', "id=$todo->id", $todo, 'list', 'magic', 'hiddenwin'); + if($todo->status != 'done') common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', 'checked', 'hiddenwin'); + if($todo->status == 'done') common::printIcon('todo', 'close', "id=$todo->id", $todo, 'list', 'off', 'hiddenwin'); + common::printIcon('todo', 'edit', "id=$todo->id", '', 'list', 'edit', '', 'iframe', true); + + if(common::hasPriv('todo', 'delete')) + { + $deleteURL = $this->createLink('todo', 'delete', "todoID=$todo->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='btn' title='{$lang->todo->delete}'"); + } + ?> +
    + +
    + + +
    + +
    + createLink('todo', 'batchEdit', "from=myTodo&type=$type&account=$account&status=$status"); @@ -112,25 +117,26 @@ { $actionLink = $this->createLink('todo', 'batchFinish'); echo html::commonButton($lang->todo->finish, "onclick=\"setFormAction('$actionLink','hiddenwin')\""); - } - echo '
    '; if(common::hasPriv('todo', 'import2Today') and $importFuture) { $actionLink = $this->createLink('todo', 'import2Today'); - echo "
    "; - echo "
    " . html::input('date', date('Y-m-d'), "class='form-control form-date'") . '
    '; + echo "
    "; + echo html::input('date', date('Y-m-d'), "class='form-control form-date'"); + echo ''; echo '
    '; echo html::commonButton($lang->todo->import, "onclick=\"setFormAction('$actionLink')\""); } ?>
    - show();?> -
    -
    + + show('right', 'pagerjs');?> +
    + + +
    + + + diff --git a/module/product/lang/en.php b/module/product/lang/en.php index b80d3e5ee3..77e950a488 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -9,11 +9,11 @@ * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->product->common = $lang->productCommon . 'View'; +$lang->product->common = $lang->productCommon; $lang->product->index = $lang->productCommon . "Home"; $lang->product->browse = "Story List"; $lang->product->dynamic = "Dynamic"; -$lang->product->view = "{$lang->productCommon}s"; +$lang->product->view = "Overview"; $lang->product->edit = "Edit {$lang->productCommon}"; $lang->product->batchEdit = "Batch Edit"; $lang->product->create = "Create {$lang->productCommon}"; @@ -31,24 +31,25 @@ $lang->product->export = "Export"; $lang->product->basicInfo = 'Basic Info'; $lang->product->otherInfo = 'Other Info'; -$lang->product->plans = 'Plans'; -$lang->product->releases = 'Releases'; +$lang->product->plans = 'Plan'; +$lang->product->releases = 'Release'; $lang->product->docs = 'Doc'; $lang->product->bugs = 'Linked Bug'; $lang->product->projects = "Linked {$lang->projectCommon}"; -$lang->product->cases = 'Cases'; -$lang->product->builds = 'Builds'; +$lang->product->cases = 'Case'; +$lang->product->builds = 'Build'; $lang->product->roadmap = 'Roadmap'; $lang->product->doc = 'Doc'; $lang->product->project = $lang->projectCommon . 'List'; $lang->product->build = 'Build'; +$lang->product->currentProject = 'Current Project'; $lang->product->activeStories = 'Activated Story'; $lang->product->changedStories = 'Changed Story'; $lang->product->draftStories = 'Draft Story'; $lang->product->closedStories = 'Closed Story'; $lang->product->unResolvedBugs = 'Unresolved Bug'; -$lang->product->assignToNullBugs = 'No Assigned Bug'; +$lang->product->assignToNullBugs = 'Unassigned Bug'; $lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; @@ -64,27 +65,27 @@ $lang->product->type = "Type"; $lang->product->status = 'Status'; $lang->product->desc = 'Description'; $lang->product->PO = "PO"; -$lang->product->QD = 'QD'; -$lang->product->RD = 'RD'; -$lang->product->acl = 'Acceptance'; +$lang->product->QD = 'QA Manager'; +$lang->product->RD = 'Release Manager'; +$lang->product->acl = 'Access Control'; $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; $lang->product->searchStory = 'Search'; -$lang->product->assignedToMe = 'Assigned to Me'; -$lang->product->openedByMe = 'Created by Me'; -$lang->product->reviewedByMe = 'Reviewed by Me'; -$lang->product->closedByMe = 'Closed by Me'; +$lang->product->assignedToMe = 'Assigned To Me'; +$lang->product->openedByMe = 'Created By Me'; +$lang->product->reviewedByMe = 'Reviewed By Me'; +$lang->product->closedByMe = 'ClosedByMe'; $lang->product->draftStory = 'Draft'; -$lang->product->activeStory = 'Activate'; +$lang->product->activeStory = 'Activated'; $lang->product->changedStory = 'Changed'; -$lang->product->willClose = 'To be Closed'; +$lang->product->willClose = 'ToBeClose'; $lang->product->closedStory = 'Closed'; $lang->product->unclosed = 'Open'; -$lang->product->unplan = 'No plan'; +$lang->product->unplan = 'Wait'; $lang->product->my = 'My'; -$lang->product->allStory = 'All Stories'; +$lang->product->allStory = 'All'; $lang->product->allProduct = 'All' . $lang->productCommon; $lang->product->allProductsOfProject = 'All linked' . $lang->productCommon; @@ -120,6 +121,9 @@ $lang->product->mySelects['resolvedbyme'] = $lang->product->reviewedByMe; $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; $lang->product->featureBar['browse']['unplan'] = $lang->product->unplan; $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; + + + $lang->product->featureBar['browse']['my'] = $lang->product->my; $lang->product->featureBar['browse']['closedbyme'] = $lang->product->closedByMe; $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index e5fadf1a90..086cea20db 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -43,6 +43,7 @@ $lang->product->doc = '文档列表'; $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; +$lang->product->currentProject = '当前项目'; $lang->product->activeStories = '激活需求'; $lang->product->changedStories = '已变更需求'; $lang->product->draftStories = '草稿需求'; @@ -83,6 +84,7 @@ $lang->product->closedStory = '已关闭'; $lang->product->unclosed = '未关闭'; $lang->product->unplan = '未计划'; + $lang->product->allStory = '全部需求'; $lang->product->allProduct = '全部' . $lang->productCommon; $lang->product->allProductsOfProject = '全部关联' . $lang->productCommon; @@ -112,12 +114,17 @@ $lang->product->storySummary = "本页共 %s 个需求，预 $lang->product->checkedSummary = "选中 %total% 个需求，预计 %estimate% 个工时，用例覆盖率%rate%。"; $lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon; + + + + $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; $lang->product->featureBar['browse']['unplan'] = $lang->product->unplan; $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; $lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; $lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; + $lang->product->featureBar['browse']['closedbyme'] = $lang->product->closedByMe; $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; $lang->product->featureBar['browse']['activestory'] = $lang->product->activeStory; diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index 6e59b146bc..72c90a08b6 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -16,7 +16,7 @@ $lang->product->dynamic = "動態"; $lang->product->view = "{$lang->productCommon}概況"; $lang->product->edit = "編輯{$lang->productCommon}"; $lang->product->batchEdit = "批量編輯"; -$lang->product->create = "新增{$lang->productCommon}"; +$lang->product->create = "添加{$lang->productCommon}"; $lang->product->delete = "刪除{$lang->productCommon}"; $lang->product->deleted = "已刪除"; $lang->product->close = "關閉"; @@ -43,6 +43,7 @@ $lang->product->doc = '文檔列表'; $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; +$lang->product->currentProject = '當前項目'; $lang->product->activeStories = '激活需求'; $lang->product->changedStories = '已變更需求'; $lang->product->draftStories = '草稿需求'; @@ -71,16 +72,18 @@ $lang->product->whitelist = '分組白名單'; $lang->product->branch = '所屬%s'; $lang->product->searchStory = '搜索'; -$lang->product->assignedToMe = '指派給我'; -$lang->product->openedByMe = '由我創建'; -$lang->product->reviewedByMe = '由我評審'; -$lang->product->closedByMe = '由我關閉'; +$lang->product->assignedToMe = '指給我'; +$lang->product->openedByMe = '我創建'; +$lang->product->reviewedByMe = '我評審'; +$lang->product->closedByMe = '我關閉'; $lang->product->draftStory = '草稿'; $lang->product->activeStory = '激活'; $lang->product->changedStory = '已變更'; $lang->product->willClose = '待關閉'; $lang->product->closedStory = '已關閉'; $lang->product->unclosed = '未關閉'; +$lang->product->unplan = '未計劃'; + $lang->product->allStory = '全部需求'; $lang->product->allProduct = '全部' . $lang->productCommon; @@ -107,14 +110,21 @@ $lang->product->aclList['open'] = "預設設置(有{$lang->productCommon}視 $lang->product->aclList['private'] = "私有{$lang->productCommon}(只有{$lang->productCommon}相關負責人和{$lang->projectCommon}團隊成員才能訪問)"; $lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名單的成員可以訪問)'; -$lang->product->storySummary = "本頁共 %s 個需求，預計 %s 個工時，用例覆蓋率%s。"; -$lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon; +$lang->product->storySummary = "本頁共 %s 個需求，預計 %s 個工時，用例覆蓋率%s。"; +$lang->product->checkedSummary = "選中 %total% 個需求，預計 %estimate% 個工時，用例覆蓋率%rate%。"; +$lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon; + + + + $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; +$lang->product->featureBar['browse']['unplan'] = $lang->product->unplan; $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; $lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; $lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; + $lang->product->featureBar['browse']['closedbyme'] = $lang->product->closedByMe; $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; $lang->product->featureBar['browse']['activestory'] = $lang->product->activeStory; diff --git a/module/product/model.php b/module/product/model.php index 9f9a0f8f3f..88eddf0328 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -614,10 +614,11 @@ class productModel extends model } if(empty($teams)) { - $teams = $this->dao->select('t1.project, t1.account')->from(TABLE_TEAM)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') + $teams = $this->dao->select('t1.root, t1.account')->from(TABLE_TEAM)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.root = t2.id') ->where('t2.deleted')->eq(0) - ->fetchGroup('project', 'account'); + ->andWhere('t1.type')->eq('project') + ->fetchGroup('root', 'account'); } if(!isset($projects[$product->id])) return $members; @@ -773,36 +774,71 @@ class productModel extends model return $stats; } + /** + * Get priv products. + * + * @access public + * @return array + */ public function getPrivProducts() { $account = ',' . $this->app->user->account . ','; static $products; if($products === null) { - $groupSql = ''; + $groups = ''; if(isset($this->app->user->groups)) { - foreach($this->app->user->groups as $group) $groupSql .= "INSTR(CONCAT(',', t1.whitelist, ','), ',$group,') > 0 OR "; + foreach($this->app->user->groups as $group) $groups .= ",$group,"; } - $groupSql = !empty($groupSql) ? '(' . substr($groupSql, 0, strlen($groupSql) - 4) . ')' : '1 != 1'; - $products = $this->dao->select('distinct t1.id')->from(TABLE_PRODUCT)->alias('t1') + $stmt = $this->dao->select('distinct t1.*,t3.type as teamType,t3.account as teamAccount,t4.deleted as projectDeleted')->from(TABLE_PRODUCT)->alias('t1') ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.product') - ->leftJoin(TABLE_TEAM)->alias('t3')->on('t2.project = t3.project') + ->leftJoin(TABLE_TEAM)->alias('t3')->on('t2.project = t3.root') ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t2.project = t4.id') - ->beginIF($this->app->user->admin)->where('t1.deleted')->eq(0)->fi() - ->beginIF(!$this->app->user->admin) - ->where('t1.acl')->eq('open') - ->orWhere("(t1.acl = 'custom' AND $groupSql)") - ->orWhere('t1.PO')->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) - ->orWhere('t3.account')->eq($this->app->user->account) - ->andWhere('t1.deleted')->eq(0) - ->andWhere('t4.deleted')->eq(0) - ->fi() - ->fetchAll('id'); + ->where('t1.deleted')->eq(0) + ->query(); + + $products = array(); + $account = $this->app->user->account; + while($product = $stmt->fetch()) + { + $id = $product->id; + if($this->app->user->admin) + { + $products[$id] = $id; + } + else + { + if($product->PO == $account OR $product->QD == $account OR $product->RD == $account OR $product->createdBy == $account) + { + $products[$id] = $id; + continue; + } + if($product->teamType == 'project' and $product->teamAccount == $account and $product->projectDeleted == '0') + { + $products[$id] = $id; + continue; + } + if($product->acl == 'open') + { + $products[$id] = $id; + continue; + } + if($product->acl == 'custom') + { + foreach(explode(',', $product->whitelist) as $whitelist) + { + if(empty($whitelist)) continue; + if(strpos($groups, ",$whitelist,") !== false) + { + $products[$id] = $id; + break; + } + } + } + } + } } return $products; } diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 6322c4bdb0..4c96ad190a 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -66,7 +66,7 @@ product->line);?> product->activeStories;?> product->changedStories;?> - product->draftStories;?> + product->draftStories;?> product->closedStories;?> product->plans;?> product->releases;?> diff --git a/module/product/view/build.html.php b/module/product/view/build.html.php index a07931ddf0..3ab95d193b 100755 --- a/module/product/view/build.html.php +++ b/module/product/view/build.html.php @@ -35,8 +35,8 @@ id;?> createLink('build', 'view', "build=$build->id"), $build->name);?> - scmPath, 'http') === true ? html::a($build->scmPath) : $build->scmPath;?> - filePath, 'http') === true ? html::a($build->filePath) : $build->filePath;?> + scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?> + filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?> date?> builder]?> diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index f905b5854b..687bf6ac15 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -23,7 +23,7 @@
    - + diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php index c18dd79ca1..18899fccea 100755 --- a/module/product/view/dynamic.html.php +++ b/module/product/view/dynamic.html.php @@ -31,10 +31,10 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> - + - + diff --git a/module/productplan/config.php b/module/productplan/config.php index c506aacdc0..0f7486b95b 100644 --- a/module/productplan/config.php +++ b/module/productplan/config.php @@ -2,8 +2,8 @@ $config->productplan = new stdclass(); $config->productplan->create = new stdclass(); $config->productplan->edit = new stdclass(); -$config->productplan->create->requiredFields = 'title,begin,end'; -$config->productplan->edit->requiredFields = 'title,begin,end'; +$config->productplan->create->requiredFields = 'title,begin'; +$config->productplan->edit->requiredFields = 'title,begin'; $config->productplan->editor = new stdclass(); $config->productplan->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); diff --git a/module/productplan/control.php b/module/productplan/control.php index 2a820a8806..261cfb3971 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -191,6 +191,7 @@ 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); diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js index e58173c215..c7d495d46f 100644 --- a/module/productplan/js/create.js +++ b/module/productplan/js/create.js @@ -1,7 +1,7 @@ /** * Convert a date string like 2011-11-11 to date object in js. - * - * @param string $date + * + * @param string $date * @access public * @return date */ @@ -9,14 +9,14 @@ function convertStringToDate(dateString) { dateString = dateString.split('-'); dateString = dateString[1] + '/' + dateString[2] + '/' + dateString[0]; - + return Date.parse(dateString); } /** * Compute the end date for productplan. - * - * @param int $delta + * + * @param int $delta * @access public * @return void */ @@ -33,7 +33,15 @@ function computeEndDate(delta) } endDate = beginDate.addDays(delta - 1).toString('yyyy-MM-dd'); - $('#end').val(endDate); + + if(delta == 9999) + { + $('#end').val('').attr("disabled","disabled"); + } + else + { + $('#end').val(endDate).removeAttr('disabled'); + } } $('#begin').on('change', function() diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js index b23058c54e..c7fb9892ad 100644 --- a/module/productplan/js/edit.js +++ b/module/productplan/js/edit.js @@ -1,7 +1,7 @@ /** * Convert a date string like 2011-11-11 to date object in js. - * - * @param string $date + * + * @param string $date * @access public * @return date */ @@ -9,14 +9,14 @@ function convertStringToDate(dateString) { dateString = dateString.split('-'); dateString = dateString[1] + '/' + dateString[2] + '/' + dateString[0]; - + return Date.parse(dateString); } /** * Compute the end date for productplan. - * - * @param int $delta + * + * @param int $delta * @access public * @return void */ @@ -33,5 +33,12 @@ function computeEndDate(delta) } endDate = beginDate.addDays(delta - 1).toString('yyyy-MM-dd'); - $('#end').val(endDate).datetimepicker('update') + if(delta == 9999) + { + $('#end').val('').attr("disabled","disabled"); + } + else + { + $('#end').val(endDate).removeAttr('disabled').datetimepicker('update'); + } } diff --git a/module/productplan/js/view.js b/module/productplan/js/view.js index 5222235cbc..ad52ab8eca 100644 --- a/module/productplan/js/view.js +++ b/module/productplan/js/view.js @@ -46,7 +46,6 @@ $(function() { var list = ''; for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; - console.log(list); $.post(createLink('productplan', 'ajaxStorySort', 'planID=' + planID), {'storys' : list, 'orderBy' : orderBy}, function() { var $target = $(data.element[0]); diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index f0450c5f84..1db1ccba00 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -9,7 +9,7 @@ * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->productplan->common = $lang->productCommon . 'Plan'; +$lang->productplan->common = $lang->productCommon . ' Plan'; $lang->productplan->browse = "View"; $lang->productplan->index = "List"; $lang->productplan->create = "Create"; @@ -17,20 +17,20 @@ $lang->productplan->edit = "Edit"; $lang->productplan->delete = "Delete"; $lang->productplan->view = "Details"; $lang->productplan->bugSummary = "%s Bugs in total on this page."; -$lang->productplan->info = 'Info'; +$lang->productplan->info = 'Info'; $lang->productplan->batchEdit = 'Batch Edit'; $lang->productplan->batchUnlink = "Batch Unlink"; -$lang->productplan->linkStory = "Linked Story"; +$lang->productplan->linkStory = "Link Story"; $lang->productplan->unlinkStory = "Unlink Story"; $lang->productplan->batchUnlinkStory = "Batch Unlink"; -$lang->productplan->linkedStories = 'link Story'; -$lang->productplan->unlinkedStories = 'UnLinkEd'; -$lang->productplan->updateOrder = 'Ranking'; +$lang->productplan->linkedStories = 'Linked Story'; +$lang->productplan->unlinkedStories = 'Unlinked Story'; +$lang->productplan->updateOrder = 'Sort'; $lang->productplan->linkBug = "Link Bug"; $lang->productplan->unlinkBug = "Unlink Bug"; -$lang->productplan->batchUnlinkBug = "Batch Unlink"; +$lang->productplan->batchUnlinkBug = "Batch Unlink Bug"; $lang->productplan->linkedBugs = 'Linked Bug'; $lang->productplan->unlinkedBugs = 'Unlinked'; @@ -46,14 +46,20 @@ $lang->productplan->desc = 'Description'; $lang->productplan->begin = 'Begin'; $lang->productplan->end = 'End'; $lang->productplan->last = 'Last plan'; +$lang->productplan->future = 'Future'; +$lang->productplan->stories = 'Stories'; +$lang->productplan->bugs = 'Bugs'; +$lang->productplan->hour = 'Hour'; +$lang->productplan->project = $lang->projectCommon; -$lang->productplan->endList[7] = '1 Week'; -$lang->productplan->endList[14] = '2 Weeks'; -$lang->productplan->endList[31] = '1 Month'; -$lang->productplan->endList[62] = '2 Months'; -$lang->productplan->endList[93] = '3 Months'; -$lang->productplan->endList[186] = '6 Months'; -$lang->productplan->endList[365] = '1 Year'; +$lang->productplan->endList[7] = '1 Week'; +$lang->productplan->endList[14] = '2 Weeks'; +$lang->productplan->endList[31] = '1 Month'; +$lang->productplan->endList[62] = '2 Months'; +$lang->productplan->endList[93] = '3 Months'; +$lang->productplan->endList[186] = '6 Months'; +$lang->productplan->endList[365] = '1 Year'; +$lang->productplan->endList[9999] = 'Future'; $lang->productplan->errorNoTitle = 'ID %s title should not be empty.'; $lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.'; @@ -61,5 +67,5 @@ $lang->productplan->errorNoEnd = 'ID %s end time should not be empty.'; $lang->productplan->beginGeEnd = 'ID %s begin time value should not be greater than t.'; $lang->productplan->featureBar['browse']['all'] = 'All'; -$lang->productplan->featureBar['browse']['unexpired'] = 'On Time'; -$lang->productplan->featureBar['browse']['overdue'] = 'Overdue'; +$lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired'; +$lang->productplan->featureBar['browse']['overdue'] = 'Expired'; diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 4f6b622a60..97102a30ab 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -17,7 +17,7 @@ $lang->productplan->edit = "编辑计划"; $lang->productplan->delete = "删除计划"; $lang->productplan->view = "计划详情"; $lang->productplan->bugSummary = "本页共 %s 个Bug"; -$lang->productplan->info = '信息'; +$lang->productplan->info = '信息'; $lang->productplan->batchEdit = '批量编辑'; $lang->productplan->batchUnlink = "批量移除"; @@ -46,14 +46,20 @@ $lang->productplan->desc = '描述'; $lang->productplan->begin = '开始日期'; $lang->productplan->end = '结束日期'; $lang->productplan->last = '上次计划'; +$lang->productplan->future = '待定'; +$lang->productplan->stories = '需求数'; +$lang->productplan->bugs = 'Bug数'; +$lang->productplan->hour = '工时'; +$lang->productplan->project = $lang->projectCommon; -$lang->productplan->endList[7] = '一星期'; -$lang->productplan->endList[14] = '两星期'; -$lang->productplan->endList[31] = '一个月'; -$lang->productplan->endList[62] = '两个月'; -$lang->productplan->endList[93] = '三个月'; -$lang->productplan->endList[186] = '半年'; -$lang->productplan->endList[365] = '一年'; +$lang->productplan->endList[7] = '一星期'; +$lang->productplan->endList[14] = '两星期'; +$lang->productplan->endList[31] = '一个月'; +$lang->productplan->endList[62] = '两个月'; +$lang->productplan->endList[93] = '三个月'; +$lang->productplan->endList[186] = '半年'; +$lang->productplan->endList[365] = '一年'; +$lang->productplan->endList[9999] = '待定'; $lang->productplan->errorNoTitle = 'ID %s 标题不能为空'; $lang->productplan->errorNoBegin = 'ID %s 开始时间不能为空'; diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php index 2adf15a56c..71511ea2d0 100644 --- a/module/productplan/lang/zh-tw.php +++ b/module/productplan/lang/zh-tw.php @@ -17,7 +17,7 @@ $lang->productplan->edit = "編輯計劃"; $lang->productplan->delete = "刪除計劃"; $lang->productplan->view = "計劃詳情"; $lang->productplan->bugSummary = "本頁共 %s 個Bug"; -$lang->productplan->basicInfo = '基本信息'; +$lang->productplan->info = '信息'; $lang->productplan->batchEdit = '批量編輯'; $lang->productplan->batchUnlink = "批量移除"; @@ -26,6 +26,7 @@ $lang->productplan->unlinkStory = "移除需求"; $lang->productplan->batchUnlinkStory = "批量移除需求"; $lang->productplan->linkedStories = '需求'; $lang->productplan->unlinkedStories = '未關聯需求'; +$lang->productplan->updateOrder = '排序'; $lang->productplan->linkBug = "關聯Bug"; $lang->productplan->unlinkBug = "移除Bug"; @@ -45,14 +46,20 @@ $lang->productplan->desc = '描述'; $lang->productplan->begin = '開始日期'; $lang->productplan->end = '結束日期'; $lang->productplan->last = '上次計劃'; +$lang->productplan->future = '待定'; +$lang->productplan->stories = '需求數'; +$lang->productplan->bugs = 'Bug數'; +$lang->productplan->hour = '工時'; +$lang->productplan->project = $lang->projectCommon; -$lang->productplan->endList[7] = '一星期'; -$lang->productplan->endList[14] = '兩星期'; -$lang->productplan->endList[31] = '一個月'; -$lang->productplan->endList[62] = '兩個月'; -$lang->productplan->endList[93] = '三個月'; -$lang->productplan->endList[186] = '半年'; -$lang->productplan->endList[365] = '一年'; +$lang->productplan->endList[7] = '一星期'; +$lang->productplan->endList[14] = '兩星期'; +$lang->productplan->endList[31] = '一個月'; +$lang->productplan->endList[62] = '兩個月'; +$lang->productplan->endList[93] = '三個月'; +$lang->productplan->endList[186] = '半年'; +$lang->productplan->endList[365] = '一年'; +$lang->productplan->endList[9999] = '待定'; $lang->productplan->errorNoTitle = 'ID %s 標題不能為空'; $lang->productplan->errorNoBegin = 'ID %s 開始時間不能為空'; diff --git a/module/productplan/model.php b/module/productplan/model.php index 22f6b0604b..c5da6ecdce 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -15,8 +15,8 @@ class productplanModel extends model { /** * Get plan by id. - * - * @param int $planID + * + * @param int $planID * @param bool $setImgSize * @access public * @return object @@ -30,9 +30,9 @@ class productplanModel extends model } /** - * Get plans by idList - * - * @param int $planIDList + * Get plans by idList + * + * @param int $planIDList * @access public * @return array */ @@ -43,8 +43,8 @@ class productplanModel extends model /** * Get last plan. - * - * @param int $productID + * + * @param int $productID * @access public * @return void */ @@ -60,9 +60,9 @@ class productplanModel extends model } /** - * Get list - * - * @param int $product + * Get list + * + * @param int $product * @param int $branch * @param string $browseType * @param object $pager @@ -73,21 +73,39 @@ class productplanModel extends model public function getList($product = 0, $branch = 0, $browseType = 'all', $pager = null, $orderBy = 'begin_desc') { $date = date('Y-m-d'); - return $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('product')->eq($product) - ->andWhere('deleted')->eq(0) - ->beginIF(!empty($branch))->andWhere('branch')->eq($branch)->fi() - ->beginIF($browseType == 'unexpired')->andWhere('end')->gt($date)->fi() - ->beginIF($browseType == 'overdue')->andWhere('end')->le($date)->fi() + $productPlans = $this->dao->select('t1.*,t2.project')->from(TABLE_PRODUCTPLAN)->alias('t1') + ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t2.plan = t1.id and t2.product = ' . $product) + ->where('t1.product')->eq($product) + ->andWhere('t1.deleted')->eq(0) + ->beginIF(!empty($branch))->andWhere('t1.branch')->eq($branch)->fi() + ->beginIF($browseType == 'unexpired')->andWhere('t1.end')->gt($date)->fi() + ->beginIF($browseType == 'overdue')->andWhere('t1.end')->le($date)->fi() ->orderBy($orderBy) ->page($pager) - ->fetchAll(); + ->fetchAll('id'); + + if(!empty($productPlans)) + { + foreach($productPlans as $productPlan) + { + $stories = $this->dao->select('id,estimate')->from(TABLE_STORY) + ->where("CONCAT(',', plan, ',')")->like("%,{$productPlan->id},%") + ->andWhere('deleted')->eq(0) + ->fetchPairs('id', 'estimate'); + $productPlan->stories = count($stories); + $productPlan->bugs = $this->dao->select()->from(TABLE_BUG)->where("plan")->eq($productPlan->id)->andWhere('deleted')->eq(0)->count(); + $productPlan->hour = array_sum($stories); + $productPlan->projectID = $productPlan->project; + } + } + return $productPlans; } /** * Get plan pairs. - * - * @param array|int $product - * @param string $expired + * + * @param array|int $product + * @param string $expired * @access public * @return array */ @@ -117,9 +135,9 @@ class productplanModel extends model } /** - * Get plans for products - * - * @param int $products + * Get plans for products + * + * @param int $products * @access public * @return void */ @@ -133,13 +151,16 @@ class productplanModel extends model /** * Create a plan. - * + * * @access public * @return int */ public function create() { - $plan = fixer::input('post')->stripTags($this->config->productplan->editor->create['id'], $this->config->allowedTags)->remove('delta,uid')->get(); + $plan = fixer::input('post')->stripTags($this->config->productplan->editor->create['id'], $this->config->allowedTags) + ->setIF($this->post->delta == 9999 || empty($_POST['end']), 'end', '2030-01-01') + ->remove('delta,uid') + ->get(); $plan = $this->loadModel('file')->processImgURL($plan, $this->config->productplan->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_PRODUCTPLAN) ->data($plan) @@ -158,15 +179,19 @@ class productplanModel extends model /** * Update a plan - * - * @param int $planID + * + * @param int $planID * @access public * @return array */ public function update($planID) { $oldPlan = $this->dao->findByID((int)$planID)->from(TABLE_PRODUCTPLAN)->fetch(); - $plan = fixer::input('post')->stripTags($this->config->productplan->editor->edit['id'], $this->config->allowedTags)->remove('delta,uid')->get(); + $plan = fixer::input('post')->stripTags($this->config->productplan->editor->edit['id'], $this->config->allowedTags) + ->setIF($this->post->delta == 9999 || $this->post->end == '', 'end', '2030-01-01') + ->remove('delta,uid') + ->get(); + $plan = $this->loadModel('file')->processImgURL($plan, $this->config->productplan->editor->edit['id'], $this->post->uid); $this->dao->update(TABLE_PRODUCTPLAN) ->data($plan) @@ -184,8 +209,8 @@ class productplanModel extends model /** * Batch update plan. - * - * @param int $productID + * + * @param int $productID * @access public * @return array */ @@ -233,8 +258,8 @@ class productplanModel extends model /** * Link stories. - * - * @param int $planID + * + * @param int $planID * @access public * @return void */ @@ -267,9 +292,9 @@ class productplanModel extends model } /** - * Unlink story - * - * @param int $storyID + * Unlink story + * + * @param int $storyID * @access public * @return void */ @@ -284,8 +309,8 @@ class productplanModel extends model /** * Link bugs. - * - * @param int $planID + * + * @param int $planID * @access public * @return void */ diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index bba3dadef4..db9c272f1b 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -43,15 +43,19 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> - - + + session->currentProductType != 'normal'):?> - + - - - - + + + + + + + + @@ -60,18 +64,23 @@ file->replaceImgURL($plan, 'desc');?> session->currentProductType != 'normal'):?> + + + + - + - - + diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php index 4b317d3dbc..a3b2aadd70 100644 --- a/module/report/view/productsummary.html.php +++ b/module/report/view/productsummary.html.php @@ -32,8 +32,8 @@ - - + + @@ -47,7 +47,7 @@ plans) ? count($product->plans) : 1;?> - + plans)):?> plans as $plan):?> diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php index 87e8a599d8..d5247d417b 100644 --- a/module/report/view/workload.html.php +++ b/module/report/view/workload.html.php @@ -17,7 +17,7 @@
    -
    +
    report->dept;?> @@ -26,9 +26,9 @@
    report->taskAssignedDate;?> -
    +
    report->to;?> -
    +
    @@ -43,6 +43,9 @@
    +
    + report->assign, $assign, "class='form-control' onchange='changeParams(this)' style='width:90px'");?> +
    report->query);?>
    diff --git a/module/score/model.php b/module/score/model.php index 75331f34c1..e3d394f7a0 100644 --- a/module/score/model.php +++ b/module/score/model.php @@ -143,7 +143,7 @@ class scoreModel extends model } /* Project team user. */ - $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('project')->eq($param->id)->fetchPairs(); + $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('root')->eq($param->id)->andWhere('type')->eq('project')->fetchPairs(); if(!empty($teams)) { $rule['score'] = $extended['member']['close']; @@ -159,7 +159,7 @@ class scoreModel extends model } /* When the project is closed, no more user get score. */ - return true; + return true; } break; case 'search': @@ -295,7 +295,7 @@ class scoreModel extends model $notice = sprintf($this->lang->score->tips, $score, $this->app->user->score); $fullNotice = << +
    {$notice}
    diff --git a/module/score/view/rule.html.php b/module/score/view/rule.html.php index 84279cdf09..e8a3bfe157 100644 --- a/module/score/view/rule.html.php +++ b/module/score/view/rule.html.php @@ -10,64 +10,72 @@ */ ?> -
    -
    my->scoreRule; ?>
    -
    - createLink('my', 'score'), $lang->score->common, '', "class='btn btn-primary'");?> +
    +
    + +
    +
    product->name;?>product->name;?>
    action->date);?>action->date);?> action->actor);?> action->action);?> action->objectType);?> action->objectType);?> idAB);?> action->objectName;?>
    idAB);?> productplan->title);?> idAB);?> productplan->title);?> product->branch);?>product->branch);?> productplan->desc;?> productplan->begin);?> productplan->end);?>actions;?> productplan->stories;?> productplan->bugs;?> productplan->hour;?> productplan->project;?> productplan->desc;?>productplan->begin);?>productplan->end);?>actions;?>
    - + id;?> id"), $plan->title);?> branch];?> stories;?>bugs;?>hour;?>projectID)) echo html::a(helper::createLink('project', 'task', 'projectID=' . $plan->projectID), '');?>
    desc;?>
    		 begin;?>end;?>end == '2030-01-01' ? $lang->productplan->future : $plan->end;?> id"), '', '', "class='btn-icon' title='{$lang->project->create}'"); if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '', '', "class='btn-icon' title='{$lang->productplan->linkStory}'"); if(common::hasPriv('productplan', 'linkBug') and $config->global->flow != 'onlyStory') echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '', '', "class='btn-icon' title='{$lang->productplan->linkBug}'"); common::printIcon('productplan', 'edit', "planID=$plan->id", $plan, 'list'); @@ -88,7 +97,7 @@
    '> + '>
    edit);?> diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php index 2585b5532f..9bba0bad30 100644 --- a/module/productplan/view/edit.html.php +++ b/module/productplan/view/edit.html.php @@ -24,28 +24,31 @@
    - +
    - + type != 'normal'):?> - + - + - + - + @@ -53,11 +56,11 @@ - + - - @@ -117,14 +115,12 @@ ?> - + @@ -350,9 +346,7 @@ @@ -401,19 +395,19 @@ - type != 'normal'):?> - - - - - + type != 'normal'):?> + + + + + - + @@ -423,7 +417,7 @@
    - +
    diff --git a/module/project/control.php b/module/project/control.php index 46a77050f1..235947c874 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -41,7 +41,7 @@ class project extends control { if($this->app->user->account == 'guest' or commonModel::isTutorialMode()) $this->config->project->homepage = 'index'; if(!isset($this->config->project->homepage)) - { + { if($this->projects and $this->app->viewType != 'mhtml') die($this->fetch('custom', 'ajaxSetHomepage', "module=project")); $this->config->project->homepage = 'index'; @@ -251,14 +251,29 @@ class project extends control /* Get tasks and group them. */ if(empty($groupBy))$groupBy = 'story'; - $tasks = $this->loadModel('task')->getProjectTasks($projectID, $productID = 0, $status = 'all', $modules = 0, $groupBy); + $sort = $this->loadModel('common')->appendOrder($groupBy); + $tasks = $this->loadModel('task')->getProjectTasks($projectID, $productID = 0, $status = 'all', $modules = 0, $sort); $groupBy = str_replace('`', '', $groupBy); $taskLang = $this->lang->task; $groupByList = array(); $groupTasks = array(); + $groupTasks = array(); + foreach($tasks as $task) + { + $groupTasks[] = $task; + if(isset($task->children)) + { + foreach($task->children as $child) $groupTasks[] = $child; + $task->children = true; + unset($task->children); + } + } + /* Get users. */ $users = $this->loadModel('user')->getPairs('noletter'); + $tasks = $groupTasks; + $groupTasks = array(); foreach($tasks as $task) { if($groupBy == 'story') @@ -290,14 +305,6 @@ class project extends control { $groupTasks[$task->$groupBy][] = $task; } - if(isset($task->children)) - { - foreach($task->children as $child) - { - $groupTasks[$child->assignedToRealName][] = $child; - } - $task->children = true; - } } /* Process closed data when group by assignedTo. */ if($groupBy == 'assignedTo' and isset($groupTasks['Closed'])) @@ -307,7 +314,6 @@ class project extends control $groupTasks['closed'] = $closedTasks; } - /* Assign. */ $this->app->loadLang('tree'); $this->view->members = $this->project->getTeamMembers($projectID); @@ -369,7 +375,7 @@ class project extends control $this->view->title = $project->name . $this->lang->colon . $this->lang->project->importTask; $this->view->position[] = html::a(inlink('browse', "projectID=$toProject"), $project->name); $this->view->position[] = $this->lang->project->importTask; - $this->view->tasks2Imported = $tasks2Imported; + $this->view->tasks2Imported = $tasks2Imported; $this->view->projects = $projects; $this->view->projectID = $project->id; $this->view->fromProject = $fromProject; @@ -394,9 +400,6 @@ class project extends control $mails = $this->project->importBug($projectID); if(dao::isError()) die(js::error(dao::getError())); - $this->loadModel('task'); - foreach($mails as $mail) $this->task->sendmail($mail->taskID, $mail->actionID); - die(js::locate($this->createLink('project', 'importBug', "projectID=$projectID"), 'parent')); } @@ -597,16 +600,27 @@ class project extends control /* Count T B C */ $storyIdList = array_keys($stories);; - $storyTasks = $this->loadModel('task')->getStoryTaskCounts($storyIdList,$projectID); - $storyBugs = $this->loadModel('bug')->getStoryBugCounts($storyIdList,$projectID); + $storyTasks = $this->loadModel('task')->getStoryTaskCounts($storyIdList, $projectID); + $storyBugs = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $projectID); $storyCases = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList); + $plans = $this->project->getPlans($productID); + $allPlans = array('' => ''); + if(!empty($plans)) + { + foreach($plans as $productID => $plan) + { + $allPlans = $allPlans + $plan; + } + } + /* Assign. */ $this->view->title = $title; $this->view->position = $position; $this->view->productID = $productID; $this->view->project = $project; $this->view->stories = $stories; + $this->view->allPlans = $allPlans; $this->view->summary = $this->product->summary($stories); $this->view->orderBy = $orderBy; $this->view->type = $type; @@ -756,6 +770,7 @@ class project extends control $this->view->orderBy = $orderBy; $this->view->tasks = $this->testtask->getProjectTasks($projectID); $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); + $this->view->products = $this->loadModel('product')->getPairs(); $this->display(); } @@ -820,8 +835,8 @@ class project extends control /** * Fix burn for first date. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -867,14 +882,16 @@ class project extends control * * @param string $projectID * @param string $copyProjectID + * @param int $planID * * @access public * @return void */ - public function create($projectID = '', $copyProjectID = '') + public function create($projectID = '', $copyProjectID = '', $planID = 0) { if($projectID) { + if(!empty($planID)) $this->project->linkStories($projectID); $this->view->title = $this->lang->project->tips; $this->view->tips = $this->fetch('project', 'tips', "projectID=$projectID"); $this->view->projectID = $projectID; @@ -882,12 +899,14 @@ class project extends control exit; } - $name = ''; - $code = ''; - $team = ''; - $products = array(); - $whitelist = ''; - $acl = 'open'; + $name = ''; + $code = ''; + $team = ''; + $products = array(); + $whitelist = ''; + $acl = 'open'; + $plan = new stdClass(); + $productPlan = new stdClass(); if($copyProjectID) { @@ -900,6 +919,16 @@ class project extends control $products = $this->project->getProducts($copyProjectID); } + if(!empty($planID)) + { + $plan = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('id')->eq($planID)->fetch(); + $products = $this->dao->select('t1.id, t1.name, t1.type, t2.branch')->from(TABLE_PRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.product') + ->where('t1.id')->eq($plan->product) + ->fetchAll('id'); + $productPlan = $this->loadModel('productplan')->getPairs($plan->product, 0, 'unexpired'); + } + if(!empty($_POST)) { $projectID = $copyProjectID == '' ? $this->project->create() : $this->project->create($copyProjectID); @@ -907,7 +936,15 @@ class project extends control if(dao::isError()) die(js::error(dao::getError())); $this->loadModel('action')->create('project', $projectID, 'opened'); - die(js::locate($this->createLink('project', 'create', "projectID=$projectID"), 'parent')); + $url = $this->createLink('project', 'create', "projectID=$projectID"); + if(!empty($planID)) + { + die(js::confirm($this->lang->project->importPlanStory, $this->createLink('project', 'create', "projectID=$projectID©ProjectID=&planID=$planID"), $url, 'parent', 'parent')); + } + else + { + die(js::locate($url, 'parent')); + } } $this->project->setMenu($this->projects, key($this->projects)); @@ -917,12 +954,14 @@ class project extends control $this->view->projects = array('' => '') + $this->projects; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->allProducts = array(0 => '') + $this->loadModel('product')->getPairs('noclosed|nocode'); + $this->view->acl = $acl; + $this->view->plan = $plan; $this->view->name = $name; $this->view->code = $code; $this->view->team = $team; - $this->view->products = $products ; + $this->view->products = $products; + $this->view->productPlan = $productPlan; $this->view->whitelist = $whitelist; - $this->view->acl = $acl ; $this->view->copyProjectID = $copyProjectID; $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products)); $this->display(); @@ -932,6 +971,9 @@ class project extends control * Edit a project. * * @param int $projectID + * @param string $action + * @param string $extra + * * @access public * @return void */ @@ -988,6 +1030,7 @@ class project extends control $this->view->qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $project->QD); $this->view->rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $project->RD); $this->view->groups = $this->loadModel('group')->getPairs(); + $this->view->plans = $this->project->getPlans(array_keys($linkedProducts)); $this->view->allProducts = $allProducts; $this->view->linkedProducts = $linkedProducts; $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts)); @@ -1260,10 +1303,10 @@ class project extends control /** * Kanban. - * - * @param int $projectID - * @param string $type - * @param string $orderBy + * + * @param int $projectID + * @param string $type + * @param string $orderBy * @access public * @return void */ @@ -1307,8 +1350,8 @@ class project extends control /** * Tree view. * Product - * - * @param int $projectID + * + * @param int $projectID * @param string $type * @access public * @return void @@ -1334,14 +1377,14 @@ class project extends control $this->view->projectID = $projectID; $this->view->level = $type; $this->view->tree = $tree; - $this->display(); + $this->display(); } /** * Print kanban. - * - * @param int $projectID - * @param string $orderBy + * + * @param int $projectID + * @param string $orderBy * @access public * @return void */ @@ -1356,7 +1399,7 @@ class project extends control $storySpecs = $this->story->getStorySpecs(array_keys($stories)); $order = 1; - foreach($stories as $story) $story->order = $order++; + foreach($stories as $story) $story->order = $order++; $kanbanTasks = $this->project->getKanbanTasks($projectID, "id"); $kanbanBugs = $this->loadModel('bug')->getProjectBugs($projectID); @@ -1443,13 +1486,13 @@ class project extends control $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name); $this->view->position[] = $this->lang->project->printKanban; - $this->display(); + $this->display(); } /** * Story kanban. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -1801,7 +1844,7 @@ class project extends control $this->project->unlinkStory($projectID, $storyID); /* if kanban then reload and if ajax request then send result. */ - if(isonlybody()) + if(isonlybody()) { die(js::reload('parent')); } @@ -2013,8 +2056,8 @@ class project extends control /** * Story sort. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -2073,11 +2116,11 @@ class project extends control } /** - * Export project. - * - * @param string $status - * @param int $productID - * @param string $orderBy + * Export project. + * + * @param string $status + * @param int $productID + * @param string $orderBy * @access public * @return void */ @@ -2138,8 +2181,8 @@ class project extends control /** * Kanban setting. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -2175,9 +2218,9 @@ class project extends control /** * Ajax reset kanban setting - * - * @param int $projectID - * @param string $confirm + * + * @param int $projectID + * @param string $confirm * @access public * @return void */ @@ -2201,4 +2244,26 @@ class project extends control die(js::reload('parent.parent')); } + + /** + * Import stories by plan. + * + * @param int $projectID + * @param int $planID + * + * @access public + * @return void + */ + public function importPlanStories($projectID, $planID) + { + $planStories = $planProducts = array(); + $planStory = $this->loadModel('story')->getPlanStories($planID); + if(!empty($planStory)) + { + $planStories = array_keys($planStory); + foreach($planStory as $story) $planProducts[$story->id] = $story->product; + $this->project->linkStory($projectID, $planStories, $planProducts); + } + die(js::locate(helper::createLink('project', 'story', 'projectID=' . $projectID), 'parent')); + } } diff --git a/module/project/js/common.js b/module/project/js/common.js index 67ff3bd237..b27ac9b066 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -16,8 +16,8 @@ function switchGroup(projectID, groupBy) /** * Convert a date string like 2011-11-11 to date object in js. - * - * @param string $date + * + * @param string $date * @access public * @return date */ @@ -29,9 +29,9 @@ function convertStringToDate(dateString) /** * Compute delta of two days. - * - * @param string $date1 - * @param string $date1 + * + * @param string $date1 + * @param string $date1 * @access public * @return int */ @@ -49,12 +49,12 @@ function computeDaysDelta(date1, date2) date1 += 1000 * 60 * 60 * 24; date1 = new Date(date1); } - return delta - weekEnds; + return delta - weekEnds; } /** * Compute work days. - * + * * @access public * @return void */ @@ -80,12 +80,12 @@ function computeWorkDays(currentID) endDate = $('#end').val(); } - if(beginDate && endDate) + if(beginDate && endDate) { if(isBactchEdit) $('#dayses\\[' + index + '\\]').val(computeDaysDelta(beginDate, endDate)); if(!isBactchEdit) $('#days').val(computeDaysDelta(beginDate, endDate)); } - else if($('input[checked="true"]').val()) + else if($('input[checked="true"]').val()) { computeEndDate(); } @@ -93,8 +93,8 @@ function computeWorkDays(currentID) /** * Compute the end date for project. - * - * @param int $delta + * + * @param int $delta * @access public * @return void */ @@ -117,8 +117,8 @@ function computeEndDate(delta) /** * Load branches. - * - * @param int $product + * + * @param int $product * @access public * @return void */ @@ -134,20 +134,20 @@ function loadBranches(product) $product.trigger("chosen:updated"); return false; } - }) + }); if($('#productsBox .input-group:last select:first').val() != 0) { var length = $('#productsBox .input-group').size(); $('#productsBox .row').append('
    ' + $('#productsBox .col-sm-3:last').html() + '
    '); - if($('#productsBox .input-group:last select').size() >= 2)$('#productsBox .input-group:last select:last').remove(); + if($('#productsBox .input-group:last select').size() >= 2) $('#productsBox .input-group:last select:last').remove(); $('#productsBox .input-group:last .chosen-container').remove(); $('#productsBox .input-group:last select:first').attr('name', 'products[' + length + ']').attr('id', 'products' + length); $('#productsBox .input-group:last .chosen').chosen(defaultChosenOptions); } var $inputgroup = $(product).closest('.input-group'); - if($inputgroup.find('select').size() >= 2)$inputgroup.find('select:last').remove(); + if($inputgroup.find('select').size() >= 2) $inputgroup.find('select:last').remove(); var index = $inputgroup.find('select:first').attr('id').replace('products' , ''); $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val()), function(data) { @@ -156,12 +156,30 @@ function loadBranches(product) $inputgroup.append(data); $inputgroup.find('select:last').attr('name', 'branch[' + index + ']').attr('id', 'branch' + index).css('width', '80px'); } - }) + }); + + var productID = $(product).val(); + + if(productID == 0 || productID != $(product).data('last')) $("#plan" + $(product).data('last')).remove(); + + if(productID != 0 && $("#plan" + productID).length == 0) + { + $(product).data("last", productID); + $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID), function(data) + { + if(data) + { + $("#plansBox .row").append('
    ' + data + '
    '); + $("#plan" + $(product).val()).find('select').attr('name', 'plans[' + productID + ']').attr('id', 'plans' + productID); + } + }); + } } + function loadBranch(){} /* Auto compute the work days. */ -$(function() +$(function() { if(typeof(replaceID) != 'undefined') { @@ -195,8 +213,8 @@ $(function() $('tr.parent-'+id).hide(); $toggleIcon.removeClass('icon-double-angle-up').addClass('icon-double-angle-down'); } - + e.stopPropagation(); e.preventDefault(); }); -}) +}); diff --git a/module/project/js/create.js b/module/project/js/create.js index b4f739c7c4..cec75c4dff 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -8,10 +8,10 @@ $(function() $('#cpmBtn').click(function(){$('#copyProjectModal').modal('show')}); $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')}); var typeWidth = $('#type').closest('td').width(); - $('#productsBox .col-sm-3').width(typeWidth); + $('#productsBox .col-sm-3,#plansBox .col-sm-3').width(typeWidth); $(document).on('change', "#productsBox select", function() { - $('#productsBox .col-sm-3').width(typeWidth); + $('#productsBox .col-sm-3,#plansBox .col-sm-3').width(typeWidth); }); $('#begin').on('change', function() { @@ -37,3 +37,4 @@ function showTypeTips() $('.type-tips').hide(); } } + diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js index 85e1e007e5..2628595ad7 100644 --- a/module/project/js/kanban.js +++ b/module/project/js/kanban.js @@ -184,6 +184,10 @@ $(function() } } + $("#kanbanHeader thead tr th").each(function(i) + { + $(this).width($('#kanbanWrapper thead tr th').eq(i).width()); + }); var fixH = $("#kanbanHeader").offset().top; $(window).scroll(function() { diff --git a/module/project/js/story.js b/module/project/js/story.js index f9290a4e9f..c05d3acb30 100644 --- a/module/project/js/story.js +++ b/module/project/js/story.js @@ -24,6 +24,17 @@ $(function() $('#branch' + branchID).addClass('active'); $(document).on('click', "#storyList tbody tr", function(){showCheckedSummary();}); $(document).on('change', "#storyList :checkbox", function(){showCheckedSummary();}); + + $("a[data-toggle='linkStoryByPlan']").click(function(){$('#linkStoryByPlan').modal('show')}) + + $('#toTaskButton').on('click', function () + { + var planID = $('#plan').val(); + if(planID) + { + parent.location.href = createLink('project', 'importPlanStories', 'projectID=' + projectID + '&planID=' + planID); + } + }) }); function showCheckedSummary() diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 310f4b6e45..d59049ef8b 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -17,43 +17,43 @@ $lang->project->name = 'Name'; $lang->project->code = 'Alias'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; -$lang->project->dateRange = 'Time Frame'; +$lang->project->dateRange = 'Duration'; $lang->project->to = 'To'; $lang->project->days = 'Man-Day'; $lang->project->day = 'day'; -$lang->project->workHour = 'Hour'; +$lang->project->workHour = 'Hour(s)'; $lang->project->status = 'Status'; $lang->project->desc = 'Desc'; $lang->project->owner = 'Owner'; -$lang->project->PO = $lang->productCommon . ' Owner'; -$lang->project->PM = $lang->projectCommon . ' Manager'; -$lang->project->QD = 'Quality Director'; -$lang->project->RD = 'Release Director'; +$lang->project->PO = 'PO'; +$lang->project->PM = 'PM'; +$lang->project->QD = 'QA Manager'; +$lang->project->RD = 'Release Manager'; $lang->project->acl = 'Access Control'; $lang->project->teamname = 'Team Name'; $lang->project->order = "Sort {$lang->projectCommon}"; -$lang->project->products = "Link {$lang->productCommon}"; +$lang->project->products = "Linked {$lang->productCommon}"; $lang->project->whitelist = 'Whitelist'; -$lang->project->totalEstimate = 'Est.'; -$lang->project->totalConsumed = 'Consumed'; -$lang->project->totalLeft = 'Total Remained'; -$lang->project->Left = 'Remained'; +$lang->project->totalEstimate = 'Est.(h)'; +$lang->project->totalConsumed = 'Cost'; +$lang->project->totalLeft = 'Left'; +$lang->project->Left = 'Left'; $lang->project->progress = 'Progress'; -$lang->project->hours = 'Estimate %s, Consumed %s, Remained %s'; +$lang->project->hours = '%s Estimate, %s Cost, %s Left.'; $lang->project->viewBug = 'Bugs'; $lang->project->noProduct = "No {$lang->productCommon}"; $lang->project->createStory = "Create Story"; $lang->project->all = 'All'; -$lang->project->undone = 'Undone'; +$lang->project->undone = 'Unfinished'; $lang->project->unclosed = 'Unclosed'; -$lang->project->typeDesc = 'No story, bug, build, testtask and burndown allowed in OPS'; +$lang->project->typeDesc = 'No story, bug, build, test task or burndown is allowed in OPS'; $lang->project->mine = 'My Responsibility: '; $lang->project->other = 'Other:'; $lang->project->deleted = 'Deleted'; $lang->project->delayed = 'Delayed'; $lang->project->product = $lang->project->products; -$lang->project->readjustTime = 'Readjust project time for begin and end'; -$lang->project->readjustTask = 'Readjust task start date and deadline'; +$lang->project->readjustTime = 'Adjust project begin and end time'; +$lang->project->readjustTask = 'Adjust task start date and deadline'; $lang->project->start = 'Start'; $lang->project->activate = 'Activate'; @@ -77,12 +77,12 @@ $lang->project->endList[365] = '1 Year'; $lang->team = new stdclass(); $lang->team->account = 'Account'; $lang->team->role = 'Role'; -$lang->team->join = 'Joined Date'; +$lang->team->join = 'Joined'; $lang->team->hours = 'Hour/Day'; $lang->team->days = 'Workdays'; $lang->team->totalHours = 'Total'; -$lang->team->limited = 'limited User'; +$lang->team->limited = 'Limited User'; $lang->team->limitedList['no'] = 'No'; $lang->team->limitedList['yes'] = 'Yes'; @@ -95,53 +95,57 @@ $lang->project->statusList['doing'] = 'Doing'; $lang->project->statusList['suspended'] = 'Suspend'; $lang->project->statusList['done'] = 'Done'; -$lang->project->aclList['open'] = "Default (You have access to {$lang->projectCommon}, if you can view it.)"; -$lang->project->aclList['private'] = 'Private (Only team members can access to it.)'; -$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members have access to it.)'; +$lang->project->aclList['open'] = "Default (Those who can visit ‘project view’ can access.)"; +$lang->project->aclList['private'] = 'Private (Only team members can access.)'; +$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members can access.)'; /* 方法列表。*/ -$lang->project->index = "Home"; -$lang->project->task = 'Tasks'; -$lang->project->groupTask = 'View by'; -$lang->project->story = 'Stories'; -$lang->project->bug = 'Bugs'; -$lang->project->dynamic = 'Dynamic'; -$lang->project->build = 'Builds'; -$lang->project->testtask = 'Test Tasks'; -$lang->project->burn = 'Burndown'; -$lang->project->baseline = 'Base Line'; -$lang->project->computeBurn = 'Update'; -$lang->project->burnData = 'Burndown Data'; -$lang->project->fixFirst = 'Edit 1st Day Data'; -$lang->project->team = 'Team Member'; -$lang->project->doc = 'Doc'; -$lang->project->manageProducts = 'Link ' . $lang->productCommon; -$lang->project->linkStory = 'Linked Story'; -$lang->project->unlinkStoryTasks = 'Unlinked'; -$lang->project->linkedProducts = 'Linked Products'; -$lang->project->unlinkedProducts = 'Unlinked Products'; -$lang->project->view = "Info"; -$lang->project->create = "Add"; -$lang->project->copy = "Copy {$lang->projectCommon}"; -$lang->project->delete = "Delete"; -$lang->project->browse = "Browse"; -$lang->project->edit = "Edit"; -$lang->project->batchEdit = "Batch Edit"; -$lang->project->manageMembers = 'Manange Team'; -$lang->project->unlinkMember = 'Unlink Member'; -$lang->project->unlinkStory = 'Unlink Story'; -$lang->project->batchUnlinkStory = 'Batch Unlink Story'; -$lang->project->importTask = 'Import Task'; -$lang->project->importBug = 'Import Bug'; -$lang->project->updateOrder = 'Order'; -$lang->project->tree = 'Tree'; -$lang->project->storyKanban = 'Story Kanban'; -$lang->project->storySort = 'Story Sort'; +$lang->project->index = "Home"; +$lang->project->task = 'Tasks'; +$lang->project->groupTask = 'View by Group'; +$lang->project->story = 'Stories'; +$lang->project->bug = 'Bugs'; +$lang->project->dynamic = 'Dynamic'; +$lang->project->build = 'Builds'; +$lang->project->testtask = 'Test Tasks'; +$lang->project->burn = 'Burndown'; +$lang->project->baseline = 'Base Line'; +$lang->project->computeBurn = 'Update'; +$lang->project->burnData = 'Burndown Data'; +$lang->project->fixFirst = 'Edit 1st Day Man-hour'; +$lang->project->team = 'Team Member'; +$lang->project->doc = 'Doc'; +$lang->project->manageProducts = 'Link ' . $lang->productCommon; +$lang->project->linkStory = 'Linked Story'; +$lang->project->linkStoryByPlan = 'Linked Story From Plan'; +$lang->project->linkPlan = 'Linked Plan'; +$lang->project->unlinkStoryTasks = 'Unlinked'; +$lang->project->linkedProducts = 'Linked Products'; +$lang->project->unlinkedProducts = 'Unlinked Products'; +$lang->project->view = "Overview"; +$lang->project->create = "Create Project"; +$lang->project->copy = "Copy {$lang->projectCommon}"; +$lang->project->delete = "Delete"; +$lang->project->browse = "Browse"; +$lang->project->edit = "Edit"; +$lang->project->batchEdit = "Batch Edit"; +$lang->project->manageMembers = 'Manange Team'; +$lang->project->unlinkMember = 'Unlink Member'; +$lang->project->unlinkStory = 'Unlink Story'; +$lang->project->batchUnlinkStory = 'Batch Unlink Story'; +$lang->project->importTask = 'Import Task'; +$lang->project->importPlanStories = 'Link Story By Plan'; +$lang->project->importBug = 'Import Bug'; +$lang->project->updateOrder = 'Order'; +$lang->project->tree = 'Tree'; +$lang->project->storyKanban = 'Story Kanban'; +$lang->project->storySort = 'Sort Story'; +$lang->project->importPlanStory = 'Create ' . $lang->projectCommon . ' success!\nImport the stories with the plan?'; /* 分组浏览。*/ $lang->project->allTasks = 'All'; -$lang->project->assignedToMe = 'Assigned to Me'; -$lang->project->myInvolved = 'My Involved'; +$lang->project->assignedToMe = 'My'; +$lang->project->myInvolved = 'Involved'; $lang->project->statusSelects[''] = 'More'; $lang->project->statusSelects['wait'] = 'Wait'; @@ -167,7 +171,7 @@ $lang->project->groupFilter['pri']['noset'] = 'Not set'; $lang->project->groupFilter['assignedTo']['undone'] = 'Pending'; $lang->project->groupFilter['assignedTo']['all'] = $lang->project->all; -$lang->project->byQuery = 'Search'; +$lang->project->byQuery = 'Search'; /* 查询条件列表。*/ $lang->project->allProject = "All {$lang->projectCommon}"; @@ -176,14 +180,14 @@ $lang->project->aboveAllProject = "All the above {$lang->projectCommon}"; /* 页面提示。*/ $lang->project->selectProject = "Select {$lang->projectCommon}"; -$lang->project->beginAndEnd = 'Time Frame'; -$lang->project->lblStats = 'Hour Report'; -$lang->project->stats = '%s Hour(s) available, %s Hour(s) Estimated, %s Hour(s) Consumed, %s Hour(s) Remained.'; -$lang->project->taskSummary = " %s Tasks on this page, %s Wait, %s Doing. %s Hour(s) Estimated, %s Hour(s) Consumed, %s Hour(s) Remained."; -$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing, %estimate% Hour(s) Estimated, %consumed% Hour(s) Consumed, %left% Hour(s) Remained."; +$lang->project->beginAndEnd = 'Duration'; +$lang->project->lblStats = 'Man-Hour Summary(h) : '; +$lang->project->stats = '%s Available, %s Total Estimated, %s Cost, %s Left.'; +$lang->project->taskSummary = "Tasks on this page : %s Total, %s Wait, %s Doing;     Hours : %s Est., %s Cost, %s Left."; +$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing; Hours: %estimate% Est., %consumed% Cost, %left% Left."; $lang->project->memberHours = "%s has %s Hour(s) available "; -$lang->project->groupSummary = "%s Tasks in this group, Wait %s, Doing %s. %s Hour(s) Estimated , %s Hour(s) Consumed, %s Hour(s) Remained."; -$lang->project->groupSummaryAB = "Total Tasks %s, Wait %s, Doing %s.
    %s Hour(s) Estimated, %s Hour(s) Consumed，%s Hour(s) Remained."; +$lang->project->groupSummary = "%s Tasks in this group, Wait %s, Doing %s. %s Hour(s) Estimated , %s Hour(s) Cost, %s Hour(s) Left."; +$lang->project->groupSummaryAB = "Tasks:%s Total,%s Wait, %s Doing.
    Hours: %s Est., %s Cost，%s Left."; $lang->project->noTimeSummary = " %s Tasks in this group, Wait %s, Doing %s."; $lang->project->wbs = "Decompose Task"; $lang->project->batchWBS = "Batch Decompose"; @@ -202,7 +206,7 @@ $lang->project->copyNoProject = "No {$lang->projectCommon} can be duplicated." $lang->project->copyFromProject = "Duplicate from {$lang->projectCommon} %s"; $lang->project->cancelCopy = 'Cancel Duplication'; $lang->project->byPeriod = 'By Time'; -$lang->project->byUser = 'By User'; +$lang->project->byUser = 'ByUser'; /* 交互提示。*/ $lang->project->confirmDelete = "Do you want to delete {$lang->projectCommon}[%s]?"; @@ -220,7 +224,7 @@ $lang->project->goback = "Go Back"; $lang->project->noweekend = 'Without Weekend'; $lang->project->withweekend = 'With Weekend'; $lang->project->interval = 'Intervals'; -$lang->project->fixFirstWithLeft = 'Modify the left time'; +$lang->project->fixFirstWithLeft = 'Modify the left'; /* 统计。*/ $lang->project->charts = new stdclass(); @@ -236,8 +240,8 @@ $lang->project->charts->burn->graph->rotateNames = 1; $lang->project->charts->burn->graph->showValues = 0; $lang->project->placeholder = new stdclass(); -$lang->project->placeholder->code = "{$lang->projectCommon} Code"; -$lang->project->placeholder->totalLeft = 'Hour(s) remained at the beginning of Project'; +$lang->project->placeholder->code = 'Project abbreviation in team'; +$lang->project->placeholder->totalLeft = 'Hour(s) remained at Project Starting'; $lang->project->selectGroup = new stdclass(); $lang->project->selectGroup->done = '(Done)'; @@ -255,7 +259,7 @@ $lang->project->resetKanban = "Reset Setting"; $lang->project->printKanban = "Print Kanban"; $lang->project->bugList = "Bugs"; -$lang->project->kanbanHideCols = 'Kanban hidden has been closed and canceled columns'; +$lang->project->kanbanHideCols = 'hide closed and canceled columns in Kanban'; $lang->project->kanbanShowOption = 'Display folding information'; $lang->project->kanbanColsColor = 'Custom color for Kanban column'; @@ -279,14 +283,14 @@ $lang->project->featureBar['task']['all'] = $lang->project->allTasks; $lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe; $lang->project->featureBar['task']['myinvolved'] = $lang->project->myInvolved; $lang->project->featureBar['task']['delayed'] = 'Delayed'; -$lang->project->featureBar['task']['needconfirm'] = 'Story Changed'; +$lang->project->featureBar['task']['needconfirm'] = 'StoryChanged'; $lang->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); -$lang->project->treeLevel['root'] = 'Show Root'; -$lang->project->treeLevel['story'] = 'Show Story'; -$lang->project->treeLevel['task'] = 'Show Task'; -$lang->project->treeLevel['all'] = 'Show All'; +$lang->project->treeLevel['root'] = 'Collapse All'; +$lang->project->treeLevel['story'] = 'Show Story'; +$lang->project->treeLevel['task'] = 'Show Task'; +$lang->project->treeLevel['all'] = 'Expand All'; global $config; if($config->global->flow == 'onlyTask') diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 44a1840780..49fea0814b 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -34,9 +34,9 @@ $lang->project->teamname = '团队名称'; $lang->project->order = $lang->projectCommon . '排序'; $lang->project->products = '相关' . $lang->productCommon; $lang->project->whitelist = '分组白名单'; -$lang->project->totalEstimate = '总预计'; -$lang->project->totalConsumed = '总消耗'; -$lang->project->totalLeft = '总剩余'; +$lang->project->totalEstimate = '预计'; +$lang->project->totalConsumed = '消耗'; +$lang->project->totalLeft = '剩余'; $lang->project->Left = '剩余'; $lang->project->progress = '进度'; $lang->project->hours = '预计 %s 消耗 %s 剩余 %s'; @@ -66,13 +66,13 @@ $lang->project->typeList['sprint'] = "短期$lang->projectCommon"; $lang->project->typeList['waterfall'] = "长期$lang->projectCommon"; $lang->project->typeList['ops'] = "运维$lang->projectCommon"; -$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->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->team = new stdclass(); $lang->team->account = '用户'; @@ -100,43 +100,47 @@ $lang->project->aclList['private'] = "私有{$lang->projectCommon}(只有{$lang- $lang->project->aclList['custom'] = "自定义白名单(团队成员和白名单的成员可以访问)"; /* 方法列表。*/ -$lang->project->index = "{$lang->projectCommon}首页"; -$lang->project->task = '任务列表'; -$lang->project->groupTask = '分组浏览任务'; -$lang->project->story = '需求列表'; -$lang->project->bug = 'Bug列表'; -$lang->project->dynamic = '动态'; -$lang->project->build = '版本列表'; -$lang->project->testtask = '测试任务'; -$lang->project->burn = '燃尽图'; -$lang->project->baseline = '基准线'; -$lang->project->computeBurn = '更新'; -$lang->project->burnData = '燃尽图数据'; -$lang->project->fixFirst = '修改首天工时'; -$lang->project->team = '团队成员'; -$lang->project->doc = '文档列表'; -$lang->project->manageProducts = '关联' . $lang->productCommon; -$lang->project->linkStory = '关联需求'; -$lang->project->unlinkStoryTasks = '未关联需求任务'; -$lang->project->linkedProducts = '已关联'; -$lang->project->unlinkedProducts = '未关联'; -$lang->project->view = "{$lang->projectCommon}概况"; -$lang->project->create = "添加{$lang->projectCommon}"; -$lang->project->copy = "复制{$lang->projectCommon}"; -$lang->project->delete = "删除{$lang->projectCommon}"; -$lang->project->browse = "浏览{$lang->projectCommon}"; -$lang->project->edit = "编辑{$lang->projectCommon}"; -$lang->project->batchEdit = "批量编辑"; -$lang->project->manageMembers = '团队管理'; -$lang->project->unlinkMember = '移除成员'; -$lang->project->unlinkStory = '移除需求'; -$lang->project->batchUnlinkStory = '批量移除需求'; -$lang->project->importTask = '转入任务'; -$lang->project->importBug = '导入Bug'; -$lang->project->updateOrder = '排序'; -$lang->project->tree = '树状图'; -$lang->project->storyKanban = '需求看板'; -$lang->project->storySort = '需求排序'; +$lang->project->index = "{$lang->projectCommon}首页"; +$lang->project->task = '任务列表'; +$lang->project->groupTask = '分组浏览任务'; +$lang->project->story = '需求列表'; +$lang->project->bug = 'Bug列表'; +$lang->project->dynamic = '动态'; +$lang->project->build = '版本列表'; +$lang->project->testtask = '测试任务'; +$lang->project->burn = '燃尽图'; +$lang->project->baseline = '基准线'; +$lang->project->computeBurn = '更新'; +$lang->project->burnData = '燃尽图数据'; +$lang->project->fixFirst = '修改首天工时'; +$lang->project->team = '团队成员'; +$lang->project->doc = '文档列表'; +$lang->project->manageProducts = '关联' . $lang->productCommon; +$lang->project->linkStory = '关联需求'; +$lang->project->linkStoryByPlan = '按照计划关联'; +$lang->project->linkPlan = '关联计划'; +$lang->project->unlinkStoryTasks = '未关联需求任务'; +$lang->project->linkedProducts = '已关联'; +$lang->project->unlinkedProducts = '未关联'; +$lang->project->view = "{$lang->projectCommon}概况"; +$lang->project->create = "添加{$lang->projectCommon}"; +$lang->project->copy = "复制{$lang->projectCommon}"; +$lang->project->delete = "删除{$lang->projectCommon}"; +$lang->project->browse = "浏览{$lang->projectCommon}"; +$lang->project->edit = "编辑{$lang->projectCommon}"; +$lang->project->batchEdit = "批量编辑"; +$lang->project->manageMembers = '团队管理'; +$lang->project->unlinkMember = '移除成员'; +$lang->project->unlinkStory = '移除需求'; +$lang->project->batchUnlinkStory = '批量移除需求'; +$lang->project->importTask = '转入任务'; +$lang->project->importPlanStories = '按计划关联需求'; +$lang->project->importBug = '导入Bug'; +$lang->project->updateOrder = '排序'; +$lang->project->tree = '树状图'; +$lang->project->storyKanban = '需求看板'; +$lang->project->storySort = '需求排序'; +$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入计划关联的相关需求？'; /* 分组浏览。*/ $lang->project->allTasks = '所有'; @@ -283,10 +287,10 @@ $lang->project->featureBar['task']['needconfirm'] = '需求变动'; $lang->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); -$lang->project->treeLevel['root'] = '全部折叠'; -$lang->project->treeLevel['story'] = '显示需求'; -$lang->project->treeLevel['task'] = '显示任务'; -$lang->project->treeLevel['all'] = '全部展开'; +$lang->project->treeLevel['root'] = '全部折叠'; +$lang->project->treeLevel['story'] = '显示需求'; +$lang->project->treeLevel['task'] = '显示任务'; +$lang->project->treeLevel['all'] = '全部展开'; global $config; if($config->global->flow == 'onlyTask') diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index b534e98c07..7d9f554aa3 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -34,15 +34,15 @@ $lang->project->teamname = '團隊名稱'; $lang->project->order = $lang->projectCommon . '排序'; $lang->project->products = '相關' . $lang->productCommon; $lang->project->whitelist = '分組白名單'; -$lang->project->totalEstimate = '總預計'; -$lang->project->totalConsumed = '總消耗'; -$lang->project->totalLeft = '總剩餘'; +$lang->project->totalEstimate = '預計'; +$lang->project->totalConsumed = '消耗'; +$lang->project->totalLeft = '剩餘'; $lang->project->Left = '剩餘'; $lang->project->progress = '進度'; $lang->project->hours = '預計 %s 消耗 %s 剩餘 %s'; $lang->project->viewBug = '查看bug'; $lang->project->noProduct = "無{$lang->productCommon}{$lang->projectCommon}"; -$lang->project->createStory = "新增需求"; +$lang->project->createStory = "添加需求"; $lang->project->all = '所有'; $lang->project->undone = '未完成'; $lang->project->unclosed = '未關閉'; @@ -66,13 +66,13 @@ $lang->project->typeList['sprint'] = "短期$lang->projectCommon"; $lang->project->typeList['waterfall'] = "長期$lang->projectCommon"; $lang->project->typeList['ops'] = "運維$lang->projectCommon"; -$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->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->team = new stdclass(); $lang->team->account = '用戶'; @@ -100,47 +100,52 @@ $lang->project->aclList['private'] = "私有{$lang->projectCommon}(只有{$lang- $lang->project->aclList['custom'] = "自定義白名單(團隊成員和白名單的成員可以訪問)"; /* 方法列表。*/ -$lang->project->index = "{$lang->projectCommon}首頁"; -$lang->project->task = '任務列表'; -$lang->project->groupTask = '分組瀏覽任務'; -$lang->project->story = '需求列表'; -$lang->project->bug = 'Bug列表'; -$lang->project->dynamic = '動態'; -$lang->project->build = '版本列表'; -$lang->project->testtask = '測試任務'; -$lang->project->burn = '燃盡圖'; -$lang->project->baseline = '基準綫'; -$lang->project->computeBurn = '更新'; -$lang->project->burnData = '燃盡圖數據'; -$lang->project->fixFirst = '修改首天工時'; -$lang->project->team = '團隊成員'; -$lang->project->doc = '文檔列表'; -$lang->project->manageProducts = '關聯' . $lang->productCommon; -$lang->project->linkStory = '關聯需求'; -$lang->project->unlinkStoryTasks = '未關聯需求任務'; -$lang->project->linkedProducts = '已關聯'; -$lang->project->unlinkedProducts = '未關聯'; -$lang->project->view = "{$lang->projectCommon}概況"; -$lang->project->create = "添加{$lang->projectCommon}"; -$lang->project->copy = "複製{$lang->projectCommon}"; -$lang->project->delete = "刪除{$lang->projectCommon}"; -$lang->project->browse = "瀏覽{$lang->projectCommon}"; -$lang->project->edit = "編輯{$lang->projectCommon}"; -$lang->project->batchEdit = "批量編輯"; -$lang->project->manageMembers = '團隊管理'; -$lang->project->unlinkMember = '移除成員'; -$lang->project->unlinkStory = '移除需求'; -$lang->project->batchUnlinkStory = '批量移除需求'; -$lang->project->importTask = '轉入任務'; -$lang->project->importBug = '導入Bug'; -$lang->project->updateOrder = '排序'; -$lang->project->tree = '樹狀圖'; -$lang->project->storyKanban = '需求看板'; -$lang->project->storySort = '需求排序'; +$lang->project->index = "{$lang->projectCommon}首頁"; +$lang->project->task = '任務列表'; +$lang->project->groupTask = '分組瀏覽任務'; +$lang->project->story = '需求列表'; +$lang->project->bug = 'Bug列表'; +$lang->project->dynamic = '動態'; +$lang->project->build = '版本列表'; +$lang->project->testtask = '測試任務'; +$lang->project->burn = '燃盡圖'; +$lang->project->baseline = '基準綫'; +$lang->project->computeBurn = '更新'; +$lang->project->burnData = '燃盡圖數據'; +$lang->project->fixFirst = '修改首天工時'; +$lang->project->team = '團隊成員'; +$lang->project->doc = '文檔列表'; +$lang->project->manageProducts = '關聯' . $lang->productCommon; +$lang->project->linkStory = '關聯需求'; +$lang->project->linkStoryByPlan = '按照計劃關聯'; +$lang->project->linkPlan = '關聯計劃'; +$lang->project->unlinkStoryTasks = '未關聯需求任務'; +$lang->project->linkedProducts = '已關聯'; +$lang->project->unlinkedProducts = '未關聯'; +$lang->project->view = "{$lang->projectCommon}概況"; +$lang->project->create = "添加{$lang->projectCommon}"; +$lang->project->copy = "複製{$lang->projectCommon}"; +$lang->project->delete = "刪除{$lang->projectCommon}"; +$lang->project->browse = "瀏覽{$lang->projectCommon}"; +$lang->project->edit = "編輯{$lang->projectCommon}"; +$lang->project->batchEdit = "批量編輯"; +$lang->project->manageMembers = '團隊管理'; +$lang->project->unlinkMember = '移除成員'; +$lang->project->unlinkStory = '移除需求'; +$lang->project->batchUnlinkStory = '批量移除需求'; +$lang->project->importTask = '轉入任務'; +$lang->project->importPlanStories = '按計劃關聯需求'; +$lang->project->importBug = '導入Bug'; +$lang->project->updateOrder = '排序'; +$lang->project->tree = '樹狀圖'; +$lang->project->storyKanban = '需求看板'; +$lang->project->storySort = '需求排序'; +$lang->project->importPlanStory = '創建' . $lang->projectCommon . '成功！\n是否導入計劃關聯的相關需求？'; /* 分組瀏覽。*/ -$lang->project->allTasks = '所有'; -$lang->project->assignedToMe = '指派給我'; +$lang->project->allTasks = '所有'; +$lang->project->assignedToMe = '指派給我'; +$lang->project->myInvolved = '由我參與'; $lang->project->statusSelects[''] = '更多'; $lang->project->statusSelects['wait'] = '未開始'; @@ -179,6 +184,7 @@ $lang->project->beginAndEnd = '起止時間'; $lang->project->lblStats = '工時統計'; $lang->project->stats = '可用工時%s工時，總共預計%s工時，已經消耗%s工時，預計剩餘%s工時'; $lang->project->taskSummary = "本頁共 %s 個任務，未開始 %s，進行中 %s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; +$lang->project->checkedSummary = "選中 %total% 個任務，未開始 %wait%，進行中 %doing%，總預計%estimate%工時，已消耗%consumed%工時，剩餘%left%工時。"; $lang->project->memberHours = "%s共有 %s 個可用工時，"; $lang->project->groupSummary = "本組共 %s 個任務，未開始 %s，進行中 %s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; $lang->project->groupSummaryAB = "總任務%s ，未開始%s，進行中%s。
    總預計%s，已消耗%s，剩餘%s。"; @@ -213,7 +219,7 @@ $lang->project->tips = '提示'; $lang->project->afterInfo = "{$lang->projectCommon}添加成功，您現在可以進行以下操作："; $lang->project->setTeam = '設置團隊'; $lang->project->linkStory = '關聯需求'; -$lang->project->createTask = '添加任務'; +$lang->project->createTask = '創建任務'; $lang->project->goback = "返回任務列表"; $lang->project->noweekend = '去除周末'; $lang->project->withweekend = '顯示周末'; @@ -275,15 +281,16 @@ $lang->printKanban->typeList['increment'] = '增量'; $lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed; $lang->project->featureBar['task']['all'] = $lang->project->allTasks; $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->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); -$lang->project->treeLevel['root'] = '全部摺疊'; -$lang->project->treeLevel['story'] = '顯示需求'; -$lang->project->treeLevel['task'] = '顯示任務'; -$lang->project->treeLevel['all'] = '全部展開'; +$lang->project->treeLevel['root'] = '全部摺疊'; +$lang->project->treeLevel['story'] = '顯示需求'; +$lang->project->treeLevel['task'] = '顯示任務'; +$lang->project->treeLevel['all'] = '全部展開'; global $config; if($config->global->flow == 'onlyTask') diff --git a/module/project/model.php b/module/project/model.php index 62da93a77d..995250acfb 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -17,16 +17,16 @@ class projectModel extends model const LINK_MEMBERS_ONE_TIME = 20; /** - * Check the privilege. - * - * @param object $project + * Check the privilege. + * + * @param object $project * @access public * @return bool */ public function checkPriv($project) { /* If is admin, return true. */ - if($this->app->user->admin) return true; + if($this->app->user->admin) return true; $acls = $this->app->user->rights['acls']; if(!empty($acls['projects']) and !in_array($project->id, $acls['projects'])) return false; @@ -36,7 +36,7 @@ class projectModel extends model /* Get all teams of all projects and group by projects, save it as static. */ static $teams; - if(empty($teams)) $teams = $this->dao->select('project, account')->from(TABLE_TEAM)->fetchGroup('project', 'account'); + if(empty($teams)) $teams = $this->dao->select('root, account')->from(TABLE_TEAM)->where('type')->eq('project')->fetchGroup('root', 'account'); $currentTeam = isset($teams[$project->id]) ? $teams[$project->id] : array(); /* If project is private, only members can access. */ @@ -61,9 +61,9 @@ class projectModel extends model /** * Set menu. - * - * @param array $projects - * @param int $projectID + * + * @param array $projects + * @param int $projectID * @param string $extra * @access public * @return void @@ -74,7 +74,7 @@ class projectModel extends model $project = $this->getById($projectID); /* Unset story, bug, build and testtask if type is ops. */ - if($project and $project->type == 'ops') + if($project and $project->type == 'ops') { unset($this->lang->project->menu->story); unset($this->lang->project->menu->bug); @@ -93,7 +93,7 @@ class projectModel extends model $moduleName = $this->app->getModuleName(); $methodName = $this->app->getMethodName(); - if($this->cookie->projectMode == 'noclosed' and $project->status == 'done') + if($this->cookie->projectMode == 'noclosed' and $project->status == 'done') { setcookie('projectMode', 'all'); $this->cookie->projectMode = 'all'; @@ -108,12 +108,12 @@ class projectModel extends model } /** - * Create the select code of projects. - * - * @param array $projects - * @param int $projectID - * @param string $currentModule - * @param string $currentMethod + * Create the select code of projects. + * + * @param array $projects + * @param int $projectID + * @param string $currentModule + * @param string $currentMethod * @param string $extra * @access public * @return string @@ -133,7 +133,7 @@ class projectModel extends model /** * Get project tree menu. - * + * * @access public * @return void */ @@ -150,7 +150,7 @@ class projectModel extends model $productName = isset($products[$productID]) ? $products[$productID] : $this->lang->project->noProduct; $projectTree .= "
  • $productName
      "; - + foreach($projects as $project) { if($project->status != 'done') @@ -160,9 +160,9 @@ class projectModel extends model } $hasDone = false; - foreach($projects as $project) + foreach($projects as $project) { - if($project->status == 'done') + if($project->status == 'done') { $hasDone = true; break; @@ -191,9 +191,9 @@ class projectModel extends model /** * Save the project id user last visited to session. - * - * @param int $projectID - * @param array $projects + * + * @param int $projectID + * @param array $projects * @access public * @return int */ @@ -217,8 +217,10 @@ class projectModel extends model } /** - * Create a project. - * + * Create a project. + * + * @param string $copyProjectID + * * @access public * @return void */ @@ -232,7 +234,7 @@ class projectModel extends model ->setDefault('team', substr($this->post->name,0, 30)) ->join('whitelist', ',') ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags) - ->remove('products, workDays, delta, branch,uid') + ->remove('products, workDays, delta, branch, uid, plans') ->get(); $project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_PROJECT)->data($project) @@ -257,14 +259,15 @@ class projectModel extends model $this->file->updateObjectID($this->post->uid, $projectID, 'project'); /* Copy team of project. */ - if($copyProjectID != '') + if($copyProjectID != '') { - $members = $this->dao->select('*')->from(TABLE_TEAM)->where('project')->eq($copyProjectID)->fetchAll(); + $members = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($copyProjectID)->andWhere('type')->eq('project')->fetchAll(); foreach($members as $member) { - $member->project = $projectID; - $member->join = $today; - $member->days = $project->days; + $member->root = $projectID; + $member->join = $today; + $member->days = $project->days; + $member->type = 'project'; $this->dao->insert(TABLE_TEAM)->data($member)->exec(); if($member->account == $this->app->user->account) $creatorExists = true; } @@ -274,12 +277,13 @@ class projectModel extends model if($copyProjectID == '' or !$creatorExists) { $member = new stdclass(); - $member->project = $projectID; - $member->account = $this->app->user->account; - $member->role = $this->lang->user->roleList[$this->app->user->role]; - $member->join = $today; - $member->days = $project->days; - $member->hours = $this->config->project->defaultWorkhours; + $member->root = $projectID; + $member->account = $this->app->user->account; + $member->role = $this->lang->user->roleList[$this->app->user->role]; + $member->join = $today; + $member->type = 'project'; + $member->days = $project->days; + $member->hours = $this->config->project->defaultWorkhours; $this->dao->insert(TABLE_TEAM)->data($member)->exec(); } @@ -293,13 +297,13 @@ class projectModel extends model $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec(); if(!dao::isError()) $this->loadModel('score')->create('project', 'create', $projectID); return $projectID; - } + } } /** * Update a project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return array */ @@ -316,7 +320,7 @@ class projectModel extends model ->setDefault('team', $this->post->name) ->join('whitelist', ',') ->stripTags($this->config->project->editor->edit['id'], $this->config->allowedTags) - ->remove('products,branch,uid') + ->remove('products, branch, uid, plans') ->get(); $project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->edit['id'], $this->post->uid); $this->dao->update(TABLE_PROJECT)->data($project) @@ -336,11 +340,12 @@ class projectModel extends model { if(!empty($value) and !isset($team[$value])) { - $member->project = (int)$projectID; + $member->root = (int)$projectID; $member->account = $value; $member->join = helper::today(); $member->role = $this->lang->project->$fieldName; $member->days = $project->days; + $member->type = 'project'; $member->hours = $this->config->project->defaultWorkhours; $this->dao->replace(TABLE_TEAM)->data($member)->exec(); } @@ -356,8 +361,8 @@ class projectModel extends model } /** - * Batch update. - * + * Batch update. + * * @access public * @return void */ @@ -365,7 +370,7 @@ class projectModel extends model { $projects = array(); $allChanges = array(); - $data = fixer::input('post')->get(); + $data = fixer::input('post')->get(); $oldProjects = $this->getByIdList($this->post->projectIDList); foreach($data->projectIDList as $projectID) { @@ -410,7 +415,8 @@ class projectModel extends model if(!empty($value) and !isset($team[$value])) { $member = new stdClass(); - $member->project = (int)$projectID; + $member->root = (int)$projectID; + $member->type = 'project'; $member->account = $value; $member->join = helper::today(); $member->role = $this->lang->project->$fieldName; @@ -430,8 +436,8 @@ class projectModel extends model /** * Start project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -453,8 +459,8 @@ class projectModel extends model /** * Put project off. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -474,8 +480,8 @@ class projectModel extends model /** * Suspend project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -497,8 +503,8 @@ class projectModel extends model /** * Activate project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -561,8 +567,8 @@ class projectModel extends model /** * Close project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return array */ @@ -587,8 +593,8 @@ class projectModel extends model /** * Get project pairs. - * - * @param string $mode all|noclosed or empty + * + * @param string $mode all|noclosed or empty * @access public * @return array */ @@ -624,8 +630,8 @@ class projectModel extends model /** * Get by idList. - * - * @param array $projectIDList + * + * @param array $projectIDList * @access public * @return array */ @@ -636,10 +642,10 @@ class projectModel extends model /** * Get project lists. - * + * * @param string $status all|undone|wait|running - * @param int $limit - * @param int $productID + * @param int $limit + * @param int $productID * @access public * @return array */ @@ -677,10 +683,10 @@ class projectModel extends model /** * Get project lists. - * + * * @param string $status involved - * @param int $limit - * @param int $productID + * @param int $limit + * @param int $productID * @param int $branch * @access public * @return array @@ -691,7 +697,7 @@ class projectModel extends model { return $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') - ->leftJoin(TABLE_TEAM)->alias('t3')->on('t3.project=t2.id') + ->leftJoin(TABLE_TEAM)->alias('t3')->on('t3.root=t2.id') ->where('t1.product')->eq($productID) ->andWhere('t2.deleted')->eq(0) ->andWhere('t2.iscat')->eq(0) @@ -699,6 +705,7 @@ class projectModel extends model ->andWhere('t2.openedBy', true)->eq($this->app->user->account) ->orWhere('t3.account')->eq($this->app->user->account) ->markRight(1) + ->andWhere('t3.type')->eq('project') ->orderBy('order_desc') ->beginIF($limit)->limit($limit)->fi() ->fetchAll('id'); @@ -706,12 +713,13 @@ class projectModel extends model else { return $this->dao->select('t1.*, IF(INSTR(" done", t1.status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT)->alias('t1') - ->leftJoin(TABLE_TEAM)->alias('t2')->on('t2.project=t1.id') + ->leftJoin(TABLE_TEAM)->alias('t2')->on('t2.root=t1.id') ->where('t1.iscat')->eq(0) ->andWhere('t1.openedBy', true)->eq($this->app->user->account) ->orWhere('t2.account')->eq($this->app->user->account) ->markRight(1) ->andWhere('t1.deleted')->eq(0) + ->andWhere('t2.type')->eq('project') ->orderBy('t1.order_desc') ->beginIF($limit)->limit($limit)->fi() ->fetchAll('id'); @@ -720,7 +728,7 @@ class projectModel extends model /** * Get projects lists grouped by product. - * + * * @access public * @return array */ @@ -738,14 +746,14 @@ class projectModel extends model { foreach($product as $ID => $project) { - if(!$this->checkPriv($projects[$project->id])) + if(!$this->checkPriv($projects[$project->id])) { unset($list[$id][$ID]); } if(!$project->product) { if($this->checkPriv($projects[$project->id])) $noProducts[] = $project; - unset($list[$id][$ID]); + unset($list[$id][$ID]); } } } @@ -757,12 +765,12 @@ class projectModel extends model /** * Get project stats. - * - * @param string $status - * @param int $productID - * @param int $itemCounts - * @param string $orderBy - * @param int $pager + * + * @param string $status + * @param int $productID + * @param int $itemCounts + * @param string $orderBy + * @param int $pager * @access public * @return void */ @@ -949,8 +957,8 @@ class projectModel extends model /** * Get project by id. - * - * @param int $projectID + * + * @param int $projectID * @param bool $setImgSize * @access public * @return void @@ -970,8 +978,8 @@ class projectModel extends model } $total = $this->dao->select(' - SUM(estimate) AS totalEstimate, - SUM(consumed) AS totalConsumed, + SUM(estimate) AS totalEstimate, + SUM(consumed) AS totalConsumed, SUM(`left`) AS totalLeft') ->from(TABLE_TASK) ->where('project')->eq((int)$projectID) @@ -980,7 +988,7 @@ class projectModel extends model ->andWhere('parent')->eq(0) ->fetch(); $project->days = $project->days ? $project->days : ''; - $project->totalHours = $this->dao->select('sum(days * hours) AS totalHours')->from(TABLE_TEAM)->where('project')->eq($project->id)->fetch('totalHours'); + $project->totalHours = $this->dao->select('sum(days * hours) AS totalHours')->from(TABLE_TEAM)->where('root')->eq($project->id)->andWhere('type')->eq('project')->fetch('totalHours'); $project->totalEstimate = round($total->totalEstimate, 1); $project->totalConsumed = round($total->totalConsumed, 1); $project->totalLeft = round($total->totalLeft, 1); @@ -992,9 +1000,9 @@ class projectModel extends model } /** - * Get the default managers for a project from it's related products. - * - * @param int $projectID + * Get the default managers for a project from it's related products. + * + * @param int $projectID * @access public * @return object */ @@ -1015,8 +1023,8 @@ class projectModel extends model /** * Get products of a project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return array */ @@ -1029,7 +1037,7 @@ class projectModel extends model if(!$withBranch) return $this->loadModel('tutorial')->getProductPairs(); return $this->loadModel('tutorial')->getProjectProducts(); } - $query = $this->dao->select('t2.id, t2.name, t2.type, t1.branch')->from(TABLE_PROJECTPRODUCT)->alias('t1') + $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)$projectID); @@ -1039,12 +1047,12 @@ class projectModel extends model /** * Build story search form. - * - * @param array $products - * @param array $branchGroups - * @param array $modules - * @param int $queryID - * @param string $actionURL + * + * @param array $products + * @param array $branchGroups + * @param array $modules + * @param int $queryID + * @param string $actionURL * @param string $type * @access public * @return void @@ -1103,9 +1111,9 @@ class projectModel extends model } /** - * Get projects to import + * Get projects to import * - * @param array $projectIds + * @param array $projectIds * @access public * @return array */ @@ -1128,8 +1136,8 @@ class projectModel extends model /** * Update products of a project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -1140,6 +1148,7 @@ class projectModel extends model if(!isset($_POST['products'])) return; $products = $_POST['products']; $branches = isset($_POST['branch']) ? $_POST['branch'] : array(); + $plans = $_POST['plans']; $existedProducts = array(); $addedProducts = array(); @@ -1160,15 +1169,16 @@ class projectModel extends model $data->project = $projectID; $data->product = $productID; $data->branch = isset($branches[$i]) ? $branches[$i] : 0; + $data->plan = isset($plans[$productID]) ? $plans[$productID] : 0; $this->dao->insert(TABLE_PROJECTPRODUCT)->data($data)->exec(); $existedProducts[$productID] = true; } } /** - * Get related projects - * - * @param int $projectID + * Get related projects + * + * @param int $projectID * @access public * @return array */ @@ -1190,9 +1200,9 @@ class projectModel extends model /** * Get tasks can be imported. - * + * * @param int $toProject - * @param array $branches + * @param array $branches * @access public * @return array */ @@ -1209,6 +1219,7 @@ class projectModel extends model ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account') ->where('t1.status')->in('wait, doing, pause, cancel') ->andWhere('t1.deleted')->eq(0) + ->andWhere('t1.parent')->eq(0) ->andWhere('t1.project')->in(array_keys($projects)) ->andWhere("(t1.story = 0 OR (t2.branch in ('0','" . join("','", $branches) . "') and t2.product " . helper::dbIN(array_keys($branches)) . "))") ->fetchGroup('project', 'id'); @@ -1217,8 +1228,8 @@ class projectModel extends model /** * Import tasks. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -1231,20 +1242,20 @@ class projectModel extends model foreach($tasks as $task) { /* Save the assignedToes and stories, should linked to project. */ - $assignedToes[$task->assignedTo] = $task->project; - $stories[$task->story] = $task->story; + $assignedToes[$task->assignedTo] = $task->project; + $stories[$task->story] = $task->story; $data = new stdclass(); $data->project = $projectID; if($task->status == 'cancel') { - $data->canceledBy = ''; - $data->canceledDate = NULL; + $data->canceledBy = ''; + $data->canceledDate = null; } - $data->status = $task->consumed > 0 ? 'doing' : 'wait'; - $this->dao->update(TABLE_TASK)->data($data)->where('id')->in($this->post->tasks)->exec(); + $data->status = $task->consumed > 0 ? 'doing' : 'wait'; + $this->dao->update(TABLE_TASK)->data($data)->where('id')->in($this->post->tasks)->orWhere('parent')->in($this->post->tasks)->exec(); $this->loadModel('action')->create('task', $task->id, 'moved', '', $task->project); } @@ -1257,9 +1268,14 @@ class projectModel extends model { if(!isset($teamMembers[$account])) { - $role = $this->dao->select('*')->from(TABLE_TEAM)->where('project')->eq($preProjectID)->andWhere('account')->eq($account)->fetch(); - $role->project = $projectID; - $role->join = helper::today(); + $role = $this->dao->select('*')->from(TABLE_TEAM) + ->where('root')->eq($preProjectID) + ->andWhere('account')->eq($account) + ->andWhere('type')->eq('project') + ->fetch(); + + $role->root = $projectID; + $role->join = helper::today(); $this->dao->insert(TABLE_TEAM)->data($role)->exec(); } } @@ -1279,9 +1295,9 @@ class projectModel extends model } /** - * Import task from Bug. - * - * @param int $projectID + * Import task from Bug. + * + * @param int $projectID * @access public * @return void */ @@ -1326,7 +1342,7 @@ class projectModel extends model if(!$bug->confirmed) $this->dao->update(TABLE_BUG)->set('confirmed')->eq(1)->where('id')->eq($bug->id)->exec(); $this->dao->insert(TABLE_TASK)->data($task)->checkIF($bugToTasks->estimate[$key] != '', 'estimate', 'float')->exec(); - if(dao::isError()) + if(dao::isError()) { echo js::error(dao::getError()); die(js::reload('parent')); @@ -1387,8 +1403,8 @@ class projectModel extends model /** * Get child projects. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -1399,8 +1415,8 @@ class projectModel extends model /** * Update childs. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -1419,22 +1435,29 @@ class projectModel extends model /** * Link story. - * - * @param int $projectID + * + * @param int $projectID + * @param array $stories + * @param array $products + * * @access public - * @return void + * @return mixed */ - public function linkStory($projectID, $stories = array()) + public function linkStory($projectID, $stories = array(), $products = array()) { if(empty($stories)) $stories = $this->post->stories; if(empty($stories)) return false; + if(empty($products)) $products = $this->post->products; $this->loadModel('action'); - $versions = $this->loadModel('story')->getVersions($stories); - $lastOrder = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order'); + $versions = $this->loadModel('story')->getVersions($stories); + $linkedStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->fetchPairs('story', 'order'); + $lastOrder = reset($linkedStories); foreach($stories as $key => $storyID) { - $productID = (int)$this->post->products[$storyID]; + if(isset($linkedStories[$storyID])) continue; + + $productID = (int)$products[$storyID]; $data = new stdclass(); $data->project = $projectID; $data->product = $productID; @@ -1444,14 +1467,42 @@ class projectModel extends model $this->dao->insert(TABLE_PROJECTSTORY)->data($data)->exec(); $this->story->setStage($storyID); $this->action->create('story', $storyID, 'linked2project', '', $projectID); - } + } } /** - * Unlink story. - * - * @param int $projectID - * @param int $storyID + * Link all stories by project. + * + * @param $projectID + */ + public function linkStories($projectID) + { + $plans = $this->dao->select('plan,product')->from(TABLE_PROJECTPRODUCT) + ->where('project')->eq($projectID) + ->fetchPairs('plan', 'product'); + + $planStories = array(); + $planProducts = array(); + if(!empty($plans)) + { + foreach($plans as $planID => $productID) + { + $planStory = $this->loadModel('story')->getPlanStories($planID, 'active'); + if(!empty($planStory)) + { + $planStories = array_merge($planStories, array_keys($planStory)); + foreach($planStory as $story) $planProducts[$story->id] = $story->product; + } + } + } + $this->linkStory($projectID, $planStories, $planProducts); + } + + /** + * Unlink story. + * + * @param int $projectID + * @param int $storyID * @access public * @return void */ @@ -1481,9 +1532,9 @@ class projectModel extends model } /** - * Get team members. - * - * @param int $projectID + * Get team members. + * + * @param int $projectID * @access public * @return array */ @@ -1492,15 +1543,16 @@ class projectModel extends model if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembers(); return $this->dao->select("t1.*, t1.hours * t1.days AS totalHours, 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.project')->eq((int)$projectID) + ->where('t1.root')->eq((int)$projectID) + ->andWhere('t1.type')->eq('project') ->fetchAll('account'); } /** * Get team members in pair. - * - * @param int $projectID - * @param string $params + * + * @param int $projectID + * @param string $params * @access public * @return array */ @@ -1509,7 +1561,8 @@ class projectModel extends model if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembersPairs(); $users = $this->dao->select('t1.account, t2.realname')->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') - ->where('t1.project')->eq((int)$projectID) + ->where('t1.root')->eq((int)$projectID) + ->andWhere('t1.type')->eq('project') ->beginIF($params == 'nodeleted' or empty($this->config->user->showDeleted)) ->andWhere('t2.deleted')->eq(0) ->fi() @@ -1525,29 +1578,30 @@ class projectModel extends model /** * Get teams which can be imported. - * - * @param string $account - * @param int $currentProject + * + * @param string $account + * @param int $currentProject * @access public * @return array */ public function getTeams2Import($account, $currentProject) { - return $this->dao->select('t1.project, t2.name as projectName') + return $this->dao->select('t1.root, t2.name as projectName') ->from(TABLE_TEAM)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.root = t2.id') ->where('t1.account')->eq($account) - ->andWhere('t1.project')->ne($currentProject) - ->groupBy('t1.project') - ->orderBy('t1.project DESC') + ->andWhere('t1.root')->ne($currentProject) + ->andWhere('t1.type')->eq('project') + ->groupBy('t1.root') + ->orderBy('t1.root DESC') ->fetchPairs(); } /** * Get members of a project who can be imported. - * - * @param int $project - * @param array $currentMembers + * + * @param int $project + * @param array $currentMembers * @access public * @return array */ @@ -1557,8 +1611,9 @@ class projectModel extends model return $this->dao->select('account, role, hours') ->from(TABLE_TEAM) - ->where('project')->eq($project) + ->where('root')->eq($project) ->andWhere('account')->notIN($currentMembers) + ->andWhere('type')->eq('project') ->fetchAll('account'); } @@ -1590,15 +1645,17 @@ class projectModel extends model { $this->dao->update(TABLE_TEAM) ->data($member) - ->where('project')->eq((int)$projectID) + ->where('root')->eq((int)$projectID) ->andWhere('account')->eq($account) + ->andWhere('type')->eq('project') ->exec(); } else { - $member->project = (int)$projectID; + $member->root = (int)$projectID; $member->account = $account; $member->join = helper::today(); + $member->type = 'project'; $this->dao->insert(TABLE_TEAM)->data($member)->exec(); } } @@ -1606,20 +1663,20 @@ class projectModel extends model /** * Unlink a member. - * - * @param int $projectID - * @param string $account + * + * @param int $projectID + * @param string $account * @access public * @return void */ public function unlinkMember($projectID, $account) { - $this->dao->delete()->from(TABLE_TEAM)->where('project')->eq((int)$projectID)->andWhere('account')->eq($account)->exec(); + $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('account')->eq($account)->andWhere('type')->eq('project')->exec(); } /** * Compute burn of a project. - * + * * @access public * @return array */ @@ -1654,8 +1711,8 @@ class projectModel extends model /** * Fix burn for first day. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */ @@ -1678,9 +1735,9 @@ class projectModel extends model } /** - * Get burn data for flot - * - * @param int $projectID + * Get burn data for flot + * + * @param int $projectID * @access public * @return array */ @@ -1694,7 +1751,7 @@ class projectModel extends model $count = 0; $burnData = array(); - foreach($sets as $date => $set) + foreach($sets as $date => $set) { if($date < $project->begin) continue; if($date > $project->end) continue; @@ -1709,12 +1766,12 @@ class projectModel extends model /** * Process burndown datas when the sets is smaller than the itemCounts. - * - * @param array $sets - * @param int $itemCounts - * @param date $begin - * @param date $end - * @param string $mode + * + * @param array $sets + * @param int $itemCounts + * @param date $begin + * @param date $end + * @param string $mode * @access public * @return array */ @@ -1772,10 +1829,10 @@ class projectModel extends model /** * Get taskes by search. - * - * @param string $condition - * @param object $pager - * @param string $orderBy + * + * @param string $condition + * @param object $pager + * @param string $orderBy * @access public * @return array */ @@ -1802,13 +1859,13 @@ class projectModel extends model } /** - * Get bugs by search in project. - * - * @param int $products - * @param int $projectID - * @param int $sql - * @param int $pager - * @param int $orderBy + * Get bugs by search in project. + * + * @param int $products + * @param int $projectID + * @param int $sql + * @param int $pager + * @param int $orderBy * @access public * @return void */ @@ -1829,8 +1886,8 @@ class projectModel extends model /** * Get the summary of project. - * - * @param array $tasks + * + * @param array $tasks * @access public * @return string */ @@ -1846,7 +1903,8 @@ class projectModel extends model $totalLeft += (($task->status == 'cancel' or $task->closedReason == 'cancel') ? 0 : $task->left); $statusVar = 'status' . ucfirst($task->status); $$statusVar ++; - if(!empty($task->children)){ + if(!empty($task->children)) + { $taskSum += count($task->children); foreach($task->children as $child) { @@ -1861,9 +1919,9 @@ class projectModel extends model /** * Judge an action is clickable or not. - * + * * @param object $project - * @param string $action + * @param string $action * @access public * @return bool */ @@ -1882,10 +1940,10 @@ class projectModel extends model /** * Create the link from module,method,extra - * - * @param string $module - * @param string $method - * @param mix $extra + * + * @param string $module + * @param string $method + * @param mix $extra * @access public * @return void */ @@ -1896,12 +1954,12 @@ class projectModel extends model { $module = 'project'; $method = 'task'; - } + } if($module == 'build' and ($method == 'edit' || $method= 'view')) - { + { $module = 'project'; $method = 'build'; - } + } if($module == 'project' and $method == 'create') return; if($extra != '') @@ -1922,12 +1980,12 @@ class projectModel extends model } /** - * Get no weekend date - * - * @param string $begin - * @param string $end - * @param string $type - * @param string|int $interval + * Get no weekend date + * + * @param string $begin + * @param string $end + * @param string $type + * @param string|int $interval * @param string $format * @access public * @return array @@ -1977,8 +2035,8 @@ class projectModel extends model /** * Get total estimate. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return float */ @@ -2001,7 +2059,7 @@ class projectModel extends model if($this->app->user->admin) return true; /* Get all teams of all projects and group by projects, save it as static. */ - $projects = $this->dao->select('project, limited')->from(TABLE_TEAM)->where('account')->eq($this->app->user->account)->andWhere('limited')->eq('yes')->orderBy('project asc')->fetchPairs('project', 'project'); + $projects = $this->dao->select('root, limited')->from(TABLE_TEAM)->where('account')->eq($this->app->user->account)->andWhere('limited')->eq('yes')->andWhere('type')->eq('project')->orderBy('root asc')->fetchPairs('root', 'root'); $_SESSION['limitedProjects'] = join(',', $projects); } @@ -2027,8 +2085,8 @@ class projectModel extends model /** * Get branches of project. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return array */ @@ -2145,11 +2203,11 @@ class projectModel extends model } /** - * Get Kanban tasks - * - * @param int $projectID - * @param string $orderBy - * @param object $pager + * Get Kanban tasks + * + * @param int $projectID + * @param string $orderBy + * @param object $pager * @access public * @return void */ @@ -2172,10 +2230,10 @@ class projectModel extends model } /** - * Get kanban group data. - * - * @param array $tasks - * @param array $bugs + * Get kanban group data. + * + * @param array $tasks + * @param array $bugs * @access public * @return array */ @@ -2226,9 +2284,9 @@ class projectModel extends model /** * Save Kanban Data. - * - * @param int $projectID - * @param array $kanbanDatas + * + * @param int $projectID + * @param array $kanbanDatas * @access public * @return void */ @@ -2242,8 +2300,8 @@ class projectModel extends model /** * Get Prev Kanban. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return array */ @@ -2255,8 +2313,8 @@ class projectModel extends model /** * Get kanban setting. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return object */ @@ -2281,10 +2339,10 @@ class projectModel extends model /** * Build burn data. - * - * @param int $projectID - * @param array $dateList - * @param string $type + * + * @param int $projectID + * @param array $dateList + * @param string $type * @access public * @return array */ @@ -2448,9 +2506,9 @@ class projectModel extends model /** * Format tasks for tree. - * - * @param array $tasks - * @param object $story + * + * @param array $tasks + * @param object $story * @access public * @return array */ @@ -2525,4 +2583,25 @@ class projectModel extends model if(isset($fullTrees[0]) and empty($fullTrees[0]->children)) array_shift($fullTrees); return array_values($fullTrees); } + + /** + * Get plans by $productID. + * + * @param int|array $productID + * + * @return mixed + */ + public function getPlans($productID) + { + $plans = $this->dao->select('id,title,product')->from(TABLE_PRODUCTPLAN) + ->where('product')->in($productID) + ->fetchAll(); + + $productPlans = array(); + foreach ($plans as $plan) + { + $productPlans[$plan->product][$plan->id] = $plan->title; + } + return $productPlans; + } } diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index bca38a49d5..100e960191 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -13,60 +13,65 @@ build->confirmDelete)?> -
      -
      - icons['build']);?> project->build;?> +
      +
      + +
      +
    • productplan->product;?> name;?>
    product->branch;?> branch, 'class="form-control"');?>
    productplan->title;?> title, "class='form-control' autocomplete='off'");?>
    productplan->begin;?> begin, "class='form-control form-date'");?>
    productplan->end;?>end, 'class="form-control form-date"');?> + end == '2030-01-01' ? ' disabled="disabled"' : '';?> + end : '', 'class="form-control form-date"' . $disabled);?> +     productplan->endList , '', "onclick='computeEndDate(this.value)'");?>
    productplan->desc;?> desc), "rows='10' class='form-control'");?>
    - id); diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 59422c92de..df56628229 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -92,9 +92,7 @@ productplan->updateOrder);?> priAB);?> story->module);?> story->title);?> openedByAB);?> assignedToAB);?>
    - - id));?> story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri);?>module)) echo $modulePairs[$story->module];?>module, '');?> title);?> openedBy);?> assignedTo);?>
    - - createLink('bug', 'view', "bugID=$bug->id"), sprintf("%03d", $bug->id));?> bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri);?>productplan->title;?> title;?>
    product->branch;?>branch];?>
    product->branch;?>branch];?>
    productplan->begin;?> begin;?>
    productplan->end;?>end;?>end == '2030-01-01' ? $lang->productplan->future : $plan->end;?>
    productplan->desc;?>
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    build->id;?>build->product;?>build->name;?>build->scmPath;?>build->filePath;?>build->date;?>build->builder;?>actions;?>
    id;?>productName;?> + branchName) echo "{$build->branchName}"?> + createLink('build', 'view', "build=$build->id"), $build->name);?> + scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?>filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?>date?>builder]?> + createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "", '', "class='btn' title='{$lang->build->linkStory}'"); + } + common::printIcon('testtask', 'create', "product=$build->product&project=$project->id&build=$build->id", $build, 'list', 'bullhorn'); + $lang->project->bug = $lang->project->viewBug; + common::printIcon('project', 'bug', "project=$project->id&orderBy=status&build=$build->id", $build, 'list'); + 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)", '', '', "class='btn' title='{$lang->build->delete}'"); + } + ?> +
    + -
    - id");?> -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    build->id;?>build->product;?>build->name;?>build->scmPath;?>build->filePath;?>build->date;?>build->builder;?>actions;?>
    id;?>productName;?> - branchName) echo "{$build->branchName}"?> - createLink('build', 'view', "build=$build->id"), $build->name);?> - scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?>filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?>date?>builder]?> - createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "", '', "class='btn-icon' title='{$lang->build->linkStory}'"); - } - common::printIcon('testtask', 'create', "product=$build->product&project=$project->id&build=$build->id", $build, 'list', 'bullhorn'); - $lang->project->bug = $lang->project->viewBug; - common::printIcon('project', 'bug', "project=$project->id&orderBy=status&build=$build->id", $build, 'list'); - 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)", '', '', "class='btn-icon' title='{$lang->build->delete}'"); - } - ?> -
    + diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php index 2cb4e85d64..6d1c6d5df2 100644 --- a/module/project/view/burn.html.php +++ b/module/project/view/burn.html.php @@ -27,7 +27,7 @@ $weekend = ($type == 'noweekend') ? 'withweekend' : "noweekend"; common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin', "title='{$lang->project->computeBurn}{$lang->project->burn}' class='btn btn-primary btn-sm' id='computeBurn'"); echo html::a($this->createLink('project', 'burn', "projectID=$projectID&type=$weekend&interval=$interval"), $lang->project->$weekend, '', "class='btn btn-sm'"); - common::printLink('project', 'fixFirst', "project=$project->id", $lang->project->fixFirst, '', "class='btn btn-sm iframe' data-width='500'"); + common::printLink('project', 'fixFirst', "project=$project->id", $lang->project->fixFirst, '', "class='btn btn-sm iframe' data-width='600'"); echo $lang->project->howToUpdateBurn; ?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index db40c91339..0b823d15e1 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -44,22 +44,22 @@ - +
    - + - + - + - + + config->global->flow == 'onlyTask') echo "class='hidden'";?>> + + + - + - + > diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 85f467c348..220cdaa3ca 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -23,11 +23,11 @@ -
    project->name;?>project->name;?>
    project->code;?>
    project->dateRange;?>
    - project->begin . "'");?> + begin) ? $plan->begin : date('Y-m-d')), "class='form-control w-100px form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?> project->to;?> - project->end . "'");?> + end) ? $plan->end : ''), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?>
    		@@ -70,15 +70,15 @@ project->days;?>
    - + begin) ? helper::workDays($plan->begin, $plan->end) : ''), "class='form-control' autocomplete='off'");?> project->day;?>
    project->teamname;?>
    project->type;?> @@ -96,8 +96,8 @@
    - id, "class='form-control chosen' onchange='loadBranches(this)'");?> - + id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?> + type != 'normal') echo html::select("branch[$i]", $branchGroups[$product->id], $product->branch, "class='form-control' style='width:80px'")?>
    @@ -106,20 +106,32 @@
    - +
    project->linkPlan;?> +
    + begin)):?> +
    + product . "]", $productPlan, $plan->id, "class='form-control'");?> +
    + +
    +
    project->desc;?>
    project->acl;?> project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
    project->whitelist;?>
    +
    - + @@ -58,15 +58,15 @@ project->day;?> - + - + - + @@ -115,7 +115,7 @@
    - id, "class='form-control chosen' onchange='loadBranches(this)'");?> + id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?> type != 'normal' and isset($branchGroups[$product->id])) echo html::select("branch[$i]", $branchGroups[$product->id], $product->branch, "class='form-control' style='width:80px'")?>
    @@ -131,6 +131,18 @@
    + config->global->flow == 'onlyTask') echo "class='hidden'";?>> + + + diff --git a/module/project/view/fixfirst.html.php b/module/project/view/fixfirst.html.php index d31f4c4cde..ddf3f03e3b 100644 --- a/module/project/view/fixfirst.html.php +++ b/module/project/view/fixfirst.html.php @@ -21,7 +21,7 @@ -
    project->totalEstimate . $project->totalEstimate . $lang->project->workHour;?>
    +
    project->totalEstimate . ' : ' . $project->totalEstimate . $lang->project->workHour;?>
    project->name;?> name, "class='form-control' autocomplete='off'");?>
    project->code;?> code, "class='form-control' autocomplete='off'");?>
    project->type;?> project->typeList, $project->type, "class='form-control'");?>
    project->teamname;?> team, "class='form-control' autocomplete='off'");?>
    project->status;?> project->statusList, $project->status, "class='form-control'");?>
    project->linkPlan;?> +
    + $plan):?> +
    + plan, "class='form-control'");?> +
    + +
    +
    project->desc;?> desc), "rows='6' class='form-control'");?>
    diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index 699f4a1b63..2233c58111 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -25,21 +25,21 @@ - - + - + @@ -55,7 +55,7 @@ $groupWait = 0; $groupDone = 0; $groupDoing = 0; - $groupClosed = 0; + $groupClosed = 0; $groupEstimate = 0.0; $groupConsumed = 0.0; $groupLeft = 0.0; @@ -113,7 +113,7 @@ - + - + task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?> children)):?> diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php index e6590fc19e..766a2fa3a7 100644 --- a/module/project/view/taskheader.html.php +++ b/module/project/view/taskheader.html.php @@ -98,7 +98,7 @@ diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index d565654f6e..4f8f1342a8 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -13,57 +13,91 @@ testtask->confirmDelete)?> -
    -
    - icons['test']);?> testtask->browse;?> -
    -
    - -
    -
    +
    +
    + +
    +
    +
    + " . $lang->task->$groupBy, '', "class='expandAll' data-action='expand'")?> " . $lang->task->$groupBy, '', "class='collapseAll hidden' data-action='collapse'")?> task->id;?> priAB;?> task->name;?>task->status;?>task->status;?> task->deadlineAB;?> task->assignedTo;?> task->finishedBy;?> task->estimateAB;?> task->consumedAB;?> task->leftAB;?>task->progress;?>task->progress;?> typeAB;?> actions;?>
    id;?>task->priList), $task->pri, $task->pri)?>'>task->priList), $task->pri, $task->pri);?>task->priList, $task->pri, $task->pri)?>'>task->priList, $task->pri, $task->pri);?> team)) echo '' . $lang->task->multipleAB . ' '; diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 156627e13f..7b775d56c6 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -10,9 +10,10 @@ * @link http://www.zentao.net */ ?> + - + @@ -24,7 +25,7 @@
    - lang->story->create = $this->lang->project->createStory; @@ -51,7 +52,18 @@ } else { + echo "
    "; common::printIcon('project', 'linkStory', "project=$project->id", '', 'button', 'link', '', 'link-story-btn'); + if(common::hasPriv('project', 'importPlanStories')) + { + echo "'; + echo "
      "; + echo "
    • " . html::a('###', $lang->project->linkStoryByPlan, '', 'data-toggle="linkStoryByPlan"') . "
      • "; + echo '
    '; + } + echo '
    '; } ?>
    @@ -73,7 +85,6 @@
    - @@ -109,7 +120,7 @@ @@ -233,6 +244,23 @@
    - + id));?>
    + + product->checkedSummary);?> id);?> diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 8a7efdad3f..38cab6a3f1 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -76,7 +76,7 @@ js::set('browseType', $browseType);
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    + + idAB;?> +     		testtask->product;?>testtask->name;?>testtask->build;?>testtask->owner;?>testtask->begin;?>testtask->end;?>statusAB;?>actions;?>
    +
    + + + id);?> +
    +     		product, '');?>createLink('testtask', 'view', "taskID=$task->id"), $task->name);?>build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName);?>owner];?>begin?>end?>testtask->statusList[$task->status];?> + id", $task, 'list', 'sitemap'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); + common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list'); + common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag'); - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    idAB;?>testtask->name;?>testtask->build;?>testtask->owner;?>testtask->begin;?>testtask->end;?>statusAB;?>actions;?>
    createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>createLink('testtask', 'view', "taskID=$task->id"), $task->name);?>build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?>owner];?>begin?>end?>testtask->statusList[$task->status];?> - id", $task, 'list', 'sitemap'); - common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); - common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list'); - common::printIcon('testreport', 'create', "objectID=$task->id&objectType=testtask", $task, 'list','flag'); - - if(common::hasPriv('testtask', 'delete', $task)) - { - $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='btn-icon' title='{$lang->testtask->delete}'"); - } - ?> -
    + if(common::hasPriv('testtask', 'delete', $task)) + { + $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='btn' title='{$lang->testtask->delete}'"); + } + ?> +
    + +
    +
    +
    + createLink('testreport', 'browse', "objectID=$projectID&objctType=project"); + $misc = common::hasPriv('testreport', 'browse') ? "onclick=\"setFormAction('$actionLink', '', '#testtaskForm')\"" : "disabled='disabled'"; + echo html::commonButton($lang->testreport->common, $misc); + ?> +
    +
    + + + + + diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 8fb16ea929..bf9b78efa8 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -74,7 +74,7 @@ project->basicInfo?> - + diff --git a/module/release/config.php b/module/release/config.php index 7e52377cd7..464702d309 100644 --- a/module/release/config.php +++ b/module/release/config.php @@ -3,7 +3,7 @@ $config->release = new stdclass(); $config->release->create = new stdclass(); $config->release->edit = new stdclass(); $config->release->create->requiredFields = 'name,date'; -$config->release->edit->requiredFields = 'name,date'; +$config->release->edit->requiredFields = 'name,date,build'; $config->release->editor = new stdclass(); $config->release->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 71d06752f7..bd330b0bb4 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -16,11 +16,11 @@ $lang->release->linkStory = "Link Story"; $lang->release->linkBug = "Link Bug"; $lang->release->delete = "Delete"; $lang->release->deleted = 'Deleted'; -$lang->release->view = "Info"; -$lang->release->browse = "Releases"; +$lang->release->view = "Overview"; +$lang->release->browse = "Browse"; $lang->release->changeStatus = "Change Status"; $lang->release->batchUnlink = "Batch Unlink"; -$lang->release->batchUnlinkStory = "Batch Unlink"; +$lang->release->batchUnlinkStory = "Batch Unlink Story"; $lang->release->batchUnlinkBug = "Batch Unlink"; $lang->release->confirmDelete = "Do you want to delete this Release?"; diff --git a/module/release/model.php b/module/release/model.php index ef6b28cd13..b9e5f341e4 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -172,7 +172,7 @@ class releaseModel extends model $this->dao->update(TABLE_RELEASE)->data($release) ->autoCheck() ->batchCheck($this->config->release->edit->requiredFields, 'notempty') - ->check('name', 'unique', "id != $releaseID AND product = {$release->product} AND branch = $branch AND deleted = '0'") + ->check('name', 'unique', "id != '$releaseID' AND product = '{$release->product}' AND branch = '$branch' AND deleted = '0'") ->where('id')->eq((int)$releaseID) ->exec(); if(!dao::isError()) diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 4aa6700a97..af70c8a323 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -13,63 +13,69 @@ release->confirmDelete)?> -
    -
    -
    - - release->browse;?> - type !== 'normal') echo '' . $branches[$branch] . '';?> +
    +
    + -
    - id&branch=$branch");?> +
    +
    project->name;?>project->name;?> name;?>
    + + + + + + type != 'normal'):?> + + + + + + + + + + + + + + type != 'normal'):?> + + + + + + + + +
    release->id;?>release->name;?>release->build;?>product->branch;?>release->date;?>release->status;?>actions;?>
    id;?>id"), $release->name);?>createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank');?>branch];?>date;?>release->statusList[$release->status];?> + id&type=story&link=true"), ' ', '', "class='btn' title='{$lang->release->linkStory}'"); + if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); + if(common::hasPriv('release', 'changeStatus', $release)) + { + $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; + echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'"); + } + common::printIcon('release', 'edit', "release=$release->id", $release, 'list'); + if(common::hasPriv('release', 'delete', $release)) + { + $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='btn' title='{$lang->release->delete}'"); + } + ?> +
    - - - - - - - type != 'normal'):?> - - - - - - - - - - - - - - type != 'normal'):?> - - - - - - - - -
    release->id;?>release->name;?>release->build;?>product->branch;?>release->date;?>release->status;?>actions;?>
    id;?>id"), $release->name);?>createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank');?>branch];?>date;?>release->statusList[$release->status];?> - id&type=story&link=true"), ' ', '', "class='btn-icon' title='{$lang->release->linkStory}'"); - if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn-icon' title='{$lang->release->linkBug}'"); - if(common::hasPriv('release', 'changeStatus', $release)) - { - $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; - echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn-icon' title='{$lang->release->changeStatusList[$changedStatus]}'"); - } - common::printIcon('release', 'edit', "release=$release->id", $release, 'list'); - if(common::hasPriv('release', 'delete', $release)) - { - $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='btn-icon' title='{$lang->release->delete}'"); - } - ?> -
    - - + diff --git a/module/report/control.php b/module/report/control.php index 6b08d41115..b3c45f224f 100644 --- a/module/report/control.php +++ b/module/report/control.php @@ -13,13 +13,13 @@ class report extends control { /** * The index of report, goto project deviation. - * + * * @access public * @return void */ public function index() { - $this->locate(inlink('productSummary')); + $this->locate(inlink('productSummary')); } /** @@ -45,7 +45,7 @@ class report extends control /** * Product information report. - * + * * @access public * @return void */ @@ -65,9 +65,9 @@ class report extends control /** * Bug create report. - * - * @param int $begin - * @param int $end + * + * @param int $begin + * @param int $end * @access public * @return void */ @@ -88,12 +88,12 @@ class report extends control $this->view->project = $project; $this->view->product = $product; $this->view->submenu = 'test'; - $this->display(); + $this->display(); } /** * Bug assign report. - * + * * @access public * @return void */ @@ -104,34 +104,42 @@ class report extends control $this->view->submenu = 'test'; $this->view->assigns = $this->report->getBugAssign(); $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted'); - $this->display(); + $this->display(); } /** * Workload report. - * + * + * @param string $begin + * @param string $end + * @param int $days + * @param int $workday + * @param int $dept + * @param int $assign + * * @access public * @return void */ - public function workload($begin = '', $end = '', $days = 0, $workday = 0, $dept = 0) + public function workload($begin = '', $end = '', $days = 0, $workday = 0, $dept = 0, $assign = 'assign') { if($_POST) { - $data = fixer::input('post')->get(); - $begin = $data->begin; - $end = $data->end; - $dept = $data->dept; - $days = $data->days; - $workday = $data->workday; + $data = fixer::input('post')->get(); + $begin = $data->begin; + $end = $data->end; + $dept = $data->dept; + $days = $data->days; + $assign = $data->assign; + $workday = $data->workday; } $this->app->loadConfig('project'); - $begin = $begin ? strtotime($begin) : time(); - $end = $end ? strtotime($end) : time() + (7 * 24 * 3600); - $end += 24 * 3600; + $begin = $begin ? strtotime($begin) : time(); + $end = $end ? strtotime($end) : time() + (7 * 24 * 3600); + $end += 24 * 3600; $beginWeekDay = date('w', $begin); - $begin = date('Y-m-d', $begin); - $end = date('Y-m-d', $end); + $begin = date('Y-m-d', $begin); + $end = date('Y-m-d', $end); if(empty($workday))$workday = $this->config->project->defaultWorkhours; $diffDays = helper::diffDate($end, $begin); @@ -150,7 +158,7 @@ class report extends control $this->view->title = $this->lang->report->workload; $this->view->position[] = $this->lang->report->workload; - $this->view->workload = $this->report->getWorkload($dept); + $this->view->workload = $this->report->getWorkload($dept, $assign); $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted'); $this->view->depts = $this->loadModel('dept')->getOptionMenu(); $this->view->begin = $begin; @@ -158,6 +166,7 @@ class report extends control $this->view->days = $days; $this->view->workday = $workday; $this->view->dept = $dept; + $this->view->assign = $assign; $this->view->allHour = $days * $workday; $this->view->submenu = 'staff'; $this->display(); @@ -165,7 +174,7 @@ class report extends control /** * Send daily reminder mail. - * + * * @access public * @return void */ @@ -176,7 +185,7 @@ class report extends control if($this->config->report->dailyreminder->task) $tasks = $this->report->getUserTasks(); if($this->config->report->dailyreminder->todo) $todos = $this->report->getUserTodos(); if($this->config->report->dailyreminder->testTask) $testTasks = $this->report->getUserTestTasks(); - + $reminder = array(); $users = array_unique(array_merge(array_keys($bugs), array_keys($tasks), array_keys($todos), array_keys($testTasks))); @@ -216,7 +225,7 @@ class report extends control if($oldViewType == 'json') $this->viewType = 'html'; $mailContent = $this->parse('report', 'dailyreminder'); $this->viewType == $oldViewType; - + /* Send email.*/ echo date('Y-m-d H:i:s') . " sending to $user, "; $this->mail->send($user, $mailTitle, $mailContent, '', true); diff --git a/module/report/js/workload.js b/module/report/js/workload.js index 2a2d960b64..469da28ebe 100644 --- a/module/report/js/workload.js +++ b/module/report/js/workload.js @@ -9,6 +9,7 @@ function changeParams(obj) var end = $('.main .row').find('#end').val(); var workday = $('.main .row').find('#workday').val(); var dept = $('.main .row').find('#dept').val(); + var assign = $('.main .row').find('#assign').val(); var days = diffDate(begin, end); $('#days').val(days); @@ -17,23 +18,23 @@ function changeParams(obj) { var beginarray = begin.split("-"); var begin = ''; - for(i=0 ; i < beginarray.length ; i++) begin = begin + beginarray[i]; + for(i = 0; i < beginarray.length; i++) begin = begin + beginarray[i]; } if(end.indexOf('-') != -1) { var endarray = end.split("-"); var end = ''; - for(i=0 ; i < endarray.length ; i++) end = end + endarray[i]; + for(i=0 ; i < endarray.length ; i++) end = end + endarray[i]; } - link = createLink('report', 'workload', 'begin=' + begin + '&end=' + end + '&days=' + days + '&workday=' + workday + '&dept=' + dept); + var link = createLink('report', 'workload', 'begin=' + begin + '&end=' + end + '&days=' + days + '&workday=' + workday + '&dept=' + dept + '&assign=' + assign); location.href=link; } /** * Convert a date string to date object in js. - * - * @param string $date + * + * @param string $date * @access public * @return date */ @@ -45,9 +46,9 @@ function convertStringToDate(dateString) /** * Compute the diff days of two date. - * - * @param string $date1 - * @param string $date1 + * + * @param string $date1 + * @param string $date1 * @access public * @return int */ @@ -65,12 +66,12 @@ function diffDate(date1, date2) date1 += 1000 * 60 * 60 * 24; date1 = new Date(date1); } - return delta - weekEnds; + return delta - weekEnds; } $(function() { - var options = + var options = { language: config.clientLang, weekStart: 1, @@ -85,4 +86,4 @@ $(function() startDate: new Date() }; $('input#begin,input#end').fixedDate().datetimepicker(options); -}) +}); diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 41855b2346..d7a56b7a91 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -11,7 +11,7 @@ */ $lang->report->common = 'Report'; $lang->report->index = 'Home'; -$lang->report->list = 'List'; +$lang->report->list = 'Report List'; $lang->report->item = 'Item'; $lang->report->value = 'Value'; $lang->report->percent = '%'; @@ -31,6 +31,9 @@ $lang->report->colors[] = '008ED6'; $lang->report->colors[] = '9D080D'; $lang->report->colors[] = 'A186BE'; +$lang->report->assign['noassign'] = 'Not assigned'; +$lang->report->assign['assign'] = 'Assigned'; + $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; @@ -39,27 +42,27 @@ $lang->report->bugCreate = 'Bug Submission Report'; $lang->report->bugAssign = 'Bug Assignment Report'; $lang->report->workload = 'Workload'; $lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Bug Opened From'; +$lang->report->bugOpenedDate = 'Bug Created From'; $lang->report->taskAssignedDate = 'From'; -$lang->report->beginAndEnd = 'Date'; +$lang->report->beginAndEnd = ' From'; $lang->report->dept = 'Dept'; $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart'; -$lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation'; -$lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bugs|report|bugcreate'; +$lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation'; +$lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary'; +$lang->reportList->test->lists[10] = 'Bugs Creation|report|bugcreate'; $lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign'; $lang->reportList->staff->lists[10] = 'Workload|report|workload'; $lang->report->id = 'ID'; $lang->report->project = $lang->projectCommon; $lang->report->product = $lang->productCommon; -$lang->report->user = 'Username'; +$lang->report->user = 'Name'; $lang->report->bugTotal = 'Bug'; $lang->report->task = 'Task'; -$lang->report->estimate = 'Hour'; -$lang->report->consumed = 'Consumed'; -$lang->report->remain = 'Remained'; +$lang->report->estimate = 'Est.(h)'; +$lang->report->consumed = 'Cost'; +$lang->report->remain = 'Left'; $lang->report->deviation = 'Deviation'; $lang->report->deviationRate = 'Deviation Rate'; $lang->report->total = 'Total'; @@ -72,23 +75,28 @@ $lang->report->unplanned = 'Unplanned'; $lang->report->workday = 'Hours/Day'; $lang->report->diffDays = 'Man-Day'; +$lang->report->typeList[''] = 'Default'; +$lang->report->typeList['pie'] = 'Pie'; +$lang->report->typeList['bar'] = 'Bar'; +$lang->report->typeList['line'] = 'Line'; + $lang->report->conditions = 'Filter by:'; $lang->report->closedProduct = 'Closed ' . $lang->productCommon; -$lang->report->overduePlan = 'Overdue Plan'; +$lang->report->overduePlan = 'Expired Plan'; /* daily reminder. */ $lang->report->idAB = 'ID'; $lang->report->bugTitle = 'Bug Title'; $lang->report->taskName = 'Task Name'; -$lang->report->todoName = 'To-Do Name'; +$lang->report->todoName = 'Todo Name'; $lang->report->testTaskName = 'Test Task Name'; $lang->report->deadline = 'Deadline'; $lang->report->mailTitle = new stdclass(); $lang->report->mailTitle->begin = 'Notice: You have'; -$lang->report->mailTitle->bug = " Bug(%s),"; -$lang->report->mailTitle->task = " Task(%s),"; -$lang->report->mailTitle->todo = " To-Do(%s),"; -$lang->report->mailTitle->testTask = " Test Task(%s),"; +$lang->report->mailTitle->bug = " Bug (%s),"; +$lang->report->mailTitle->task = " Task (%s),"; +$lang->report->mailTitle->todo = " Todo (%s),"; +$lang->report->mailTitle->testTask = " Test Task (%s),"; $lang->report->proVersion = 'Try ZenTao Pro for more!'; diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 0965b08343..e638c08276 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -31,6 +31,9 @@ $lang->report->colors[] = '008ED6'; $lang->report->colors[] = '9D080D'; $lang->report->colors[] = 'A186BE'; +$lang->report->assign['noassign'] = '未指派'; +$lang->report->assign['assign'] = '已指派'; + $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . '偏差报表'; @@ -72,6 +75,11 @@ $lang->report->unplanned = '未计划'; $lang->report->workday = '每天工时'; $lang->report->diffDays = '工作日天数'; +$lang->report->typeList[''] = '默认'; +$lang->report->typeList['pie'] = '饼图'; +$lang->report->typeList['bar'] = '柱状图'; +$lang->report->typeList['line'] = '折线图'; + $lang->report->conditions = '筛选条件：'; $lang->report->closedProduct = '关闭' . $lang->productCommon; $lang->report->overduePlan = '过期计划'; diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php index 051651dfd8..5bd985c463 100644 --- a/module/report/lang/zh-tw.php +++ b/module/report/lang/zh-tw.php @@ -31,6 +31,9 @@ $lang->report->colors[] = '008ED6'; $lang->report->colors[] = '9D080D'; $lang->report->colors[] = 'A186BE'; +$lang->report->assign['noassign'] = '未指派'; +$lang->report->assign['assign'] = '已指派'; + $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . '偏差報表'; @@ -72,6 +75,11 @@ $lang->report->unplanned = '未計劃'; $lang->report->workday = '每天工時'; $lang->report->diffDays = '工作日天數'; +$lang->report->typeList[''] = '預設'; +$lang->report->typeList['pie'] = '餅圖'; +$lang->report->typeList['bar'] = '柱狀圖'; +$lang->report->typeList['line'] = '折線圖'; + $lang->report->conditions = '篩選條件：'; $lang->report->closedProduct = '關閉' . $lang->productCommon; $lang->report->overduePlan = '過期計劃'; diff --git a/module/report/model.php b/module/report/model.php index a52a888639..8c6436b731 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -15,8 +15,8 @@ class reportModel extends model { /** * Compute percent of every item. - * - * @param array $datas + * + * @param array $datas * @access public * @return array */ @@ -69,9 +69,9 @@ class reportModel extends model /** * Convert date format. - * - * @param array $dateList - * @param string $format + * + * @param array $dateList + * @param string $format * @access public * @return array */ @@ -82,8 +82,8 @@ class reportModel extends model } /** - * Get projects. - * + * Get projects. + * * @access public * @return void */ @@ -121,10 +121,10 @@ class reportModel extends model } /** - * Get products. - * + * Get products. + * * @access public - * @return array + * @return array */ public function getProducts($conditions) { @@ -195,10 +195,10 @@ class reportModel extends model } /** - * Get bugs - * - * @param int $begin - * @param int $end + * Get bugs + * + * @param int $begin + * @param int $end * @access public * @return array */ @@ -232,20 +232,55 @@ class reportModel extends model $bugCreate[$account]['validRate'] = (isset($bug['resolved']) and $bug['resolved']) ? ($validRate / $bug['resolved']) : "0"; } uasort($bugCreate, 'sortSummary'); - return $bugCreate; + return $bugCreate; } /** - * Get workload. - * + * Get workload. + * + * @param int $dept + * @param string $assign + * * @access public * @return array */ - public function getWorkload($dept = 0) + public function getWorkload($dept = 0, $assign = 'assign') { $depts = array(); if($dept) $depts = $this->loadModel('dept')->getAllChildId($dept); + if($assign == 'noassign') + { + $members = $this->dao->select('t1.account,t2.name,t1.root')->from(TABLE_TEAM)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t2.id = t1.root') + ->leftJoin(TABLE_USER)->alias('t3')->on('t3.account = t1.account') + ->where('t2.status')->notin('cancel, closed, done, suspended') + ->beginIF($dept)->andWhere('t3.dept')->in($depts)->fi() + ->andWhere('t1.type')->eq('project') + ->andWhere("t1.account NOT IN(SELECT `assignedTo` FROM " . TABLE_TASK . " WHERE `project` = t1.`root` AND `status` NOT IN('cancel, closed, done, pause') AND assignedTo != '' GROUP BY assignedTo)") + ->fetchGroup('account', 'name'); + + $workload = array(); + if(!empty($members)) + { + foreach($members as $member => $projects) + { + if(!empty($projects)) + { + foreach($projects as $name => $project) + { + $workload[$member]['task'][$name]['count'] = 0; + $workload[$member]['task'][$name]['manhour'] = 0; + $workload[$member]['task'][$name]['projectID'] = $project->root; + $workload[$member]['total']['count'] = 0; + $workload[$member]['total']['manhour'] = 0; + } + } + } + } + return $workload; + } + $tasks = $this->dao->select('t1.*, t2.name as projectName')->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account') @@ -254,7 +289,23 @@ class reportModel extends model ->andWhere('t2.deleted')->eq(0) ->andWhere('t2.status')->notin('cancel, closed, done, suspended') ->beginIF($dept)->andWhere('t3.dept')->in($depts)->fi() - ->fetchGroup('assignedTo'); + ->fetchGroup('assignedTo', 'id'); + + if(empty($tasks)) return array(); + + /* Fix bug for children. */ + $parents = array(); + foreach($tasks as $user => $userTasks) + { + if($user) + { + foreach($userTasks as $task) + { + if(!empty($task->parent)) $parents[$task->parent] = $task->parent; + } + } + } + $workload = array(); foreach($tasks as $user => $userTasks) { @@ -262,11 +313,12 @@ class reportModel extends model { foreach($userTasks as $task) { + if(!empty($parents) && in_array($task->id, $parents)) continue; $workload[$user]['task'][$task->projectName]['count'] = isset($workload[$user]['task'][$task->projectName]['count']) ? $workload[$user]['task'][$task->projectName]['count'] + 1 : 1; $workload[$user]['task'][$task->projectName]['manhour'] = isset($workload[$user]['task'][$task->projectName]['manhour']) ? $workload[$user]['task'][$task->projectName]['manhour'] + $task->left : $task->left; $workload[$user]['task'][$task->projectName]['projectID'] = $task->project; - $workload[$user]['total']['count'] = isset($workload[$user]['total']['count']) ? $workload[$user]['total']['count'] + 1 : 1; - if($task->parent == 0) $workload[$user]['total']['manhour'] = isset($workload[$user]['total']['manhour']) ? $workload[$user]['total']['manhour'] + $task->left : $task->left; + $workload[$user]['total']['count'] = isset($workload[$user]['total']['count']) ? $workload[$user]['total']['count'] + 1 : 1; + $workload[$user]['total']['manhour'] = isset($workload[$user]['total']['manhour']) ? $workload[$user]['total']['manhour'] + $task->left : $task->left; } } } @@ -275,10 +327,10 @@ class reportModel extends model } /** - * Get bug assign. - * + * Get bug assign. + * * @access public - * @return array + * @return array */ public function getBugAssign() { @@ -307,7 +359,7 @@ class reportModel extends model /** * Get System URL. - * + * * @access public * @return void */ @@ -331,13 +383,13 @@ class reportModel extends model /** * Get user bugs. - * + * * @access public * @return void */ public function getUserBugs() { - $bugs = $this->dao->select('t1.id, t1.title, t2.account as user, t1.deadline') + return $this->dao->select('t1.id, t1.title, t2.account as user, t1.deadline') ->from(TABLE_BUG)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2') ->on('t1.assignedTo = t2.account') @@ -345,19 +397,21 @@ class reportModel extends model ->andWhere('t1.assignedTo')->ne('closed') ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.deleted')->eq(0) + ->andWhere('t1.deadline', true)->eq('0000-00-00') + ->orWhere('t1.deadline')->lt(date(DT_DATE1, strtotime('+4 day'))) + ->markRight(1) ->fetchGroup('user'); - return $bugs; } /** * Get user tasks. - * + * * @access public * @return void */ public function getUserTasks() { - $tasks = $this->dao->select('t1.id, t1.name, t2.account as user, t1.deadline')->from(TABLE_TASK)->alias('t1') + return $this->dao->select('t1.id, t1.name, t2.account as user, t1.deadline')->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.assignedTo = t2.account') ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project = t3.id') ->where('t1.assignedTo')->ne('') @@ -365,16 +419,17 @@ class reportModel extends model ->andWhere('t2.deleted')->eq(0) ->andWhere('t1.status')->in('wait, doing') ->andWhere('t3.status')->ne('suspended') + ->andWhere('t1.deadline', true)->eq('0000-00-00') + ->orWhere('t1.deadline')->lt(date(DT_DATE1, strtotime('+4 day'))) + ->markRight(1) ->fetchGroup('user'); - - return $tasks; } /** * Get user todos. - * + * * @access public - * @return void + * @return array */ public function getUserTodos() { @@ -398,7 +453,7 @@ class reportModel extends model /** * Get user testTasks. - * + * * @access public * @return array */ @@ -413,6 +468,12 @@ class reportModel extends model } } +/** + * @param $pre + * @param $next + * + * @return int + */ function sortSummary($pre, $next) { if($pre['validRate'] == $next['validRate']) return 0; diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php index d2e206329d..70acfa6bb5 100644 --- a/module/report/view/bugcreate.html.php +++ b/module/report/view/bugcreate.html.php @@ -45,7 +45,7 @@     		bug->resolutionList['notrepro'];?> bug->resolutionList['postponed'];?> bug->resolutionList['willnotfix'];?>bug->resolutionList['tostory'];?>bug->resolutionList['tostory'];?> report->validRate;?> report->total;?>
    product->name;?> product->PO;?> productplan->common;?>productplan->begin;?>productplan->end;?>productplan->begin;?>productplan->end;?> story->statusList['draft'];?> story->statusList['active'];?> story->statusList['changed'];?>
    " . html::a($this->createLink('product', 'view', "product=$product->id"), $product->name) . "

    ";?>    		" . $users[$product->PO] . '

    ';?>    		" . zget($users, $product->PO) . '

    ';?>
    + + + + + + + + + + + + score->rule as $module => $moduleRule):?> + $rule):?> + + + + + + + + + + + +
    score->module;?>score->method;?>score->times;?>score->hour;?>score->score;?>score->desc;?>
    score->modules[$module];?>score->methods[$module][$method];?>score->noLimit : $rule['times'];?>score->noLimit : $rule['hour'];?> + score->extended[$module][$method])) + { + $desc = $lang->score->extended[$module][$method]; + $descRule = explode('##', $desc); + if(!empty($descRule)) + { + foreach($descRule as $key => $value) + { + if($key % 2 == 1) + { + $match = explode(',', $value); + if(count($match) == 2) + { + $score = $config->score->ruleExtended[$module][$method][$match[0]][$match[1]]; + } + else + { + $score = $config->score->ruleExtended[$module][$method][$match[0]]; + } + $desc = str_replace('##' . $value . '##', $score, $desc); + } + } + } + echo $desc; + } + ?> +
    + - - - - - - - - - - - - - - score->rule as $module => $moduleRule):?> - $rule):?> - - - - - - - - - - - -
    score->module;?>score->method;?>score->times;?>score->hour;?>score->score;?>score->desc;?>
    score->modules[$module];?>score->methods[$module][$method];?>score->noLimit : $rule['times'];?>score->noLimit : $rule['hour'];?> - score->extended[$module][$method])) - { - $desc = $lang->score->extended[$module][$method]; - $descRule = explode('##', $desc); - if(!empty($descRule)) - { - foreach($descRule as $key => $value) - { - if($key % 2 == 1) - { - $match = explode(',', $value); - if(count($match) == 2) - { - $score = $config->score->ruleExtended[$module][$method][$match[0]][$match[1]]; - } - else - { - $score = $config->score->ruleExtended[$module][$method][$match[0]]; - } - $desc = str_replace('##' . $value . '##', $score, $desc); - } - } - } - echo $desc; - } - ?> -
    + diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 4564626295..0868ec317f 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -13,13 +13,13 @@ $lang->search->common = 'Search'; $lang->search->reset = 'Reset'; $lang->search->saveQuery = 'Save'; $lang->search->myQuery = 'My Queries'; -$lang->search->group1 = '1'; -$lang->search->group2 = '2'; +$lang->search->group1 = 'Group 1'; +$lang->search->group2 = 'Group 2'; $lang->search->buildForm = 'Search Form'; $lang->search->buildQuery = 'Execute Query'; -$lang->search->saveQuery = 'Save'; -$lang->search->deleteQuery = 'Delete'; -$lang->search->setQueryTitle = 'Please enter the title( Save it before searching.):'; +$lang->search->saveQuery = 'Save Query'; +$lang->search->deleteQuery = 'Delete Query'; +$lang->search->setQueryTitle = 'Enter the query title. Save it After searching.'; $lang->search->select = 'Stories/Tasks Filter'; $lang->search->me = 'Me'; $lang->search->noQuery = 'No query saved!'; diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 0934964a27..81f6499ae9 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -44,8 +44,9 @@ include '../../common/view/chosen.html.php'; #searchlite {line-height: 127px} #searchform.showmore #searchmore, #searchform #searchlite {display: none;} #searchform.showmore #searchlite, #searchform #searchmore {display: inline-block;} -#searchform .chosen-container .chosen-single{max-width: 170px;} -#searchform .chosen-container .chosen-drop{min-width: 400px;} +#searchform .chosen-container[id^="field"] .chosen-drop{min-width: 120px;} +#searchform [id^="valueBox"] .chosen-container .chosen-single{max-width: 170px;} +#searchform [id^="valueBox"] .chosen-container .chosen-drop{min-width: 400px;} #searchform .chosen-container .chosen-drop ul.chosen-results li{white-space:normal} #searchmore > i, #searchlite > i {font-size: 28px;} #searchmore > i {position: relative; top: 4px;} @@ -376,7 +377,7 @@ foreach($fieldParams as $fieldName => $param) echo ''; /* Print field. */ - echo "" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control'") . ''; + echo "" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . ''; /* Print operator. */ echo "" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . ''; @@ -435,7 +436,7 @@ foreach($fieldParams as $fieldName => $param) echo ''; /* Print field. */ - echo "" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control'") . ''; + echo "" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . ''; /* Print operator. */ echo "" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . ''; diff --git a/module/story/config.php b/module/story/config.php index f6db8e00e8..3c117df04c 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -38,8 +38,8 @@ $config->story->list->exportFields = ' childStories, linkStories, duplicateStory, files'; $config->story->list->customCreateFields = 'source,verify,pri,estimate,mailto,keywords'; -$config->story->list->customBatchCreateFields = 'module,plan,spec,source,verify,pri,estimate,review,keywords'; -$config->story->list->customBatchEditFields = 'branch,module,plan,estimate,pri,assignedTo,source,stage,closedBy,closedReason,keywords'; +$config->story->list->customBatchCreateFields = 'plan,spec,source,verify,pri,estimate,review,keywords'; +$config->story->list->customBatchEditFields = 'branch,plan,estimate,pri,assignedTo,source,stage,closedBy,closedReason,keywords'; $config->story->custom = new stdclass(); $config->story->custom->createFields = $config->story->list->customCreateFields; @@ -91,12 +91,12 @@ $config->story->datatable->fieldList['sourceNote']['required'] = 'no'; $config->story->datatable->fieldList['status']['title'] = 'statusAB'; $config->story->datatable->fieldList['status']['fixed'] = 'no'; -$config->story->datatable->fieldList['status']['width'] = '50'; +$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'] = '50'; +$config->story->datatable->fieldList['estimate']['width'] = '55'; $config->story->datatable->fieldList['estimate']['required'] = 'no'; $config->story->datatable->fieldList['stage']['title'] = 'stageAB'; diff --git a/module/story/control.php b/module/story/control.php index 6defe6006a..cd47d513af 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -37,10 +37,11 @@ class story extends control * @param int $projectID * @param int $bugID * @param int $planID + * @param int $todoID * @access public * @return void */ - public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0, $planID = 0) + public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0, $planID = 0, $todoID = 0) { if(!empty($_POST)) { @@ -73,7 +74,12 @@ class story extends control $action = $bugID == 0 ? 'Opened' : 'Frombug'; $extra = $bugID == 0 ? '' : $bugID; $actionID = $this->action->create('story', $storyID, $action, '', $extra); - $this->story->sendmail($storyID, $actionID); + + if($todoID > 0) + { + $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq($todoID)->exec(); + $this->action->create('todo', $todoID, 'finished', '', "STORY:$storyID"); + } if($this->post->newStory) { @@ -156,6 +162,15 @@ class story extends control } } + if($todoID > 0) + { + $todo = $this->loadModel('todo')->getById($todoID); + $source = 'todo'; + $title = $todo->name; + $spec = $todo->desc; + $pri = $todo->pri; + } + /* Set Custom*/ foreach(explode(',', $this->config->story->list->customCreateFields) as $field) $customFields[$field] = $this->lang->story->$field; $this->view->customFields = $customFields; @@ -211,11 +226,7 @@ class story extends control if(dao::isError()) die(js::error(dao::getError())); $stories = array(); - foreach($mails as $mail) - { - $stories[] = $mail->storyID; - if($mail->actionID) $this->story->sendmail($mail->storyID, $mail->actionID); - } + foreach($mails as $mail) $stories[] = $mail->storyID; if($project) $this->loadModel('project')->linkStory($project, $stories); /* If storyID not equal zero, subdivide this story to child stories and close it. */ @@ -225,7 +236,6 @@ class story extends control $actionID = $this->story->subdivide($storyID, $mails); if(dao::isError()) die(js::error(dao::getError())); - $this->story->sendmail($storyID, $actionID); if(isonlybody()) die(js::closeModal('parent.parent', 'this')); die(js::locate(inlink('view', "storyID=$storyID"), 'parent')); @@ -243,11 +253,11 @@ class story extends control $this->product->setMenu($products, $product->id, $branch); /* Init vars. */ - $planID = $plan; - $pri = 0; - $estimate = ''; - $title = ''; - $spec = ''; + $planID = $plan; + $pri = 0; + $estimate = ''; + $title = ''; + $spec = ''; /* Process upload images. */ if($this->session->storyImagesFile) @@ -359,7 +369,6 @@ class story extends control $action = !empty($changes) ? 'Edited' : 'Commented'; $actionID = $this->action->create('story', $storyID, $action, $this->post->comment); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } die(js::locate($this->createLink('story', 'view', "storyID=$storyID"), 'parent')); } @@ -403,7 +412,6 @@ class story extends control $actionID = $this->action->create('story', $storyID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } } die(js::locate($this->session->storyList, 'parent')); @@ -537,7 +545,6 @@ class story extends control if(!empty($files)) $fileAction = $this->lang->addFiles . join(',', $files) . "\n" ; $actionID = $this->action->create('story', $storyID, $action, $fileAction . $this->post->comment); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } die(js::locate($this->createLink('story', 'view', "storyID=$storyID"), 'parent')); } @@ -571,7 +578,6 @@ class story extends control $this->story->activate($storyID); if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('story', $storyID, 'Activated', $this->post->comment); - $this->story->sendmail($storyID, $actionID); if(isonlybody()) die(js::closeModal('parent.parent', 'this')); die(js::locate($this->createLink('story', 'view', "storyID=$storyID"), 'parent')); @@ -681,7 +687,6 @@ class story extends control $result = $this->post->result; if($this->post->closedReason != '' and strpos('done,postponed,subdivided,willnotdo', $this->post->closedReason) === false) $result = 'pass'; $actionID = $this->action->create('story', $storyID, 'Reviewed', $this->post->comment, ucfirst($result)); - $this->story->sendmail($storyID, $actionID); if($this->post->result == 'reject') { $this->action->create('story', $storyID, 'Closed', '', ucfirst($this->post->closedReason)); @@ -735,7 +740,6 @@ class story extends control $actions = $this->story->batchReview($storyIDList, $result, $reason); if(dao::isError()) die(js::error(dao::getError())); - foreach($actions as $storyID => $actionID) $this->story->sendmail($storyID, $actionID); if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther'); die(js::locate($this->session->storyList, 'parent')); } @@ -755,7 +759,6 @@ class story extends control if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('story', $storyID, 'Closed', $this->post->comment, ucfirst($this->post->closedReason) . ($this->post->duplicateStory ? ':' . (int)$this->post->duplicateStory : '')); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); if(isonlybody()) die(js::closeModal('parent.parent', 'this')); die(js::locate(inlink('view', "storyID=$storyID"), 'parent')); } @@ -802,7 +805,6 @@ class story extends control { $actionID = $this->action->create('story', $storyID, 'Closed', htmlspecialchars($this->post->comments[$storyID]), ucfirst($this->post->closedReasons[$storyID]) . ($this->post->duplicateStoryIDList[$storyID] ? ':' . (int)$this->post->duplicateStoryIDList[$storyID] : '')); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } } if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther'); @@ -883,7 +885,6 @@ class story extends control { $actionID = $this->action->create('story', $storyID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther'); die(js::reload('parent')); @@ -906,7 +907,6 @@ class story extends control { $actionID = $this->action->create('story', $storyID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther'); die(js::reload('parent')); @@ -929,7 +929,6 @@ class story extends control { $actionID = $this->action->create('story', $storyID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther'); die(js::reload('parent')); @@ -954,7 +953,6 @@ class story extends control { $actionID = $this->action->create('story', $storyID, $action); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther'); die(js::locate($this->session->storyList, 'parent')); @@ -976,7 +974,6 @@ class story extends control { $actionID = $this->action->create('story', $storyID, 'Edited'); $this->action->logHistory($actionID, $changes); - $this->story->sendmail($storyID, $actionID); } } if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther'); @@ -1314,7 +1311,7 @@ class story extends control * @access public * @return void */ - public function report($productID, $browseType, $branchID, $moduleID) + public function report($productID, $browseType, $branchID, $moduleID, $chartType = 'pie') { $this->loadModel('report'); $this->view->charts = array(); @@ -1326,9 +1323,9 @@ class story extends control $chartFunc = 'getDataOf' . $chart; $chartData = $this->story->$chartFunc(); $chartOption = $this->lang->story->report->$chart; + if(!empty($chartType)) $chartOption->type = $chartType; $this->story->mergeChartOption($chart); - $this->view->charts[$chart] = $chartOption; $this->view->datas[$chart] = $this->report->computePercent($chartData); } @@ -1340,8 +1337,10 @@ class story extends control $this->view->position[] = $this->products[$productID]; $this->view->position[] = $this->lang->story->reportChart; $this->view->productID = $productID; + $this->view->branchID = $branchID; $this->view->browseType = $browseType; $this->view->moduleID = $moduleID; + $this->view->chartType = $chartType; $this->view->checkedCharts = $this->post->charts ? join(',', $this->post->charts) : ''; $this->display(); } diff --git a/module/story/js/batchedit.js b/module/story/js/batchedit.js index 2faf80e809..864b39fb39 100644 --- a/module/story/js/batchedit.js +++ b/module/story/js/batchedit.js @@ -30,11 +30,11 @@ function loadBranches(product, branch, storyID) if(typeof(branch) == 'undefined') branch = 0; if(!branch) branch = 0; - moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + product + '&viewtype=story&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=' + storyID + '&needManage=true'); - $('#modules' + storyID).parent('td').load(moduleLink, function(){$('#modules' + storyID).chosen(defaultChosenOptions);}) + moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + product + '&viewtype=story&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=' + storyID); + $('#modules' + storyID).parent('td').load(moduleLink, function(){$('#modules' + storyID).chosen(defaultChosenOptions);}); planID = $('#plans' + storyID).val(); - planLink = createLink('product', 'ajaxGetPlans', 'productID=' + product + '&branch=' + branch + '&planID=' + planID + '&fieldID=' + storyID + '&needCreate=true'); + planLink = createLink('product', 'ajaxGetPlans', 'productID=' + product + '&branch=' + branch + '&planID=' + planID + '&fieldID=' + storyID); $('#plans' + storyID).parent('td').load(planLink, function(){$('#plans' + storyID).chosen(defaultChosenOptions);}); } diff --git a/module/story/js/report.js b/module/story/js/report.js index 38276947f3..2c8ef3ee94 100644 --- a/module/story/js/report.js +++ b/module/story/js/report.js @@ -12,3 +12,9 @@ $(function() fixedTableHead('.table-wrapper'); $(window).resize(resizeChartTable); }); + +function changeChartType(type) +{ + $('form').attr('action', createLink('story', 'report', 'productID=' + productID + '&browseType=' + browseType + '&branchID=' + branchID + '&moduleID=' + moduleID + '&chartType=' + type)); + $('form').find('#submit').click(); +} diff --git a/module/story/lang/en.php b/module/story/lang/en.php index f07f6418ce..3cc8b6a497 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -9,7 +9,7 @@ * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->story->create = "Story"; +$lang->story->create = "Create Story"; $lang->story->batchCreate = "Batch Create"; $lang->story->change = "Change"; $lang->story->changed = 'Change'; @@ -35,8 +35,8 @@ $lang->story->caseCountAB = 'C'; $lang->story->linkStory = 'Link'; $lang->story->unlinkStory = 'UnLinked'; $lang->story->export = "Export Data"; -$lang->story->zeroCase = "Zero Case"; -$lang->story->zeroTask = "Zero Task"; +$lang->story->zeroCase = "Stories without cases"; +$lang->story->zeroTask = "Only Show Stories without tasks"; $lang->story->reportChart = "Report"; $lang->story->copyTitle = "Copy Title"; $lang->story->batchChangePlan = "Batch Change Plans"; @@ -58,25 +58,25 @@ $lang->story->title = 'Title'; $lang->story->spec = 'Description'; $lang->story->verify = 'Acceptance'; $lang->story->pri = 'Priority'; -$lang->story->estimate = 'Hour'; -$lang->story->estimateAB = 'Hour'; +$lang->story->estimate = 'Est.(h)'; +$lang->story->estimateAB = 'Est.(h)'; $lang->story->hour = 'Hour'; $lang->story->status = 'Status'; $lang->story->stage = 'Stage'; $lang->story->stageAB = 'Stage'; $lang->story->mailto = 'Mailto'; -$lang->story->openedBy = 'Open By'; -$lang->story->openedDate = 'Open on'; +$lang->story->openedBy = 'Creator'; +$lang->story->openedDate = 'Create on'; $lang->story->assignedTo = 'Assignee'; -$lang->story->assignedDate = 'Assigned On'; -$lang->story->lastEditedBy = 'Last Edited By'; -$lang->story->lastEditedDate = 'Last Edited On'; -$lang->story->closedBy = 'Closed By'; -$lang->story->closedDate = 'Closed On'; -$lang->story->closedReason = 'Reason'; +$lang->story->assignedDate = 'Assigned on'; +$lang->story->lastEditedBy = 'Last Edited'; +$lang->story->lastEditedDate = 'Edited on'; +$lang->story->closedBy = 'Closed by'; +$lang->story->closedDate = 'Closed on'; +$lang->story->closedReason = 'Close Reason'; $lang->story->rejectedReason = 'Reject Reason'; $lang->story->reviewedBy = 'Reviewer'; -$lang->story->reviewedDate = 'Review on'; +$lang->story->reviewedDate = 'Reviewed on'; $lang->story->version = 'Version'; $lang->story->plan = 'Plan'; $lang->story->planAB = 'Plan'; @@ -114,15 +114,16 @@ $lang->story->stageList['testing'] = 'Testing'; $lang->story->stageList['tested'] = 'Tested'; $lang->story->stageList['verified'] = 'Accepted'; $lang->story->stageList['released'] = 'Released'; +$lang->story->stageList['closed'] = 'Closed'; $lang->story->reasonList[''] = ''; $lang->story->reasonList['done'] = 'Done'; $lang->story->reasonList['subdivided'] = 'Decomposed'; -$lang->story->reasonList['duplicate'] = 'Duplicate'; +$lang->story->reasonList['duplicate'] = 'Duplicated'; $lang->story->reasonList['postponed'] = 'Postponed'; $lang->story->reasonList['willnotdo'] = "Ignore"; $lang->story->reasonList['cancel'] = 'Cancelled'; -$lang->story->reasonList['bydesign'] = 'Default Design'; +$lang->story->reasonList['bydesign'] = 'By Design'; //$lang->story->reasonList['isbug'] = 'Bug!'; $lang->story->reviewResultList[''] = ''; @@ -141,7 +142,7 @@ $lang->story->sourceList['po'] = $lang->productCommon . ' Owner'; $lang->story->sourceList['market'] = 'Marketing'; $lang->story->sourceList['service'] = 'Customer Service'; $lang->story->sourceList['operation'] = 'Operations'; -$lang->story->sourceList['support'] = 'Technical support'; +$lang->story->sourceList['support'] = 'Technical Support'; $lang->story->sourceList['competitor'] = 'Competitor'; $lang->story->sourceList['partner'] = 'Partner'; $lang->story->sourceList['dev'] = 'Dev Team'; @@ -160,7 +161,7 @@ $lang->story->legendLifeTime = 'Story Life '; $lang->story->legendRelated = 'Related Info'; $lang->story->legendMailto = 'Mail To'; $lang->story->legendAttatch = 'Files'; -$lang->story->legendProjectAndTask = $lang->projectCommon . 'Task'; +$lang->story->legendProjectAndTask = $lang->projectCommon . ' Task'; $lang->story->legendBugs = 'Linked Bug'; $lang->story->legendFromBug = 'From Bug'; $lang->story->legendCases = 'Linked Case'; @@ -213,22 +214,22 @@ $lang->story->action->unlinkchildstory = array('main' => '$date, unlinked by /* 统计报表。*/ $lang->story->report = new stdclass(); $lang->story->report->common = 'Report'; -$lang->story->report->select = 'Select the type of Story Report'; +$lang->story->report->select = 'Group Stories by'; $lang->story->report->create = 'Generate'; $lang->story->report->value = 'Story Count'; -$lang->story->report->charts['storysPerProduct'] = 'per ' . $lang->productCommon; -$lang->story->report->charts['storysPerModule'] = 'per Module'; -$lang->story->report->charts['storysPerSource'] = 'per Source'; -$lang->story->report->charts['storysPerPlan'] = 'per Plan'; -$lang->story->report->charts['storysPerStatus'] = 'per Status'; -$lang->story->report->charts['storysPerStage'] = 'per Stage'; -$lang->story->report->charts['storysPerPri'] = 'per Priority'; -$lang->story->report->charts['storysPerEstimate'] = 'per Hour'; -$lang->story->report->charts['storysPerOpenedBy'] = 'per CreatedBy'; -$lang->story->report->charts['storysPerAssignedTo'] = 'per Assignee'; -$lang->story->report->charts['storysPerClosedReason'] = 'per Closed Reason'; -$lang->story->report->charts['storysPerChange'] = 'per Change'; +$lang->story->report->charts['storysPerProduct'] = 'by ' . $lang->productCommon; +$lang->story->report->charts['storysPerModule'] = 'by Module'; +$lang->story->report->charts['storysPerSource'] = 'by Source'; +$lang->story->report->charts['storysPerPlan'] = 'by Plan'; +$lang->story->report->charts['storysPerStatus'] = 'by Status'; +$lang->story->report->charts['storysPerStage'] = 'by Stage'; +$lang->story->report->charts['storysPerPri'] = 'by Priority'; +$lang->story->report->charts['storysPerEstimate'] = 'by Hour'; +$lang->story->report->charts['storysPerOpenedBy'] = 'by CreatedBy'; +$lang->story->report->charts['storysPerAssignedTo'] = 'by Assignee'; +$lang->story->report->charts['storysPerClosedReason'] = 'by Closed Reason'; +$lang->story->report->charts['storysPerChange'] = 'by Change times'; $lang->story->report->options = new stdclass(); $lang->story->report->options->graph = new stdclass(); diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 3c328f6cae..6734e32f82 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -114,6 +114,7 @@ $lang->story->stageList['testing'] = '测试中'; $lang->story->stageList['tested'] = '测试完毕'; $lang->story->stageList['verified'] = '已验收'; $lang->story->stageList['released'] = '已发布'; +$lang->story->stageList['closed'] = '已关闭'; $lang->story->reasonList[''] = ''; $lang->story->reasonList['done'] = '已完成'; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index e79851cc16..f42730ab48 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->story->create = "提需求"; -$lang->story->batchCreate = "批量添加"; +$lang->story->batchCreate = "批量提需求"; $lang->story->change = "變更"; $lang->story->changed = '需求變更'; $lang->story->review = '評審'; @@ -114,6 +114,7 @@ $lang->story->stageList['testing'] = '測試中'; $lang->story->stageList['tested'] = '測試完畢'; $lang->story->stageList['verified'] = '已驗收'; $lang->story->stageList['released'] = '已發佈'; +$lang->story->stageList['closed'] = '已關閉'; $lang->story->reasonList[''] = ''; $lang->story->reasonList['done'] = '已完成'; diff --git a/module/story/model.php b/module/story/model.php index a6141dd336..3568ffe48b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -115,10 +115,11 @@ class storyModel extends model /* Get team members. */ if($story->projects) { - $story->teams = $this->dao->select('account, project') + $story->teams = $this->dao->select('account, root') ->from(TABLE_TEAM) - ->where('project')->in(array_keys($story->projects)) - ->fetchGroup('project'); + ->where('root')->in(array_keys($story->projects)) + ->andWhere('type')->eq('project') + ->fetchGroup('root'); } /* Get affected bugs. */ @@ -614,6 +615,7 @@ class storyModel extends model if(!dao::isError()) { + $this->setStage($storyID); if($story->closedReason == 'done') $this->loadModel('score')->create('story', 'close'); $allChanges[$storyID] = common::createChanges($oldStory, $story); } @@ -800,6 +802,7 @@ class storyModel extends model ->add('assignedTo', 'closed') ->add('assignedDate', $now) ->add('status', 'closed') + ->add('stage', 'closed') ->removeIF($this->post->closedReason != 'duplicate', 'duplicateStory') ->removeIF($this->post->closedReason != 'subdivided', 'childStories') ->setIF($this->post->closedReason == 'done', 'stage', 'released') @@ -845,6 +848,7 @@ class storyModel extends model $story->assignedTo = 'closed'; $story->assignedDate = $now; $story->status = 'closed'; + $story->stage = 'closed'; $story->closedReason = $data->closedReasons[$storyID]; $story->duplicateStory = $data->duplicateStoryIDList[$storyID] ? $data->duplicateStoryIDList[$storyID] : $oldStory->duplicateStory; @@ -1310,6 +1314,7 @@ class storyModel extends model * Get stories list of a product. * * @param int $productID + * @param int $branch * @param array|string $moduleIdList * @param string $status * @param string $orderBy @@ -1595,7 +1600,7 @@ class storyModel extends model ->fetchPairs(); $sql = str_replace(array('`product`', '`version`'), array('t1.`product`', 't1.`version`'), $sql); - $tmpStories = $this->dao->select('*')->from(TABLE_STORY)->alias('t1') + $tmpStories = $this->dao->select('t1.*')->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id=t2.story') ->where($sql) ->beginIF($productID != 'all' and $productID != '')->andWhere('t1.`product`')->eq((int)$productID)->fi() @@ -1815,7 +1820,7 @@ class storyModel extends model ->andWhere('assignedTo')->eq($account) ->orderBy('id_desc') ->limit($limit) - ->fetchAll(); + ->fetchPairs('id', 'title'); } /** @@ -1833,7 +1838,7 @@ class storyModel extends model ->andWhere('t2.status')->eq('doing') ->andWhere('t2.deleted')->eq(0) ->fetchPairs(); - if($projects) return($this->dao->select('account')->from(TABLE_TEAM)->where('project')->in($projects)->fetchPairs('account')); + if($projects) return($this->dao->select('account')->from(TABLE_TEAM)->where('root')->in($projects)->andWhere('type')->eq('project')->fetchPairs('account')); } /** @@ -2271,8 +2276,10 @@ class storyModel extends model /** * Merge plan title. * - * @param int|array $productID - * @param array $stories + * @param int|array $productID + * @param array $stories + * @param int $branch + * * @access public * @return array */ @@ -2287,13 +2294,9 @@ class storyModel extends model } $plans = $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN) ->where('product')->in($productID) - ->beginIF($branch)->andWhere('branch')->in($branch)->fi() ->andWhere('deleted')->eq(0) ->fetchPairs('id', 'title'); - $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('branch')->in($branch)->fetchGroup('story', 'branch'); - $branch = trim(str_replace(',0,', '', ",$branch,"), ','); - $branch = empty($branch) ? 0 : $branch; foreach($stories as $story) { $story->planTitle = ''; @@ -2352,15 +2355,15 @@ class storyModel extends model echo ""; break; case 'title': - if($story->branch) echo "{$branches[$story->branch]} "; - if($modulePairs and $story->module) echo "{$modulePairs[$story->module]} "; + if($story->branch and isset($branches[$story->branch])) echo "{$branches[$story->branch]} "; + if($story->module and isset($modulePairs[$story->module])) echo "{$modulePairs[$story->module]} "; echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color'") : "{$story->title}"; break; case 'plan': echo $story->planTitle; break; case 'branch': - echo $branches[$story->branch]; + echo zget($branches, $story->branch, ''); break; case 'keywords': echo $story->keywords; @@ -2504,9 +2507,8 @@ class storyModel extends model public function sendmail($storyID, $actionID) { $this->loadModel('mail'); - $story = $this->getById($storyID); - $productName = $this->loadModel('product')->getById($story->product)->name; - $users = $this->loadModel('user')->getPairs('noletter'); + $story = $this->getById($storyID); + $users = $this->loadModel('user')->getPairs('noletter'); /* Get actions. */ $action = $this->loadModel('action')->getById($actionID); @@ -2541,14 +2543,47 @@ class storyModel extends model ob_end_clean(); chdir($oldcwd); + $sendUsers = $this->getToAndCcList($story, $action->action); + if(!$sendUsers) return; + list($toList, $ccList) = $sendUsers; + $subject = $this->getSubject($story); + + /* Send it. */ + $this->mail->send($toList, $subject, $mailContent, $ccList); + if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError())); + } + + /** + * Get mail subject. + * + * @param object $story + * @access public + * @return string + */ + public function getSubject($story) + { + $productName = $this->loadModel('product')->getById($story->product)->name; + return 'STORY #' . $story->id . ' ' . $story->title . ' - ' . $productName; + } + + /** + * Get toList and ccList. + * + * @param object $story + * @param string $actionType + * @access public + * @return bool|array + */ + public function getToAndCcList($story, $actionType) + { /* Set toList and ccList. */ $toList = $story->assignedTo; $ccList = str_replace(' ', '', trim($story->mailto, ',')); /* If the action is changed or reviewed, mail to the project team. */ - if(strtolower($action->action) == 'changed' or strtolower($action->action) == 'reviewed') + if(strtolower($actionType) == 'changed' or strtolower($actionType) == 'reviewed') { - $prjMembers = $this->getProjectMembers($storyID); + $prjMembers = $this->getProjectMembers($story->id); if($prjMembers) { $ccList .= ',' . join(',', $prjMembers); @@ -2558,7 +2593,7 @@ class storyModel extends model if(empty($toList)) { - if(empty($ccList)) return; + if(empty($ccList)) return false; if(strpos($ccList, ',') === false) { $toList = $ccList; @@ -2576,8 +2611,6 @@ class storyModel extends model $toList = $story->openedBy; } - /* Send it. */ - $this->mail->send($toList, 'STORY #' . $story->id . ' ' . $story->title . ' - ' . $productName, $mailContent, $ccList); - if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError())); + return array($toList, $ccList); } } diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 186532129f..a5a3c327ba 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -40,7 +40,7 @@ if($this->story->checkForceReview()) unset($visibleFields['review']); idAB;?> '>product->branch;?> - '>story->module;?> + story->module;?> '>story->plan;?> = 9) echo "class='w-150px'"?>>story->title;?> '>story->spec;?> @@ -93,7 +93,7 @@ if($this->story->checkForceReview()) unset($visibleFields['review']); - '> + ' style='overflow:visible'> ' style='overflow:visible'> ' style='overflow:visible'> @@ -121,7 +121,7 @@ if($this->story->checkForceReview()) unset($visibleFields['review']); %s - '> + ' style='overflow:visible'> ' style='overflow:visible'> ' style='overflow:visible'> diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index 0302921c71..427dd46b61 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -42,7 +42,7 @@ foreach(explode(',', $showFields) as $field) '>story->branch;?> - '>story->module;?> + story->module;?> '>story->planAB;?> story->title;?> '> story->estimateAB;?> @@ -87,8 +87,12 @@ foreach(explode(',', $showFields) as $field) branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $storyID);' $disabled");?> - ' style='overflow:visible'> module, "class='form-control chosen'");?> - ' style='overflow:visible'> plan, "class='form-control chosen'");?> + ' style='overflow:visible'> + module, "class='form-control chosen'");?> + + ' style='overflow:visible'> + plan, "class='form-control chosen'");?> +
    color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->story->colorTag}' data-update-text='#titles\\[{$storyID}\\]'");?> diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index a114a8a932..eb9e3f3a9e 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -71,9 +71,9 @@
    story->source?> - story->sourceList, $source, "class='form-control'");?> + story->sourceList, $source, "class='form-control chosen'");?> story->sourceNote?> - +
    @@ -113,7 +113,7 @@ $hasCustomPri = false; foreach($lang->story->priList as $priKey => $priValue) { - if($priKey != $priValue) + if($priKey != $priValue or strlen($priKey) != strlen($priValue)) { $hasCustomPri = true; break; @@ -121,7 +121,7 @@ } ?> - story->priList, $pri, "class='form-control minw-80px'");?> + story->priList, $pri, "class='form-control minw-80px chosen'");?>
    +
    +
    + +
    + desc), "rows='8' class='form-control'");?> +
    +
    +
    + +
    + todo->statusList, $todo->status, "class='form-control chosen'");?> +
    +
    +
    + +
    + begin, 'onchange=selectNext(); class="form-control chosen"')?> +
    +
    + end, 'class="form-control chosen"');?> +
    +
    + begin == 2400) echo 'checked';?> > + +
    +
    +
    + +
    + private) echo 'checked';?> /> + +
    +
    +
    +
    + + +
    +
    + diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 5a9138e896..4ff5808fc0 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -11,6 +11,7 @@ */ ?> + private or ($todo->private and $todo->account == $app->user->account)):?>
    @@ -24,7 +25,7 @@
    - todo->desc; if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), ' BUG#' . $todo->idvalue); if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), ' TASK#' . $todo->idvalue); @@ -39,8 +40,8 @@
    - todo->legendBasic;?> - + todo->legendBasic;?> +
    @@ -55,7 +56,7 @@ - + @@ -65,12 +66,66 @@ + assignedTo)):?> + + + + + + + + +
    todo->pri;?> todo->priList[$todo->pri];?>
    todo->account;?>account;?>account);?>
    todo->date;?>todo->beginAndEnd;?> begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?>
    todo->assignTo;?>assignedTo;?>
    todo->assignTo . $lang->todo->date;?>assignedDate;?>
    +
    + cycle):?> + config = json_decode($todo->config);?> +
    + todo->cycle;?> + + + + + + + + + +
    todo->beginAndEnd?>config->begin . " ~ " . $todo->config->end;?>
    todo->cycleConfig?> + config->type == 'day') + { + echo $lang->todo->every . $todo->config->day . $lang->day; + } + elseif($todo->config->type == 'week') + { + foreach(explode(',', $todo->config->week) as $week) echo $lang->todo->dayNames[$week] . ' '; + } + elseif($todo->config->type == 'month') + { + foreach(explode(',', $todo->config->month) as $month) echo $month . ' '; + } + echo '
    '; + if($todo->config->beforeDays) printf($lang->todo->lblBeforeDays, $todo->config->beforeDays); + ?> +
    +
    +
    account == $app->user->account) + { + if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), " " . $lang->todo->edit, '', "class='btn showinonlybody'"); + if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), " " . $lang->todo->activate, 'hiddenwin', "class='btn showinonlybody'"); + if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), " " . $lang->todo->close, 'hiddenwin', "class='btn showinonlybody'"); + echo html::a($this->createLink('todo', 'delete', "todoID=$todo->id"), " " . $lang->todo->delete, 'hiddenwin', "class='btn showinonlybody'"); + + echo html::a('#commentBox', '', '', "title='$lang->comment' onclick='setComment()' class='btn'"); + } + if($this->session->todoList) { $browseLink = $this->session->todoList; @@ -84,16 +139,73 @@ $browseLink = $this->createLink('user', 'todo', "account=$todo->account"); } - common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'button', '', 'hiddenwin', 'showinonlybody btn-success'); - if($todo->account == $app->user->account) + if($todo->status != 'done' && $todo->status != 'closed') { - common::printIcon('todo', 'edit', "todoID=$todo->id"); - common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin'); + echo "
    "; + echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), " " . $lang->todo->finish, 'hiddenwin', "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 ""; + echo ""; + if($isonlybody) $_GET['onlybody'] = 'yes'; + } + echo "
    "; } + common::printRPN($browseLink); ?>
    +
    + comment;?> +
    id")?>' target='hiddenwin'> +
    + +
    +
    + + +id);?> todo->thisIsPrivate;?> diff --git a/module/tree/control.php b/module/tree/control.php index 8be48097e6..02542e5fbe 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -326,9 +326,11 @@ class tree extends control * AJAX: Get the option menu of modules. * * @param int $rootID - * @param string $viewType - * @param int $rootModuleID + * @param string $viewType + * @param int $branch + * @param int $rootModuleID * @param string $returnType + * @param string $fieldID * @param bool $needManage * @access public * @return string the html select string. diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 260c70104a..ea236ec550 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -13,21 +13,21 @@ $lang->tree = new stdclass(); $lang->tree->common = 'Module'; $lang->tree->edit = 'Edit'; $lang->tree->delete = 'Delete'; -$lang->tree->browse = 'General Module'; -$lang->tree->browseTask = 'Task Module'; -$lang->tree->manage = 'Manage Module'; +$lang->tree->browse = 'Manage General Module'; +$lang->tree->browseTask = 'Manage Task Module'; +$lang->tree->manage = 'Manage module'; $lang->tree->fix = 'Fix'; $lang->tree->manageProduct = "Manage {$lang->productCommon}"; $lang->tree->manageProject = "Manage {$lang->projectCommon}"; -$lang->tree->manageLine = 'Manage Product Line'; +$lang->tree->manageLine = 'Manage product line'; $lang->tree->manageBug = 'Manage Bug'; $lang->tree->manageCase = 'Manage Case'; $lang->tree->manageCaseLib = 'Manage Library'; $lang->tree->manageCustomDoc = 'Manage DocLib'; -$lang->tree->updateOrder = 'Update Order'; +$lang->tree->updateOrder = 'Sort'; $lang->tree->manageChild = 'Manage Child Module'; -$lang->tree->manageStoryChild = 'Manage Child Story'; -$lang->tree->manageLineChild = 'Manage Product Line'; +$lang->tree->manageStoryChild = 'Manage Child Module'; +$lang->tree->manageLineChild = 'Manage product line'; $lang->tree->manageBugChild = 'Manage Child Bug'; $lang->tree->manageCaseChild = 'Manage Child Case'; $lang->tree->manageCaselibChild = 'Manage Child Library'; diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php index 6d0956dab7..fc16aa1637 100644 --- a/module/tree/lang/zh-tw.php +++ b/module/tree/lang/zh-tw.php @@ -45,6 +45,7 @@ $lang->tree->repeatName = '模組名“%s”已經存在！'; $lang->tree->name = '模組名稱'; $lang->tree->line = '產品綫名稱'; +$lang->tree->cate = '分類名稱'; $lang->tree->root = '所屬根'; $lang->tree->branch = '平台/分支'; $lang->tree->path = '路徑'; diff --git a/module/tree/model.php b/module/tree/model.php index 3154bb34ad..5971b0c427 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -372,7 +372,7 @@ class treeModel extends model } if(!$firstBranch) $lastMenu .= ''; - $lastMenu = "
      $lastMenu
    \n"; + $lastMenu = "
      $lastMenu
    \n"; return $lastMenu; } @@ -402,7 +402,7 @@ class treeModel extends model } /* createdVersion > 4.1. */ - $menu = "
      "; + $menu = "
        "; /* Set the start module. */ $startModulePath = ''; @@ -511,8 +511,8 @@ class treeModel extends model { $productInfo = $this->product->getById($id); /* tree menu. */ - $productTree = ''; - $branchTrees = ''; + $productTree = array(); + $branchTrees = array(); if(empty($branchGroups[$id])) $branchGroups[$id]['0'] = ''; foreach($branchGroups[$id] as $branch => $branchName) { @@ -566,7 +566,7 @@ class treeModel extends model public function getProjectStoryTreeMenu($rootID, $startModule = 0, $userFunc) { $extra['projectID'] = $rootID; - $menu = "
          "; + $menu = "
            "; $startModulePath = ''; if($startModule > 0) { @@ -1477,7 +1477,7 @@ class treeModel extends model if(empty($branches)) $branches = $this->post->branch; $branches = array_unique($branches); - if($this->isMergeModule($rootID, $viewType)) $viewType .= ',story'; + if($this->isMergeModule($rootID, $viewType) and $viewType != 'task') $viewType .= ',story'; $existsModules = $this->dao->select('id,branch,name')->from(TABLE_MODULE)->where('root')->eq($rootID)->andWhere('type')->in($viewType)->andWhere('parent')->eq($parentModuleID)->andWhere('branch')->in($branches)->andWhere('deleted')->eq(0)->fetchAll(); $repeatName = ''; diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 64118b6abc..c11daffb87 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -23,7 +23,7 @@
            -
              +
        @@ -138,7 +138,6 @@ $(function() { var data = $.parseJSON(''); var options = { - name: 'tree--edit', initialState: 'preserve', data: data, sortable: { diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php index fccf7fc470..538160f73a 100644 --- a/module/tree/view/browsetask.html.php +++ b/module/tree/view/browsetask.html.php @@ -19,7 +19,7 @@
        -
          +
            @@ -121,14 +121,11 @@ $(function() { var data = $.parseJSON(''); var options = { - name: 'tree-project-edit', initialState: 'preserve', data: data, itemCreator: function($li, item) { - var $toggle = $('' + link + ''); - var title = (item.type === 'product' ? ' ' : '') + item.name; var link = item.id !== undefined ? ('' + title + '') : ('' + title + ''); diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index daa70b72af..670abf9b2b 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -29,7 +29,7 @@ $lang->tutorial->requiredTip = '【%s】is required.'; $lang->tutorial->congratulateTask = 'Congratulations! You have finished【】!'; $lang->tutorial->serverErrorTip = 'Error!'; $lang->tutorial->ajaxSetError = 'Finished task must be defined. If you want to reset the Task, please set its value as null.'; -$lang->tutorial->novice = "If you use ZenTao for the first time, do you want to start the Tutorial?"; +$lang->tutorial->novice = "For a quick start, let's go through a smart(2min) Tutorial?"; $lang->tutorial->dataNotSave = "Data generated in the Tutorial will not be saved!"; $lang->tutorial->tasks = array(); diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php index cd0f0b8303..fffb263c39 100644 --- a/module/tutorial/lang/zh-tw.php +++ b/module/tutorial/lang/zh-tw.php @@ -39,7 +39,7 @@ $lang->tutorial->tasks['createAccount']['nav'] = array('module' => 'user', 'met $lang->tutorial->tasks['createAccount']['desc'] = "

            在系統創建一個新的用戶帳號：

            • 打開 組織 用戶 添加用戶 頁面；
            • 在添加用戶表單中填寫新用戶信息；
            • 保存用戶信息。
            "; $lang->tutorial->tasks['createProduct'] = array('title' => '創建產品'); -$lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '新增產品'); +$lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加產品'); $lang->tutorial->tasks['createProduct']['desc'] = "

            在系統創建一個新的產品：

            • 打開 產品 添加產品 頁面；
            • 在表單中填寫要創建的產品信息；
            • 保存產品信息。
            "; $lang->tutorial->tasks['createStory'] = array('title' => '創建需求'); diff --git a/module/tutorial/model.php b/module/tutorial/model.php index dc5ca1866e..72464b3f55 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -242,4 +242,15 @@ class tutorialModel extends model $users['test'] = 'Test'; return $users; } + + /** + * Get tutorialed. + * + * @access public + * @return string + */ + public function getTutorialed() + { + return $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('tutorial')->andWhere('owner')->eq($this->app->user->account)->andWhere('section')->eq('tasks')->andWhere('`key`')->eq('setting')->fetch('value'); + } } diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 8052d9b7bf..44a1bf707c 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -37,8 +37,15 @@ class upgrade extends control { if($this->get->agree == true) $this->locate(inlink('backup')); + $clientLang = $this->app->getClientLang(); + $licenseCN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.CN'); + $licenseEN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.EN'); + + $license = $licenseEN . $licenseCN; + if($clientLang == 'zh-cn' or $clientLang == 'zh-tw') $license = $licenseCN . $licenseEN; + $this->view->title = $this->lang->upgrade->common; - $this->view->license = file_get_contents($this->app->getBasePath() . 'doc/LICENSE'); + $this->view->license = $license; $this->display(); } diff --git a/module/upgrade/css/afterexec.css b/module/upgrade/css/afterexec.css index 3151ee49a3..8d820e952d 100644 --- a/module/upgrade/css/afterexec.css +++ b/module/upgrade/css/afterexec.css @@ -1,19 +1,10 @@ .adbox{margin-top:20px;} -.card { - border: none; - border-radius: 0px; - box-shadow: none; - display: block; - margin-bottom: 0px; - overflow: hidden; - padding: 0; - position: relative; - transition: all 0.5s cubic-bezier(0.175, 0.885, 0.32, 1) 0s; -} + +.card.ad{margin-bottom:0px;} .card.ad > .img-wrapper { background-position: center; background-repeat: no-repeat; - height: 85px; + height: 115px; width: 100%; } .card.ad > .img-wrapper > img{display: none;} diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 84a645e2f5..453e8d88c9 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -129,3 +129,7 @@ $lang->upgrade->fromVersions['9_5_1'] = '9.5.1'; $lang->upgrade->fromVersions['9_6'] = '9.6'; $lang->upgrade->fromVersions['9_6_1'] = '9.6.1'; $lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; +$lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; +$lang->upgrade->fromVersions['9_7'] = '9.7'; +$lang->upgrade->fromVersions['9_8'] = '9.8'; +$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index cfbc9a4ab8..5cb4fe1699 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -129,3 +129,7 @@ $lang->upgrade->fromVersions['9_5_1'] = '9.5.1'; $lang->upgrade->fromVersions['9_6'] = '9.6'; $lang->upgrade->fromVersions['9_6_1'] = '9.6.1'; $lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; +$lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; +$lang->upgrade->fromVersions['9_7'] = '9.7'; +$lang->upgrade->fromVersions['9_8'] = '9.8'; +$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 7da01c03ea..591ec9d8a8 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -129,3 +129,7 @@ $lang->upgrade->fromVersions['9_5_1'] = '9.5.1'; $lang->upgrade->fromVersions['9_6'] = '9.6'; $lang->upgrade->fromVersions['9_6_1'] = '9.6.1'; $lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; +$lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; +$lang->upgrade->fromVersions['9_7'] = '9.7'; +$lang->upgrade->fromVersions['9_8'] = '9.8'; +$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 6ea04e8f06..7803f4007a 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -75,13 +75,13 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('3.3')); $this->updateTaskAssignedTo(); case '4_0_beta1': $this->execSQL($this->getUpgradeFile('4.0.beta1')); - case '4_0_beta2': + case '4_0_beta2': $this->execSQL($this->getUpgradeFile('4.0.beta2')); $this->updateProjectType(); $this->updateEstimatePriv(); - case '4_0': + case '4_0': $this->execSQL($this->getUpgradeFile('4.0')); - case '4_0_1': + case '4_0_1': $this->execSQL($this->getUpgradeFile('4.0.1')); $this->addPriv4_0_1(); case '4_1': @@ -195,15 +195,28 @@ class upgradeModel extends model $this->fixDatatableColsConfig(); case '9_6_1': $this->addLimitedGroup(); - } + case '9_6_2': + case '9_6_3': + $this->execSQL($this->getUpgradeFile('9.6.3')); + $this->changeLimitedName(); + $this->adjustPriv9_7(); + $this->changeStoryWidth(); + case '9_7': + $this->execSQL($this->getUpgradeFile('9.7')); + $this->changeTeamFields(); + $this->moveData2Notify(); + case '9_8': + $this->fixFinishedBy(); + case '9_8_1': + } $this->deletePatch(); } /** * Create the confirm contents. - * - * @param string $fromVersion + * + * @param string $fromVersion * @access public * @return string */ @@ -269,7 +282,7 @@ class upgradeModel extends model case '8_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.0.1')); case '8_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.1')); case '8_1_3': $confirmContent .= file_get_contents($this->getUpgradeFile('8.1.3')); - case '8_2_beta': + case '8_2_beta': case '8_2': case '8_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.2.1')); case '8_2_2': @@ -294,6 +307,12 @@ class upgradeModel extends model case '9_5': $confirmContent .= file_get_contents($this->getUpgradeFile('9.5')); case '9_5_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.5.1')); case '9_6': $confirmContent .= file_get_contents($this->getUpgradeFile('9.6')); + case '9_6_1': + case '9_6_2': + case '9_6_3': $confirmContent .= file_get_contents($this->getUpgradeFile('9.6.3')); + case '9_7': $confirmContent .= file_get_contents($this->getUpgradeFile('9.7')); + case '9_8': + case '9_8_1': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); } @@ -329,7 +348,7 @@ class upgradeModel extends model /** * Update ubb code in bug table and user Templates table to html. - * + * * @access public * @return void */ @@ -391,7 +410,7 @@ class upgradeModel extends model /** * Update nl to br from 1.3 version. - * + * * @access public * @return void */ @@ -437,7 +456,7 @@ class upgradeModel extends model /** * Update task fields. - * + * * @access public * @return void */ @@ -519,8 +538,8 @@ class upgradeModel extends model } /** - * Update activated count of Bug. - * + * Update activated count of Bug. + * * @access public * @return void */ @@ -543,7 +562,7 @@ class upgradeModel extends model /** * Update lastRun and lastResult field in zt_case - * + * * @access public * @return void */ @@ -561,21 +580,21 @@ class upgradeModel extends model } /** - * Update type of projects. - * + * Update type of projects. + * * @access public * @return void */ public function updateProjectType() { - $projects = $this->dao->select('root')->from(TABLE_MODULE)->where('type')->eq('task')->fetchPairs('root'); - $this->dao->update(TABLE_PROJECT)->set('type')->eq('waterfall')->where('id')->in($projects)->exec(); + $projects = $this->dao->select('root')->from(TABLE_MODULE)->where('type')->eq('task')->fetchPairs('root'); + $this->dao->update(TABLE_PROJECT)->set('type')->eq('waterfall')->where('id')->in($projects)->exec(); return true; } /** * Update estimate priv. - * + * * @access public * @return void */ @@ -628,8 +647,8 @@ class upgradeModel extends model } /** - * Update the data of action. - * + * Update the data of action. + * * @access public * @return void */ @@ -673,8 +692,8 @@ class upgradeModel extends model } /** - * Init the data of product and project order field. - * + * Init the data of product and project order field. + * * @access public * @return void */ @@ -695,7 +714,7 @@ class upgradeModel extends model /** * Update task assignedTo. - * + * * @access public * @return void */ @@ -710,7 +729,7 @@ class upgradeModel extends model /** * Delete the patch record. - * + * * @access public * @return void */ @@ -722,8 +741,8 @@ class upgradeModel extends model /** * Get the upgrade sql file. - * - * @param string $version + * + * @param string $version * @access public * @return string */ @@ -734,8 +753,8 @@ class upgradeModel extends model /** * Execute a sql. - * - * @param string $sqlFile + * + * @param string $sqlFile * @access public * @return void */ @@ -746,7 +765,7 @@ class upgradeModel extends model /* Read the sql file to lines, remove the comment lines, then join theme by ';'. */ $sqls = explode("\n", file_get_contents($sqlFile)); - foreach($sqls as $key => $line) + foreach($sqls as $key => $line) { $line = trim($line); $sqls[$key] = $line; @@ -771,7 +790,7 @@ class upgradeModel extends model { $this->dbh->exec($sql); } - catch (PDOException $e) + catch (PDOException $e) { $errorInfo = $e->errorInfo; $errorCode = $errorInfo[1]; @@ -781,8 +800,8 @@ class upgradeModel extends model } /** - * Add priv for version 4.0.1 - * + * Add priv for version 4.0.1 + * * @access public * @return void */ @@ -823,10 +842,10 @@ class upgradeModel extends model } /** - * Add priv for version 4.1 - * + * Add priv for version 4.1 + * * @access public - * @return bool + * @return bool */ public function addPriv4_1() { @@ -918,7 +937,7 @@ class upgradeModel extends model /** * Add priv for 8.2. - * + * * @access public * @return bool */ @@ -964,7 +983,7 @@ class upgradeModel extends model /** * Adjust config section and key. - * + * * @access public * @return bool */ @@ -983,8 +1002,8 @@ class upgradeModel extends model /** * To lower table. - * - * @param string $build + * + * @param string $build * @access public * @return bool */ @@ -1028,7 +1047,7 @@ class upgradeModel extends model /** * Process finishedBy and finishedDate of task. - * + * * @access public * @return bool */ @@ -1046,7 +1065,7 @@ class upgradeModel extends model /** * Delete company field for the table of zt_config and zt_groupPriv. - * + * * @access public * @return void */ @@ -1080,7 +1099,7 @@ class upgradeModel extends model /** * Merge the goal and desc of project. - * + * * @access public * @return void */ @@ -1101,7 +1120,7 @@ class upgradeModel extends model /** * Fix OS info of bugs. - * + * * @access public * @return void */ @@ -1113,7 +1132,7 @@ class upgradeModel extends model /** * Fix finishedBy of task. - * + * * @access public * @return void */ @@ -1143,7 +1162,7 @@ class upgradeModel extends model /** * Touch index.html for upload when has not it. - * + * * @access public * @return bool */ @@ -1159,7 +1178,7 @@ class upgradeModel extends model /** * Init order. - * + * * @access public * @return bool */ @@ -1178,7 +1197,7 @@ class upgradeModel extends model /** * Adjust order for 7.3 - * + * * @access public * @return void */ @@ -1191,8 +1210,8 @@ class upgradeModel extends model } /** - * Adjust priv for 7.4.beta - * + * Adjust priv for 7.4.beta + * * @access public * @return void */ @@ -1213,7 +1232,7 @@ class upgradeModel extends model /** * Adjust doc module. - * + * * @access public * @return bool */ @@ -1322,7 +1341,7 @@ class upgradeModel extends model /** * Update file objectID in editor. - * + * * @access public * @return bool */ @@ -1428,7 +1447,7 @@ class upgradeModel extends model /** * Move doc content to table zt_doccontent. - * + * * @access public * @return bool */ @@ -1438,7 +1457,7 @@ class upgradeModel extends model $processFields = 0; foreach($descDoc as $field) { - if($field->Field == 'content' or $field->Field == 'digest' or $field->Field == 'url') $processFields ++; + if($field->Field == 'content' or $field->Field == 'digest' or $field->Field == 'url') $processFields ++; } if($processFields < 3) return true; @@ -1466,8 +1485,8 @@ class upgradeModel extends model } /** - * Adjust priv 8.3 - * + * Adjust priv 8.3 + * * @access public * @return bool */ @@ -1490,10 +1509,10 @@ class upgradeModel extends model } return true; } - + /** * Rename main lib. - * + * * @access public * @return bool */ @@ -1507,7 +1526,7 @@ class upgradeModel extends model /** * Adjust priv for 8.4. - * + * * @access public * @return bool */ @@ -1538,8 +1557,8 @@ class upgradeModel extends model } /** - * Adjust priv for 9.0 - * + * Adjust priv for 9.0 + * * @access public * @return void */ @@ -1568,7 +1587,7 @@ class upgradeModel extends model /** * Fix projectproduct data. - * + * * @access public * @return bool */ @@ -1580,7 +1599,7 @@ class upgradeModel extends model /** * Add bug deadline for custom fields. - * + * * @access public * @return bool */ @@ -1612,8 +1631,8 @@ class upgradeModel extends model } /** - * Adjust priv for 9.0.1. - * + * Adjust priv for 9.0.1. + * * @access public * @return bool */ @@ -1719,7 +1738,7 @@ class upgradeModel extends model * Adjust priv for 9.4. * * @access public - * @return bool + * @return bool */ public function adjustPriv9_4() { @@ -1730,6 +1749,7 @@ class upgradeModel extends model $data->group = $groupID; $data->module = 'bug'; $data->method = 'batchActivate'; + $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); } return true; } @@ -1747,7 +1767,7 @@ class upgradeModel extends model /** * Get errors during the upgrading. - * + * * @access public * @return array */ @@ -1760,7 +1780,7 @@ class upgradeModel extends model /** * Check safe file. - * + * * @access public * @return string|false */ @@ -1773,7 +1793,7 @@ class upgradeModel extends model /** * Check weither process or not. - * + * * @access public * @return array */ @@ -1786,8 +1806,8 @@ class upgradeModel extends model } /** - * Process customMenus for different working. - * + * Process customMenus for different working. + * * @access public * @return void */ @@ -1806,7 +1826,7 @@ class upgradeModel extends model /** * Init project story order. - * + * * @access public * @return bool */ @@ -1831,7 +1851,7 @@ class upgradeModel extends model /** * Fix datatable cols config. - * + * * @access public * @return bool */ @@ -1859,7 +1879,7 @@ class upgradeModel extends model /** * Add limited group. - * + * * @access public * @return bool */ @@ -1904,7 +1924,7 @@ class upgradeModel extends model /** * Change limited name. - * + * * @access public * @return bool */ @@ -1920,8 +1940,8 @@ class upgradeModel extends model } /** - * Adjust Priv for 9.7 - * + * Adjust Priv for 9.7 + * * @access public * @return bool */ @@ -1941,7 +1961,7 @@ class upgradeModel extends model /** * Change story field width. - * + * * @access public * @return bool */ @@ -1959,4 +1979,136 @@ class upgradeModel extends model } return true; } + + /** + * Change team field for 9.8. + * + * @access public + * @return bool + */ + public function changeTeamFields() + { + $desc = $this->dao->query('DESC ' . TABLE_TEAM)->fetchAll(); + $fields = array(); + foreach($desc as $field) + { + $fieldName = $field->Field; + $fields[$fieldName] = $fieldName; + } + if(isset($fields['root'])) return true; + + $this->dao->exec("ALTER TABLE " . TABLE_TEAM . " CHANGE `project` `root` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'"); + $this->dao->exec("ALTER TABLE " . TABLE_TEAM . " ADD `type` ENUM('project', 'task') NOT NULL DEFAULT 'project' AFTER `root`"); + $this->dao->exec("UPDATE " . TABLE_TEAM . " SET `root` = `task`, `type` = 'task' WHERE `task` > '0'"); + $this->dao->exec("ALTER TABLE " . TABLE_TEAM . " DROP PRIMARY KEY"); + $this->dao->exec("ALTER TABLE " . TABLE_TEAM . " DROP `task`"); + return true; + } + + /** + * Move data to notify. + * + * @access public + * @return bool + */ + public function moveData2Notify() + { + $this->dao->exec('TRUNCATE TABLE ' . TABLE_NOTIFY); + $mailQueueTable = '`' . $this->config->db->prefix . 'mailqueue`'; + $stmt = $this->dao->select('*')->from($mailQueueTable)->query(); + while($mailQueue = $stmt->fetch()) + { + $notify = new stdclass(); + $notify->objectType = 'mail'; + $notify->toList = $mailQueue->toList; + $notify->ccList = $mailQueue->ccList; + $notify->subject = $mailQueue->subject; + $notify->data = $mailQueue->body; + $notify->createdBy = $mailQueue->addedBy; + $notify->createdDate = $mailQueue->addedDate; + $notify->sendTime = $mailQueue->sendTime; + $notify->status = $mailQueue->status; + $notify->failReason = $mailQueue->failReason; + $this->dao->insert(TABLE_NOTIFY)->data($notify)->exec(); + } + + $webhookDataTable = '`' . $this->config->db->prefix . 'webhookdatas`'; + $stmt = $this->dao->select('*')->from($webhookDataTable)->query(); + while($webhookData = $stmt->fetch()) + { + $notify = new stdclass(); + $notify->objectType = 'webhook'; + $notify->objectID = $webhookData->webhook; + $notify->action = $webhookData->action; + $notify->data = $webhookData->data; + $notify->createdBy = $webhookData->createdBy; + $notify->createdDate = $webhookData->createdDate; + $notify->status = $webhookData->status; + $this->dao->insert(TABLE_NOTIFY)->data($notify)->exec(); + } + return true; + } + + /** + * Adjust priv 9.8. + * + * @access public + * @return bool + */ + public function adjustPriv9_8() + { + $groups = $this->dao->select('id')->from(TABLE_GROUP)->fetchPairs('id', 'id'); + foreach($groups as $group) + { + $groupPriv = new stdclass(); + $groupPriv->group = $groupID; + $groupPriv->module = 'todo'; + $groupPriv->method = 'createcycle'; + $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); + } + + $groups = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('mail')->orWhere('module')->eq('webhook')->fetchPairs('group', 'group'); + foreach($groups as $group) + { + $groupPriv = new stdclass(); + $groupPriv->group = $groupID; + $groupPriv->module = 'message'; + $groupPriv->method = 'index'; + $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); + } + + $groups = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('linkStory')->fetchPairs('group', 'group'); + foreach($groups as $group) + { + $groupPriv = new stdclass(); + $groupPriv->group = $groupID; + $groupPriv->module = 'project'; + $groupPriv->method = 'importPlanStories'; + $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); + } + return true; + } + + /** + * Fix task finishedBy. + * + * @access public + * @return bool + */ + public function fixFinishedBy() + { + $stmt = $this->dao->select('t1.id as historID,t2.objectType,t2.objectID,t2.actor')->from(TABLE_HISTORY)->alias('t1') + ->leftJoin(TABLE_ACTION)->alias('t2')->on('t1.action=t2.id') + ->where('t1.field')->eq('finishedBy') + ->andWhere('t2.objectType')->eq('task') + ->andWhere('t2.action')->eq('finished') + ->andWhere('t2.actor != t1.`new`') + ->query(); + while($action = $stmt->fetch()) + { + $this->dao->update(TABLE_HISTORY)->set('`new`')->eq($action->actor)->where('id')->eq($action->historID)->exec(); + $this->dao->update(TABLE_TASK)->set('`finishedBy`')->eq($action->actor)->where('id')->eq($action->objectID)->exec(); + } + return true; + } } diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php index b2b1d9fc1c..0590377b09 100644 --- a/module/upgrade/view/afterexec.html.php +++ b/module/upgrade/view/afterexec.html.php @@ -22,22 +22,18 @@
            install->promotion?>
            -
            -
            - -
            -             -
            -
            - -
            -             -
            -
            - -
            +
            + install->product as $product):?> +
            + +
            +
            +
            install->{$product}->name?>
            +
            install->{$product}->desc?>
            +
            +
            diff --git a/module/user/config.php b/module/user/config.php index b4211a351f..bd2bfb21c9 100644 --- a/module/user/config.php +++ b/module/user/config.php @@ -6,8 +6,8 @@ $config->user->edit = new stdclass(); $config->user->create->requiredFields = 'account,realname,password,password1,password2'; $config->user->edit->requiredFields = 'account,realname'; -$config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; -$config->user->customBatchEditFields = 'dept,email,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; +$config->user->customBatchCreateFields = 'dept,email,gender,commiter,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; +$config->user->customBatchEditFields = 'dept,email,commiter,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; $config->user->custom = new stdclass(); $config->user->custom->batchCreateFields = 'dept,email,gender'; diff --git a/module/user/control.php b/module/user/control.php index 2188c95621..bfb38b2fd2 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -626,31 +626,6 @@ class user extends control } } - /** - * Check Tmp dir. - * - * @access public - * @return void - */ - public function checkTmp() - { - if(!is_dir($this->app->tmpRoot)) mkdir($this->app->tmpRoot, 0755, true); - if(!is_dir($this->app->cacheRoot)) mkdir($this->app->cacheRoot, 0755, true); - if(!is_dir($this->app->logRoot)) mkdir($this->app->logRoot, 0755, true); - if(!is_dir($this->app->logRoot)) return false; - - $file = $this->app->logRoot . DS . 'demo.txt'; - if($fp = @fopen($file, 'a+')) - { - @fclose($fp); - @unlink($file); - } - else - { - return false; - } - return true; - } /** * User login, identify him and authorize him. @@ -663,7 +638,7 @@ class user extends control */ public function login($referer = '', $from = '') { - if($this->checkTmp() === false) + if($this->user->checkTmp() === false) { echo ""; echo "
            "; @@ -736,9 +711,6 @@ class user extends control /* Keep login. */ if($this->post->keepLogin) $this->user->keepLogin($user); - /* Check password. */ - if(isset($this->config->safe->mode) and $this->user->computePasswordStrength($password) < $this->config->safe->mode) echo js::alert($this->lang->user->weakPassword); - /* Go to the referer. */ if($this->post->referer and strpos($this->post->referer, $loginLink) === false and strpos($this->post->referer, $denyLink) === false) { @@ -807,7 +779,9 @@ class user extends control { if(!empty($this->config->global->showDemoUsers)) { - $demoUsers = $this->user->getPairs('noletter|noempty|noclosed|nodeleted'); + $demoUsers = 'productManager,projectManager,dev1,dev2,dev3,tester1,tester2,tester3,testManager'; + if($this->app->getClientLang() == 'en') $demoUsers = 'thePO,pm1,pm2,pg1,pg2,pg3,thePM,qa1,theQS'; + $demoUsers = $this->dao->select('account,password,realname')->from(TABLE_USER)->where('account')->in($demoUsers)->andWhere('deleted')->eq(0)->fetchAll('account'); $this->view->demoUsers = $demoUsers; } diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 6be646a744..5416043108 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -20,13 +20,13 @@ $lang->user->role = 'Role'; $lang->user->group = 'Group'; $lang->user->realname = 'Name'; $lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'Commiter'; +$lang->user->commiter = 'SCM Account'; $lang->user->birthyear = 'Birth Year'; $lang->user->gender = 'Gender'; $lang->user->email = 'Email'; $lang->user->basicInfo = 'Basic Info'; $lang->user->accountInfo = 'Account'; -$lang->user->verify = 'Acceptance'; +$lang->user->verify = 'Safety Verification'; $lang->user->contactInfo = 'Contact'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; @@ -44,12 +44,12 @@ $lang->user->last = 'Last Login'; $lang->user->ranzhi = 'Zdoo Account'; $lang->user->ditto = 'Ditto'; $lang->user->originalPassword = 'Old Password'; -$lang->user->verifyPassword = 'Enter your password'; +$lang->user->verifyPassword = 'Admin password'; $lang->user->resetPassword = 'Forgot Password?'; $lang->user->index = "Home"; -$lang->user->view = "Info"; -$lang->user->create = "Add"; +$lang->user->view = "Overview"; +$lang->user->create = "Add User"; $lang->user->batchCreate = "Batch Add User"; $lang->user->edit = "Edit"; $lang->user->batchEdit = "Batch Edit"; @@ -75,7 +75,7 @@ $lang->user->bug = 'Bug'; $lang->user->test = 'Test'; $lang->user->testTask = 'Test Task'; $lang->user->testCase = 'Test Case'; -$lang->user->todo = 'To-Do'; +$lang->user->todo = 'Todo'; $lang->user->story = 'Story'; $lang->user->dynamic = 'Dynamic'; @@ -95,17 +95,24 @@ $lang->user->errorDeny = "Sorry, your access to %s Module %s Fe $lang->user->loginFailed = "Login failed. Please check your account and password."; $lang->user->lockWarning = "You can try %s times."; $lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s mins later."; -$lang->user->weakPassword = "Your password does meet the setting requirements."; +$lang->user->weakPassword = "Your password does not meet the setting requirements."; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = 'Developer'; $lang->user->roleList['qa'] = 'QA'; $lang->user->roleList['pm'] = 'Project Manager'; $lang->user->roleList['po'] = 'Product Owner'; +<<<<<<< HEAD $lang->user->roleList['td'] = 'Test Director'; $lang->user->roleList['pd'] = 'Product Director'; $lang->user->roleList['qd'] = 'QA Director'; $lang->user->roleList['top'] = 'Top Manager'; +======= +$lang->user->roleList['td'] = 'Technical Manager'; +$lang->user->roleList['pd'] = 'Product Manager'; +$lang->user->roleList['qd'] = 'QA Manager'; +$lang->user->roleList['top'] = 'Senior Manager'; +>>>>>>> d53267cadf32651eb7ccfff3e0b1a5dd744d3d3e $lang->user->roleList['others'] = 'Other'; $lang->user->genderList['m'] = 'M'; @@ -128,15 +135,15 @@ $lang->user->tpl->content = 'Content'; $lang->user->tpl->public = 'Public'; $lang->user->placeholder = new stdclass(); -$lang->user->placeholder->account = 'letters, underline, and numbers,at lease three characters'; +$lang->user->placeholder->account = 'Letters, Underline and Numbers, at least 3 characters'; $lang->user->placeholder->password1 = 'six characters at lease '; $lang->user->placeholder->role = "Role affects content and user order."; $lang->user->placeholder->group = "Group decides user privilege."; -$lang->user->placeholder->commiter = 'Subversion Account'; +$lang->user->placeholder->commiter = 'Svn or Git like'; $lang->user->placeholder->verify = 'Password is required.'; -$lang->user->placeholder->passwordStrength[1] = 'letters and numbers, at lease six characters'; -$lang->user->placeholder->passwordStrength[2] = 'letters, numbers and special characters, at lease 10 characters'; +$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, at least 6 characters'; +$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, at lease 10 characters'; $lang->user->error = new stdclass(); $lang->user->error->account = "ID %s，must be contain letters, underline, and numbers,at lease three characters"; @@ -157,7 +164,7 @@ $lang->user->contacts->userList = 'User List'; $lang->user->contacts->manage = 'Manage'; $lang->user->contacts->contactsList = 'Contacts'; -$lang->user->contacts->selectedUsers = 'User'; +$lang->user->contacts->selectedUsers = 'Select User'; $lang->user->contacts->selectList = 'List'; $lang->user->contacts->createList = 'Create a List'; $lang->user->contacts->noListYet = 'No contact list exists. Please create a list first.'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index a0766cfce1..ea3c98fdef 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -145,6 +145,7 @@ $lang->user->error->realname = "ID %s，必須填寫真實姓名"; $lang->user->error->password = "ID %s，密碼必須六位以上"; $lang->user->error->mail = "ID %s，請填寫正確的郵箱地址"; $lang->user->error->role = "ID %s，職位不能為空"; +$lang->user->error->reserved = "ID %s，該用戶名系統預留"; $lang->user->error->verifyPassword = "安全驗證密碼錯誤，請輸入你的登錄密碼"; $lang->user->error->originalPassword = "原密碼不正確"; diff --git a/module/user/model.php b/module/user/model.php index d124add45d..42335a2b0d 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -15,7 +15,7 @@ class userModel extends model { /** * Set the menu. - * + * * @param array $users user pairs * @param string $account current account * @access public @@ -34,11 +34,11 @@ class userModel extends model /** * Set users list. - * - * @param array $users - * @param string $account + * + * @param array $users + * @param string $account * @access public - * @return html + * @return html */ public function setUserList($users, $account) { @@ -52,7 +52,7 @@ class userModel extends model /** * Get users list of current company. - * + * * @access public * @return void */ @@ -112,9 +112,9 @@ class userModel extends model /** * Get commiters from the user table. - * + * * @access public - * @return array + * @return array */ public function getCommiters() { @@ -133,11 +133,11 @@ class userModel extends model return $commiters; } - + /** * Get user list with email and real name. - * - * @param string|array $users + * + * @param string|array $users * @access public * @return array */ @@ -151,8 +151,8 @@ class userModel extends model /** * Get roles for some users. - * - * @param string $users + * + * @param string $users * @access public * @return array */ @@ -167,8 +167,8 @@ class userModel extends model /** * Get user info by ID. - * - * @param int $userID + * + * @param int $userID * @access public * @return object|bool */ @@ -182,9 +182,9 @@ class userModel extends model /** * Get users by sql. - * - * @param int $query - * @param int $pager + * + * @param int $query + * @param int $pager * @access public * @return void */ @@ -213,6 +213,7 @@ class userModel extends model ->setDefault('join', '0000-00-00') ->setIF($this->post->password1 != false, 'password', md5($this->post->password1)) ->setIF($this->post->password1 == false, 'password', '') + ->setIF($this->post->email != false, 'email', trim($this->post->email)) ->remove('group, password1, password2, verifyPassword') ->get(); @@ -233,7 +234,6 @@ class userModel extends model ->batchCheck($this->config->user->create->requiredFields, 'notempty') ->check('account', 'unique') ->check('account', 'account') - ->checkIF($this->post->email != false, 'email', 'email') ->exec(); if($this->post->group) { @@ -287,9 +287,9 @@ class userModel extends model $data[$i]->group = $users->group[$i] == 'ditto' ? (isset($prev['group']) ? $prev['group'] : '') : $users->group[$i]; $data[$i]->email = $users->email[$i]; $data[$i]->gender = $users->gender[$i]; - $data[$i]->password = md5($users->password[$i]); + $data[$i]->password = md5($users->password[$i]); $data[$i]->commiter = $users->commiter[$i]; - $data[$i]->join = empty($users->join[$i]) ? '0000-00-00' : ($user->join[$i]); + $data[$i]->join = empty($users->join[$i]) ? '0000-00-00' : ($users->join[$i]); $data[$i]->skype = $users->skype[$i]; $data[$i]->qq = $users->qq[$i]; $data[$i]->yahoo = $users->yahoo[$i]; @@ -333,7 +333,7 @@ class userModel extends model } unset($user->group); $this->dao->insert(TABLE_USER)->data($user)->autoCheck()->exec(); - if(dao::isError()) + if(dao::isError()) { echo js::error(dao::getError()); die(js::reload('parent')); @@ -347,8 +347,8 @@ class userModel extends model /** * Update a user. - * - * @param int $userID + * + * @param int $userID * @access public * @return void */ @@ -362,6 +362,7 @@ class userModel extends model $user = fixer::input('post') ->setDefault('join', '0000-00-00') ->setIF($this->post->password1 != false, 'password', md5($this->post->password1)) + ->setIF($this->post->email != false, 'email', trim($this->post->email)) ->remove('password1, password2, groups,verifyPassword') ->get(); @@ -382,7 +383,6 @@ class userModel extends model ->batchCheck($this->config->user->edit->requiredFields, 'notempty') ->check('account', 'unique', "id != '$userID'") ->check('account', 'account') - ->checkIF($this->post->email != false, 'email', 'email') ->where('id')->eq((int)$userID) ->exec(); @@ -523,9 +523,9 @@ class userModel extends model } /** - * Update password - * - * @param string $userID + * Update password + * + * @param string $userID * @access public * @return void */ @@ -560,14 +560,14 @@ class userModel extends model /** * Reset password. - * + * * @access public * @return bool */ public function resetPassword() { if(!$this->checkPassword()) return; - + $user = $this->getById($this->post->account); if(!$user) return false; @@ -584,7 +584,7 @@ class userModel extends model /** * Check the passwds posted. - * + * * @access public * @return bool */ @@ -601,7 +601,7 @@ class userModel extends model /** * Identify a user. - * + * * @param string $account the user account * @param string $password the user password or auth hash * @access public @@ -657,13 +657,17 @@ class userModel extends model } $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'); + $this->loadModel('todo')->createByCycle($todoList); } return $user; } /** * Identify user by PHP_AUTH_USER. - * + * * @access public * @return void */ @@ -684,7 +688,7 @@ class userModel extends model /** * Identify user by cookie. - * + * * @access public * @return void */ @@ -707,7 +711,7 @@ class userModel extends model /** * Authorize a user. - * + * * @param string $account * @access public * @return array the user rights. @@ -795,7 +799,7 @@ class userModel extends model /** * Judge a user is logon or not. - * + * * @access public * @return bool */ @@ -806,8 +810,8 @@ class userModel extends model /** * Get groups a user belongs to. - * - * @param string $account + * + * @param string $account * @access public * @return array */ @@ -817,17 +821,18 @@ class userModel extends model } /** - * Get projects a user participated. - * - * @param string $account + * Get projects a user participated. + * + * @param string $account * @access public * @return array */ public function getProjects($account) { $projects = $this->dao->select('t1.*,t2.*')->from(TABLE_TEAM)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.root = t2.id') ->where('t1.account')->eq($account) + ->andWhere('t1.type')->eq('project') ->andWhere('t2.deleted')->eq(0) ->fetchAll(); @@ -846,8 +851,8 @@ class userModel extends model /** * Plus the fail times. - * - * @param int $account + * + * @param int $account * @access public * @return void */ @@ -857,8 +862,8 @@ class userModel extends model if(empty($user)) return 0; $fails = $user->fails; - $fails ++; - if($fails < $this->config->user->failTimes) + $fails ++; + if($fails < $this->config->user->failTimes) { $locked = '0000-00-00 00:00:00'; $failTimes = $fails; @@ -873,15 +878,15 @@ class userModel extends model } /** - * Check whether the user is locked. - * - * @param int $account + * Check whether the user is locked. + * + * @param int $account * @access public * @return void */ public function checkLocked($account) { - $user = $this->dao->select('locked')->from(TABLE_USER)->where('account')->eq($account)->fetch(); + $user = $this->dao->select('locked')->from(TABLE_USER)->where('account')->eq($account)->fetch(); if(empty($user)) return false; if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) > $this->config->user->lockMinutes * 60) return false; @@ -889,9 +894,9 @@ class userModel extends model } /** - * Unlock the locked user. - * - * @param int $account + * Unlock the locked user. + * + * @param int $account * @access public * @return void */ @@ -901,9 +906,9 @@ class userModel extends model } /** - * Unbind Ranzhi - * - * @param string $account + * Unbind Ranzhi + * + * @param string $account * @access public * @return void */ @@ -914,7 +919,7 @@ class userModel extends model /** * Get contact list of a user. - * + * * @param string $account * @param string $params withempty|withnote * @@ -960,8 +965,8 @@ class userModel extends model /** * Get a contact list by id. - * - * @param int $listID + * + * @param int $listID * @access public * @return object */ @@ -972,8 +977,8 @@ class userModel extends model /** * Get user account and realname pairs from a contact list. - * - * @param string $accountList + * + * @param string $accountList * @access public * @return array */ @@ -984,9 +989,9 @@ class userModel extends model /** * Create a contact list. - * - * @param string $listName - * @param string $userList + * + * @param string $listName + * @param string $userList * @access public * @return int */ @@ -1013,10 +1018,10 @@ class userModel extends model /** * Update a contact list. - * - * @param int $listID - * @param string $listName - * @param string $userList + * + * @param int $listID + * @param string $listName + * @param string $userList * @access public * @return void */ @@ -1065,8 +1070,8 @@ class userModel extends model /** * Delete a contact list. - * - * @param int $listID + * + * @param int $listID * @access public * @return void */ @@ -1077,8 +1082,8 @@ class userModel extends model /** * Get data in JSON. - * - * @param object $user + * + * @param object $user * @access public * @return array */ @@ -1094,7 +1099,7 @@ class userModel extends model /** * Get weak users. - * + * * @access public * @return array */ @@ -1142,9 +1147,9 @@ class userModel extends model } /** - * Compute password strength. - * - * @param string $password + * Compute password strength. + * + * @param string $password * @access public * @return int */ @@ -1188,4 +1193,30 @@ class userModel extends model return $strength; } + + /** + * Check Tmp dir. + * + * @access public + * @return void + */ + public function checkTmp() + { + if(!is_dir($this->app->tmpRoot)) mkdir($this->app->tmpRoot, 0755, true); + if(!is_dir($this->app->cacheRoot)) mkdir($this->app->cacheRoot, 0755, true); + if(!is_dir($this->app->logRoot)) mkdir($this->app->logRoot, 0755, true); + if(!is_dir($this->app->logRoot)) return false; + + $file = $this->app->logRoot . DS . 'demo.txt'; + if($fp = @fopen($file, 'a+')) + { + @fclose($fp); + @unlink($file); + } + else + { + return false; + } + return true; + } } diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 01bae78aa6..d9a0a506ab 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -24,9 +24,9 @@
            - +
            - + @@ -69,12 +69,6 @@ - diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 5b6a859e33..80a5c33c43 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -39,10 +39,6 @@ - @@ -100,7 +96,7 @@ - + @@ -109,7 +105,7 @@
            user->dept;?>user->dept;?>
            user->commiter;?>
            user->gender;?> user->genderList, 'm');?>
            user->gender;?> user->genderList, $user->gender);?>
            phone, "class='form-control' autocomplete='off'");?> user->address;?> address, "class='form-control' autocomplete='off'");?>
            user->zipcode;?> zipcode, "class='form-control' autocomplete='off'");?>
            - + - @@ -95,11 +89,11 @@ - + - + @@ -107,11 +101,11 @@ - + - + @@ -119,11 +113,11 @@ - + - + diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php index d7d3882904..35f86b240c 100644 --- a/module/user/view/project.html.php +++ b/module/user/view/project.html.php @@ -18,7 +18,7 @@ - + @@ -33,7 +33,7 @@ - + delay)):?> @@ -47,5 +47,5 @@ -
            user->verify;?>
            user->verifyPassword;?>user->verifyPassword;?>
            user->placeholder->verify}'");?> diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index b232c4519b..15592b4b43 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -60,11 +60,13 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
            user->loginWithDemoUser; ?> requestType == 'GET' ? '&' : '?'; - foreach($demoUsers as $demoUser => $demoRealname) + $password = md5('123456'); + $link = inlink('login'); + $link .= strpos($link, '?') !== false ? '&' : '?'; + foreach($demoUsers as $demoAccount => $demoUser) { - if(strpos($this->app->company->admins, ",{$demoUser},") !== false) continue; - echo html::a(inlink('login') . $sign . "account={$demoUser}&password=" . md5(md5('123456') + $this->session->rand), $demoRealname, 'hiddenwin'); + if($demoUser->password != $password) continue; + echo html::a($link . "account={$demoAccount}&password=" . md5($password . $this->session->rand), $demoUser->realname, 'hiddenwin'); } ?>
            diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php index 64e3f40f07..9d8f5aee0c 100644 --- a/module/user/view/profile.html.php +++ b/module/user/view/profile.html.php @@ -74,12 +74,6 @@             		user->email;?> email;?>
            user->visits;?> visits;?>
            user->skype;?> skype) echo html::a("callto://$user->skype", $user->skype);?>
            user->qq;?> qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
            user->yahoo;?> yahoo;?>
            user->gtalk;?> gtalk;?>
            user->wangwang;?> wangwang;?>
            user->mobile;?> mobile;?>
            user->phone;?> phone;?>
            user->address;?> address;?>
            user->zipcode;?> zipcode;?>
            idAB;?> project->code;?>project->name;?>project->name;?> project->begin;?> project->end;?> statusAB;?>
            id);?> code;?>name);?>name);?> begin;?> end;?>
            +
            diff --git a/module/webhook/config.php b/module/webhook/config.php index a559e38e6b..df7384e81f 100644 --- a/module/webhook/config.php +++ b/module/webhook/config.php @@ -5,15 +5,6 @@ $config->webhook->create->requiredFields = 'name, url'; $config->webhook->edit = new stdclass(); $config->webhook->edit->requiredFields = 'name, url'; -$config->webhook->objectTypes['release'] = array('opened', 'edited', 'changestatus'); -$config->webhook->objectTypes['build'] = array('opened', 'edited'); -$config->webhook->objectTypes['testsuite'] = array('opened', 'edited'); -$config->webhook->objectTypes['caselib'] = array('opened', 'edited'); -$config->webhook->objectTypes['testreport'] = array('opened', 'edited'); -$config->webhook->objectTypes['doc'] = array('created', 'edited', 'commented'); -$config->webhook->objectTypes['doclib'] = array('created', 'edited'); -$config->webhook->objectTypes['user'] = array('login', 'logout'); - /* Unset entry to hide actions. */ $config->webhook->objectTypes = array(); $config->webhook->objectTypes['product'] = array('opened', 'edited', 'closed', 'undeleted'); diff --git a/module/webhook/control.php b/module/webhook/control.php index 4aecf53d51..86382877bd 100644 --- a/module/webhook/control.php +++ b/module/webhook/control.php @@ -11,6 +11,12 @@ */ class webhook extends control { + public function __construct($moduleName = '', $methodName = '') + { + parent::__construct($moduleName, $methodName); + $this->loadModel('message'); + } + /** * Browse webhooks. * @@ -54,8 +60,6 @@ class webhook extends control $this->view->title = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->create; $this->view->products = $this->loadModel('product')->getPairs(); $this->view->projects = $this->loadModel('project')->getPairs(); - $this->view->objectTypes = $this->webhook->getObjectTypes(); - $this->view->objectActions = $this->webhook->getObjectActions(); $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->api); $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->common); $this->view->position[] = $this->lang->webhook->create; @@ -83,8 +87,6 @@ class webhook extends control $this->view->title = $this->lang->webhook->edit . $this->lang->colon . $webhook->name; $this->view->products = $this->loadModel('product')->getPairs(); $this->view->projects = $this->loadModel('project')->getPairs(); - $this->view->objectTypes = $this->webhook->getObjectTypes(); - $this->view->objectActions = $this->webhook->getObjectActions(); $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->api); $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->common); $this->view->position[] = $this->lang->webhook->edit; @@ -157,19 +159,20 @@ class webhook extends control return true; } + $now = helper::now(); foreach($dataList as $data) { - $webhook = zget($webhooks, $data->webhook, ''); + $webhook = zget($webhooks, $data->objectID, ''); if($webhook) { $result = $this->webhook->fetchHook($webhook, $data->data); $this->webhook->saveLog($webhook, $data->action, $data->data, $result); } - $this->dao->update(TABLE_WEBHOOKDATAS)->set('status')->eq('sended')->where('id')->eq($data->id)->exec(); + $this->dao->update(TABLE_NOTIFY)->set('status')->eq('sended')->set('sendTime')->eq($now)->where('id')->eq($data->id)->exec(); } - $this->dao->delete()->from(TABLE_WEBHOOKDATAS)->where('status')->eq('sended')->exec(); + $this->dao->delete()->from(TABLE_NOTIFY)->where('status')->eq('sended')->exec(); echo "OK\n"; return true; diff --git a/module/webhook/model.php b/module/webhook/model.php index ce466af534..81a5e6a6a2 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -21,7 +21,6 @@ class webhookModel extends model public function getByID($id) { $webhook = $this->dao->select('*')->from(TABLE_WEBHOOK)->where('id')->eq($id)->fetch(); - $webhook->actions = json_decode($webhook->actions); return $webhook; } @@ -41,7 +40,6 @@ class webhookModel extends model ->orderBy($orderBy) ->page($pager) ->fetchAll('id'); - if($decode) foreach($webhooks as $webhook) $webhook->actions = json_decode($webhook->actions); return $webhooks; } @@ -96,42 +94,7 @@ class webhookModel extends model */ public function getDataList() { - return $this->dao->select('*')->from(TABLE_WEBHOOKDATAS)->where('status')->eq('wait')->orderBy('id')->fetchAll('id'); - } - - /** - * Get object types. - * - * @access public - * @return array - */ - public function getObjectTypes() - { - $objectTypes = array(); - foreach($this->config->webhook->objectTypes as $objectType => $actions) - { - $objectTypes[$objectType] = $this->lang->action->objectTypes[$objectType]; - } - return $objectTypes; - } - - /** - * Get object actions. - * - * @access public - * @return array - */ - public function getObjectActions() - { - $objectActions = array(); - foreach($this->config->webhook->objectTypes as $objectType => $actions) - { - foreach($actions as $action) - { - $objectActions[$objectType][$action] = str_replace($this->lang->webhook->trimWords, '', $this->lang->action->label->$action); - } - } - return $objectActions; + return $this->dao->select('*')->from(TABLE_NOTIFY)->where('status')->eq('wait')->andWhere('objectType')->eq('webhook')->orderBy('id')->fetchAll('id'); } /** @@ -151,7 +114,6 @@ class webhookModel extends model ->remove('allParams, allActions') ->get(); $webhook->params = $this->post->params ? implode(',', $this->post->params) . ',text' : 'text'; - $webhook->actions = $this->post->actions ? json_encode($this->post->actions) : '[]'; $this->dao->insert(TABLE_WEBHOOK)->data($webhook) ->batchCheck($this->config->webhook->create->requiredFields, 'notempty') @@ -180,7 +142,6 @@ class webhookModel extends model ->remove('allParams, allActions') ->get(); $webhook->params = $this->post->params ? implode(',', $this->post->params) . ',text' : 'text'; - $webhook->actions = $this->post->actions ? json_encode($this->post->actions) : '[]'; $this->dao->update(TABLE_WEBHOOK)->data($webhook) ->batchCheck($this->config->webhook->edit->requiredFields, 'notempty') @@ -208,7 +169,6 @@ class webhookModel extends model foreach($webhooks as $id => $webhook) { - if(!isset($webhook->actions->$objectType) or !in_array($actionType, $webhook->actions->$objectType)) continue; $postData = $this->buildData($objectType, $objectID, $actionType, $actionID, $webhook); if(!$postData) continue; @@ -435,13 +395,14 @@ class webhookModel extends model public function saveData($webhookID, $actionID, $data) { $webhookData = new stdclass(); - $webhookData->webhook = $webhookID; + $webhookData->objectType = 'webhook'; + $webhookData->objectID = $webhookID; $webhookData->action = $actionID; $webhookData->data = $data; $webhookData->createdBy = $this->app->user->account; $webhookData->createdDate = helper::now(); - $this->dao->insert(TABLE_WEBHOOKDATAS)->data($webhookData)->exec(); + $this->dao->insert(TABLE_NOTIFY)->data($webhookData)->exec(); return !dao::isError(); } diff --git a/module/webhook/view/create.html.php b/module/webhook/view/create.html.php index 0ac100cbf2..8e201e6f7d 100644 --- a/module/webhook/view/create.html.php +++ b/module/webhook/view/create.html.php @@ -10,16 +10,10 @@ * @link http://www.zentao.net */ ?> - + webhook->note->typeList);?>
            -
            -
            - webhook->api;?> - webhook->create;?> -
            -
            @@ -60,27 +54,6 @@ - - - - diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php index cb45e9f8ed..4bf7adfdd7 100644 --- a/module/webhook/view/edit.html.php +++ b/module/webhook/view/edit.html.php @@ -10,15 +10,9 @@ * @link http://www.zentao.net */ ?> - +
            -
            -
            - webhook->api;?> - webhook->edit;?> -
            -
            webhook->paramsList, 'text');?>
            - - - - webhook->objectTypes as $objectType => $actions):?> - - - - - -
            - -
            -
            webhook->desc;?>
            @@ -63,28 +57,6 @@ - - - - diff --git a/module/webhook/view/header.html.php b/module/webhook/view/header.html.php index 3458d7405e..6d0254836c 100644 --- a/module/webhook/view/header.html.php +++ b/module/webhook/view/header.html.php @@ -13,8 +13,14 @@
              -
            • webhook->entry);?>
              • -
            • webhook->common);?>
              • + message->typeList as $type => $typeName):?> + message->typeLink[$type])):?> + message->typeLink[$type]);?> + +
            • >createLink($moduleName, $methodName), $typeName)?>
              • + + +
            • createLink('message', 'setting'), $lang->message->setting)?>
            diff --git a/module/webhook/view/log.html.php b/module/webhook/view/log.html.php index 5ef11c07b1..24498abe57 100644 --- a/module/webhook/view/log.html.php +++ b/module/webhook/view/log.html.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ ?> - +
            webhook->common);?> diff --git a/tools/check.php b/tools/check.php index d0b398aba4..843f16fd6b 100755 --- a/tools/check.php +++ b/tools/check.php @@ -193,11 +193,9 @@ foreach(glob($moduleRoot . '*') as $modulePath) $lines = file($langFile); foreach($mainLines as $lineNO => $line) { - if(strpos($line, '$lang') === false) - { - //if($line != $lines[$lineNO]) echo $moduleName . ' ' . $langKey . ' ' . $lineNO . "\n"; - } - else + if(!isset($lines[$lineNO]) OR empty(trim($lines[$lineNO]))) continue; + if(empty(trim($line))) continue; + if(strpos($line, '$lang') === 0) { if(strpos($line, '=') !== false) { diff --git a/www/index.php b/www/index.php index 7fd8a00c87..de622f3c62 100644 --- a/www/index.php +++ b/www/index.php @@ -40,7 +40,7 @@ if(isset($_GET['mode']) and $_GET['mode'] == 'getconfig') die(helper::removeUTF8 /* Check for need upgrade. */ $config->installedVersion = $common->loadModel('setting')->getVersion(); -if(!(!is_numeric($config->version{0}) and $config->version{0} != $config->installedVersion{0}) and version_compare($config->version, $config->installedVersion, '>')) die(header('location: upgrade.php')); +if(((is_numeric($config->version{0}) and is_numeric($config->installedVersion{0})) or $config->version{0} == $config->installedVersion{0}) and version_compare($config->version, $config->installedVersion, '>')) die(header('location: upgrade.php')); /* Remove install.php and upgrade.php. */ if(file_exists('install.php') or file_exists('upgrade.php')) diff --git a/www/js/my.full.js b/www/js/my.full.js index 5ab6d30827..ba37f3ae16 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -15,7 +15,16 @@ function createLink(moduleName, methodName, vars, viewType, isOnlyBody) if(vars) { vars = vars.split('&'); - for(i = 0; i < vars.length; i ++) vars[i] = vars[i].split('='); + for(i = 0; i < vars.length; i ++) + { + splited = vars[i].split('='); + + var newvars = new Array() + newvars[0] = splited.shift(); + newvars[1] = splited.join('='); + + vars[i] = newvars; + } } if(config.requestType != 'GET') { @@ -48,11 +57,11 @@ function createLink(moduleName, methodName, vars, viewType, isOnlyBody) */ function setSearchBox() { - $('#typeSelector a').click(function() + $('#searchTypeMenu a').click(function() { - $('#typeSelector li.active').removeClass('active'); + $('#searchTypeMenu li.selected').removeClass('selected'); var $this = $(this); - $this.closest('li').addClass('active'); + $this.closest('li').addClass('selected'); $("#searchType").val($this.data('value')); $("#searchTypeName").text($this.text()); }); @@ -67,7 +76,7 @@ function setSearchBox() function shortcut() { objectType = $('#searchType').attr('value'); - objectValue = $('#searchQuery').attr('value'); + objectValue = $("input#searchInput").attr('value'); if(objectType && objectValue) { method = objectType == 'testsuite' ? 'library' : 'view'; @@ -1986,6 +1995,34 @@ function selectFocusJump(type) } } +function adjustNoticePosition() +{ + var bottom = 25; + $('#noticeBox').find('.alert').each(function() + { + $(this).css('bottom', bottom + 'px'); + bottom += $(this).outerHeight(true) - 10; + }); +} + +function notifyMessage(data) +{ + if(window.Notification) + { + if(Notification.permission == "granted") + { + new Notification("", {body:data}); + } + else if(Notification.permission != "denied") + { + Notification.requestPermission(function(permission) + { + new Notification("", {body:data}); + }); + } + } +} + /* Ping the server every some minutes to keep the session. */ needPing = true; @@ -2013,7 +2050,7 @@ $(document).ready(function() fixStyle(); // Init tree menu - $('.tree').tree({name: config.currentModule + '-' + config.currentMethod, initialState: 'preserve'}); + $('.tree').tree({initialState: 'preserve'}); $(window).resize(saveWindowSize); // When window resized, call it again. diff --git a/www/js/zui/min.js b/www/js/zui/min.js index 2a4850a429..0abeeb43f1 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,23 +1,59 @@ /*! - * ZUI: zui for zentao - v1.7.0 - 2017-08-22 + * ZUI: Zentao template - v1.8.1 - 2018-03-30 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git - * Copyright (c) 2017 cnezsoft.com; Licensed MIT + * Copyright (c) 2018 cnezsoft.com; Licensed MIT */ -/*! Some code copy from Bootstrap v3.0.0 by @fat and @mdo. (Copyright 2013 Twitter, Inc. Licensed under http://www.apache.org/licenses/)*/ -!function(t,e,a){"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 i={all:-1,left:0,middle:1,right:2},o=0;t.zui({uuid:function(){return 1e3*(new Date).getTime()+o++%1e3},callEvent:function(e,i,o){if(t.isFunction(e)){o!==a&&(e=t.proxy(e,o));var n=e(i);return i&&(i.result=n),!(n!==a&&!n)}return 1},clientLang:function(){var a,i=e.config;if("undefined"!=typeof i&&i.clientLang&&(a=i.clientLang),!a){var o=t("html").attr("lang");a=o?o:navigator.userLanguage||navigator.userLanguage||"zh_cn"}return a.replace("-","_").toLowerCase()},strCode:function(t){var e=0;if(t&&t.length)for(var a=0;a0&&(o=n.data(e.substring(s+1))),o&&o.options){var d=o.options[r];t.isFunction(d)&&(l.result=t.zui.callEvent(d,l,o))}return n.trigger(l),l}}(jQuery,window,void 0),function(){"use strict";String.prototype.format||(String.prototype.format=function(t){var e=this;if(arguments.length>0){var a;if(arguments.length<=2&&"object"==typeof t)for(var i in t)void 0!==t[i]&&(a=new RegExp("("+(arguments[1]?arguments[1].replace("0",i):"{"+i+"}")+")","g"),e=e.replace(a,t[i]));else for(var o=0;o0&&(n=a.data(e.substring(o+1))),n&&n.options){var h=n.options[r];t.isFunction(h)&&(l.result=t.zui.callEvent(h,l,n))}return a.trigger(l),l},t.fn.callComEvent=function(e,s,n){n===i||t.isArray(n)||(n=[n]);var a=this,o=a.triggerHandler(s,n),r=e.options[s];return r&&(o=r.apply(e,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",s=function(i){t(i).on("click",e,this.close)};s.prototype.close=function(e){function s(){o.trigger("closed."+i).remove()}var n=t(this),a=n.attr("data-target");a||(a=n.attr("href"),a=a&&a.replace(/.*(?=#[^\s]*$)/,""));var o=t(a);e&&e.preventDefault(),o.length||(o=n.hasClass("alert")?n:n.parent()),o.trigger(e=t.Event("close."+i)),e.isDefaultPrevented()||(o.removeClass("in"),t.support.transition&&o.hasClass("fade")?o.one(t.support.transition.end,s).emulateTransitionEnd(150):s())};var n=t.fn.alert;t.fn.alert=function(e){return this.each(function(){var n=t(this),a=n.data(i);a||n.data(i,a=new s(this)),"string"==typeof e&&a[e].call(n)})},t.fn.alert.Constructor=s,t.fn.alert.noConflict=function(){return t.fn.alert=n,this},t(document).on("click."+i+".data-api",e,s.prototype.close)}(window.jQuery),function(t,e){"use strict";var i="zui.pager",s={page:1,recTotal:0,recPerPage:10},n={zh_cn:{prev:"上一页",next:"下一页",first:"第一页",last:"最后一页","goto":"跳转",pageOf:"第 {page} 页",totalPage:"共 {totalPage} 页",totalCount:"共 {recTotal} 项",pageSize:"每页 {recPerPage} 项",itemsRange:"第 {start} ~ {end} 项",pageOfTotal:"第 {page}/{totalPage} 页"},zh_tw:{prev:"上一頁",next:"下一頁",first:"第一頁",last:"最後一頁","goto":"跳轉",pageOf:"第 {page} 頁",totalPage:"共 {totalPage} 頁",totalCount:"共 {recTotal} 項",pageSize:"每頁 {recPerPage} 項",itemsRange:"第 {start} ~ {end} 項",pageOfTotal:"第 {page}/{totalPage} 頁"},en:{prev:"Prev",next:"Next",first:"First",last:"Last","goto":"Goto",pageOf:"Page {page}",totalPage:"{totalPage} pages",totalCount:"{recTotal} items",pageSize:"{recPerPage} items per page",itemsRange:"From {start} to {end}",pageOfTotal:"Page {page} of {totalPage}"}},a=function(e,s){var o=this;o.name=i,o.$=t(e),s=o.options=t.extend({},a.DEFAULTS,this.$.data(),s);var r=s.lang||"zh_cn";o.lang=t.isPlainObject(r)?t.extend(!0,{},n[r.lang||t.zui.clientLang()],r):n[r],o.state={},o.set(s.page,s.recTotal,s.recPerPage,!0),o.$.on("click",".pager-goto-btn",function(){var e=t(this).closest(".pager-goto"),i=parseInt(e.find(".pager-goto-input").val());NaN!==i&&o.set(i)}).on("click",".pager-item",function(){var e=t(this).data("page");"number"==typeof e&&e>0&&o.set(e)}).on("click",".pager-size-menu [data-size]",function(){var e=t(this).data("size");"number"==typeof e&&e>0&&o.set(-1,-1,e)})};a.prototype.set=function(e,i,n,a){var o=this;"object"==typeof e&&null!==e&&(n=e.recPerPage,i=e.recTotal,e=e.page);var r=o.state;r||(r=t.extend({},s));var l=t.extend({},r);return"number"==typeof n&&n>0&&(r.recPerPage=n),"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.page1&&(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').attr("href",i?a.createLink(i,a.state):"###").html(s);return n||(o=t("
          • ").append(o).toggleClass("active",i===a.state.page).toggleClass("disabled",!i)),o},a.prototype.createNavItems=function(t){var i=this,s=i.$,n=i.state,a=n.totalPage,o=n.page,r=function(t,n){if(t===!1)return void s.append(i.createLinkItem(0,n||i.options.navEllipsisItem));n===e&&(n=t);for(var a=t;a<=n;++a)s.append(i.createLinkItem(a))};t===e&&(t=i.options.maxNavCount||10),r(1),a>1&&(a<=t?r(2,a):oa-t+2?(r(!1),r(a-t+2,a)):(r(!1),r(o-Math.ceil((t-4)/2),o+Math.floor((t-4)/2)),r(!1),r(a)))},a.prototype.createGoto=function(){var e=this,i=this.state,s=t('
            ");return s},a.prototype.createSizeMenu=function(){var e=this,i=this.state,s=t('
              '),n=e.options.pageSizeOptions;"string"==typeof n&&(n=n.split(","));for(var a=0;a'+o+"
              • ").toggleClass("active",o===i.recPerPage);s.append(r)}return t('
              ').addClass(e.options.menuDirection).append(s)},a.prototype.createElement=function(e,i,s){var n=this,a=t.proxy(n.createLinkItem,n),o=n.lang;switch(e){case"prev":return a(s.prev,o.prev);case"prev_icon":return a(s.prev,'');case"next":return a(s.next,o.next);case"next_icon":return a(s.next,'');case"first":return a(1,o.first,!0);case"first_icon":return a(1,'',!0);case"last":return a(s.totalPage,o.last,!0);case"last_icon":return a(s.totalPage,'',!0);case"space":case"|":return t('
            • ');case"nav":case"pages":return void n.createNavItems();case"total_text":return t(('
              '+o.totalCount+"
              ").format(s));case"page_text":return t(('
              '+o.pageOf+"
              ").format(s));case"total_page_text":return t(('
              '+o.totalPage+"
              ").format(s));case"page_of_total_text":return t(('
              '+o.pageOfTotal+"
              ").format(s));case"page_size_text":return t(('
              '+o.pageSize+"
              ").format(s));case"items_range_text":return t(('
              '+o.itemsRange+"
              ").format(s));case"goto":return n.createGoto();case"size_menu":return n.createSizeMenu();default:return t("
            • ").html(e)}},a.prototype.createLink=function(i,s){i===e&&(i=this.state.page),s===e&&(s=this.state);var n=this.options.linkCreator;return"string"==typeof n?n.format(t.extend({},s,{page:i})):t.isFunction(n)?n(i,s):"#page="+i},a.prototype.render=function(e){var i=this,s=i.state,n=i.options.elementCreator||i.createElement,a=t.isPlainObject(n);e=e||i.elements||i.options.elements,"string"==typeof e&&(e=e.split(",")),i.elements=e,i.$.empty();for(var o=0;o").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",[s]),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:'',maxNavCount:10,menuDirection:"dropdown",pageSizeOptions:[10,20,30,50,100]},s),t.fn.pager=function(e){return this.each(function(){var s=t(this),n=s.data(i),o="object"==typeof e&&e;n||s.data(i,n=new a(this,o)),"string"==typeof e&&n[e]()})},a.NAME=i,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,s=i.closest("ul:not(.dropdown-menu)"),n=i.attr("data-target")||i.attr("data-tab");if(n||(n=i.attr("href"),n=n&&n.replace(/.*(?=#[^\s]*$)/,"")),!i.parent("li").hasClass("active")){var a=s.find(".active:last a")[0],o=t.Event("show."+e,{relatedTarget:a});if(i.trigger(o),!o.isDefaultPrevented()){var r=t(n);this.activate(i.parent("li"),s),this.activate(r,r.parent(),function(){i.trigger({type:"shown."+e,relatedTarget:a})})}}},i.prototype.activate=function(e,i,s){function n(){a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),e.addClass("active"),o?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu")&&e.closest("li.dropdown").addClass("active"),s&&s()}var a=i.find("> .active"),o=s&&t.support.transition&&a.hasClass("fade");o?a.one(t.support.transition.end,n).emulateTransitionEnd(150):n(),a.removeClass("in")};var s=t.fn.tab;t.fn.tab=function(s){return this.each(function(){var n=t(this),a=n.data(e);a||n.data(e,a=new i(this)),"string"==typeof s&&a[s]()})},t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=s,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,s=this;t(this).one("bsTransitionEnd",function(){i=!0});var n=function(){i||t(s).trigger(t.support.transition.end)};return setTimeout(n,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,s){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,s),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 s=this.$parent&&this.$parent.find(".in");if(s&&s.length){var n=s.data(e);if(n&&n.transitioning)return;s.collapse("hide"),n||s.data(e,null)}var a=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[a](0),this.transitioning=1;var o=function(){this.$element.removeClass("collapsing").addClass("in")[a]("auto"),this.transitioning=0,this.$element.trigger("shown."+e)};if(!t.support.transition)return o.call(this);var r=t.camelCase(["scroll",a].join("-"));this.$element.one(t.support.transition.end,t.proxy(o,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 s=this.dimension();this.$element[s](this.$element[s]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var n=function(){this.transitioning=0,this.$element.trigger("hidden."+e).removeClass("collapsing").addClass("collapse")};return t.support.transition?void this.$element[s](0).one(t.support.transition.end,t.proxy(n,this)).emulateTransitionEnd(350):n.call(this)}}},i.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var s=t.fn.collapse;t.fn.collapse=function(s){return this.each(function(){var n=t(this),a=n.data(e),o=t.extend({},i.DEFAULTS,n.data(),"object"==typeof s&&s);a||n.data(e,a=new i(this,o)),"string"==typeof s&&a[s]()})},t.fn.collapse.Constructor=i,t.fn.collapse.noConflict=function(){return t.fn.collapse=s,this},t(document).on("click."+e+".data-api","[data-toggle=collapse]",function(i){var s,n=t(this),a=n.attr("data-target")||i.preventDefault()||(s=n.attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,""),o=t(a),r=o.data(e),l=r?"toggle":n.data(),h=n.attr("data-parent"),c=h&&t(h);r&&r.transitioning||(c&&c.find('[data-toggle=collapse][data-parent="'+h+'"]').not(n).addClass("collapsed"),n[o.hasClass("in")?"addClass":"removeClass"]("collapsed")),o.collapse(l)})}(window.jQuery),function(t,e){"use strict";var i=1200,s=992,n=768,a=e(t),o=function(){var t=a.width();e("html").toggleClass("screen-desktop",t>=s&&t=i).toggleClass("screen-tablet",t>=n&&t=s)},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(o),o()}(window,jQuery),function(t){"use strict";var e={zh_cn:'您的浏览器版本过低，无法体验所有功能，建议升级或者更换浏览器。 了解更多...',zh_tw:'您的瀏覽器版本過低，無法體驗所有功能，建議升級或者更换瀏覽器。了解更多...',en:'Your browser is too old, it has been unable to experience the colorful internet. We strongly recommend that you upgrade a better one. Learn more...'},i=function(){var t=this.isIE()||this.isIE10()||!1;if(t)for(var e=10;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)},i.prototype.tip=function(i){var s=t("#browseHappyTip");s.length||(s=t('
              '),s.prependTo("body")),s.find(".content").html(i||this.browseHappyTip||e[t.zui.clientLang()||"zh_cn"])},i.prototype.isIE=function(t){if(10===t)return this.isIE10();var e=document.createElement("b");return e.innerHTML="",1===e.getElementsByTagName("i").length},i.prototype.isIE10=function(){return!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(){"use strict";Date.ONEDAY_TICKS=864e5,Date.prototype.format||(Date.prototype.format=function(t){var e={"M+":this.getMonth()+1,"d+":this.getDate(),"h+":this.getHours(),"m+":this.getMinutes(),"s+":this.getSeconds(),"q+":Math.floor((this.getMonth()+3)/3),"S+":this.getMilliseconds()};/(y+)/i.test(t)&&(t=t.replace(RegExp.$1,(this.getFullYear()+"").substr(4-RegExp.$1.length)));for(var i in e)new RegExp("("+i+")").test(t)&&(t=t.replace(RegExp.$1,1==RegExp.$1.length?e[i]:("00"+e[i]).substr((""+e[i]).length)));return t}),Date.prototype.addMilliseconds||(Date.prototype.addMilliseconds=function(t){return this.setTime(this.getTime()+t),this}),Date.prototype.addDays||(Date.prototype.addDays=function(t){return this.addMilliseconds(t*Date.ONEDAY_TICKS),this}),Date.prototype.clone||(Date.prototype.clone=function(){var t=new Date;return t.setTime(this.getTime()),t}),Date.isLeapYear||(Date.isLeapYear=function(t){return t%4===0&&t%100!==0||t%400===0}),Date.getDaysInMonth||(Date.getDaysInMonth=function(t,e){return[31,Date.isLeapYear(t)?29:28,31,30,31,30,31,31,30,31,30,31][e]}),Date.prototype.isLeapYear||(Date.prototype.isLeapYear=function(){return Date.isLeapYear(this.getFullYear())}),Date.prototype.clearTime||(Date.prototype.clearTime=function(){return this.setHours(0),this.setMinutes(0),this.setSeconds(0),this.setMilliseconds(0),this}),Date.prototype.getDaysInMonth||(Date.prototype.getDaysInMonth=function(){return Date.getDaysInMonth(this.getFullYear(),this.getMonth())}),Date.prototype.addMonths||(Date.prototype.addMonths=function(t){var e=this.getDate();return this.setDate(1),this.setMonth(this.getMonth()+t),this.setDate(Math.min(e,this.getDaysInMonth())),this}),Date.prototype.getLastWeekday||(Date.prototype.getLastWeekday=function(t){t=t||1;for(var e=this.clone();e.getDay()!=t;)e.addDays(-1);return e.clearTime(),e}),Date.prototype.isSameDay||(Date.prototype.isSameDay=function(t){return t.toDateString()===this.toDateString()}),Date.prototype.isSameWeek||(Date.prototype.isSameWeek=function(t){var e=this.getLastWeekday(),i=e.clone().addDays(7);return t>=e&&t0){var i;if(arguments.length<=2&&"object"==typeof t)for(var s in t)void 0!==t[s]&&(i=new RegExp("("+(arguments[1]?arguments[1].replace("0",s):"{"+s+"}")+")","g"),e=e.replace(i,t[s]));else for(var n=0;ni.length)&&(e=i.length),e-=t.length;var s=i.indexOf(t,e);return s!==-1&&s===e}),String.prototype.startsWith||(String.prototype.startsWith=function(t,e){return e=e||0,this.lastIndexOf(t,e)===e}),String.prototype.includes||(String.prototype.includes=function(){return String.prototype.indexOf.apply(this,arguments)!==-1})}(),/*! * jQuery resize event - v1.1 * http://benalman.com/projects/jquery-resize-plugin/ * Copyright (c) 2010 "Cowboy" Ben Alman * MIT & GPL http://benalman.com/about/license/ */ -function(t,e,a){"$:nomunge";function i(){o=e[r](function(){n.each(function(){var e=t(this),a=e.width(),i=e.height(),o=t.data(this,d);a===o.w&&i===o.h||e.trigger(l,[o.w=a,o.h=i])}),i()},s[c])}var o,n=t([]),s=t.resize=t.extend(t.resize,{}),r="setTimeout",l="resize",d=l+"-special-event",c="delay",p="throttleWindow";s[c]=250,s[p]=!0,t.event.special[l]={setup:function(){if(!s[p]&&this[r])return!1;var e=t(this);n=n.add(e),t.data(this,d,{w:e.width(),h:e.height()}),1===n.length&&i()},teardown:function(){if(!s[p]&&this[r])return!1;var e=t(this);n=n.not(e),e.removeData(d),n.length||clearTimeout(o)},add:function(e){function i(e,i,n){var s=t(this),r=t.data(this,d)||{};r.w=i!==a?i:s.width(),r.h=n!==a?n:s.height(),o.apply(this,arguments)}if(!s[p]&&this[r])return!1;var o;return t.isFunction(e)?(o=e,i):(o=e.handler,void(e.handler=i))}}}(jQuery,this),function(){"use strict";Date.ONEDAY_TICKS=864e5,Date.prototype.format||(Date.prototype.format=function(t){var e={"M+":this.getMonth()+1,"d+":this.getDate(),"h+":this.getHours(),"m+":this.getMinutes(),"s+":this.getSeconds(),"q+":Math.floor((this.getMonth()+3)/3),"S+":this.getMilliseconds()};/(y+)/i.test(t)&&(t=t.replace(RegExp.$1,(this.getFullYear()+"").substr(4-RegExp.$1.length)));for(var a in e)new RegExp("("+a+")").test(t)&&(t=t.replace(RegExp.$1,1==RegExp.$1.length?e[a]:("00"+e[a]).substr((""+e[a]).length)));return t}),Date.prototype.addMilliseconds||(Date.prototype.addMilliseconds=function(t){return this.setTime(this.getTime()+t),this}),Date.prototype.addDays||(Date.prototype.addDays=function(t){return this.addMilliseconds(t*Date.ONEDAY_TICKS),this}),Date.prototype.clone||(Date.prototype.clone=function(){var t=new Date;return t.setTime(this.getTime()),t}),Date.isLeapYear||(Date.isLeapYear=function(t){return t%4===0&&t%100!==0||t%400===0}),Date.getDaysInMonth||(Date.getDaysInMonth=function(t,e){return[31,Date.isLeapYear(t)?29:28,31,30,31,30,31,31,30,31,30,31][e]}),Date.prototype.isLeapYear||(Date.prototype.isLeapYear=function(){return Date.isLeapYear(this.getFullYear())}),Date.prototype.clearTime||(Date.prototype.clearTime=function(){return this.setHours(0),this.setMinutes(0),this.setSeconds(0),this.setMilliseconds(0),this}),Date.prototype.getDaysInMonth||(Date.prototype.getDaysInMonth=function(){return Date.getDaysInMonth(this.getFullYear(),this.getMonth())}),Date.prototype.addMonths||(Date.prototype.addMonths=function(t){var e=this.getDate();return this.setDate(1),this.setMonth(this.getMonth()+t),this.setDate(Math.min(e,this.getDaysInMonth())),this}),Date.prototype.getLastWeekday||(Date.prototype.getLastWeekday=function(t){t=t||1;for(var e=this.clone();e.getDay()!=t;)e.addDays(-1);return e.clearTime(),e}),Date.prototype.isSameDay||(Date.prototype.isSameDay=function(t){return t.toDateString()===this.toDateString()}),Date.prototype.isSameWeek||(Date.prototype.isSameWeek=function(t){var e=this.getLastWeekday(),a=e.clone().addDays(7);return t>=e&&t=0;t--)delete this.page[a[t]];this.set(n,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 a=this.page[t];return void 0===e||null!==a&&void 0!==a?a:e},s.prototype.pageSet=function(t,a){e.isPlainObject(t)?e.extend(!0,this.page,t):this.page[this.serialize(t)]=a,this.pageSave()},s.prototype.check=function(){if(!this.enable&&!this.slience)throw new Error("Browser not support localStorage or enable status been set true.");return this.enable},s.prototype.length=function(){return this.check()?a.getLength?a.getLength():a.length:0},s.prototype.removeItem=function(t){return a.removeItem(t),this},s.prototype.remove=function(t){return this.removeItem(t)},s.prototype.getItem=function(t){return a.getItem(t)},s.prototype.get=function(t,e){var a=this.deserialize(this.getItem(t));return"undefined"!=typeof a&&null!==a||"undefined"==typeof e?a:e},s.prototype.key=function(t){return a.key(t)},s.prototype.setItem=function(t,e){return a.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 a.clear(),this},s.prototype.forEach=function(t){for(var e=this.length(),i=e-1;i>=0;i--){var o=a.key(i);t(o,this.get(o))}return this},s.prototype.getAll=function(){var t={};return this.forEach(function(e,a){t[e]=a}),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,e,a,i){"use strict";function o(t){if(t=t.toLowerCase(),t&&c.test(t)){var e;if(4===t.length){var a="#";for(e=1;e<4;e+=1)a+=t.slice(e,e+1).concat(t.slice(e,e+1));t=a}var i=[];for(e=1;e<7;e+=2)i.push(y("0x"+t.slice(e,e+2)));return{r:i[0],g:i[1],b:i[2],a:1}}throw new Error("Wrong hex string! (hex: "+t+")")}function n(e){return typeof e===u&&("transparent"===e.toLowerCase()||v[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 a=t.h,i=t.s,o=t.l,n=t.a;a=d(a)%h/h,i=l(d(i)),o=l(d(o)),n=l(d(n));var s=o<=.5?o*(i+1):o+i-o*i,r=2*o-s,c={r:e(a+1/3)*p,g:e(a)*p,b:e(a-1/3)*p,a:n};return c}function r(t,a,i){return m(i)&&(i=0),m(a)&&(a=p),e.min(e.max(t,i),a)}function l(t,e){return r(t,e)}function d(t){return"number"==typeof t?t:parseFloat(t)}var c=/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/,p=255,h=360,f=100,u="string",g="object",v={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"},m=function(t){return t===i},b=function(t){return!m(t)},y=function(t){return parseInt(t)},w=function(t){return y(l(d(t),p))},C=function(t,e,a,i){var n=this;if(n.r=n.g=n.b=0,n.a=1,b(i)&&(n.a=l(d(i),1)),b(t)&&b(e)&&b(a))n.r=w(t),n.g=w(e),n.b=w(a);else if(b(t)){var r=typeof t;if(r==u)t=t.toLowerCase(),"transparent"===t?n.a=0:v[t]?this.rgb(o(v[t])):n.rgb(o(t));else if("number"==r&&m(e))n.r=n.g=n.b=w(t);else if(r==g&&b(t.r))n.r=w(t.r),b(t.g)&&(n.g=w(t.g)),b(t.b)&&(n.b=w(t.b)),b(t.a)&&(n.a=l(d(t.a),1));else if(r==g&&b(t.h)){var c={h:l(d(t.h),h),s:1,l:1,a:1};b(t.s)&&(c.s=l(d(t.s),1)),b(t.l)&&(c.l=l(d(t.l),1)),b(t.a)&&(c.a=l(d(t.a),1)),n.rgb(s(c))}}};C.prototype.rgb=function(t){var e=this;if(b(t)){if(typeof t==g)b(t.r)&&(e.r=w(t.r)),b(t.g)&&(e.g=w(t.g)),b(t.b)&&(e.b=w(t.b)),b(t.a)&&(e.a=l(d(t.a),1));else{var a=y(d(t));e.r=a,e.g=a,e.b=a}return e}return{r:e.r,g:e.g,b:e.b,a:e.a}},C.prototype.hue=function(t){var e=this,a=e.toHsl();return m(t)?a.h:(a.h=l(d(t),h),e.rgb(s(a)),e)},C.prototype.darken=function(t){var e=this,a=e.toHsl();return a.l-=t/f,a.l=l(a.l,1),e.rgb(s(a)),e},C.prototype.clone=function(){var t=this;return new C(t.r,t.g,t.b,t.a)},C.prototype.lighten=function(t){return this.darken(-t)},C.prototype.fade=function(t){return this.a=l(t/f,1),this},C.prototype.spin=function(t){var e=this.toHsl(),a=(e.h+t)%h;return e.h=a<0?h+a:a,this.rgb(s(e))},C.prototype.toHsl=function(){var t,a,i=this,o=i.r/p,n=i.g/p,s=i.b/p,r=i.a,l=e.max(o,n,s),d=e.min(o,n,s),c=(l+d)/2,f=l-d;if(l===d)t=a=0;else{switch(a=c>.5?f/(2-l-d):f/(l+d),l){case o:t=(n-s)/f+(ne.luma()){var i=e;e=t,t=i}return this.a<.5?t:(a=m(a)?.43:d(a),this.luma()0?t.a<1?"rgba("+t.r+","+t.g+","+t.b+","+t.a+")":t.hexStr():"transparent"},C.isColor=n,C.names=v,C.get=function(t){return new C(t)},t.zui({Color:C})}(jQuery,Math,window,void 0),/*! - * ZUI: Generated from less code - v1.7.0 - 2017-08-22 - * http://zui.sexy - * GitHub: https://github.com/easysoft/zui.git - * Copyright (c) 2017 cnezsoft.com; Licensed MIT +function(t,e,i){"$:nomunge";function s(){n=e[r](function(){a.each(function(){var e=t(this),i=e.width(),s=e.height(),n=t.data(this,h);i===n.w&&s===n.h||e.trigger(l,[n.w=i,n.h=s])}),s()},o[c])}var n,a=t([]),o=t.resize=t.extend(t.resize,{}),r="setTimeout",l="resize",h=l+"-special-event",c="delay",d="throttleWindow";o[c]=250,o[d]=!0,t.event.special[l]={setup:function(){if(!o[d]&&this[r])return!1;var e=t(this);a=a.add(e),t.data(this,h,{w:e.width(),h:e.height()}),1===a.length&&s()},teardown:function(){if(!o[d]&&this[r])return!1;var e=t(this);a=a.not(e),e.removeData(h),a.length||clearTimeout(n)},add:function(e){function s(e,s,a){var o=t(this),r=t.data(this,h)||{};r.w=s!==i?s:o.width(),r.h=a!==i?a:o.height(),n.apply(this,arguments)}if(!o[d]&&this[r])return!1;var n;return t.isFunction(e)?(n=e,s):(n=e.handler,void(e.handler=s))}}}(jQuery,this),function(t,e){"use strict";var i,s,n="localStorage",a="page_"+t.location.pathname+t.location.search,o=function(){this.slience=!0;try{n in t&&t[n]&&t[n].setItem&&(this.enable=!0,i=t[n])}catch(o){}this.enable||(s={},i={getLength:function(){var t=0;return e.each(s,function(){t++}),t},key:function(t){var i,n=0;return e.each(s,function(e){return n===t?(i=e,!1):void n++}),i},removeItem:function(t){delete s[t]},getItem:function(t){return s[t]},setItem:function(t,e){s[t]=e},clear:function(){s={}}}),this.storage=i,this.page=this.get(a,{})};o.prototype.pageSave=function(){if(e.isEmptyObject(this.page))this.remove(a);else{var t,i=[];for(t in this.page){var s=this.page[t];null===s&&i.push(t)}for(t=i.length-1;t>=0;t--)delete this.page[i[t]];this.set(a,this.page)}},o.prototype.pageRemove=function(t){"undefined"!=typeof this.page[t]&&(this.page[t]=null,this.pageSave())},o.prototype.pageClear=function(){this.page={},this.pageSave()},o.prototype.pageGet=function(t,e){var i=this.page[t];return void 0===e||null!==i&&void 0!==i?i:e},o.prototype.pageSet=function(t,i){e.isPlainObject(t)?e.extend(!0,this.page,t):this.page[this.serialize(t)]=i,this.pageSave()},o.prototype.check=function(){if(!this.enable&&!this.slience)throw new Error("Browser not support localStorage or enable status been set true.");return this.enable},o.prototype.length=function(){return this.check()?i.getLength?i.getLength():i.length:0},o.prototype.removeItem=function(t){return i.removeItem(t),this},o.prototype.remove=function(t){return this.removeItem(t)},o.prototype.getItem=function(t){return i.getItem(t)},o.prototype.get=function(t,e){var i=this.deserialize(this.getItem(t));return"undefined"!=typeof i&&null!==i||"undefined"==typeof e?i:e},o.prototype.key=function(t){return i.key(t)},o.prototype.setItem=function(t,e){return i.setItem(t,e),this},o.prototype.set=function(t,e){return void 0===e?this.remove(t):(this.setItem(t,this.serialize(e)),this)},o.prototype.clear=function(){return i.clear(),this},o.prototype.forEach=function(t){for(var e=this.length(),s=e-1;s>=0;s--){var n=i.key(s);t(n,this.get(n))}return this},o.prototype.getAll=function(){var t={};return this.forEach(function(e,i){t[e]=i}),t},o.prototype.serialize=function(t){return"string"==typeof t?t:JSON.stringify(t)},o.prototype.deserialize=function(t){if("string"==typeof t)try{return JSON.parse(t)}catch(e){return t||void 0}},e.zui({store:new o})}(window,jQuery),function(t){"use strict";var e="zui.searchBox",i=function(e,s){var n=this;n.name=name,n.$=t(e),n.options=s=t.extend({},i.DEFAULTS,n.$.data(),s);var a=n.$.is(s.inputSelector)?n.$:n.$.find(s.inputSelector);if(a.length){var o=function(){n.changeTimer&&(clearTimeout(n.changeTimer),n.changeTimer=null)},r=function(){o();var t=n.getSearch();if(t!==n.lastValue){var e=""===t;a.toggleClass("empty",e),n.$.callComEvent(n,"onSearchChange",[t,e]),n.lastValue=t}};n.$input=a=a.first(),n.lastValue=n.getSearch(),a.on(s.listenEvent,function(t){n.changeTimer=setTimeout(function(){r()},s.changeDelay)}).on("focus",function(t){a.addClass("focus"),n.$.callComEvent(n,"onFocus",[t])}).on("blur",function(t){a.removeClass("focus"),n.$.callComEvent(n,"onBlur",[t])}).on("keydown",function(t){var e=0,i=t.which;27===i&&s.escToClear?(this.setSearch("",!0),r(),e=1):13===i&&s.onPressEnter&&(r(),n.$.callComEvent(n,"onPressEnter",[t]));var a=n.$.callComEvent(n,"onKeyDown",[t]);a===!1&&(e=1),e&&t.preventDefault()}),n.$.on("click",".search-clear-btn",function(t){n.setSearch("",!0),r(),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(s){return this.each(function(){var n=t(this),a=n.data(e),o="object"==typeof s&&s;a||n.data(e,a=new i(this,o)),"string"==typeof s&&a[s]()})},i.NAME=e,t.fn.searchBox.Constructor=i}(jQuery),function(t,e){"use strict";var i="zui.draggable",s={container:"body",move:!0},n=0,a=function(e,i){var a=this;a.$=t(e),a.id=n++,a.options=t.extend({},s,a.$.data(),i),a.init()};a.DEFAULTS=s,a.NAME=i,a.prototype.init=function(){var s,n,a,o,r,l=this,h=l.$,c="before",d="drag",u="finish",p="."+i+"."+l.id,f="mousedown"+p,g="mouseup"+p,m="mousemove"+p,v=l.options,y=v.selector,w=v.handle,b=h,_=t.isFunction(v.move),x=function(t){var e=t.pageX,i=t.pageY;r=!0;var n={left:e-a.x,top:i-a.y};b.removeClass("drag-ready").addClass("dragging"),v.move&&(_?v.move(n,b):b.css(n)),v[d]&&v[d]({event:t,element:b,startOffset:a,pos:n,offset:{x:e-s.x,y:i-s.y},smallOffset:{x:e-o.x,y:i-o.y}}),o.x=e,o.y=i,v.stopPropagation&&t.stopPropagation()},C=function(i){if(t(e).off(p),!r)return void b.removeClass("drag-ready");var n={left:i.pageX-a.x,top:i.pageY-a.y};b.removeClass("drag-ready dragging"),v.move&&(_?v.move(n,b):b.css(n)),v[u]&&v[u]({event:i,element:b,startOffset:a,pos:n,offset:{x:i.pageX-s.x,y:i.pageY-s.y},smallOffset:{x:i.pageX-o.x,y:i.pageY-o.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&&(b=w?h.closest(y):h),v[c]){var d=v[c]({event:i,element:b});if(d===!1)return}var u=t(v.container),p=b.offset();n=u.offset(),s={x:i.pageX,y:i.pageY},a={x:i.pageX-p.left+n.left,y:i.pageY-p.top+n.top},o=t.extend({},s),r=!1,b.addClass("drag-ready"),i.preventDefault(),v.stopPropagation&&i.stopPropagation(),t(e).on(m,x).on(g,C)}};w?h.on(f,w,k):y?h.on(f,y,k):h.on(f,k)},a.prototype.destroy=function(){var s="."+i+"."+this.id;this.$.off(s),t(e).off(s),this.$.data(i,null)},t.fn.draggable=function(e){return this.each(function(){var s=t(this),n=s.data(i),o="object"==typeof e&&e;n||s.data(i,n=new a(this,o)),"string"==typeof e&&n[e]()})},t.fn.draggable.Constructor=a}(jQuery,document),function(t,e,i){"use strict";var s="zui.droppable",n={target:".droppable-target",deviation:5,sensorOffsetX:0,sensorOffsetY:0},a=0,o=function(e,i){var s=this;s.id=a++,s.$=t(e),s.options=t.extend({},n,s.$.data(),i),s.init()};o.DEFAULTS=n,o.NAME=s,o.prototype.trigger=function(e,i){return t.zui.callEvent(this.options[e],i,this)},o.prototype.init=function(){var n,a,o,r,l,h,c,d,u,p,f,g,m,v=this,y=v.$,w=v.options,b=w.deviation,_="."+s+"."+v.id,x="mousedown"+_,C="mouseup"+_,k="mousemove"+_,T=w.selector,S=w.handle,D=w.flex,M=w.container,P=w.canMoveHere,F=y,L=!1,z=M?t(w.container).first():T?y:t("body"),I=function(e){if(L&&(f={left:e.pageX,top:e.pageY},!(i.abs(f.left-d.left)a&&f.top>o&&f.left-1&&i.button!==s)){var f=t(this);T&&(F=S?f.closest(T):f),F.hasClass("drag-shadow")||w.before&&w.before({event:i,element:F})===!1||(L=!0,n=t.isFunction(w.target)?w.target(y):z.find(w.target),a=null,o=null,r=!1,l=!0,h=null,c=F.offset(),u=z.offset(),d={left:i.pageX,top:i.pageY},g=t.extend({},d),p={left:d.left-c.left,top:d.top-c.top},F.addClass("drag-from"),t(e).on(k,I).on(C,A),m=setTimeout(function(){t(e).on(x,A)},10),i.preventDefault())}};S?y.on(x,S,E):T?y.on(x,T,E):y.on(x,E)},o.prototype.destroy=function(){var i="."+s+"."+this.id;this.$.off(i),t(e).off(i),this.$.data(s,null)},o.prototype.reset=function(){this.destroy(),this.init()},t.fn.droppable=function(e){return this.each(function(){var i=t(this),n=i.data(s),a="object"==typeof e&&e;n||i.data(s,n=new o(this,a)),"string"==typeof e&&n[e]()})},t.fn.droppable.Constructor=o}(jQuery,document,Math),+function(t,e){"use strict";function i(e,i,a){return this.each(function(){var o=t(this),r=o.data(s),l=t.extend({},n.DEFAULTS,o.data(),"object"==typeof e&&e);r||o.data(s,r=new n(this,l)),"string"==typeof e?r[e](i,a):l.show&&r.show(i,a)})}var s="zui.modal",n=function(i,n){var a=this;a.options=n,a.$body=t(document.body),a.$element=t(i),a.$backdrop=a.isShown=null,a.scrollbarWidth=0,n.moveable===e&&(a.options.moveable=a.$element.hasClass("modal-moveable")),n.remote&&a.$element.find(".modal-content").load(n.remote,function(){a.$element.trigger("loaded."+s)})};n.VERSION="3.2.0",n.TRANSITION_DURATION=300,n.BACKDROP_TRANSITION_DURATION=150,n.DEFAULTS={backdrop:!0,keyboard:!0,show:!0,position:"fit"};var a=function(e,i){var s=t(window);i.left=Math.max(0,Math.min(i.left,s.width()-e.outerWidth())),i.top=Math.max(0,Math.min(i.top,s.height()-e.outerHeight())),e.css(i)};n.prototype.toggle=function(t,e){return this.isShown?this.hide():this.show(t,e)},n.prototype.ajustPosition=function(i){var n=this,o=n.options;if(i===e&&(i=o.position),i!==e){t.isFunction(i)&&(i=i(n));var r=n.$element.find(".modal-dialog"),l=Math.max(0,(t(window).height()-r.outerHeight())/2);if("fit"===i?i={marginTop:2*l/3}:"center"===i?i={marginTop:l}:t.isPlainObject(i)||(i={marginTop:i}),r.hasClass("modal-moveable")){var h=null,c=o.rememberPos;c&&(c===!0?h=n.$element.data("modal-pos"):t.zui.store&&(h=t.zui.store.pageGet(s+".rememberPos."+c))),i=t.extend(i,{left:Math.max(0,(t(window).width()-r.outerWidth())/2)},h),"inside"===o.moveable?a(r,i):r.css(i)}else r.css(i)}},n.prototype.setMoveale=function(){t.fn.draggable||console.error("Moveable modal requires draggable.js.");var e=this,i=e.options,n=e.$element.find(".modal-dialog").removeClass("modal-dragged");n.toggleClass("modal-moveable",!!i.moveable),e.$element.data("modal-moveable-setup")||n.draggable({container:e.$element,handle:".modal-header",before:function(){n.css("margin-top","").addClass("modal-dragged")},finish:function(n){var a=i.rememberPos;a&&(e.$element.data("modal-pos",n.pos),t.zui.store&&a!==!0&&t.zui.store.pageSet(s+".rememberPos."+a,n.pos))},move:"inside"!==i.moveable||function(t){a(n,t)}})},n.prototype.show=function(e,i){var a=this,o=t.Event("show."+s,{relatedTarget:e});a.$element.trigger(o),a.isShown||o.isDefaultPrevented()||(a.isShown=!0,a.options.moveable&&a.setMoveale(),a.checkScrollbar(),a.options.backdrop!==!1&&(a.$body.addClass("modal-open"),a.setScrollbar()),a.escape(),a.$element.on("click.dismiss."+s,'[data-dismiss="modal"]',t.proxy(a.hide,a)),a.backdrop(function(){var o=t.support.transition&&a.$element.hasClass("fade");a.$element.parent().length||a.$element.appendTo(a.$body),a.$element.show().scrollTop(0),o&&a.$element[0].offsetWidth,a.$element.addClass("in").attr("aria-hidden",!1),a.ajustPosition(i),a.enforceFocus();var r=t.Event("shown."+s,{relatedTarget:e});o?a.$element.find(".modal-dialog").one("bsTransitionEnd",function(){a.$element.trigger("focus").trigger(r)}).emulateTransitionEnd(n.TRANSITION_DURATION):a.$element.trigger("focus").trigger(r)}))},n.prototype.hide=function(e){e&&e.preventDefault();var i=this;e=t.Event("hide."+s),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."+s),i.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss."+s),t.support.transition&&i.$element.hasClass("fade")?i.$element.one("bsTransitionEnd",t.proxy(i.hideModal,i)).emulateTransitionEnd(n.TRANSITION_DURATION):i.hideModal())},n.prototype.enforceFocus=function(){t(document).off("focusin."+s).on("focusin."+s,t.proxy(function(t){this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},n.prototype.escape=function(){this.isShown&&this.options.keyboard?t(document).on("keydown.dismiss."+s,t.proxy(function(i){if(27==i.which){var n=t.Event("escaping."+s),a=this.$element.triggerHandler(n,"esc");if(a!=e&&!a)return;this.hide()}},this)):this.isShown||t(document).off("keydown.dismiss."+s)},n.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$element.trigger("hidden."+s)})},n.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},n.prototype.backdrop=function(e){var i=this,a=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var o=t.support.transition&&a;if(this.$backdrop=t('
              ').appendTo(this.$body),this.$element.on("mousedown.dismiss."+s,t.proxy(function(t){t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),o&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return;o?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(n.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(n.BACKDROP_TRANSITION_DURATION):r()}else e&&e()},n.prototype.checkScrollbar=function(){document.body.clientWidth>=window.innerWidth||(this.scrollbarWidth=this.scrollbarWidth||this.measureScrollbar())},n.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.scrollbarWidth&&this.$body.css("padding-right",t+this.scrollbarWidth)},n.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},n.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 o=t.fn.modal;t.fn.modal=i,t.fn.modal.Constructor=n,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click."+s+".data-api",'[data-toggle="modal"]',function(e){var n=t(this),a=n.attr("href"),o=null;try{o=t(n.attr("data-target")||a&&a.replace(/.*(?=#[^\s]+$)/,""))}catch(r){return}if(o.length){var l=o.data(s)?"toggle":t.extend({remote:!/#/.test(a)&&a},o.data(),n.data());n.is("a")&&e.preventDefault(),o.one("show."+s,function(t){t.isDefaultPrevented()||o.one("hidden."+s,function(){n.is(":visible")&&n.trigger("focus")})}),i.call(o,l,this,n.data("position"))}})}(jQuery,void 0),function(t,e,i){"use strict";if(!t.fn.modal)throw new Error("Modal trigger requires modal.js");var s="zui.modaltrigger",n="ajax",a=".zui.modal",o="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()};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"},r.prototype.init=function(i){var r=this;if(i.url&&(!i.type||i.type!=n&&"iframe"!=i.type)&&(i.type=n),i.remote)i.type=n,typeof i.remote===o&&(i.url=i.remote);else if(i.iframe)i.type="iframe",typeof i.iframe===o&&(i.url=i.iframe);else if(i.custom&&(i.type="custom",typeof i.custom===o)){var l;try{l=t(i.custom)}catch(h){}l&&l.length?i.custom=l:t.isFunction(e[i.custom])&&(i.custom=e[i.custom])}var c=t("#"+i.name);c.length&&(r.isShown||c.off(a),c.remove()),c=t('').appendTo("body").data(s,r);var d=function(e,s){var n=i[e];t.isFunction(n)&&c.on(s+a,n)};d("onShow","show"),d("shown","shown"),d("onHide","hide"),d("hidden","hidden"),d("loaded","loaded"),c.on("shown"+a,function(){r.isShown=!0}).on("hidden"+a,function(){r.isShown=!1}),this.$modal=c,this.$dialog=c.find(".modal-dialog"),i.mergeOptions&&(this.options=i)},r.prototype.show=function(i){var a=t.extend({},this.options,{url:this.$trigger?this.$trigger.attr("href")||this.$trigger.attr("data-url")||this.$trigger.data("url"):this.options.url},i);this.init(a);var r=this,l=this.$modal,h=this.$dialog,c=a.custom,d=h.find(".modal-body").css("padding",""),u=h.find(".modal-header"),p=h.find(".modal-content");l.toggleClass("fade",a.fade).addClass(a.className).toggleClass("modal-loading",!this.isShown),h.toggleClass("modal-md","md"===a.size).toggleClass("modal-sm","sm"===a.size).toggleClass("modal-lg","lg"===a.size).toggleClass("modal-fullscreen","fullscreen"===a.size),u.toggle(a.showHeader),u.find(".modal-icon").attr("class","modal-icon icon-"+a.icon),u.find(".modal-title-name").text(a.title||""),a.size&&"fullscreen"===a.size&&(a.width="",a.height="");var f=function(){clearTimeout(this.resizeTask),this.resizeTask=setTimeout(function(){r.ajustPosition(a.position)},100)},g=function(t,e){return"undefined"==typeof t&&(t=a.delay),setTimeout(function(){h=l.find(".modal-dialog"),a.width&&"auto"!=a.width&&h.css("width",a.width),a.height&&"auto"!=a.height&&(h.css("height",a.height),"iframe"===a.type&&d.css("height",h.height()-u.outerHeight())),r.ajustPosition(a.position),l.removeClass("modal-loading"),"iframe"!=a.type&&h.off("resize."+s).on("resize."+s,f),e&&e()},t)};if("custom"===a.type&&c)if(t.isFunction(c)){var m=c({modal:l,options:a,modalTrigger:r,ready:g});typeof m===o&&(d.html(m),g())}else c instanceof t?(d.html(t("
              ").append(c.clone()).html()),g()):(d.html(c),g());else if(a.url){var v=function(){var t=l.callComEvent(r,"broken");t&&(d.html(t),g())};if(l.attr("ref",a.url),"iframe"===a.type){l.addClass("modal-iframe"),this.firstLoad=!0;var y="iframe-"+a.name;u.detach(),d.detach(),p.empty().append(u).append(d),d.css("padding",0).html(''),a.waittime>0&&(r.waitTimeout=g(a.waittime,v));var w=document.getElementById(y);w.onload=w.onreadystatechange=function(){if(r.firstLoad&&l.addClass("modal-loading"),!this.readyState||"complete"==this.readyState){r.firstLoad=!1,a.waittime>0&&clearTimeout(r.waitTimeout);try{l.attr("ref",w.contentWindow.location.href);var t=e.frames[y].$;if(t&&"auto"===a.height&&"fullscreen"!=a.size){var i=t("body").addClass("body-modal");a.iframeBodyClass&&i.addClass(a.iframeBodyClass);var n=function(t){l.removeClass("fade");var e=i.outerHeight();t===!0&&a.onlyIncreaseHeight&&(e=Math.max(e,d.data("minModalHeight")||0),d.data("minModalHeight",e)),d.css("height",e),a.fade&&l.addClass("fade"),g()};l.callComEvent(r,"loaded",{modalType:"iframe",jQuery:t}),setTimeout(n,100),i.off("resize."+s).on("resize."+s,f)}else g();t.extend({closeModal:e.closeModal})}catch(o){g()}}}}else t.ajax(t.extend({url:a.url,success:function(i){try{var s=t(i);s.filter(".modal-dialog").length?h.replaceWith(s):s.filter(".modal-content").length?h.find(".modal-content").replaceWith(s):d.wrapInner(s)}catch(a){e.console&&e.console.warn&&console.warn("ZUI: Cannot recogernize remote content.",{error:a,data:i}),l.html(i)}l.callComEvent(r,"loaded",{modalType:n}),g()},error:v},a.ajaxOptions))}l.modal({show:"show",backdrop:a.backdrop,moveable:a.moveable,rememberPos:a.rememberPos,keyboard:a.keyboard})},r.prototype.close=function(i,s){(i||s)&&this.$modal.on("hidden"+a,function(){t.isFunction(i)&&i(),typeof s===o&&("this"===s?e.location.reload():e.location=s)}),this.$modal.modal("hide")},r.prototype.toggle=function(t){this.isShown?this.close():this.show(t)},r.prototype.ajustPosition=function(e){e=e===i?this.options.position:e,t.isFunction(e)&&(e=e(this)),this.$modal.modal("ajustPosition",e)},t.zui({ModalTrigger:r,modalTrigger:new r}),t.fn.modalTrigger=function(e,i){return t(this).each(function(){var n=t(this),a=n.data(s),l=t.extend({title:n.attr("title")||n.text(),url:n.attr("href"),type:n.hasClass("iframe")?"iframe":""},n.data(),t.isPlainObject(e)&&e);a||n.data(s,a=new r(l,n)),typeof e==o?a[e](i):l.show&&a.show(i),n.on((l.trigger||"click")+".toggle."+s,function(t){a.toggle(l),n.is("a")&&t.preventDefault()})})};var l=t.fn.modal;t.fn.modal=function(e,i){return t(this).each(function(){var s=t(this);s.hasClass("modal")?l.call(s,e,i):s.modalTrigger(e,i)})};var h=function(e){var i=typeof e;return"undefined"===i?e=t(".modal.modal-trigger"):i===o&&(e=t(e)),e&&e instanceof t?e:null},c=function(e,i,n){if(t.isFunction(e)){var a=n;n=i,i=e,e=a}e=h(e),e&&e.length&&e.each(function(){t(this).data(s).close(i,n)})},d=function(t,e){e=h(e),e&&e.length&&e.modal("ajustPosition",t)};t.zui({closeModal:c,ajustModalPosition:d}),t(document).on("click."+s+".data-api",'[data-toggle="modal"]',function(e){var i=t(this),n=i.attr("href"),a=null;try{a=t(i.attr("data-target")||n&&n.replace(/.*(?=#[^\s]+$)/,""))}catch(o){}a&&a.length||(i.data(s)?i.trigger(".toggle."+s):i.modalTrigger({show:!0})),i.is("a")&&e.preventDefault()})}(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:'
              ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.prototype.init=function(e,i,s){this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(s);for(var n=this.options.trigger.split(" "),a=n.length;a--;){var o=n[a];if("click"==o)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this));else if("manual"!=o){var r="hover"==o?"mouseenter":"focus",l="hover"==o?"mouseleave":"blur";this.$element.on(r+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,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,s){i[t]!=s&&(e[t]=s)}),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 s=this;if(s.$element.trigger(i),i.isDefaultPrevented())return;var n=s.tip();s.setContent(e),s.options.animation&&n.addClass("fade");var a="function"==typeof s.options.placement?s.options.placement.call(s,n[0],s.$element[0]):s.options.placement,o=/\s?auto?\s?/i,r=o.test(a);r&&(a=a.replace(o,"")||"top"),n.detach().css({top:0,left:0,display:"block"}).addClass(a),s.options.container?n.appendTo(s.options.container):n.insertAfter(s.$element);var l=s.getPosition(),h=n[0].offsetWidth,c=n[0].offsetHeight;if(r){var d=s.$element.parent(),u=a,p=document.documentElement.scrollTop||document.body.scrollTop,f="body"==s.options.container?window.innerWidth:d.outerWidth(),g="body"==s.options.container?window.innerHeight:d.outerHeight(),m="body"==s.options.container?0:d.offset().left;a="bottom"==a&&l.top+l.height+c-p>g?"top":"top"==a&&l.top-p-c<0?"bottom":"right"==a&&l.right+h>f?"left":"left"==a&&l.left-h').insertAfter(t(this)).on("click",e),o.trigger(n=t.Event("show."+s)),n.isDefaultPrevented())return;o.toggleClass("open").trigger("shown."+s),a.focus()}return!1}},o.prototype.keydown=function(e){if(/(38|40|27)/.test(e.keyCode)){var s=t(this);if(e.preventDefault(),e.stopPropagation(),!s.is(".disabled, :disabled")){var n=i(s),o=n.hasClass("open");if(!o||o&&27==e.keyCode)return 27==e.which&&n.find(a).focus(),s.click();var r=t("[role=menu] li:not(.divider):visible a",n);if(r.length){var l=r.index(r.filter(":focus"));38==e.keyCode&&l>0&&l--,40==e.keyCode&&l
              ',a={type:"default",placement:"top",time:4e3,parent:"body",icon:null,close:!0,fade:!0,scale:!0},o={},r=function(e,r){t.isPlainObject(e)&&(r=e,e=r.message);var l=this;r=l.options=t.extend({},a,r),l.id=r.id||s++;var h=o[l.id];h&&h.destroy(),o[l.id]=l,l.message=(r.icon?' ':"")+e,l.$=t(n.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 s=t('
              '),i.prependTo("body")),i.find(".content").html(a||this.browseHappyTip||e[t.zui.clientLang()||"zh_cn"])},a.prototype.isIE=function(t){if(10===t)return this.isIE10();var e=document.createElement("b");return e.innerHTML="",1===e.getElementsByTagName("i").length},a.prototype.isIE10=function(){return!1},t.zui({browser:new a}),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";var e="zui.collapse",a=function(e,i){this.$element=t(e),this.options=t.extend({},a.DEFAULTS,i),this.transitioning=null,this.options.parent&&(this.$parent=t(this.options.parent)),this.options.toggle&&this.toggle()};a.DEFAULTS={toggle:!0},a.prototype.dimension=function(){var t=this.$element.hasClass("width");return t?"width":"height"},a.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var a=t.Event("show."+e);if(this.$element.trigger(a),!a.isDefaultPrevented()){var i=this.$parent&&this.$parent.find(".in");if(i&&i.length){var o=i.data(e);if(o&&o.transitioning)return;i.collapse("hide"),o||i.data(e,null)}var n=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[n](0),this.transitioning=1;var s=function(){this.$element.removeClass("collapsing").addClass("in")[n]("auto"),this.transitioning=0,this.$element.trigger("shown."+e)};if(!t.support.transition)return s.call(this);var r=t.camelCase(["scroll",n].join("-"));this.$element.one(t.support.transition.end,t.proxy(s,this)).emulateTransitionEnd(350)[n](this.$element[0][r])}}},a.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var a=t.Event("hide."+e);if(this.$element.trigger(a),!a.isDefaultPrevented()){var i=this.dimension();this.$element[i](this.$element[i]())[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[i](0).one(t.support.transition.end,t.proxy(o,this)).emulateTransitionEnd(350):o.call(this)}}},a.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var i=t.fn.collapse;t.fn.collapse=function(i){return this.each(function(){var o=t(this),n=o.data(e),s=t.extend({},a.DEFAULTS,o.data(),"object"==typeof i&&i);n||o.data(e,n=new a(this,s)),"string"==typeof i&&n[i]()})},t.fn.collapse.Constructor=a,t.fn.collapse.noConflict=function(){return t.fn.collapse=i,this},t(document).on("click."+e+".data-api","[data-toggle=collapse]",function(a){var i,o=t(this),n=o.attr("data-target")||a.preventDefault()||(i=o.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,""),s=t(n),r=s.data(e),l=r?"toggle":o.data(),d=o.attr("data-parent"),c=d&&t(d);r&&r.transitioning||(c&&c.find('[data-toggle=collapse][data-parent="'+d+'"]').not(o).addClass("collapsed"),o[s.hasClass("in")?"addClass":"removeClass"]("collapsed")),s.collapse(l)})}(window.jQuery),+function(t){"use strict";function e(){t(o).remove(),t(n).each(function(e){var o=a(t(this));o.hasClass("open")&&(o.trigger(e=t.Event("hide."+i)),e.isDefaultPrevented()||o.removeClass("open").trigger("hidden."+i))})}function a(e){var a=e.attr("data-target");a||(a=e.attr("href"),a=a&&/#/.test(a)&&a.replace(/.*(?=#[^\s]*$)/,""));var i;try{i=a&&t(a)}catch(o){}return i&&i.length?i:e.parent()}var i="zui.dropdown",o=".dropdown-backdrop",n="[data-toggle=dropdown]",s=function(e){t(e).on("click."+i,this.toggle)};s.prototype.toggle=function(o){var n=t(this);if(!n.is(".disabled, :disabled")){var s=a(n),r=s.hasClass("open");if(e(),!r){if("ontouchstart"in document.documentElement&&!s.closest(".navbar-nav").length&&t('
              ').insertAfter(t(this)).on("click",e),s.trigger(o=t.Event("show."+i)),o.isDefaultPrevented())return;s.toggleClass("open").trigger("shown."+i),n.focus()}return!1}},s.prototype.keydown=function(e){if(/(38|40|27)/.test(e.keyCode)){var i=t(this);if(e.preventDefault(),e.stopPropagation(),!i.is(".disabled, :disabled")){var o=a(i),s=o.hasClass("open");if(!s||s&&27==e.keyCode)return 27==e.which&&o.find(n).focus(),i.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 .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"),i&&i()}var n=a.find("> .active"),s=i&&t.support.transition&&n.hasClass("fade");s?n.one(t.support.transition.end,o).emulateTransitionEnd(150):o(),n.removeClass("in")};var i=t.fn.tab;t.fn.tab=function(i){return this.each(function(){var o=t(this),n=o.data(e);n||o.data(e,n=new a(this)),"string"==typeof i&&n[i]()})},t.fn.tab.Constructor=a,t.fn.tab.noConflict=function(){return t.fn.tab=i,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(e,o,n){return this.each(function(){var s=t(this),r=s.data(a),l=t.extend({},i.DEFAULTS,s.data(),"object"==typeof e&&e);r||s.data(a,r=new i(this,l)),"string"==typeof e?r[e](o,n):l.show&&r.show(o,n)})}var a="zui.modal",i=function(e,i){this.options=i,this.$body=t(document.body),this.$element=t(e),this.$backdrop=this.isShown=null,this.scrollbarWidth=0,"undefined"==typeof this.options.moveable&&(this.options.moveable=this.$element.hasClass("modal-moveable")),this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,t.proxy(function(){this.$element.trigger("loaded."+a)},this))};i.VERSION="3.2.0",i.TRANSITION_DURATION=300,i.BACKDROP_TRANSITION_DURATION=150,i.DEFAULTS={backdrop:!0,keyboard:!0,show:!0,position:"fit"},i.prototype.toggle=function(t,e){return this.isShown?this.hide():this.show(t,e)},i.prototype.ajustPosition=function(e){if("undefined"==typeof e&&(e=this.options.position),"undefined"!=typeof e){var i=this.$element.find(".modal-dialog"),o=Math.max(0,(t(window).height()-i.outerHeight())/2),n="fit"==e?2*o/3:"center"==e?o:e;if(i.hasClass("modal-moveable")){var s=null,r=this.options.rememberPos;r&&(r===!0?s=this.$element.data("modal-pos"):t.zui.store&&(s=t.zui.store.pageGet(a+".rememberPos."+r))),s||(s={left:Math.max(0,(t(window).width()-i.outerWidth())/2),top:n}),i.css(s)}else i.css("margin-top",n)}},i.prototype.setMoveale=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(){o.css("margin-top","").addClass("modal-dragged")},finish:function(o){var n=i.rememberPos;n&&(e.$element.data("modal-pos",o.pos),t.zui.store&&n!==!0&&t.zui.store.pageSet(a+".rememberPos."+n,o.pos))}})},i.prototype.show=function(e,o){var n=this,s=t.Event("show."+a,{relatedTarget:e});n.$element.trigger(s),n.isShown||s.isDefaultPrevented()||(n.isShown=!0,n.options.moveable&&n.setMoveale(),n.checkScrollbar(),n.$body.addClass("modal-open"),n.setScrollbar(),n.escape(),n.$element.on("click.dismiss."+a,'[data-dismiss="modal"]',t.proxy(n.hide,n)),n.backdrop(function(){var s=t.support.transition&&n.$element.hasClass("fade");n.$element.parent().length||n.$element.appendTo(n.$body),n.$element.show().scrollTop(0),s&&n.$element[0].offsetWidth,n.$element.addClass("in").attr("aria-hidden",!1),n.ajustPosition(o),n.enforceFocus();var r=t.Event("shown."+a,{relatedTarget:e});s?n.$element.find(".modal-dialog").one("bsTransitionEnd",function(){n.$element.trigger("focus").trigger(r)}).emulateTransitionEnd(i.TRANSITION_DURATION):n.$element.trigger("focus").trigger(r)}))},i.prototype.hide=function(e){e&&e.preventDefault(),e=t.Event("hide."+a),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.$body.removeClass("modal-open"),this.resetScrollbar(),this.escape(),t(document).off("focusin."+a),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss."+a),t.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",t.proxy(this.hideModal,this)).emulateTransitionEnd(i.TRANSITION_DURATION):this.hideModal())},i.prototype.enforceFocus=function(){t(document).off("focusin."+a).on("focusin."+a,t.proxy(function(t){this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},i.prototype.escape=function(){this.isShown&&this.options.keyboard?t(document).on("keydown.dismiss."+a,t.proxy(function(e){if(27==e.which){var i=t.Event("escaping."+a),o=this.$element.triggerHandler(i,"esc");if(void 0!=o&&!o)return;this.hide()}},this)):this.isShown||t(document).off("keydown.dismiss."+a)},i.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$element.trigger("hidden."+a)})},i.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},i.prototype.backdrop=function(e){var o=this,n=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var s=t.support.transition&&n;if(this.$backdrop=t('
              ').appendTo(this.$body),this.$element.on("mousedown.dismiss."+a,t.proxy(function(t){t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return;s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var r=function(){o.removeBackdrop(),e&&e()};t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",r).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):r()}else e&&e()},i.prototype.checkScrollbar=function(){document.body.clientWidth>=window.innerWidth||(this.scrollbarWidth=this.scrollbarWidth||this.measureScrollbar())},i.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.scrollbarWidth&&this.$body.css("padding-right",t+this.scrollbarWidth)},i.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},i.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 o=t.fn.modal;t.fn.modal=e,t.fn.modal.Constructor=i,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click."+a+".data-api",'[data-toggle="modal"]',function(i){var o=t(this),n=o.attr("href"),s=null;try{s=t(o.attr("data-target")||n&&n.replace(/.*(?=#[^\s]+$)/,""))}catch(r){return}if(s.length){var l=s.data(a)?"toggle":t.extend({remote:!/#/.test(n)&&n},s.data(),o.data());o.is("a")&&i.preventDefault(),s.one("show."+a,function(t){t.isDefaultPrevented()||s.one("hidden."+a,function(){o.is(":visible")&&o.trigger("focus")})}),e.call(s,l,this,o.data("position"))}})}(jQuery),+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:'
              ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.prototype.init=function(e,a,i){this.enabled=!0,this.type=e,this.$element=t(a),this.options=this.getOptions(i);for(var o=this.options.trigger.split(" "),n=o.length;n--;){var s=o[n];if("click"==s)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,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,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,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={},a=this.getDefaults();return this._options&&t.each(this._options,function(t,i){a[t]!=i&&(e[t]=i)}),e},e.prototype.enter=function(e){var a=e instanceof this.constructor?e:t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type);return clearTimeout(a.timeout),a.hoverState="in",a.options.delay&&a.options.delay.show?void(a.timeout=setTimeout(function(){"in"==a.hoverState&&a.show()},a.options.delay.show)):a.show()},e.prototype.leave=function(e){var a=e instanceof this.constructor?e:t(e.currentTarget)[this.type](this.getDelegateOptions()).data("zui."+this.type);return clearTimeout(a.timeout),a.hoverState="out",a.options.delay&&a.options.delay.hide?void(a.timeout=setTimeout(function(){"out"==a.hoverState&&a.hide()},a.options.delay.hide)):a.hide()},e.prototype.show=function(e){var a=t.Event("show.zui."+this.type);if((e||this.hasContent())&&this.enabled){var i=this;if(i.$element.trigger(a),a.isDefaultPrevented())return;var o=i.tip();i.setContent(e),i.options.animation&&o.addClass("fade");var n="function"==typeof i.options.placement?i.options.placement.call(i,o[0],i.$element[0]):i.options.placement,s=/\s?auto?\s?/i,r=s.test(n);r&&(n=n.replace(s,"")||"top"),o.detach().css({top:0,left:0,display:"block"}).addClass(n),i.options.container?o.appendTo(i.options.container):o.insertAfter(i.$element);var l=i.getPosition(),d=o[0].offsetWidth,c=o[0].offsetHeight;if(r){var p=i.$element.parent(),h=n,f=document.documentElement.scrollTop||document.body.scrollTop,u="body"==i.options.container?window.innerWidth:p.outerWidth(),g="body"==i.options.container?window.innerHeight:p.outerHeight(),v="body"==i.options.container?0:p.offset().left;n="bottom"==n&&l.top+l.height+c-f>g?"top":"top"==n&&l.top-f-c<0?"bottom":"right"==n&&l.right+d>u?"left":"left"==n&&l.left-d

              '}),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 a=this.getTitle(),i=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](a),t.find(".popover-content")[this.options.html?"html":"text"](i),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,a=this.options,i=e.attr("data-target")||("function"==typeof a.target?a.target.call(e[0]):a.target);return!!i&&("$next"==i?e.next(".popover"):t(i))},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 a=t.fn.popover;t.fn.popover=function(a){return this.each(function(){var i=t(this),o=i.data("zui.popover"),n="object"==typeof a&&a;o||i.data("zui.popover",o=new e(this,n)),"string"==typeof a&&o[a]()})},t.fn.popover.Constructor=e,t.fn.popover.noConflict=function(){return t.fn.popover=a,this}}(window.jQuery),function(t,e,a){"use strict";var i="zui.droppable",o={target:".droppable-target",deviation:5,sensorOffsetX:0,sensorOffsetY:0},n=0,s=function(e,a){var i=this;i.id=n++,i.$=t(e),i.options=t.extend({},o,i.$.data(),a),i.init()};s.DEFAULTS=o,s.NAME=i,s.prototype.trigger=function(e,a){return t.zui.callEvent(this.options[e],a,this)},s.prototype.init=function(){var o,n,s,r,l,d,c,p,h,f,u,g,v,m=this,b=m.$,y=m.options,w=y.deviation,C="."+i+"."+m.id,x="mousedown"+C,$="mouseup"+C,k="mousemove"+C,T=y.selector,E=y.handle,z=y.flex,S=y.container,D=y.canMoveHere,L=b,A=!1,O=S?t(y.container).first():T?b:t("body"),P=function(e){if(A&&(u={left:e.pageX,top:e.pageY},!(a.abs(u.left-p.left)n&&u.top>s&&u.left-1&&a.button!==i)){var u=t(this);T&&(L=E?u.closest(T):u),L.hasClass("drag-shadow")||y.before&&y.before({event:a,element:L})===!1||(A=!0,o=t.isFunction(y.target)?y.target(b):O.find(y.target),n=null,s=null,r=!1,l=!0,d=null,c=L.offset(),h=O.offset(),p={left:a.pageX,top:a.pageY},g=t.extend({},p),f={left:p.left-c.left,top:p.top-c.top},L.addClass("drag-from"),t(e).on(k,P).on($,M),v=setTimeout(function(){t(e).on(x,M)},10),a.preventDefault())}};E?b.on(x,E,j):T?b.on(x,T,j):b.on(x,j)},s.prototype.destroy=function(){var a="."+i+"."+this.id;this.$.off(a),t(e).off(a),this.$.data(i,null)},s.prototype.reset=function(){this.destroy(),this.init()},t.fn.droppable=function(e){return this.each(function(){var a=t(this),o=a.data(i),n="object"==typeof e&&e;o||a.data(i,o=new s(this,n)),"string"==typeof e&&o[e]()})},t.fn.droppable.Constructor=s}(jQuery,document,Math),+function(t,e,a){"use strict";if(!t.fn.droppable)return void console.error("Sortable requires droppable.js");var i="zui.sortable",o={selector:"li,div",dragCssClass:"invisible",sortingClass:"sortable-sorting"},n="order",s=function(e,a){var i=this;i.$=t(e),i.options=t.extend({},o,i.$.data(),a),i.init()};s.DEFAULTS=o,s.NAME=i,s.prototype.init=function(){var e=this,a=e.$,i=e.options,o=i.selector,s=i.sortingClass,r=i.dragCssClass,l=i.reverse,d=function(a){a=a||e.getItems(1);var i=[];a.each(function(){var e=t(this).data(n);"number"==typeof e&&i.push(e)}),i.sort(function(t,e){return t-e});for(var o=a.length;i.lengthc?o[l?"after":"before"](i):o[l?"before":"after"](i);var p=e.getItems(1);d(p),e.trigger(n,{list:p,element:i})}},finish:function(t){r&&t.element&&t.element.removeClass(r),a.removeClass(s),e.trigger("finish",{list:e.getItems(1),element:t.element})}})},s.prototype.destroy=function(){this.$.droppable("destroy")},s.prototype.reset=function(){this.destroy(),this.init()},s.prototype.getItems=function(e){var a=this.$.children(this.options.selector).not(".drag-shadow");return e?a:a.map(function(){var e=t(this);return{item:e,order:e.data("order")}})},s.prototype.trigger=function(e,a){return t.zui.callEvent(this.options[e],a,this)},t.fn.sortable=function(e){return this.each(function(){var a=t(this),o=a.data(i),n="object"==typeof e&&e;o?"object"==typeof e&&o.reset():a.data(i,o=new s(this,n)), -"string"==typeof e&&o[e]()})},t.fn.sortable.Constructor=s}(jQuery,window,document),/*! bootbox.js v4.4.0 http://bootboxjs.com/license.txt */ -function(t,e){"use strict";"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):t.bootbox=e(t.jQuery)}(this,function t(e,a){"use strict";function i(t){var e=v[u.locale];return e?e[t]:v.en[t]}function o(t,a,i){t.stopPropagation(),t.preventDefault();var o=e.isFunction(i)&&i.call(a,t)===!1;o||a.modal("hide")}function n(t){var e,a=0;for(e in t)a++;return a}function s(t,a){var i=0;e.each(t,function(t,e){a(t,e,i++)})}function r(t){var a,i;if("object"!=typeof t)throw new Error("Please supply an object of options");if(!t.message)throw new Error("Please specify a message");return t=e.extend({},u,t),t.buttons||(t.buttons={}),a=t.buttons,i=n(a),s(a,function(t,o,n){if(e.isFunction(o)&&(o=a[t]={callback:o}),"object"!==e.type(o))throw new Error("button with key "+t+" must be an object");o.label||(o.label=t),o.className||(2===i&&("ok"===t||"confirm"===t)||1===i?o.className="btn-primary":o.className="btn-default")}),t}function l(t,e){var a=t.length,i={};if(a<1||a>2)throw new Error("Invalid argument length");return 2===a||"string"==typeof t[0]?(i[e[0]]=t[0],i[e[1]]=t[1]):i=t[0],i}function d(t,a,i){return e.extend(!0,{},t,l(a,i))}function c(t,e,a,i){var o={className:"bootbox-"+t,buttons:p.apply(null,e)};return h(d(o,i,a),e)}function p(){for(var t={},e=0,a=arguments.length;e
              ",header:"

              ",footer:"
              ",closeButton:"",form:"",inputs:{text:"",textarea:"",email:"",select:"",checkbox:"
              ",date:"",time:"",number:"",password:""}},u={locale:e.zui&&e.zui.clientLang?e.zui.clientLang():"zh_cn",backdrop:"static",animate:!0,className:null,closeButton:!0,show:!0,container:"body"},g={};g.alert=function(){var t;if(t=c("alert",["ok"],["message","callback"],arguments),t.callback&&!e.isFunction(t.callback))throw new Error("alert requires callback property to be a function when provided");return t.buttons.ok.callback=t.onEscape=function(){return!e.isFunction(t.callback)||t.callback.call(this)},g.dialog(t)},g.confirm=function(){var t;if(t=c("confirm",["confirm","cancel"],["message","callback"],arguments),t.buttons.cancel.callback=t.onEscape=function(){return t.callback.call(this,!1)},t.buttons.confirm.callback=function(){return t.callback.call(this,!0)},!e.isFunction(t.callback))throw new Error("confirm requires a callback");return g.dialog(t)},g.prompt=function(){var t,i,o,n,r,l,c;if(n=e(f.form),i={className:"bootbox-prompt",buttons:p("cancel","confirm"),value:"",inputType:"text"},t=h(d(i,arguments,["title","callback"]),["confirm","cancel"]),l=t.show===a||t.show,t.message=n,t.buttons.cancel.callback=t.onEscape=function(){return t.callback.call(this,null)},t.buttons.confirm.callback=function(){var a;switch(t.inputType){case"text":case"textarea":case"email":case"select":case"date":case"time":case"number":case"password":a=r.val();break;case"checkbox":var i=r.find("input:checked");a=[],s(i,function(t,i){a.push(e(i).val())})}return t.callback.call(this,a)},t.show=!1,!t.title)throw new Error("prompt requires a title");if(!e.isFunction(t.callback))throw new Error("prompt requires a callback");if(!f.inputs[t.inputType])throw new Error("invalid prompt type");switch(r=e(f.inputs[t.inputType]),t.inputType){case"text":case"textarea":case"email":case"date":case"time":case"number":case"password":r.val(t.value);break;case"select":var u={};if(c=t.inputOptions||[],!e.isArray(c))throw new Error("Please pass an array of input options");if(!c.length)throw new Error("prompt with select requires options");s(c,function(t,i){var o=r;if(i.value===a||i.text===a)throw new Error("given options in wrong format");i.group&&(u[i.group]||(u[i.group]=e("").attr("label",i.group)),o=u[i.group]),o.append("")}),s(u,function(t,e){r.append(e)}),r.val(t.value);break;case"checkbox":var v=e.isArray(t.value)?t.value:[t.value];if(c=t.inputOptions||[],!c.length)throw new Error("prompt with checkbox requires options");if(!c[0].value||!c[0].text)throw new Error("given options in wrong format");r=e("
              "),s(c,function(a,i){var o=e(f.inputs[t.inputType]);o.find("input").attr("value",i.value),o.find("label").append(i.text),s(v,function(t,e){e===i.value&&o.find("input").prop("checked",!0)}),r.append(o)})}return t.placeholder&&r.attr("placeholder",t.placeholder),t.pattern&&r.attr("pattern",t.pattern),t.maxlength&&r.attr("maxlength",t.maxlength),n.append(r),n.on("submit",function(t){t.preventDefault(),t.stopPropagation(),o.find(".btn-primary").click()}),o=g.dialog(t),o.off("shown.zui.modal"),o.on("shown.zui.modal",function(){r.focus()}),l===!0&&o.modal("show"),o},g.dialog=function(t){t=r(t);var i=e(f.dialog),n=i.find(".modal-dialog"),l=i.find(".modal-body"),d=t.buttons,c="",p={onEscape:t.onEscape};if(e.fn.modal===a)throw new Error("$.fn.modal is not defined; please double check you have included the Bootstrap JavaScript library. See http://getbootstrap.com/javascript/ for more details.");if(s(d,function(t,e){c+="",p[t]=e.callback}),l.find(".bootbox-body").html(t.message),t.animate===!0&&i.addClass("fade"),t.className&&i.addClass(t.className),"large"===t.size?n.addClass("modal-lg"):"small"===t.size&&n.addClass("modal-sm"),t.title&&l.before(f.header),t.closeButton){var h=e(f.closeButton);t.title?i.find(".modal-header").prepend(h):h.css("margin-top","-10px").prependTo(l)}return t.title&&i.find(".modal-title").html(t.title),c.length&&(l.after(f.footer),i.find(".modal-footer").html(c)),i.on("hidden.zui.modal",function(t){t.target===this&&i.remove()}),i.on("shown.zui.modal",function(){i.find(".btn-primary:first").focus()}),"static"!==t.backdrop&&i.on("click.dismiss.zui.modal",function(t){i.children(".modal-backdrop").length&&(t.currentTarget=i.children(".modal-backdrop").get(0)),t.target===t.currentTarget&&i.trigger("escape.close.bb")}),i.on("escape.close.bb",function(t){p.onEscape&&o(t,i,p.onEscape)}),i.on("click",".modal-footer button",function(t){var a=e(this).data("bb-handler");o(t,i,p[a])}),i.on("click",".bootbox-close-button",function(t){o(t,i,p.onEscape)}),i.on("keyup",function(t){27===t.which&&i.trigger("escape.close.bb")}),e(t.container).append(i),i.modal({backdrop:!!t.backdrop&&"static",keyboard:!1,show:!1}),t.show&&i.modal("show"),i},g.setDefaults=function(){var t={};2===arguments.length?t[arguments[0]]=arguments[1]:t=arguments[0],e.extend(u,t)},g.hideAll=function(){return e(".bootbox").modal("hide"),g};var v={en:{OK:"OK",CANCEL:"Cancel",CONFIRM:"OK"},zh_cn:{OK:"确认",CANCEL:"取消",CONFIRM:"确认"},zh_tw:{OK:"確認",CANCEL:"取消",CONFIRM:"確認"}};return g.addLocale=function(t,a){return e.each(["OK","CANCEL","CONFIRM"],function(t,e){if(!a[e])throw new Error("Please supply a translation for '"+e+"'")}),v[t]={OK:a.OK,CANCEL:a.CANCEL,CONFIRM:a.CONFIRM},g},g.removeLocale=function(t){return delete v[t],g},g.setLocale=function(t){return g.setDefaults("locale",t)},g.init=function(a){return t(a||e)},g}),function(t,e){"use strict";var a="zui.draggable",i={container:"body",move:!0},o=0,n=function(e,a){var n=this;n.$=t(e),n.id=o++,n.options=t.extend({},i,n.$.data(),a),n.init()};n.DEFAULTS=i,n.NAME=a,n.prototype.init=function(){var i,o,n,s,r,l=this,d=l.$,c="before",p="drag",h="finish",f="."+a+"."+l.id,u="mousedown"+f,g="mouseup"+f,v="mousemove"+f,m=l.options,b=m.selector,y=m.handle,w=d,C=function(t){var e=t.pageX,a=t.pageY;r=!0;var o={left:e-n.x,top:a-n.y};w.removeClass("drag-ready").addClass("dragging"),m.move&&w.css(o),m[p]&&m[p]({event:t,element:w,startOffset:n,pos:o,offset:{x:e-i.x,y:a-i.y},smallOffset:{x:e-s.x,y:a-s.y}}),s.x=e,s.y=a,m.stopPropagation&&t.stopPropagation()},x=function(a){if(t(e).off(f),!r)return void w.removeClass("drag-ready");var o={left:a.pageX-n.x,top:a.pageY-n.y};w.removeClass("drag-ready dragging"),m.move&&w.css(o),m[h]&&m[h]({event:a,element:w,startOffset:n,pos:o,offset:{x:a.pageX-i.x,y:a.pageY-i.y},smallOffset:{x:a.pageX-s.x,y:a.pageY-s.y}}),a.preventDefault(),m.stopPropagation&&a.stopPropagation()},$=function(a){var l=t.zui.getMouseButtonCode(m.mouseButton);if(!(l>-1&&a.button!==l)){var d=t(this);if(b&&(w=y?d.closest(b):d),m[c]){var p=m[c]({event:a,element:w});if(p===!1)return}var h=t(m.container),f=w.offset();o=h.offset(),i={x:a.pageX,y:a.pageY},n={x:a.pageX-f.left+o.left,y:a.pageY-f.top+o.top},s=t.extend({},i),r=!1,w.addClass("drag-ready"),a.preventDefault(),m.stopPropagation&&a.stopPropagation(),t(e).on(v,C).on(g,x)}};y?d.on(u,y,$):b?d.on(u,b,$):d.on(u,$)},n.prototype.destroy=function(){var i="."+a+"."+this.id;this.$.off(i),t(e).off(i),this.$.data(a,null)},t.fn.draggable=function(e){return this.each(function(){var i=t(this),o=i.data(a),s="object"==typeof e&&e;o||i.data(a,o=new n(this,s)),"string"==typeof e&&o[e]()})},t.fn.draggable.Constructor=n}(jQuery,document),function(t){"use strict";function e(e,a){if(e===!1)return e;if(!e)return a;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var i;return t.isArray(e)&&(i={},t.each(e,function(e,a){t.isPlainObject(a)?i[a.action]=a:i[a]=!0}),e=i),t.isPlainObject(e)&&(i={},t.each(e,function(e,a){a?i[e]=t.extend({type:e},s[e],t.isPlainObject(a)?a:null):i[e]=!1}),e=i),a?t.extend(!0,{},a,e):e}function a(e,a,i){return a=a||e.type,t(i||e.template).addClass("tree-action").attr(t.extend({"data-type":a,title:e.title||""},e.attr)).data("action",e)}var i="zui.tree",o=0,n=function(e,a){this.name=i,this.$=t(e),this.getOptions(a),this._init()},s={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};n.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},n.prototype.add=function(e,a,i,o,n){var s,r=t(e),l=this.options;if(r.is("li")?(s=r.children("ul"),s.length||(s=t("
              • webhook->paramsList, $webhook->params);?>
              - - - - webhook->objectTypes as $objectType => $actions):?> - - - - - -
              - - actions->$objectType) ? $webhook->actions->$objectType : '');?>
              -
              webhook->desc;?> desc, "rows='3' class='form-control'");?>
              ').append(u))}a.flexStart=-1,a.flexEnd=-1,i=a.cols,a.colsLength=i.length;for(var s=0;s=0,a.fixedRight=a.flexEnd>=0&&a.flexEnd0,a.flexStart<0&&a.flexEnd<0&&(a.fixedLeft=!0,a.flexStart=a.colsLength,a.flexEnd=a.colsLength),this.data=a,this.callEvent("afterLoad",{data:a}),this.render()},i.prototype.render=function(){var a,i,o,n,s=this,r=s.$datatable||(s.isTable?t('
              '):s.$datatable),l=s.options,d=s.data,c=s.data.cols,p=s.data.rows,h=l.checkable,f='
              ',u='
              ';r.children(".datatable-head, .datatable-rows, .scroll-wrapper").remove(),r.toggleClass("sortable",l.sortable);var g,v,m,b=t('
              ');for(a=t(""),o=t(""),n=t(""),i=0;i=d.flexStart&&i<=d.flexEnd?n:o,0===i&&h&&g.append(''),m.ignore||(v=t(""),v.toggleClass("sort-down","down"===m.sort).toggleClass("sort-up","up"===m.sort).toggleClass("sort-disabled",m.sort===!1),v.addClass(m.cssClass).addClass(m.colClass).html(m.text).attr({"data-index":i,"data-type":m.type,style:m.css}).css("width",m.width),g.append(v));var y;d.fixedLeft&&(y=t(u),y.addClass("fixed-left").find("table").addClass(l.tableClass).find("thead").append(a),b.append(y)),d.flexArea&&(y=t(u),y.addClass("flexarea").find(".datatable-wrapper").append('
              ').find("table").addClass(l.tableClass).find("thead").append(n),b.append(y)),d.fixedRight&&(y=t(u),y.addClass("fixed-right").find("table").addClass(l.tableClass).find("thead").append(o),b.append(y)),r.append(b);var w,C,x,$,k,T,E,z,S=t('
              '),D=p.length;a=t(""),o=t(""),n=t("");for(var L=0;L"),w.addClass(T.cssClass).toggleClass(l.checkedClass,!!T.checked).attr({"data-index":L,"data-id":T.id}),C=w.clone(),x=w.clone(),z=T.data.length,i=0;i0&&E.empty||(g=i=d.flexStart&&i<=d.flexEnd?C:x,0===i&&h&&(k=t(''),l.checkboxName&&k.append(''),g.append(k)),c[i].ignore||(t.isPlainObject(E)?(E.row=L,E.index=i):E={text:E,row:L,index:i},T.data[i]=E,$=t(""),$.html(E.text).addClass(E.cssClass).addClass(c[i].colClass).attr("colspan",E.colSpan).attr({"data-row":L,"data-index":i,"data-flex":!1,"data-type":c[i].type,style:E.css,title:E.title||""}).css("width",c[i].width),g.append($)));a.append(w),n.append(C),o.append(x)}var A;d.fixedLeft&&(A=t(f),A.addClass("fixed-left").find("table").addClass(l.tableClass).append(a),S.append(A)),d.flexArea&&(A=t(f),A.addClass("flexarea").find(".datatable-wrapper").append('
              ').find("table").addClass(l.tableClass).append(n),S.append(A)),d.fixedRight&&(A=t(f),A.addClass("fixed-right").find("table").addClass(l.tableClass).append(o),S.append(A)),r.append(S),d.flexArea&&r.append('
              ');var O=r.children(".datatable-footer").detach();d.footer?(r.append(t('
              ').append(d.footer)),d.footer=null):O.length&&r.append(O),s.$datatable=r.data(e,s),s.isTable&&s.firstShow&&(s.$table.attr("data-datatable-id",this.id).hide().after(r),s.firstShow=!1),s.bindEvents(),s.refreshSize(),s.callEvent("render")},i.prototype.bindEvents=function(){var e=this,i=this.data,o=this.options,n=this.$datatable,s=e.$dataSpans=n.children(".datatable-head, .datatable-rows").find(".datatable-span"),r=e.$rowsSpans=n.children(".datatable-rows").children(".datatable-rows-span"),l=e.$headSpans=n.children(".datatable-head").children(".datatable-head-span"),d=e.$cells=s.find("td, th"),c=e.$dataCells=d.filter("td");e.$headCells=d.filter("th");var p=e.$rows=e.$rowsSpans.find(".table > tbody > tr");if(o.rowHover){var h=o.hoverClass;r.on("mouseenter","td",function(){c.filter("."+h).removeClass(h),p.filter("."+h).removeClass(h),p.filter('[data-index="'+t(this).addClass(h).closest("tr").data("index")+'"]').addClass(h)}).on("mouseleave","td",function(){c.filter("."+h).removeClass(h),p.filter("."+h).removeClass(h)})}if(o.colHover){var f=o.colHoverClass;l.on("mouseenter","th",function(){d.filter("."+f).removeClass(f),d.filter('[data-index="'+t(this).data("index")+'"]').addClass(f)}).on("mouseleave","th",function(){d.filter("."+f).removeClass(f)})}if(i.flexArea){var u,g,v,m,b,y,w,C=n.find(".scroll-slide"),x=n.find(".datatable-span.flexarea"),$=n.find(".datatable-span.fixed-left"),k=n.find(".datatable-span.flexarea .table"),T=C.children(".bar"),E=e.id+"_scrollOffset";e.width=n.width(),n.resize(function(){e.width=n.width()});var z=function(t,e){b=Math.max(0,Math.min(u-g,t)),e||n.addClass("scrolling"),T.css("left",b),w=0-Math.floor((v-u)*b/(u-g)),k.css("left",w),m=b,n.toggleClass("scrolled-in",b>2).toggleClass("scrolled-out",bu),y||u===g||(y=!0,z(a.pageGet(E,0),!0)),n.hasClass("size-changing")&&z(b,!0)};x.resize(S),o.storage&&S();var D={move:!1,stopPropagation:!0,drag:function(t){z(T.position().left+t.smallOffset.x*(t.element.hasClass("bar")?1:-1))},finish:function(){n.removeClass("scrolling")}};t.fn.draggable?(T.draggable(D),o.flexHeadDrag&&n.find(".datatable-head-span.flexarea").draggable(D)):console.error("DataTable requires draggable.js to improve UI."),C.mousedown(function(t){var e=t.pageX-C.offset().left;z(e-g/2)})}if(o.checkable){var L,A=e.id+"_checkedStatus",O=o.checkedClass,P=function(){var n=r.first().find(".table > tbody > tr"),s=n.filter("."+O);o.checkboxName&&n.find(".check-row input:checkbox").prop("checked",!1);var d={checkedAll:n.length===s.length&&s.length>0,checks:s.map(function(){return L=t(this).data("id"),o.checkboxName&&t(this).find(".check-row input:checkbox").prop("checked",!0),L}).toArray()};e.checks=d,t.each(i.rows,function(e,a){a.checked=t.inArray(a.id,d.checks)>-1}),l.find(".check-all").toggleClass("checked",!!d.checkedAll),o.storage&&a.pageSet(A,d),e.callEvent("checksChanged",{checks:d})},M=function(e,a){var i=t(e).closest("tr");void 0===a&&(a=!i.hasClass(O)),p.filter('[data-index="'+i.data("index")+'"]').toggleClass(O,!!a)},j="click.zui.datatable.check";if(o.selectable){var F={selector:".datatable-rows tr",trigger:".datatable-rows",start:function(e){var a=t(e.target).closest(".check-row, .check-btn");if(a.length)return a.is(".check-row")&&(M(a),P()),!1},rangeFunc:function(t,e){return Math.max(t.top,e.top)N&&H+_ tbody > tr > td"),a=this.data.cols,i=0;i1){var s,r;n.each(function(){var e=t(this);s&&e.html()===s.html()?(r=s.attr("rowspan")||1,"number"!=typeof r&&(r=parseInt(r),isNaN(r)&&(r=1)),s.attr("rowspan",r+1).css("vertical-align","middle"),e.remove()):s=e})}}}},i.prototype.sortTable=function(e){var a=t.zui.store,i=this.options,o=this.id+"_datatableSorter",n=i.storage?a.pageGet(o):null;if(e||(e=n?this.$headCells.filter('[data-index="'+n.index+'"]').addClass("sort-"+n.type):this.$headCells.filter(".sort-up, .sort-down").first()),e.length){var s,r,l,d=this.data,c=d.cols,p=d.rows,h=this.$headCells;s=!e.hasClass("sort-up"),d.keepSort&&(s=!s),d.keepSort=null,h.removeClass("sort-up sort-down"),e.addClass(s?"sort-up":"sort-down"),l=e.data("index"),t.each(c,function(t,e){t==l||"up"!==e.sort&&"down"!==e.sort?t==l&&(e.sort=s?"up":"down",r=e.type):e.sort=!0});var f,u,g,v=this.$dataCells.filter('[data-index="'+l+'"]');p.sort(function(t,e){return t=t.data[l],e=e.data[l],f=v.filter('[data-row="'+t.row+'"]').text(),u=v.filter('[data-row="'+e.row+'"]').text(),"number"===r?(f=parseFloat(f),u=parseFloat(u)):"date"===r?(f=Date.parse(f),u=Date.parse(u)):(f=f.toLowerCase(),u=u.toLowerCase()),g=f>u?1:f",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 %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},i.types={};var s=i.helpers={},n=s.each=function(t,e,i){var s=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var n;for(n=0;n=0;s--){var n=t[s];if(e(n))return n}},s.inherits=function(t){var e=this,i=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},s=function(){this.constructor=i};return s.prototype=e.prototype,i.prototype=new s,i.extend=h,t&&o(i.prototype,t),i.__super__=e.prototype,i}),c=s.noop=function(){},d=s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),u=s.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},p=s.amd="function"==typeof define&&define.amd,f=s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=s.max=function(t){return Math.max.apply(Math,t)},m=s.min=function(t){return Math.min.apply(Math,t)},v=(s.cap=function(t,e,i){if(f(e)){if(t>e)return e}else if(f(i)&&t=o,l=g(t),h=m(t);l===h&&(l+=.5,h>=.5&&!s?h-=.5:l+=.5);for(var c=Math.abs(l-h),d=b(c),u=Math.ceil(l/(1*Math.pow(10,d)))*Math.pow(10,d),p=s?0:Math.floor(h/(1*Math.pow(10,d)))*Math.pow(10,d),f=u-p,v=Math.pow(10,d),y=Math.round(f/v);(y>o||2*yo)v*=2,y=Math.round(f/v),y%1!==0&&(r=!0);else if(n&&d>=0){if(v/2%1!==0)break;v/=2,y=Math.round(f/v)}else v/=2,y=Math.round(f/v);return r&&(y=a,v=f/y),{steps:y,stepValue:v,min:p,max:p+y*v}},s.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('');"):s[t]=s[t];return e?i(e):i}if(t instanceof Function)return t(e);var s={};return i(t,e)}),x=(s.generateLabels=function(t,e,i,s){var a=new Array(e);return labelTemplateString&&n(a,function(e,n){a[n]=_(t,{value:i+s*(n+1)})}),a},s.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,s=1;return 0===t?0:1==(t/=1)?1:(i||(i=.3),ss?i:s}),s},A=s.drawRoundedRectangle=function(t,e,i,s,n,a){t.beginPath(),t.moveTo(e+a,i),t.lineTo(e+s-a,i),t.quadraticCurveTo(e+s,i,e+s,i+a),t.lineTo(e+s,i+n-a),t.quadraticCurveTo(e+s,i+n,e+s-a,i+n),t.lineTo(e+a,i+n),t.quadraticCurveTo(e,i+n,e,i+n-a),t.lineTo(e,i+a),t.quadraticCurveTo(e,i,e+a,i),t.closePath()};i.instances={},i.Type=function(t,e,s){this.options=e,this.chart=s,this.id=d(),i.instances[this.id]=this,e.responsive&&this.resize(),this.initialize.call(this,t)},o(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),s=this.options.maintainAspectRatio?i/this.chart.aspectRatio:P(this.chart.canvas);return e.width=this.chart.width=i,e.height=this.chart.height=s,F(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?s.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 _(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:(n(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 o,r,h=this.datasets.length-1;h>=0&&(o=this.datasets[h].points||this.datasets[h].bars||this.datasets[h].segments,r=l(o,t[0]),r===-1);h--);var c=[],d=[],u=function(t){var e,i,n,a,o,l=[],h=[],u=[];return s.each(this.datasets,function(t){t.showTooltips!==!1&&(e=t.points||t.bars||t.segments,e[r]&&e[r].hasValue()&&l.push(e[r]))}),s.each(l,function(t){h.push(t.x),u.push(t.y),c.push(s.template(this.options.multiTooltipTemplate,t)),d.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),o=m(u),n=g(u),a=m(h),i=g(h),{x:a>this.chart.width/2?a:i,y:(o+n)/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:t[0].label,chart:this.chart,ctx:this.chart.ctx,custom:this.options.customTooltips}).draw()}else n(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:_(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,s=function(){return e.apply(this,arguments)};if(s.prototype=a(e.prototype),o(s.prototype,t),s.extend=i.Type.extend,t.name||e.prototype.name){var n=t.name||e.prototype.name,l=i.defaults[e.prototype.name]?a(i.defaults[e.prototype.name]):{};i.defaults[n]=o(l,t.defaults),i.types[n]=s,i.prototype[n]=function(t,e){var a=r(i.defaults.global,i.defaults[n],e||{});return new s(t,a,this)}}else u("Name not provided for this chart, so it hasn't been registered");return e},i.Element=function(t){o(this,t),this.initialize.apply(this,arguments),this.save()},o(i.Element.prototype,{initialize:function(){},restore:function(t){return t?n(t,function(t){this[t]=this._saved[t]},this):o(this,this._saved),this},save:function(){return this._saved=a(this),delete this._saved._saved,this},update:function(t){return n(t,function(t,e){this._saved[e]=this[e],this[e]=t},this),this},transition:function(t,e){return n(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 f(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)=this.startAngle&&i.angle<=this.endAngle,a=i.distance>=this.innerRadius&&i.distance<=this.outerRadius;return n&&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;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()}}),i.Rectangle=i.Element.extend({draw:function(){var t=this.ctx,e=this.width/2,i=this.x-e,s=this.x+e,n=this.base-(this.base-this.y),a=this.strokeWidth/2;this.showStroke&&(i+=a,s-=a,n+=a),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(i,this.base),t.lineTo(i,n),t.lineTo(s,n),t.lineTo(s,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=z(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,s=this.fontSize+2*this.yPadding,n=s+this.caretHeight+e;this.x+i/2>this.chart.width?this.xAlign="left":this.x-i/2<0&&(this.xAlign="right"),this.y-n<0&&(this.yAlign="below");var a=this.x-i/2,o=this.y-n;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":o=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,o,i,s,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,a+i/2,o+s/2)}}}),i.MultiTooltip=i.Element.extend({initialize:function(){this.font=z(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=z(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 s=this.height/2;this.y-s<0?this.y=s:this.y+s>this.chart.height&&(this.y=this.chart.height-s),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,s.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(_(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(),tthis.yLabelWidth+10?i/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var n,a=I(this.ctx,this.font,this.xLabels);this.xLabelWidth=a;for(var o=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>o&&0===this.xLabelRotation||this.xLabelWidth>o&&this.xLabelRotation<=90&&this.xLabelRotation>0;)n=Math.cos(y(this.xLabelRotation)),t=n*i,e=n*s,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=n*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),s=i*t+this.xScalePaddingLeft;return this.offsetGridLines&&(s+=i/2),Math.round(s)},update:function(t){s.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;n(this.yLabels,function(n,o){var r=this.endPoint-e*o,l=Math.round(r),h=this.showHorizontalLines;t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(n,i-10,r),0!==o||h||(h=!0),h&&t.beginPath(),o>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),l+=s.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),n(this.xLabels,function(e,i){var s=this.calculateX(i)+w(this.lineWidth),n=this.calculateX(i-(this.offsetGridLines?.5:0))+w(this.lineWidth),o=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(n,this.endPoint),t.lineTo(n,this.startPoint-3),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(n,this.endPoint),t.lineTo(n,this.endPoint+a),t.stroke(),t.closePath(),t.save(),t.translate(s,o?this.endPoint+12:this.endPoint+8),t.rotate(y(this.xLabelRotation)*-1),t.font=this.font,t.textAlign=o?"right":"center",t.textBaseline=o?"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(_(this.templateString,{value:(this.min+e*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,e,i,s,n,a,o,r,l,h,c,d,u=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),p=this.width,g=0;for(this.ctx.font=z(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),e=0;ep&&(p=t.x+s,n=e),t.x-sp&&(p=t.x+i,n=e):e>this.valuesCount/2&&t.x-i0){var s,n=i*(this.drawingArea/this.steps),a=this.yCenter-n;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,n,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var o=0;o=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 s=this.getPointPosition(e,this.calculateCenterOffset(this.max)+5);t.font=z(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var a=this.labels.length,o=this.labels.length/2,r=o/2,l=ea-r,h=e===r||e===a-r;0===e?t.textAlign="center":e===o?t.textAlign="center":e<% for (var i=0; i
            • <%if(datasets[i].label){%><%=datasets[i].label%><%}%>
              • <%}%>'};i.Type.extend({name:"Line",defaults:n,initialize:function(e){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)0&&ethis.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.ythis.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y0&&(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()),s.each(r,function(t){t.draw()})},this)}}),t.fn.lineChart=function(e,s){var n=[];return this.each(function(){var a=t(this);n.push(new i(this.getContext("2d")).Line(e,t.extend(a.data(),s)))}),1===n.length?n[0]:n}}.call(this,jQuery),function(t){"use strict";var e=t&&t.zui?t.zui:this,i=e.Chart,s=i.helpers,n={segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:1,percentageInnerCutout:50,scaleShowLabels:!1,scaleLabel:"<%=value%>",scaleLabelPlacement:"auto",animationSteps:60,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'
                <% for (var i=0; i
              • <%if(segments[i].label){%><%=segments[i].label%><%}%>
                • <%}%>
              '};i.Type.extend({name:"Doughnut",defaults:n,initialize:function(t){this.segments=[],this.outerRadius=(s.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&&s.bindEvents(this,this.options.tooltipEvents,function(t){var e="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];s.each(this.segments,function(t){t.restore(["fillColor"])}),s.each(e,function(t){t.fillColor=t.highlightColor}),this.showTooltip(e)}),this.calculateTotal(t),s.each(t,function(t,e){this.addData(t,e,!0)},this),this.render()},getSegmentsAtEvent:function(t){var e=[],i=s.getRelativePosition(t);return s.each(this.segments,function(t){t.inRange(i.x,i.y)&&e.push(t)},this),e},addData:function(e,i,s){if(t.zui&&t.zui.Color&&t.zui.Color.get){var n=new t.zui.Color.get(e.color);e.color=n.toCssStr(),e.highlight||(e.highlight=n.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,label:e.label})),s||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(Math.abs(t)/this.total)},calculateTotal:function(t){this.total=0,s.each(t,function(t){this.total+=Math.abs(t.value)},this)},update:function(){this.calculateTotal(this.segments),s.each(this.activeElements,function(t){t.restore(["fillColor"])}),s.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var e=s.isNumber(t)?t:this.segments.length-1;this.segments.splice(e,1),this.reflow(),this.update()},reflow:function(){s.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(s.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,s.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},drawLabel:function(e,i,n){var a=this.options,o=(e.endAngle+e.startAngle)/2,r=a.scaleLabelPlacement;"inside"!==r&&"outside"!==r&&this.chart.width-this.chart.height>50&&e.circumference=0,g=l+u,m=h+p;d.textAlign=f?"left":"right",d.measureText(c).width,l=f?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+p)/v)+1,w=(Math.floor(this.chart.width/v)+1,f?1:-1);if(n[y*w]&&(y>1?y--:y++),n[y*w])return;h=(y-1)*v+a.scaleFontSize/2,n[y*w]=!0,d.beginPath(),d.moveTo(g,m),d.lineTo(l,h),l=f?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+p,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(s.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,t.draw(),0===i&&(t.startAngle=1.5*Math.PI),i<% for (var i=0; i
            • <%if(datasets[i].label){%><%=datasets[i].label%><%}%>
              • <%}%>'};i.Type.extend({name:"Bar",defaults:n,initialize:function(e){var n=this.options;this.ScaleClass=i.Scale.extend({offsetGridLines:!0,calculateBarX:function(t,e,i){var s=this.calculateBaseWidth(),a=this.calculateX(i)-s/2,o=this.calculateBarWidth(t);return a+o*e+e*n.barDatasetSpacing+o/2},calculateBaseWidth:function(){return this.calculateX(1)-this.calculateX(0)-2*n.barValueSpacing},calculateBarWidth:function(t){var e=this.calculateBaseWidth()-(t-1)*n.barDatasetSpacing;return e/t}}),this.datasets=[],this.options.showTooltips&&s.bindEvents(this,this.options.tooltipEvents,function(t){var e="mouseout"!==t.type?this.getBarsAtEvent(t):[];this.eachBars(function(t){t.restore(["fillColor","strokeColor"])}),s.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}),s.each(e.datasets,function(i,n){if(t.zui&&t.zui.Color&&t.zui.Color.get){var a=t.zui.Color.get(i.color),o=a.toCssStr();i.fillColor||(i.fillColor=a.clone().fade(50).toCssStr()),i.strokeColor||(i.strokeColor=o)}var r={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,bars:[]};this.datasets.push(r),s.each(i.data,function(t,s){r.bars.push(new this.BarClass({value:t,label:e.labels[s],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){s.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(),s.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachBars(function(t){t.save()}),this.render()},eachBars:function(t){s.each(this.datasets,function(e,i){s.each(e.bars,t,this,i)},this)},getBarsAtEvent:function(t){for(var e,i=[],n=s.getRelativePosition(t),a=function(t){i.push(t.bars[e])},o=0;o=this.startDate&&t<=this.endDate?(this.date=t,this.setValue(),this.viewDate=this.date,this.fill()):this.element.trigger({type:"outOfRange",date:t,startDate:this.startDate,endDate:this.endDate})},setFormat:function(t){this.format=n.parseFormat(t,this.formatType);var e;this.isInput?e=this.element:this.component&&(e=this.element.find("input")),e&&e.val()&&this.setValue()},setValue:function(){var e=this.getFormattedDate();this.isInput?this.element.val(e):(this.component&&this.element.find("input").val(e),this.element.data("date",e)),this.linkField&&t("#"+this.linkField).val(this.getFormattedDate(this.linkFormat))},getFormattedDate:function(t){return void 0==t&&(t=this.format),n.formatDate(this.date,t,this.language,this.formatType)},setStartDate:function(t){this.startDate=t||-(1/0),this.startDate!==-(1/0)&&(this.startDate=n.parseDate(this.startDate,this.format,this.language,this.formatType)),this.update(),this.updateNavArrows()},setEndDate:function(t){this.endDate=t||1/0,this.endDate!==1/0&&(this.endDate=n.parseDate(this.endDate,this.format,this.language,this.formatType)),this.update(),this.updateNavArrows()},setDaysOfWeekDisabled:function(e){this.daysOfWeekDisabled=e||[],t.isArray(this.daysOfWeekDisabled)||(this.daysOfWeekDisabled=this.daysOfWeekDisabled.split(/,\s*/)),this.daysOfWeekDisabled=t.map(this.daysOfWeekDisabled,function(t){return parseInt(t,10)}),this.update(),this.updateNavArrows()},place:function(){if(!this.isInline){var e=0;t("div").each(function(){var i=parseInt(t(this).css("zIndex"),10);i>e&&(e=i)});var i,s,n,a=e+10;this.component?(i=this.component.offset(),n=i.left,"bottom-left"!==this.pickerPosition&&"top-left"!==this.pickerPosition&&"auto-left"!==this.pickerPosition||(n+=this.component.outerWidth()-this.picker.outerWidth())):(i=this.element.offset(),n=i.left);var o=0===this.pickerPosition.indexOf("auto-"),r=o?(i.top+this.picker.outerHeight()>t(window).height()+t(window).scrollTop()?"top":"bottom")+(0===this.pickerPosition.lastIndexOf("-left")?"-left":"-right"):this.pickerPosition;s="top-left"===r||"top-right"===r?i.top-this.picker.outerHeight():i.top+this.height,this.picker.css({top:s,left:n,zIndex:a}).attr("class","datetimepicker dropdown-menu datetimepicker-dropdown-"+r),this.pickerClass&&this.picker.addClass(this.pickerClass),this.pickerId&&this.picker.attr("id",this.pickerId)}},update:function(){var t,e=!1;arguments&&arguments.length&&("string"==typeof arguments[0]||arguments[0]instanceof Date)?(t=arguments[0],e=!0):(t=this.element.data("date")||(this.isInput?this.element.val():this.element.find("input").val())||this.initialDate,("string"==typeof t||t instanceof String)&&(t=t.replace(/^\s+|\s+$/g,""))),t||(t=new Date,e=!1),this.date=n.parseDate(t,this.format,this.language,this.formatType),e&&this.setValue(),this.datethis.endDate?this.viewDate=new Date(this.endDate):this.viewDate=new Date(this.date),this.fill()},fillDow:function(){for(var t=this.weekStart,e="";t'+s[this.language].daysMin[t++%7]+"";e+="",this.picker.find(".datetimepicker-days thead").append(e)},fillMonths:function(){for(var t="",e=0;e<12;)t+=''+s[this.language].monthsShort[e++]+"";this.picker.find(".datetimepicker-months td").html(t)},fill:function(){if(null!=this.date&&null!=this.viewDate){var i=new Date(this.viewDate),a=i.getUTCFullYear(),o=i.getUTCMonth(),r=i.getUTCDate(),l=i.getUTCHours(),h=i.getUTCMinutes(),c=this.startDate!==-(1/0)?this.startDate.getUTCFullYear():-(1/0),d=this.startDate!==-(1/0)?this.startDate.getUTCMonth():-(1/0),u=this.endDate!==1/0?this.endDate.getUTCFullYear():1/0,p=this.endDate!==1/0?this.endDate.getUTCMonth():1/0,f=new e(this.date.getUTCFullYear(),this.date.getUTCMonth(),this.date.getUTCDate()).valueOf(),g=new Date;if(this.picker.find(".datetimepicker-days thead th:eq(1)").text(s[this.language].months[o]+" "+a),"time"==this.formatViewType){var m=l%12?l%12:12,v=(m<10?"0":"")+m,y=(h<10?"0":"")+h,w=s[this.language].meridiem[l<12?0:1];this.picker.find(".datetimepicker-hours thead th:eq(1)").text(v+":"+y+" "+w.toUpperCase()),this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(v+":"+y+" "+w.toUpperCase())}else this.picker.find(".datetimepicker-hours thead th:eq(1)").text(r+" "+s[this.language].months[o]+" "+a),this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(r+" "+s[this.language].months[o]+" "+a);this.picker.find("tfoot th.today").text(s[this.language].today).toggle(this.todayBtn!==!1),this.updateNavArrows(),this.fillMonths();var b=e(a,o-1,28,0,0,0,0),_=n.getDaysInMonth(b.getUTCFullYear(),b.getUTCMonth());b.setUTCDate(_),b.setUTCDate(_-(b.getUTCDay()-this.weekStart+7)%7);var x=new Date(b);x.setUTCDate(x.getUTCDate()+42),x=x.valueOf();for(var C,k=[];b.valueOf()"),C="",b.getUTCFullYear()a||b.getUTCFullYear()==a&&b.getUTCMonth()>o)&&(C+=" new"),this.todayHighlight&&b.getUTCFullYear()==g.getFullYear()&&b.getUTCMonth()==g.getMonth()&&b.getUTCDate()==g.getDate()&&(C+=" today"),b.valueOf()==f&&(C+=" active"),(b.valueOf()+864e5<=this.startDate||b.valueOf()>this.endDate||t.inArray(b.getUTCDay(),this.daysOfWeekDisabled)!==-1)&&(C+=" disabled"),k.push(''+b.getUTCDate()+""),b.getUTCDay()==this.weekEnd&&k.push(""),b.setUTCDate(b.getUTCDate()+1);this.picker.find(".datetimepicker-days tbody").empty().append(k.join("")),k=[];for(var T="",S="",D="",M=0;M<24;M++){var P=e(a,o,r,M);C="",P.valueOf()+36e5<=this.startDate||P.valueOf()>this.endDate?C+=" disabled":l==M&&(C+=" active"),this.showMeridian&&2==s[this.language].meridiem.length?(S=M<12?s[this.language].meridiem[0]:s[this.language].meridiem[1],S!=D&&(""!=D&&k.push(""),k.push('
              '+S.toUpperCase()+"")),D=S,T=M%12?M%12:12,k.push(''+T+""),23==M&&k.push("
              ")):(T=M+":00",k.push(''+T+""))}this.picker.find(".datetimepicker-hours td").html(k.join("")),k=[],T="",S="",D="";for(var M=0;M<60;M+=this.minuteStep){var P=e(a,o,r,l,M,0);C="",P.valueOf()this.endDate?C+=" disabled":Math.floor(h/this.minuteStep)==Math.floor(M/this.minuteStep)&&(C+=" active"),this.showMeridian&&2==s[this.language].meridiem.length?(S=l<12?s[this.language].meridiem[0]:s[this.language].meridiem[1],S!=D&&(""!=D&&k.push(""),k.push('
              '+S.toUpperCase()+"")),D=S,T=l%12?l%12:12,k.push(''+T+":"+(M<10?"0"+M:M)+""),59==M&&k.push("
              ")):(T=M+":00",k.push(''+l+":"+(M<10?"0"+M:M)+""))}this.picker.find(".datetimepicker-minutes td").html(k.join(""));var F=this.date.getUTCFullYear(),L=this.picker.find(".datetimepicker-months").find("th:eq(1)").text(a).end().find("span").removeClass("active");F==a&&L.eq(this.date.getUTCMonth()).addClass("active"),(au)&&L.addClass("disabled"),a==c&&L.slice(0,d).addClass("disabled"),a==u&&L.slice(p+1).addClass("disabled"),k="",a=10*parseInt(a/10,10);var z=this.picker.find(".datetimepicker-years").find("th:eq(1)").text(a+"-"+(a+9)).end().find("td");a-=1;for(var M=-1;M<11;M++)k+='u?" disabled":"")+'">'+a+"",a+=1;z.html(k),this.place()}},updateNavArrows:function(){var t=new Date(this.viewDate),e=t.getUTCFullYear(),i=t.getUTCMonth(),s=t.getUTCDate(),n=t.getUTCHours();switch(this.viewMode){case 0:this.startDate!==-(1/0)&&e<=this.startDate.getUTCFullYear()&&i<=this.startDate.getUTCMonth()&&s<=this.startDate.getUTCDate()&&n<=this.startDate.getUTCHours()?this.picker.find(".prev").css({visibility:"hidden"}):this.picker.find(".prev").css({visibility:"visible"}),this.endDate!==1/0&&e>=this.endDate.getUTCFullYear()&&i>=this.endDate.getUTCMonth()&&s>=this.endDate.getUTCDate()&&n>=this.endDate.getUTCHours()?this.picker.find(".next").css({visibility:"hidden"}):this.picker.find(".next").css({visibility:"visible"});break;case 1:this.startDate!==-(1/0)&&e<=this.startDate.getUTCFullYear()&&i<=this.startDate.getUTCMonth()&&s<=this.startDate.getUTCDate()?this.picker.find(".prev").css({visibility:"hidden"}):this.picker.find(".prev").css({visibility:"visible"}),this.endDate!==1/0&&e>=this.endDate.getUTCFullYear()&&i>=this.endDate.getUTCMonth()&&s>=this.endDate.getUTCDate()?this.picker.find(".next").css({visibility:"hidden"}):this.picker.find(".next").css({visibility:"visible"});break;case 2:this.startDate!==-(1/0)&&e<=this.startDate.getUTCFullYear()&&i<=this.startDate.getUTCMonth()?this.picker.find(".prev").css({visibility:"hidden"}):this.picker.find(".prev").css({visibility:"visible"}),this.endDate!==1/0&&e>=this.endDate.getUTCFullYear()&&i>=this.endDate.getUTCMonth()?this.picker.find(".next").css({visibility:"hidden"}):this.picker.find(".next").css({visibility:"visible"});break;case 3:case 4:this.startDate!==-(1/0)&&e<=this.startDate.getUTCFullYear()?this.picker.find(".prev").css({visibility:"hidden"}):this.picker.find(".prev").css({visibility:"visible"}),this.endDate!==1/0&&e>=this.endDate.getUTCFullYear()?this.picker.find(".next").css({visibility:"hidden"}):this.picker.find(".next").css({visibility:"visible"})}},mousewheel:function(e){if(e.preventDefault(),e.stopPropagation(),!this.wheelPause){this.wheelPause=!0;var i=e.originalEvent,s=i.wheelDelta,n=s>0?1:0===s?0:-1;this.wheelViewModeNavigationInverseDirection&&(n=-n),this.showMode(n),setTimeout(t.proxy(function(){this.wheelPause=!1},this),this.wheelViewModeNavigationDelay)}},click:function(i){i.stopPropagation(),i.preventDefault();var s=t(i.target).closest("span, td, th, legend");if(1==s.length){if(s.is(".disabled"))return void this.element.trigger({type:"outOfRange",date:this.viewDate,startDate:this.startDate,endDate:this.endDate});switch(s[0].nodeName.toLowerCase()){case"th":switch(s[0].className){case"switch":this.showMode(1);break;case"prev":case"next":var a=n.modes[this.viewMode].navStep*("prev"==s[0].className?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveHour(this.viewDate,a);break;case 1:this.viewDate=this.moveDate(this.viewDate,a);break;case 2:this.viewDate=this.moveMonth(this.viewDate,a);break;case 3:case 4:this.viewDate=this.moveYear(this.viewDate,a)}this.fill();break;case"today":var o=new Date;o=e(o.getFullYear(),o.getMonth(),o.getDate(),o.getHours(),o.getMinutes(),o.getSeconds(),0),othis.endDate&&(o=this.endDate),this.viewMode=this.startViewMode,this.showMode(0),this._setDate(o),this.fill(),this.autoclose&&this.hide()}break;case"span":if(!s.is(".disabled")){var r=this.viewDate.getUTCFullYear(),l=this.viewDate.getUTCMonth(),h=this.viewDate.getUTCDate(),c=this.viewDate.getUTCHours(),d=this.viewDate.getUTCMinutes(),u=this.viewDate.getUTCSeconds();if(s.is(".month")?(this.viewDate.setUTCDate(1),l=s.parent().find("span").index(s),h=this.viewDate.getUTCDate(),this.viewDate.setUTCMonth(l),this.element.trigger({type:"changeMonth",date:this.viewDate}),this.viewSelect>=3&&this._setDate(e(r,l,h,c,d,u,0))):s.is(".year")?(this.viewDate.setUTCDate(1),r=parseInt(s.text(),10)||0,this.viewDate.setUTCFullYear(r),this.element.trigger({type:"changeYear",date:this.viewDate}),this.viewSelect>=4&&this._setDate(e(r,l,h,c,d,u,0))):s.is(".hour")?(c=parseInt(s.text(),10)||0,(s.hasClass("hour_am")||s.hasClass("hour_pm"))&&(12==c&&s.hasClass("hour_am")?c=0:12!=c&&s.hasClass("hour_pm")&&(c+=12)),this.viewDate.setUTCHours(c),this.element.trigger({type:"changeHour",date:this.viewDate}),this.viewSelect>=1&&this._setDate(e(r,l,h,c,d,u,0))):s.is(".minute")&&(d=parseInt(s.text().substr(s.text().indexOf(":")+1),10)||0,this.viewDate.setUTCMinutes(d),this.element.trigger({type:"changeMinute",date:this.viewDate}),this.viewSelect>=0&&this._setDate(e(r,l,h,c,d,u,0))),0!=this.viewMode){var p=this.viewMode;this.showMode(-1),this.fill(),p==this.viewMode&&this.autoclose&&this.hide()}else this.fill(),this.autoclose&&this.hide()}break;case"td":if(s.is(".day")&&!s.is(".disabled")){var h=parseInt(s.text(),10)||1,r=this.viewDate.getUTCFullYear(),l=this.viewDate.getUTCMonth(),c=this.viewDate.getUTCHours(),d=this.viewDate.getUTCMinutes(),u=this.viewDate.getUTCSeconds();s.is(".old")?0===l?(l=11,r-=1):l-=1:s.is(".new")&&(11==l?(l=0,r+=1):l+=1),this.viewDate.setUTCFullYear(r),this.viewDate.setUTCMonth(l,h),this.element.trigger({type:"changeDay",date:this.viewDate}),this.viewSelect>=2&&this._setDate(e(r,l,h,c,d,u,0))}var p=this.viewMode;this.showMode(-1),this.fill(),p==this.viewMode&&this.autoclose&&this.hide()}}},_setDate:function(t,e){e&&"date"!=e||(this.date=t),e&&"view"!=e||(this.viewDate=t),this.fill(),this.setValue();var i;this.isInput?i=this.element:this.component&&(i=this.element.find("input")),i&&(i.change(),this.autoclose&&(!e||"date"==e)),this.element.trigger({type:"changeDate",date:this.date}),null===t&&(this.date=this.viewDate)},moveMinute:function(t,e){if(!e)return t;var i=new Date(t.valueOf());return i.setUTCMinutes(i.getUTCMinutes()+e*this.minuteStep),i},moveHour:function(t,e){if(!e)return t;var i=new Date(t.valueOf());return i.setUTCHours(i.getUTCHours()+e),i},moveDate:function(t,e){if(!e)return t;var i=new Date(t.valueOf());return i.setUTCDate(i.getUTCDate()+e),i},moveMonth:function(t,e){if(!e)return t;var i,s,n=new Date(t.valueOf()),a=n.getUTCDate(),o=n.getUTCMonth(),r=Math.abs(e);if(e=e>0?1:-1,1==r)s=e==-1?function(){return n.getUTCMonth()==o}:function(){return n.getUTCMonth()!=i},i=o+e,n.setUTCMonth(i),(i<0||i>11)&&(i=(i+12)%12);else{for(var l=0;l=this.startDate&&t<=this.endDate},keydown:function(t){if(this.picker.is(":not(:visible)"))return void(27==t.keyCode&&this.show());var e,i,s,n=!1;switch(t.keyCode){case 27:this.hide(),t.preventDefault();break;case 37:case 39:if(!this.keyboardNavigation)break;e=37==t.keyCode?-1:1,viewMode=this.viewMode,t.ctrlKey?viewMode+=2:t.shiftKey&&(viewMode+=1),4==viewMode?(i=this.moveYear(this.date,e),s=this.moveYear(this.viewDate,e)):3==viewMode?(i=this.moveMonth(this.date,e),s=this.moveMonth(this.viewDate,e)):2==viewMode?(i=this.moveDate(this.date,e),s=this.moveDate(this.viewDate,e)):1==viewMode?(i=this.moveHour(this.date,e),s=this.moveHour(this.viewDate,e)):0==viewMode&&(i=this.moveMinute(this.date,e),s=this.moveMinute(this.viewDate,e)),this.dateWithinRange(i)&&(this.date=i,this.viewDate=s,this.setValue(),this.update(),t.preventDefault(),n=!0);break;case 38:case 40:if(!this.keyboardNavigation)break;e=38==t.keyCode?-1:1,viewMode=this.viewMode,t.ctrlKey?viewMode+=2:t.shiftKey&&(viewMode+=1),4==viewMode?(i=this.moveYear(this.date,e),s=this.moveYear(this.viewDate,e)):3==viewMode?(i=this.moveMonth(this.date,e),s=this.moveMonth(this.viewDate,e)):2==viewMode?(i=this.moveDate(this.date,7*e),s=this.moveDate(this.viewDate,7*e)):1==viewMode?this.showMeridian?(i=this.moveHour(this.date,6*e),s=this.moveHour(this.viewDate,6*e)):(i=this.moveHour(this.date,4*e),s=this.moveHour(this.viewDate,4*e)):0==viewMode&&(i=this.moveMinute(this.date,4*e),s=this.moveMinute(this.viewDate,4*e)),this.dateWithinRange(i)&&(this.date=i,this.viewDate=s,this.setValue(),this.update(),t.preventDefault(),n=!0);break;case 13:if(0!=this.viewMode){var a=this.viewMode;this.showMode(-1),this.fill(),a==this.viewMode&&this.autoclose&&this.hide()}else this.fill(),this.autoclose&&this.hide();t.preventDefault();break;case 9:this.hide()}if(n){var o;this.isInput?o=this.element:this.component&&(o=this.element.find("input")),o&&o.change(),this.element.trigger({type:"changeDate",date:this.date})}},showMode:function(t){if(t){var e=Math.max(0,Math.min(n.modes.length-1,this.viewMode+t));e>=this.minView&&e<=this.maxView&&(this.element.trigger({type:"changeMode",date:this.viewDate,oldViewMode:this.viewMode,newViewMode:e}),this.viewMode=e)}this.picker.find(">div").hide().filter(".datetimepicker-"+n.modes[this.viewMode].clsName).css("display","block"),this.updateNavArrows()},reset:function(t){this._setDate(null,"date")}},t.fn.datetimepicker=function(e){var s=Array.apply(null,arguments);return s.shift(),this.each(function(){var n=t(this),a=n.data("datetimepicker"),o="object"==typeof e&&e;a||n.data("datetimepicker",a=new i(this,t.extend({},t.fn.datetimepicker.defaults,n.data(),o))),"string"==typeof e&&"function"==typeof a[e]&&a[e].apply(a,s)})},t.fn.datetimepicker.defaults={pickerPosition:"auto-right"},t.fn.datetimepicker.Constructor=i;var s=t.fn.datetimepicker.dates={en:{days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa","Su"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],meridiem:["am","pm"],suffix:["st","nd","rd","th"],today:"Today"}};s["zh-cn"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六","星期日"],daysShort:["周日","周一","周二","周三","周四","周五","周六","周日"],daysMin:["日","一","二","三","四","五","六","日"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],today:"今日",suffix:[],meridiem:[]},s["zh-tw"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六","星期日"],daysShort:["周日","周一","周二","周三","周四","周五","周六","周日"],daysMin:["日","一","二","三","四","五","六","日"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],today:"今天",suffix:[],meridiem:["上午","下午"]};var n={modes:[{clsName:"minutes",navFnc:"Hours",navStep:1},{clsName:"hours",navFnc:"Date",navStep:1},{clsName:"days",navFnc:"Month",navStep:1},{clsName:"months",navFnc:"FullYear",navStep:1},{clsName:"years",navFnc:"FullYear",navStep:10}],isLeapYear:function(t){return t%4===0&&t%100!==0||t%400===0},getDaysInMonth:function(t,e){return[31,n.isLeapYear(t)?29:28,31,30,31,30,31,31,30,31,30,31][e]},getDefaultFormat:function(t,e){if("standard"==t)return"input"==e?"yyyy-mm-dd hh:ii":"yyyy-mm-dd hh:ii:ss";if("php"==t)return"input"==e?"Y-m-d H:i":"Y-m-d H:i:s";throw new Error("Invalid format type.")},validParts:function(t){if("standard"==t)return/hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g;if("php"==t)return/[dDjlNwzFmMnStyYaABgGhHis]/g;throw new Error("Invalid format type.")},nonpunctuation:/[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,parseFormat:function(t,e){var i=t.replace(this.validParts(e),"\0").split("\0"),s=t.match(this.validParts(e));if(!i||!i.length||!s||0==s.length)throw new Error("Invalid date format.");return{separators:i,parts:s}},parseDate:function(n,a,o,r){if(n instanceof Date){var l=new Date(n.valueOf()-6e4*n.getTimezoneOffset());return l.setMilliseconds(0),l}if(/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(n)&&(a=this.parseFormat("yyyy-mm-dd",r)),/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(n)&&(a=this.parseFormat("yyyy-mm-dd hh:ii",r)),/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(n)&&(a=this.parseFormat("yyyy-mm-dd hh:ii:ss",r)),/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(n)){var h,c,d=/([-+]\d+)([dmwy])/,u=n.match(/([-+]\d+)([dmwy])/g);n=new Date;for(var p=0;p',contTemplate:'',footTemplate:''};n.template='
              '+n.headTemplate+n.contTemplate+n.footTemplate+'
              '+n.headTemplate+n.contTemplate+n.footTemplate+'
              '+n.headTemplate+""+n.footTemplate+'
              '+n.headTemplate+n.contTemplate+n.footTemplate+'
              '+n.headTemplate+n.contTemplate+n.footTemplate+"
              ",t.fn.datetimepicker.DPGlobal=n,t.fn.datetimepicker.noConflict=function(){return t.fn.datetimepicker=old,this},t(document).on("focus.datetimepicker.data-api click.datetimepicker.data-api",'[data-provide="datetimepicker"]',function(e){ +var i=t(this);i.data("datetimepicker")||(e.preventDefault(),i.datetimepicker("show"))}),t(function(){t('[data-provide="datetimepicker-inline"]').datetimepicker()})}(window.jQuery),/*! +Chosen, a Select Box Enhancer for jQuery and Prototype +by Patrick Filler for Harvest, http://getharvest.com + +Version 1.1.0 +Full source at https://github.com/harvesthq/chosen +Copyright (c) 2011 Harvest http://getharvest.com + +MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md +*/ +function(){var t,e,i,s,n,a={}.hasOwnProperty,o=function(t,e){function i(){this.constructor=t}for(var s in e)a.call(e,s)&&(t[s]=e[s]);return i.prototype=e.prototype,t.prototype=new i,t.__super__=e.prototype,t},r={zh_cn:{no_results_text:"没有找到"},zh_tw:{no_results_text:"沒有找到"},en:{no_results_text:"No results match"}};s=function(){function e(){this.options_index=0,this.parsed=[]}return e.prototype.add_node=function(t){return"OPTGROUP"===t.nodeName.toUpperCase()?this.add_group(t):this.add_option(t)},e.prototype.add_group=function(e){var i,s,n,a,o,r;for(i=this.parsed.length,this.parsed.push({array_index:i,group:!0,label:this.escapeExpression(e.label),children:0,disabled:e.disabled,title:e.title,search_keys:t.trim(e.getAttribute("data-keys")||"").replace(/,/g," ")}),o=e.childNodes,r=[],n=0,a=o.length;n\"\'\`]/.test(t)?(e={"<":"<",">":">",'"':""","'":"'","`":"`"},i=/&(?!\w+;)|[\<\>\"\'\`]/g,t.replace(i,function(t){return e[t]||"&"})):t},e}(),s.select_to_array=function(t){var e,i,n,a,o;for(i=new s,o=t.childNodes,n=0,a=o.length;n0?(e=document.createElement("li"),e.className="group-result",e.title=t.title,e.innerHTML=t.search_text,this.outerHTML(e)):""},e.prototype.results_update_field=function(){if(this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing)return this.winnow_results()},e.prototype.reset_single_select_options=function(){var t,e,i,s,n;for(s=this.results_data,n=[],e=0,i=s.length;e"+i.search_text.substr(l+r.length),i.search_text=h.substr(0,l)+""+h.substr(l)):i.search_keys_match&&i.search_keys.length&&(l=i.search_keys.search(c),h=i.search_keys.substr(0,l+r.length)+""+i.search_keys.substr(l+r.length),i.search_text+='  '+h.substr(0,l)+""+h.substr(l)+""),null!=o&&(o.group_match=!0)):null!=i.group_array_index&&this.results_data[i.group_array_index].search_match&&(i.search_match=!0)));return this.result_clear_highlight(),a<1&&r.length?(this.update_results_content(""),this.no_results(r)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight(t))},e.prototype.search_string_match=function(t,e){var i,s,n,a;if(e.test(t))return!0;if(this.enable_split_word_search&&(t.indexOf(" ")>=0||0===t.indexOf("["))&&(s=t.replace(/\[|\]/g,"").split(" "),s.length))for(n=0,a=s.length;n0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(t.preventDefault(),this.results_showing)return this.result_select(t);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},e.prototype.clipboard_event_checker=function(t){var e=this;return setTimeout(function(){return e.results_search()},50)},e.prototype.container_width=function(){return null!=this.options.width?this.options.width:this.form_field.classList.contains("form-control")?"100%":""+this.form_field.offsetWidth+"px"},e.prototype.include_option_in_results=function(t){return!(this.is_multiple&&!this.display_selected_options&&t.selected)&&(!(!this.display_disabled_options&&t.disabled)&&!t.empty)},e.prototype.search_results_touchstart=function(t){return this.touch_started=!0,this.search_results_mouseover(t)},e.prototype.search_results_touchmove=function(t){return this.touch_started=!1,this.search_results_mouseout(t)},e.prototype.search_results_touchend=function(t){if(this.touch_started)return this.search_results_mouseup(t)},e.prototype.outerHTML=function(t){var e;return t.outerHTML?t.outerHTML:(e=document.createElement("div"),e.appendChild(t),e.innerHTML)},e.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:!/iP(od|hone)/i.test(window.navigator.userAgent)&&(!/Android/i.test(window.navigator.userAgent)||!/Mobile/i.test(window.navigator.userAgent))},e.default_multiple_text="",e.default_single_text="",e.default_no_result_text="No results match",e}(),t=jQuery,t.fn.extend({chosen:function(s){return e.browser_is_supported()?this.each(function(e){var n,a;n=t(this),a=n.data("chosen"),"destroy"===s&&a?a.destroy():a||n.data("chosen",new i(this,s))}):this}}),i=function(e){function i(){return n=i.__super__.constructor.apply(this,arguments)}return o(i,e),i.prototype.setup=function(){return this.form_field_jq=t(this.form_field),this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")},i.prototype.set_up_html=function(){var e,i;e=["chosen-container"],e.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&e.push(this.form_field.className),this.is_rtl&&e.push("chosen-rtl");var s=this.form_field.getAttribute("data-css-class");return s&&e.push(s),i={"class":e.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(i.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=t("
              ",i),this.is_multiple?this.container.html('
                '):this.container.html(''+this.default_text+'
                  '),this.form_field_jq.hide().after(this.container),this.dropdown=this.container.find("div.chosen-drop").first(),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chosen-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chosen-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chosen-search").first(),this.selected_item=this.container.find(".chosen-single").first()),this.options.drop_width&&this.dropdown.css("width",this.options.drop_width).addClass("chosen-drop-size-limited"),this.results_build(),this.set_tab_index(),this.set_label_behavior(),this.form_field_jq.trigger("chosen:ready",{chosen:this})},i.prototype.register_observers=function(){var t=this;return this.container.bind("mousedown.chosen",function(e){t.container_mousedown(e)}),this.container.bind("mouseup.chosen",function(e){t.container_mouseup(e)}),this.container.bind("mouseenter.chosen",function(e){t.mouse_enter(e)}),this.container.bind("mouseleave.chosen",function(e){t.mouse_leave(e)}),this.search_results.bind("mouseup.chosen",function(e){t.search_results_mouseup(e)}),this.search_results.bind("mouseover.chosen",function(e){t.search_results_mouseover(e)}),this.search_results.bind("mouseout.chosen",function(e){t.search_results_mouseout(e)}),this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(e){t.search_results_mousewheel(e)}),this.search_results.bind("touchstart.chosen",function(e){t.search_results_touchstart(e)}),this.search_results.bind("touchmove.chosen",function(e){t.search_results_touchmove(e)}),this.search_results.bind("touchend.chosen",function(e){t.search_results_touchend(e)}),this.form_field_jq.bind("chosen:updated.chosen",function(e){t.results_update_field(e)}),this.form_field_jq.bind("chosen:activate.chosen",function(e){t.activate_field(e)}),this.form_field_jq.bind("chosen:open.chosen",function(e){t.container_mousedown(e)}),this.form_field_jq.bind("chosen:close.chosen",function(e){t.input_blur(e)}),this.search_field.bind("blur.chosen",function(e){t.input_blur(e)}),this.search_field.bind("keyup.chosen",function(e){t.keyup_checker(e)}),this.search_field.bind("keydown.chosen",function(e){t.keydown_checker(e)}),this.search_field.bind("focus.chosen",function(e){t.input_focus(e)}),this.search_field.bind("cut.chosen",function(e){t.clipboard_event_checker(e)}),this.search_field.bind("paste.chosen",function(e){t.clipboard_event_checker(e)}),this.is_multiple?this.search_choices.bind("click.chosen",function(e){t.choices_click(e)}):this.container.bind("click.chosen",function(t){t.preventDefault()})},i.prototype.destroy=function(){return t(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex),this.container.remove(),this.form_field_jq.removeData("chosen"),this.form_field_jq.show()},i.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field_jq[0].disabled,this.is_disabled?(this.container.addClass("chosen-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action),this.close_field()):(this.container.removeClass("chosen-disabled"),this.search_field[0].disabled=!1,this.is_multiple?void 0:this.selected_item.bind("focus.chosen",this.activate_action))},i.prototype.container_mousedown=function(e){if(!this.is_disabled&&(e&&"mousedown"===e.type&&!this.results_showing&&e.preventDefault(),null==e||!t(e.target).hasClass("search-choice-close")))return this.active_field?this.is_multiple||!e||t(e.target)[0]!==this.selected_item[0]&&!t(e.target).parents("a.chosen-single").length||(e.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),t(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action),this.results_show()),this.activate_field()},i.prototype.container_mouseup=function(t){if("ABBR"===t.target.nodeName&&!this.is_disabled)return this.results_reset(t)},i.prototype.search_results_mousewheel=function(t){var e;if(t.originalEvent&&(e=-t.originalEvent.wheelDelta||t.originalEvent.detail),null!=e)return t.preventDefault(),"DOMMouseScroll"===t.type&&(e=40*e),this.search_results.scrollTop(e+this.search_results.scrollTop())},i.prototype.blur_test=function(t){if(!this.active_field&&this.container.hasClass("chosen-container-active"))return this.close_field()},i.prototype.close_field=function(){return t(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClass("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},i.prototype.activate_field=function(){this.container.addClass("chosen-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val())},i.prototype.test_active_click=function(e){var i;return i=t(e.target).closest(".chosen-container"),i.length&&this.container[0]===i[0]?this.active_field=!0:this.close_field()},i.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=s.select_to_array(this.form_field),this.is_multiple?this.search_choices.find("li.search-choice").remove():this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field[0].readOnly=!0,this.container.addClass("chosen-container-single-nosearch")):(this.search_field[0].readOnly=!1,this.container.removeClass("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},i.prototype.result_do_highlight=function(t,e){var i,s,n,a,o,r,l=-1;t.length&&(this.result_clear_highlight(),this.result_highlight=t,this.result_highlight.addClass("highlighted"),n=parseInt(this.search_results.css("maxHeight"),10),r=this.result_highlight.outerHeight(),o=this.search_results.scrollTop(),a=n+o,s=this.result_highlight.position().top+this.search_results.scrollTop(),i=s+r,this.middle_highlight&&(e||"always"===this.middle_highlight||i>=a||s=a?l=i-n>0?i-n:0:s-1&&this.search_results.scrollTop(l))},i.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},i.prototype.results_show=function(){if(this.is_multiple&&this.max_selected_options<=this.choices_count())return this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1;this.container.addClass("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results(1);var e=this.drop_direction;if("auto"===e)if(this.drop_directionFixed)e=this.drop_directionFixed;else{var i=this.container.find(".chosen-drop"),s=this.container.offset();s.top+i.outerHeight()+30>t(window).height()+t(window).scrollTop()&&(e="up"),this.drop_directionFixed=e}return this.container.toggleClass("chosen-up","up"===e),this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this})},i.prototype.update_results_content=function(t){return this.search_results.html(t)},i.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClass("chosen-with-drop"),this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this}),this.drop_directionFixed=0),this.results_showing=!1},i.prototype.set_tab_index=function(t){var e;if(this.form_field.tabIndex)return e=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=e},i.prototype.set_label_behavior=function(){var e=this;if(this.form_field_label=this.form_field_jq.parents("label"),!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=t("label[for='"+this.form_field.id+"']")),this.form_field_label.length>0)return this.form_field_label.bind("click.chosen",function(t){return e.is_multiple?e.container_mousedown(t):e.activate_field()})},i.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},i.prototype.search_results_mouseup=function(e){var i;i=t(e.target).hasClass("active-result")?t(e.target):t(e.target).parents(".active-result").first(),i.length&&(this.result_highlight=i,this.result_select(e))},i.prototype.search_results_mouseover=function(e){var i;if(i=t(e.target).hasClass("active-result")?t(e.target):t(e.target).parents(".active-result").first())return this.result_do_highlight(i)},i.prototype.search_results_mouseout=function(e){if(t(e.target).hasClass("active-result"))return this.result_clear_highlight()},i.prototype.choice_build=function(e){var i,s,n=this;return i=t("
                • ",{"class":"search-choice"}).html(""+e.html+""),e.disabled?i.addClass("search-choice-disabled"):(s=t("",{"class":"search-choice-close","data-option-array-index":e.array_index}),s.bind("click.chosen",function(t){return n.choice_destroy_link_click(t)}),i.append(s)),this.search_container.before(i)},i.prototype.choice_destroy_link_click=function(e){if(e.preventDefault(),e.stopPropagation(),!this.is_disabled)return this.choice_destroy(t(e.target))},i.prototype.choice_destroy=function(t){if(this.result_deselect(t[0].getAttribute("data-option-array-index")))return this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide(),t.parents("li").first().remove(),this.search_field_scale()},i.prototype.results_reset=function(){if(this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change"),this.active_field)return this.results_hide()},i.prototype.results_reset_cleanup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.selected_item.find("abbr").remove()},i.prototype.result_select=function(t){var e,i;if(this.result_highlight)return e=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?e.removeClass("active-result"):this.reset_single_select_options(),i=this.results_data[e[0].getAttribute("data-option-array-index")],i.selected=!0,this.form_field.options[i.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(i):this.single_set_selected_text(i.text),(t.metaKey||t.ctrlKey)&&this.is_multiple||this.results_hide(),this.search_field.val(""),(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[i.options_index].value}),this.current_selectedIndex=this.form_field.selectedIndex,this.search_field_scale())},i.prototype.single_set_selected_text=function(t){return null==t&&(t=this.default_text),t===this.default_text?this.selected_item.addClass("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClass("chosen-default")),this.selected_item.find("span").attr("title",t).text(t)},i.prototype.result_deselect=function(t){var e;return e=this.results_data[t],!this.form_field.options[e.options_index].disabled&&(e.selected=!1,this.form_field.options[e.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[e.options_index].value}),this.search_field_scale(),!0)},i.prototype.single_deselect_control_build=function(){if(this.allow_single_deselect)return this.selected_item.find("abbr").length||this.selected_item.find("span").first().after(''),this.selected_item.addClass("chosen-single-with-deselect")},i.prototype.get_search_text=function(){return this.search_field.val()===this.default_text?"":t("
                  ").text(t.trim(this.search_field.val())).html()},i.prototype.winnow_results_set_highlight=function(t){var e,i;if(i=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),e=i.length?i.first():this.search_results.find(".active-result").first(),null!=e)return this.result_do_highlight(e,t)},i.prototype.no_results=function(e){var i;return i=t('
                • '+this.results_none_found+' ""
                  • '),i.find("span").first().html(e),this.search_results.append(i),this.form_field_jq.trigger("chosen:no_results",{chosen:this})},i.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},i.prototype.keydown_arrow=function(){var t;return this.results_showing&&this.result_highlight?(t=this.result_highlight.nextAll("li.active-result").first())?this.result_do_highlight(t):void 0:this.results_show()},i.prototype.keyup_arrow=function(){var t;return this.results_showing||this.is_multiple?this.result_highlight?(t=this.result_highlight.prevAll("li.active-result"),t.length?this.result_do_highlight(t.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},i.prototype.keydown_backstroke=function(){var t;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(t=this.search_container.siblings("li.search-choice").last(),t.length&&!t.hasClass("search-choice-disabled")?(this.pending_backstroke=t,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")):void 0)},i.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},i.prototype.keydown_checker=function(t){var e,i;switch(e=null!=(i=t.which)?i:t.keyCode,this.search_field_scale(),8!==e&&this.pending_backstroke&&this.clear_backstroke(),e){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(t),this.mouse_on_container=!1;break;case 13:t.preventDefault();break;case 38:t.preventDefault(),this.keyup_arrow();break;case 40:t.preventDefault(),this.keydown_arrow()}},i.prototype.search_field_scale=function(){var e,i,s,n,a,o,r,l,h;if(this.is_multiple){for(s=0,r=0,a="position:absolute; left: -1000px; top: -1000px; display:none;",o=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],l=0,h=o.length;l",{style:a}),e.text(this.search_field.val()),t("body").append(e),r=e.width()+25,e.remove(),i=this.container.outerWidth(),r>i-10&&(r=i-10),this.search_field.css({width:r+"px"})}},i}(e)}.call(this),function(t){"use strict";var e="zui.selectable",i=function(i,s){this.name=e,this.$=t(i),this.id=t.zui.uuid(),this.selectOrder=1,this.selections={},this.getOptions(s),this._init()},s=function(t,e,i){return t>=i.left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height},n=function(t,e){var i=Math.max(t.left,e.left),n=Math.max(t.top,e.top),a=Math.min(t.left+t.width,e.left+e.width),o=Math.min(t.top+t.height,e.top+e.height);return s(i,n,t)&&s(a,o,t)&&s(i,n,e)&&s(a,o,e)};i.DEFAULTS={selector:"li,tr,div",trigger:"",selectClass:"active",rangeStyle:{border:"1px solid "+(t.zui.colorset?t.zui.colorset.primary:"#3280fc"),backgroundColor:t.zui.colorset?new t.zui.Color(t.zui.colorset.primary).fade(20).toCssStr():"rgba(50, 128, 252, 0.2)"},clickBehavior:"toggle",ignoreVal:3,listenClick:!0},i.prototype.getOptions=function(e){this.options=t.extend({},i.DEFAULTS,this.$.data(),e)},i.prototype.select=function(t){this.toggle(t,!0)},i.prototype.unselect=function(t){this.toggle(t,!1)},i.prototype.toggle=function(e,i,s){var n,a,o=this.options.selector,r=this;if(void 0===e)return void this.$.find(o).each(function(){r.toggle(this,i)});if("object"==typeof e?(n=t(e).closest(o),a=n.data("id")):(a=e,n=r.$.find('.slectable-item[data-id="'+a+'"]')),n&&n.length){if(a||(a=t.zui.uuid(),n.attr("data-id",a)),void 0!==i&&null!==i||(i=!r.selections[a]),!!i!=!!r.selections[a]){var l;t.isFunction(s)&&(l=s(i)),l!==!0&&(r.selections[a]=!!i&&r.selectOrder++,r.callEvent(i?"select":"unselect",{id:a,selections:r.selections,target:n,selected:r.getSelectedArray()},r))}r.options.selectClass&&n.toggleClass(r.options.selectClass,i)}},i.prototype.getSelectedArray=function(){var e=[];return t.each(this.selections,function(t,i){i&&e.push(t)}),e},i.prototype.syncSelectionsFromClass=function(){var e=this;e.$children=e.$.find(e.options.selector);e.selections={},e.$children.each(function(){var i=t(this);e.selections[i.data("id")]=i.hasClass(e.options.selectClass)})},i.prototype._init=function(){var e,i,s,a,o,r,l,h=this.options,c=this,d=h.ignoreVal,u=!0,p="."+this.name+"."+this.id,f=t.isFunction(h.checkFunc)?h.checkFunc:null,g=t.isFunction(h.rangeFunc)?h.rangeFunc:null,m=!1,v=null,y="mousedown"+p,w=function(){a&&c.$children.each(function(){var e=t(this),i=e.offset();i.width=e.outerWidth(),i.height=e.outerHeight();var s=g?g.call(this,a,i):n(a,i);if(f){var o=f.call(c,{intersect:s,target:e,range:a,targetRange:i});o===!0?c.select(e):o===!1&&c.unselect(e)}else s?c.select(e):c.multiKey||c.unselect(e)})},b=function(n){m&&(o=n.pageX,r=n.pageY,a={width:Math.abs(o-e),height:Math.abs(r-i),left:o>e?e:o,top:r>i?i:r},u&&a.width
                  ').css(t.extend({zIndex:1060,position:"absolute",top:e,left:i,pointerEvents:"none"},c.options.rangeStyle)).appendTo(t("body")))),s.css(a),clearTimeout(l),l=setTimeout(w,10),u=!1))},_=function(e){t(document).off(p),clearTimeout(v),m&&(m=!1,s&&s.remove(),u||a&&(clearTimeout(l),w(),a=null),c.callEvent("finish",{selections:c.selections,selected:c.getSelectedArray()}),e.preventDefault())},x=function(n){if(m)return _(n);var a=t.zui.getMouseButtonCode(h.mouseButton);if(!(a>-1&&n.button!==a||c.altKey||3===n.which||c.callEvent("start",n)===!1)){var o=c.$children=c.$.find(h.selector);o.addClass("slectable-item");var r=c.multiKey?"multi":h.clickBehavior;if("single"===r&&c.unselect(),h.listenClick&&("multi"===r?c.toggle(n.target):"single"===r?c.select(n.target):"toggle"===r&&c.toggle(n.target,null,function(t){c.unselect()})),c.callEvent("startDrag",n)===!1)return void c.callEvent("finish",{selections:c.selections,selected:c.getSelectedArray()});e=n.pageX,i=n.pageY,s=null,u=!0,m=!0,t(document).on("mousemove"+p,b).on("mouseup"+p,_),v=setTimeout(function(){t(document).on(y,_)},10),n.preventDefault()}},C=h.container&&"default"!==h.container?t(h.container):this.$;h.trigger?C.on(y,h.trigger,x):C.on(y,x),t(document).on("keydown",function(t){var e=t.keyCode;17===e||91==e?c.multiKey=e:18===e&&(c.altKey=!0)}).on("keyup",function(t){c.multiKey=!1,c.altKey=!1})},i.prototype.callEvent=function(e,i){var s=t.Event(e+"."+this.name);this.$.trigger(s,i);var n=s.result,a=this.options[e];return t.isFunction(a)&&(n=a.apply(this,t.isArray(i)?i:[i])),n},t.fn.selectable=function(s){return this.each(function(){var n=t(this),a=n.data(e),o="object"==typeof s&&s;a||n.data(e,a=new i(this,o)),"string"==typeof s&&a[s]()})},t.fn.selectable.Constructor=i,t(function(){t('[data-ride="selectable"]').selectable()})}(jQuery),/*! + * jQuery Form Plugin + * version: 4.2.2 + * Requires jQuery v1.7.2 or later + * Project repository: https://github.com/jquery-form/form + + * Copyright 2017 Kevin Morris + * Copyright 2006 M. Alsup + + * Dual licensed under the LGPL-2.1+ or MIT licenses + * https://github.com/jquery-form/form#license + + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 void 0===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,s=t(i);if(!s.is("[type=submit],[type=image]")){var n=s.closest("[type=submit]");if(0===n.length)return;i=n[0]}var a=i.form;if(a.clk=i,"image"===i.type)if(void 0!==e.offsetX)a.clk_x=e.offsetX,a.clk_y=e.offsetY;else if("function"==typeof t.fn.offset){var o=s.offset();a.clk_x=e.pageX-o.left,a.clk_y=e.pageY-o.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 s(){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 n=/\r?\n/g,a={};a.fileapi=void 0!==t('').get(0).files,a.formdata=void 0!==window.FormData;var o=!!t.fn.prop;t.fn.attr2=function(){if(!o)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,n,r){function l(i){var s,n,a=t.param(i,e.traditional).split("&"),o=a.length,r=[];for(s=0;s',T).val(d.extraData[l].value).appendTo(C)[0]):o.push(h('',T).val(d.extraData[l]).appendTo(C)[0]));d.iframeTarget||g.appendTo(S),m.attachEvent?m.attachEvent("onload",r):m.addEventListener("load",r,!1),setTimeout(t,15);try{C.submit()}catch(h){document.createElement("form").submit.apply(C)}}finally{C.setAttribute("action",i),C.setAttribute("enctype",a),e?C.setAttribute("target",e):p.removeAttr("target"),h(o).remove()}}function r(t){if(!y.aborted&&!I){if((z=n(m))||(s("cannot access response document"),t=M),t===D&&y)return y.abort("timeout"),void k.reject(y,"timeout");if(t===M&&y)return y.abort("server abort"),void k.reject(y,"error","server abort");if(z&&z.location.href!==d.iframeSrc||_){m.detachEvent?m.detachEvent("onload",r):m.removeEventListener("load",r,!1);var e,i="success";try{if(_)throw"timeout";var a="xml"===d.dataType||z.XMLDocument||v.isXMLDoc(z);if(s("isXml="+a),!a&&window.opera&&(null===z.body||!z.body.innerHTML)&&--A)return s("requeing onLoad callback, DOM not available"),void setTimeout(r,250);var o=z.body?z.body:z.documentElement;y.responseText=o?o.innerHTML:null,y.responseXML=z.XMLDocument?z.XMLDocument:z,a&&(d.dataType="xml"),y.getResponseHeader=function(t){return{"content-type":d.dataType}[t.toLowerCase()]},o&&(y.status=Number(o.getAttribute("status"))||y.status,y.statusText=o.getAttribute("statusText")||y.statusText);var l=(d.dataType||"").toLowerCase(),h=/(json|script|text)/.test(l);if(h||d.textarea){var c=z.getElementsByTagName("textarea")[0];if(c)y.responseText=c.value,y.status=Number(c.getAttribute("status"))||y.status,y.statusText=c.getAttribute("statusText")||y.statusText;else if(h){var p=z.getElementsByTagName("pre")[0],f=z.getElementsByTagName("body")[0];p?y.responseText=p.textContent?p.textContent:p.innerText:f&&(y.responseText=f.textContent?f.textContent:f.innerText)}}else"xml"===l&&!y.responseXML&&y.responseText&&(y.responseXML=E(y.responseText));try{L=U(y,l,d)}catch(v){i="parsererror",y.error=e=v||i}}catch(v){s("error caught: ",v),i="error",y.error=e=v||i}y.aborted&&(s("upload aborted"),i=null),y.status&&(i=y.status>=200&&y.status<300||304===y.status?"success":"error"),"success"===i?(d.success&&d.success.call(d.context,L,"success",y),k.resolve(y.responseText,"success",y),u&&v.event.trigger("ajaxSuccess",[y,d])):i&&(void 0===e&&(e=y.statusText),d.error&&d.error.call(d.context,y,i,e),k.reject(y,"error",e),u&&v.event.trigger("ajaxError",[y,d,e])),u&&v.event.trigger("ajaxComplete",[y,d]),u&&!--v.active&&v.event.trigger("ajaxStop"),d.complete&&d.complete.call(d.context,y,i),I=!0,d.timeout&&clearTimeout(x),setTimeout(function(){d.iframeTarget?g.attr("src",d.iframeSrc):g.remove(),y.responseXML=null},100)}}}var l,h,d,u,f,g,m,y,w,b,_,x,C=p[0],k=t.Deferred();if(k.abort=function(t){y.abort(t)},i)for(h=0;h',T)).css({position:"absolute",top:"-1000px",left:"-1000px"}),m=g[0],y={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(t){var e="timeout"===t?"timeout":"aborted";s("aborting upload... "+e),this.aborted=1;try{m.contentWindow.document.execCommand&&m.contentWindow.document.execCommand("Stop")}catch(i){}g.attr("src",d.iframeSrc),y.error=e,d.error&&d.error.call(d.context,y,e,t),u&&i.event.trigger("ajaxError",[y,d,e]),d.complete&&d.complete.call(d.context,y,e)}},(u=d.global)&&0==t.active++&&t.event.trigger("ajaxStart"),u&&t.event.trigger("ajaxSend",[y,d]),d.beforeSend&&!1===d.beforeSend.call(d.context,y,d))return d.global&&t.active--,k.reject(),k;if(y.aborted)return k.reject(),k;(w=C.clk)&&(b=w.name)&&!w.disabled&&(d.extraData=d.extraData||{},d.extraData[b]=w.value,"image"===w.type&&(d.extraData[b+".x"]=C.clk_x,d.extraData[b+".y"]=C.clk_y));var D=1,M=2,P=t("meta[name=csrf-token]").attr("content"),F=t("meta[name=csrf-param]").attr("content");F&&P&&(d.extraData=d.extraData||{},d.extraData[F]=P),d.forceSync?a():setTimeout(a,10);var L,z,I,A=50,E=t.parseXML||function(t,e){return window.ActiveXObject?((e=new ActiveXObject("Microsoft.XMLDOM")).async="false",e.loadXML(t)):e=(new DOMParser).parseFromString(t,"text/xml"),e&&e.documentElement&&"parsererror"!==e.documentElement.nodeName?e:null},$=t.parseJSON||function(t){return window.eval("("+t+")")},U=function(e,i,s){var n=e.getResponseHeader("content-type")||"",a=("xml"===i||!i)&&n.indexOf("xml")>=0,o=a?e.responseXML:e.responseText;return a&&"parsererror"===o.documentElement.nodeName&&t.error&&t.error("parsererror"),s&&s.dataFilter&&(o=s.dataFilter(o,i)),"string"==typeof o&&(("json"===i||!i)&&n.indexOf("json")>=0?o=$(o):("script"===i||!i)&&n.indexOf("javascript")>=0&&t.globalEval(o)),o};return k}if(!this.length)return s("ajaxSubmit: skipping submit process - no element selected"),this;var c,d,u,p=this;"function"==typeof e?e={success:e}:"string"==typeof e||!1===e&&arguments.length>0?(e={url:e,data:i,dataType:n},"function"==typeof r&&(e.success=r)):void 0===e&&(e={}),c=e.method||e.type||this.attr2("method"),(u=(u="string"==typeof(d=e.url||this.attr2("action"))?t.trim(d):"")||window.location.href||"")&&(u=(u.match(/^([^#]+)/)||[])[1]),e=t.extend(!0,{url:u,success:t.ajaxSettings.success,type:c||t.ajaxSettings.type,iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},e);var f={};if(this.trigger("form-pre-serialize",[this,e,f]),f.veto)return s("ajaxSubmit: submit vetoed via form-pre-serialize trigger"),this;if(e.beforeSerialize&&!1===e.beforeSerialize(this,e))return s("ajaxSubmit: submit aborted via beforeSerialize callback"),this;var g=e.traditional;void 0===g&&(g=t.ajaxSettings.traditional);var m,v=[],y=this.formToArray(e.semantic,v,e.filtering);if(e.data){var w=t.isFunction(e.data)?e.data(y):e.data;e.extraData=w,m=t.param(w,g)}if(e.beforeSubmit&&!1===e.beforeSubmit(y,this,e))return s("ajaxSubmit: submit aborted via beforeSubmit callback"),this;if(this.trigger("form-submit-validate",[y,this,e,f]),f.veto)return s("ajaxSubmit: submit vetoed via form-submit-validate trigger"),this;var b=t.param(y,g);m&&(b=b?b+"&"+m:m),"GET"===e.type.toUpperCase()?(e.url+=(e.url.indexOf("?")>=0?"&":"?")+b,e.data=null):e.data=b;var _=[];if(e.resetForm&&_.push(function(){p.resetForm()}),e.clearForm&&_.push(function(){p.clearForm(e.includeHidden)}),!e.dataType&&e.target){var x=e.success||function(){};_.push(function(i,s,n){var a=arguments,o=e.replaceTarget?"replaceWith":"html";t(e.target)[o](i).each(function(){x.apply(this,a)})})}else e.success&&(t.isArray(e.success)?t.merge(_,e.success):_.push(e.success));if(e.success=function(t,i,s){for(var n=e.context||this,a=0,o=_.length;a0,S="multipart/form-data",D=p.attr("enctype")===S||p.attr("encoding")===S,M=a.fileapi&&a.formdata;s("fileAPI :"+M);var P,F=(T||D)&&!M;!1!==e.iframe&&(e.iframe||F)?e.closeKeepAlive?t.get(e.closeKeepAlive,function(){P=h(y)}):P=h(y):P=(T||D)&&M?function(i){for(var s=new FormData,n=0;n0)&&(n={url:n,data:a,dataType:o},"function"==typeof r&&(n.success=r)),n=n||{},n.delegation=n.delegation&&t.isFunction(t.fn.on),!n.delegation&&0===this.length){var l={s:this.selector,c:this.context};return!t.isReady&&l.s?(s("DOM not ready, queuing ajaxForm"),t(function(){t(l.s,l.c).ajaxForm(n)}),this):(s("terminating; zero elements found by selector"+(t.isReady?"":" (DOM not ready)")),this)}return n.delegation?(t(document).off("submit.form-plugin",this.selector,e).off("click.form-plugin",this.selector,i).on("submit.form-plugin",this.selector,n,e).on("click.form-plugin",this.selector,n,i),this):this.ajaxFormUnbind().on("submit.form-plugin",n,e).on("click.form-plugin",n,i)},t.fn.ajaxFormUnbind=function(){return this.off("submit.form-plugin click.form-plugin")},t.fn.formToArray=function(e,i,s){var n=[];if(0===this.length)return n;var o,r=this[0],l=this.attr("id"),h=e||void 0===r.elements?r.getElementsByTagName("*"):r.elements;if(h&&(h=t.makeArray(h)),l&&(e||/(Edge|Trident)\//.test(navigator.userAgent))&&(o=t(':input[form="'+l+'"]').get()).length&&(h=(h||[]).concat(o)),!h||!h.length)return n;t.isFunction(s)&&(h=t.map(h,s));var c,d,u,p,f,g,m;for(c=0,g=h.length;c'),p=i.children("canvas")),p.attr("width",u).attr("height",n);var f={labels:a,datasets:[{fillColor:"rgba(0,0,255,0.05)",strokeColor:"#0054EC",pointColor:"rgba(255,136,0,1)",pointStrokeColor:"#fff",data:a}]},g={animation:!0,scaleOverride:!0,scaleStepWidth:Math.ceil(l/10),scaleSteps:10,scaleStartValue:0,showScale:!1,showTooltips:!1,pointDot:!1,scaleShowGridLines:!1,datasetStrokeWidth:1},m=t(p).lineChart(f,g);i.data("sparklineChart",m)})},t(function(){t(".sparkline").sparkline()})}(jQuery),function(t){t(function(){t.fn.fixedDate=function(){return t(this).each(function(){var e=t(this);e.offset().top+200>t(document.body).height()&&e.attr("data-picker-position","top-right"),"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")})})};var e={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"},i=t.extend({},e,{minView:2,format:"yyyy-mm-dd"}),s=t.extend({},e,{startView:1,minView:0,maxView:1,format:"hh:ii"});t(".datepicker-wrapper").click(function(){t(this).find(".form-date, .form-datetime, .form-time").datetimepicker("show").focus()}),window.datepickerOptions=e,t.fn.datepicker=function(e){return this.datetimepicker(t.extend({},i,e))},t.fn.timepicker=function(e){return this.datetimepicker(t.extend({},s,e))},t.fn.datepickerAll=function(){return this.find(".form-datetime").fixedDate().datetimepicker(e),this.find(".form-date").fixedDate().datepicker(),this.find(".form-time").fixedDate().timepicker(),this},t("body").datepickerAll()})}(jQuery),function(t){var e=function(e,i){i=t.extend({idStart:0,idEnd:9},i,e.data());var s=e.find(".template");!s.length&&i.template&&(s=t(i.template));var n={options:i};if(s.length){var a=e.find("tbody,.batch-rows"),o=s.remove().html(),r=function(e,n){var r=o;null!==e&&(r=r.replace(/\$idPlus/g,e+1).replace(/\$id/g,e));var l=t("<"+s[0].tagName.toLowerCase()+" />").html(r);return l.addClass(s.attr("class")).removeClass("template"),i.rowCreator&&i.rowCreator(l,e,i),n?n.after(l):a.append(l),t.fn.chosen&&l.find(".chosen").chosen(i.chosen),t.fn.datetimepicker&&l.datepickerAll(),l};t.extend(n,{createRow:r,template:o});for(var l=i.idStart;l<=i.idEnd;++l)r(l)}e.data("zui.batchActionForm",n)};t.fn.batchActionForm=function(i){return this.each(function(){e(t(this),i)})}}(jQuery),function(t){"use strict";var e="zui.table",i={zh_cn:{selectedItems:"已选择 {0} 项",attrTotal:"{0}总计 {1}"},zh_tw:{selectedItems:"已选择 {0} 项",attrTotal:"{0}总计 {1}"},en:{selectedItems:"Seleted {0} items",attrTotal:"{0} total {1}"}},s=function(n,a){var o=this;o.name=e;var r=o.$=t(n);a=o.options=t.extend({},s.DEFAULTS,this.$.data(),a);var l=a.lang||"zh_cn";o.lang=t.isPlainObject(l)?t.extend(!0,{},i[l.lang||t.zui.clientLang()],l):i[l];var h=o.$table=r.is("table")?r:r.find("table"),c=o.$tbody=h.find("tbody");o.$header=h.find("thead");var d=(o.$footer=r.find(".table-footer"),o.$form=r.is("form")?r:r.find("form"));a.checkable&&(r.on("click",".check-all",function(){o.checkAll(!t(this).hasClass("checked"))}),c.on("click","tr",function(){o.checkRow(t(this))}).on("click",'input[type="checkbox"]',function(e){e.stopPropagation();var i=t(this);o.checkRow(i.closest("tr"),i.is(":checked"))}).on("click","a,.btn",function(t){t.stopPropagation()}),a.selectable&&c.selectable(t.extend({},{selector:"tr",selectClass:"",trigger:".c-id",clickBehavior:"multi",listenClick:!1,select:function(t){o.checkRow(t.target,!0)},unselect:function(t){o.checkRow(t.target,!1)},rangeStyle:{border:"1px solid #006af1",backgroundColor:"rgba(50, 128, 252, 0.2)",borderRadius:"2px"}},t.isPlainObject(a.selectable)?a.selectable:null))),d.length&&(a.ajaxForm?d.ajaxForm(t.isPlainObject(a.ajaxForm)?a.ajaxForm:null):d.on("click","[data-form-action]",function(){d.attr("action",t(this).data("formAction")).submit()})),(a.fixFooter||a.fixHeader)&&(o.pageFooterHeight=t("#footer").outerHeight(),o.updateFixUI(),t(window).on("scroll resize",function(){o.updateFixUI()})),o.$statistic=r.find(".table-statistic"),o.updateStatistic()};s.prototype.updateStatistic=function(){var e=this,i=e.$statistic;if(i.length){var s=e.statisticCols;if(!s&&s!==!1){s={};var n=!1;e.$header.find("th").each(function(e){var i=t(this),a=i.data("statistic");a&&(n=!0,s[e]={format:a,name:i.text()})}),e.statisticCols=!!n&&s}var a=0;s&&t.each(s,function(t){s[t].total=0,s[t].checkedTotal=0}),e.$tbody.children("tr").each(function(e){var i=t(this),n=i.hasClass("checked"),o=i.children("td");n&&a++,s&&t.each(s,function(t){var e=parseFloat(o.eq(t).text());isNaN(e)&&(e=0),s[t].total+=e,n&&(s[t].checkedTotal+=e)})});var o=[];a&&o.push(e.lang.selectedItems.format(a)),s&&t.each(s,function(t){var i=s[t],n=i[a?"checkedTotal":"total"];i.format&&(n=i.format.format(n)),o.push(e.lang.attrTotal.format(i.name,n))}),i.text(o.join(", "))}},s.prototype.updateFixUI=function(t){var e=this,i=(new Date).getTime();return!t&&(e.lastUpdateCall&&clearTimeout(e.lastUpdateCall),!e.lastUpdateTime||i-e.lastUpdateTime<100)?void(e.lastUpdateCall=setTimeout(function(){e.updateFixUI(!0)},30)):(e.lastUpdateTime=i,e.lastUpdateCall&&(clearTimeout(e.lastUpdateCall),e.lastUpdateCall=null),e.options.fixHeader&&e.fixHeader(),void(e.options.fixFooter&&e.fixFooter()))},s.prototype.fixHeader=function(){var e=this,i=e.$header,s=i[0].getBoundingClientRect(),n=e.options.fixFooter,a=t.isFunction(n)?n(s,i):s.top<("number"==typeof n?n:-5),o=e.$.find("table.fixed-header-copy");if(a){o.length||(o=t('
                  ').addClass(e.$table.attr("class")).append(i.clone()).insertAfter(e.$table)),o.css({top:0,left:s.left,position:"fixed",width:s.width});var r=o.find("th");i.find("th").each(function(e){r.eq(e).css("width",t(this).outerWidth())})}else o.remove()},s.prototype.fixFooter=function(){var e=this,i=e.$footer,s=e.$tbody,n=s[0].getBoundingClientRect(),a=e.options.fixFooter;i.toggleClass("fixed-footer",!!o);var o=t.isFunction(a)?a(n,i):n.bottom>window.innerHeight-50-("number"==typeof a?a:e.pageFooterHeight||5);i.toggleClass("fixed-footer",!!o),o?i.css({bottom:e.pageFooterHeight,left:n.left,width:n.width}):i.css({width:""})},s.prototype.checkAll=function(e){var i=this,s=i.$tbody.find("tr");s.each(function(){i.checkRow(t(this),e,!0)}),i.updateCheckUI()},s.prototype.checkRow=function(t,e,i){var s=t.find('input[type="checkbox"]');void 0===e&&(e=!s.is(":checked")),t.toggleClass("checked",e),s.prop("checked",e),i||this.updateCheckUI()},s.prototype.updateCheckUI=function(){var e=this.$tbody.find("tr"),i=!1,s=null,n=0,a=!1,o=e.length;e.each(function(e){var r=t(this);a=r.hasClass("checked"),r.toggleClass("row-check-begin",a&&!i),s&&s.toggleClass("row-check-end",!a&&i),a&&(n+=1),s=r,i=a,o===e+1&&r.toggleClass("row-check-end",a)}),this.$.toggleClass("has-row-checked",n>0).find(".check-all").toggleClass("checked",n===o),this.updateStatistic()},s.DEFAULTS={checkable:!0,ajaxForm:!1,selectable:!0,fixHeader:!0,fixFooter:!0},t.fn.table=function(i){return this.each(function(){var n=t(this),a=n.data(e),o="object"==typeof i&&i;a||n.data(e,a=new s(this,o)),"string"==typeof i&&a[i]()})},s.NAME=e,t.fn.table.Constructor=s,t(function(){t('[data-ride="table"]').table()})}(jQuery),function(t,e,i){t.fn._ajaxForm=t.fn.ajaxForm;var s={timeout:e.config?e.config.timeout:0,dataType:"json",errControlStyle:{borderColor:"#D2322D"}},n="";t.fn.enableForm=function(e){return e===i&&(e=!0),this.each(function(){var i=t(this);i.find('[type="submit"]').attr("disabled",e?null:"disabled"),i.hasClass("load-indicator")&&i.toggleClass("loading",!e)})};var a=function(e,i,s){"string"==typeof i&&(s=i,i=null),s=s||"show",t.zui.messager?t.zui.messager[s](e,i):alert(e)};t.ajaxForm=function(o,r){var l=t(o);if(l.length>1)return l.each(function(){t.ajaxForm(this,r)});t.isFunction(r)&&(r={complete:r}),r=t.extend({},s,l.data(),r);var h=r.beforeSubmit,c=r.error,d=r.success,u=r.finish;delete r.finish;var p=r.errControlStyle;delete r.errControlStyle,r=t.extend({beforeSubmit:function(s,a,o){if(l.enableForm(!1),(h&&h(s,a,o))!==!1){var c={},d=a.find('[type="file"]');c.fileapi=d.length&&d[0].files!==i,c.formdata=e.FormData!==i;var u=c.fileapi&&a.find('input[type="file"]:enabled').filter(function(){return""!==t(this).val()}),p=u.length,f="multipart/form-data",g=a.attr("enctype")==f||a.attr("encoding")==f,m=c.fileapi&&c.formdata,v=(p||g)&&!m;v&&(""==n&&(n=r.url),r.url!=n&&(r.url=n),r.url=r.url.indexOf("&")>=0?r.url+"&HTTP_X_REQUESTED_WITH=XMLHttpRequest":r.url+"?HTTP_X_REQUESTED_WITH=XMLHttpRequest")}},success:function(i,s,n){if(l.enableForm(),(d&&d(i,s,n,l))!==!1){try{"string"==typeof i&&(i=JSON.parse(i))}catch(o){}if("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;if("success"===i.result){if(c){var f=l.find('[type="submit"]'),g=!1;f.length&&(f.popover({container:"body",trigger:"manual",content:c,tipClass:"popover-in-modal popover-success text-success",placement:i.placement||r.popoverPlacement||"right"}).popover("show"),setTimeout(function(){f.popover("destroy")},r.popoverTime||2e3),g=!0),h.length&&(h.html(''+c+"").show().delay(3e3).fadeOut(100),g=!0),g||a(c,"success")}if(u)return u(i,!0,l);if((r.closeModal||i.closeModal)&&setTimeout(t.zui.closeModal,r.closeModalTime||2e3),i.callback){var m=e[i.callback];if(t.isFunction(m)&&m()===!1)return}var v=r.locate||i.locate;if(v)if("loadInModal"==v){var y=t(".modal");setTimeout(function(){y.load(y.attr("ref"),function(){t(this).find(".modal-dialog").css("width",t(this).data("width")),t.zui.ajustModalPosition()})},1e3)}else{var w="reload"==v?e.location.href:v;setTimeout(function(){e.location.href=w},1200)}var b=r.ajaxReload||i.ajaxReload;if(b){var _=t(b);_.length&&_.load(e.location.href+" "+b,function(){_.find('[data-toggle="modal"]').modalTrigger()})}}else{if("string"==typeof c)h.length?h.html(''+c+"").show().delay(3e3).fadeOut(100):a(c,"danger");else if("object"==typeof c){var x=!1,C=[];t.each(c,function(e,i){var s=t.isArray(i)?i.join(";"):i,n=t("#"+e);if(!n.length)return void C.push(s);var a=e+"Label",o=t("#"+a);if(!o.length){var r=n.closest(".input-group").length;o=t('
                  ').appendTo(r?n.closest(".input-group").parent():n.parent())}o.empty().append(s),n.css(p).addClass("has-error");var l=function(){var e=t("#"+a);if(e.length)return e.remove(),n.removeAttr("style").removeClass("has-error"),!0};n.on("change input mousedown",l);var h=t("#"+e+"_chosen");h.length&&h.find(".chosen-single").css(p).addClass("has-error").on("mousedown",function(){l()===!0&&t(this).removeAttr("style").removeClass("has-error")}),x||(n.focus(),x=!0)}),C.length&&a(C.join(";"),"danger")}if(u)return u(i,!1,l)}}},error:function(t,i,s){if((c&&c(t,i,s,l))!==!1){l.enableForm();var n="timeout"==i||"error"==i?e.lang?e.lang.timeout:i:t.responseText+i+s;a(n,"danger")}}},r),l._ajaxForm(r),l.on("click","[data-form-action]",function(){l.attr("action",t(this).data("formAction")).submit()})},t.fn.ajaxForm=function(e){return this.each(function(){t.ajaxForm(this,e)})},t(function(){t('.form-ajax,form[data-type="ajax"]').ajaxForm()})}(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'+d+"")}}t.val()||(time=e(a.format("hh:mm")),time=time-time%10+10,t.val(s(time)))};t.fn.timeSpanControl=function(i){return this.each(function(){var o=t(this),r=t.extend({},i,o.data()),l=o.find('[name="begin"],.control-time-begin'),h=o.find('[name="end"],.control-time-end'),c=function(){var t=l.val();if(o.find(".hide-empty-begin").toggleClass("hide",!t),t){const i=s(e(t)+30);h.find('option[value="'+i+'"]').length&&h.val(i),r.onChange&&r.onChange(h,i)}};if(o.data("timeSpanControlInit")){ +if(r.begin){const d=n(r.begin).format("hh:mm");l.find('option[value="'+d+'"]').length&&l.val(d),r.onChange&&r.onChange(l,d)}if(r.end){const u=n(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),o.data("timeSpanControlInit",!0);r.end||c()})},t.timeSpanControl={convertTimeToNum:e,convertNumToTime:s,initTimeSelect:a,createTime:n},t.fn.blockTodoes=function(){return this.each(function(){var e=t(this),i=e.find("form"),s=i.find('[name="title"]'),n=function(t){void 0===t&&(t=!e.hasClass("show-form")),e.toggleClass("show-form",t),t&&setTimeout(function(){s.focus()},50)};e.on("click",".todo-form-trigger",function(){n(t(this).data("trigger"))}),i.timeSpanControl({onChange:function(t){t.trigger("chosen:updated")}})})},t(function(){t(".block-todoes").blockTodoes()});var o=t("#searchTypeMenu"),r=t("#searchType"),l=function(e){e||(e=r.val()),e=e||"bug",r.val(e),o.find("li.selected").removeClass("selected");var i=o.find('a[data-value="'+e+'"]'),s=i.text();i.parent().addClass("selected"),t("#searchTypeName").text(s)};l(),o.on("click","a[data-value]",function(){l(t(this).data("value"))}),t.chosenDefaultOptions={disable_search_threshold:4},t.fn._chosen=t.fn.chosen,t.fn.chosen=function(e){this._chosen(t.extend({},t.chosenDefaultOptions,e))},t.extend(t.fn.pager.Constructor.DEFAULTS,{maxNavCount:8,prevIcon:"icon-angle-left",nextIcon:"icon-angle-right",navEllipsisItem:"…",menuDirection:"dropup",pageSizeOptions:[5,10,15,20,25,30,35,40,45,50,100,200,500,1e3,2e3],elements:["total_text","size_menu","prev_icon","nav","next_icon"],onPageChange:function(t,e){console.log("onPageChange",t,e),t.recPerPage!==e.recPerPage&&(window.location.href=this.createLink())}}),t.zui.Messager.DEFAULTS.cssClass="messagger-zt"}(jQuery); \ No newline at end of file diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 6c1fd8992e..a16646a3a4 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -49,8 +49,6 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ /* columns */ .row-table {display: table; width: 100%} -.col-side, .col-main, .col-table {padding: 0; display: table-cell; vertical-align: top;} -.col-side {width: 350px; max-width:350px; padding-left: 10px;} .col-main, .row-table-swap .col-side {padding-right: 10px; padding-left: 0;} .row-table-swap .col-main {padding-right: 0; padding-left: 10px;} .row-table-side-left .col-side {padding-right: 10px; padding-left: 0;} @@ -59,752 +57,6 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ /* === Components === */ /* remove outline of links */ a,a:focus,a:active {text-decoration: none; outline:none;} - -/* Label */ -.label-badge {padding: 2px 6px} -.label-angle {background-color: #d3dff7; line-height: 24px; padding: 0 5px; position: relative; top: 2px; border: 1px solid #c6d2eb; margin-right: 18px; font-size: 13px; transition: margin .2s, padding .2s; color: #114f8e} -.label-angle > a {position: absolute; right: 0; top: 0; filter: alpha(opacity=0); opacity: 0} -.label-angle.with-close:hover {padding-right: 18px; margin-right: 5px} -.label-angle:hover > a {filter: alpha(opacity=100); opacity: 1} -.label-angle:before, .label-angle:after {content: ' '; display: block; width: 0; height: 0; border-style: solid; border-width: 13px 0 13px 13px; border-color: transparent transparent transparent #c6d2eb; position: absolute; right: -13px; top: -1px; z-index: 1} -.label-angle:after {border-width: 12px 0 12px 12px; top: 0px; z-index: 2; right: -11px; border-color: transparent transparent transparent #d3dff7;} -.label-branch {background-color: #dbcaee; border-color: #b29fc7; color: #6931a8} - -/* Label in table */ -.table .label.label-info {background: #d3dff7; border: 1px solid #c6d2eb; color: #114f8e;} - -/* dropdown */ -.dropdown-menu {min-width: 80px; padding: 4px 0; z-index:1020;} -.dropdown-menu > li > a, .dropdown-header {font-size: 12px; padding: 5px 25px 5px 15px} -.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:active {background: #f1f1f1; font-weight: bold;} -.dropdown-menu > .active {position: relative;} -.dropdown-menu > .active > a:before {content: '\e60d'; font-family: NewZenIcon; font-size: 14px; position: absolute; right: 8px; top: 4px; display: block; color: #808080; font-weight: normal;} -.dropdown-submenu > a {min-width: 80px;} -.dropdown-menu .divider {margin: 4px 0;} -.dropdown-submenu.left > .dropdown-menu{left: -110px;} - -/* hr */ -hr.small {margin: 10px 0} - -/* Buttons */ -.btn.text-danger {color: #D2322D} -.btn.text-info {color: #39B3D7} -.btn.text-success {color: #229F24} -.btn.text-warning {color: #E48600} -.btn.text-primary {color: #3280FC} -.btn.text-important {color: #81511C} -.btn.text-special {color: #8957A1} - -/* Table */ -.table td .input[type="radio"], .table td input[type="checkbox"] {vertical-align: middle; position: relative; top: -3px} -.table-borderless {border: none!important} -.table tr[data-url] td {cursor: pointer;} - -/* Tables sorters */ -.tablesorter thead tr th {height:33px;} -.tablesorter thead tr div {padding:0; margin:0} -.tablesorter thead tr .header {cursor:pointer;} -.tablesorter thead tr .header a,.tablesorter thead tr .headerSortUp a,.tablesorter thead tr .headerSortDown a{display: block; text-decoration:none} -.tablesorter thead tr .header a {color:#333;} -.tablesorter thead tr .header > a:after {font-family: NewZenIcon; font-weight: normal;content: "\e6bd";font-size: 14px; margin-left: -2px;} -.tablesorter thead tr .headerSortUp > a:after {font-family: NewZenIcon; font-weight: normal;content: "\e6b9";font-size: 14px;color:#03C; margin-left: -2px;} -.tablesorter thead tr .headerSortDown > a:after{font-family: NewZenIcon; font-weight: normal;content: "\e6b8";font-size: 14px;color:#03C; margin-left: -2px;} -.tablesorter-header-inner {display: inline;} -.tablesorter thead tr .header.sorter-false:after {display: none} - -.table tr.active td, .table-hover>tbody>tr.active:hover>td, .table-hover>tbody>tr.active:hover>th, .table-striped>tbody>tr.active:nth-child(odd).active>td, .table-striped>tbody>tr.active:nth-child(odd)>th {background-color: #FCE6A2} -.table tr>td.active, .table tr>th.active, .table tr.active>td, .table tr.active>th {background-color: #FCE6A2} - -.table caption {padding: 8px 20px; border: 1px solid #DDD; border-bottom: 0; background: #fafafa;} -.table.table-condensed caption {padding: 6px 15px;} -.table td.td-has-control {padding: 2px 4px; background-color: white!important} - -/* Datepicker */ -.datepicker-wrapper {position: relative; cursor: pointer;} -.datepicker-wrapper:before {font-family: NewZenIcon; content: '\e617'; display: block; position: absolute; right: 8px; color: #808080; font-size: 14px; top: 5px;} -.datepicker-wrapper > .form-control {padding-right: 30px; cursor: pointer;} -.datepicker-wrapper.datepicker-date:before {content: '\e66c'} -.datepicker-wrapper:hover:before {color: #145CCD} - -/* alert */ -.alert>[class*="icon-"]+.content {padding-left: 2em;} -.alert-pure {border: none; background: none} - -/* datetime picker */ -.datetimepicker {border-radius: 0!important; background: #fafafa; font-size: 12px} -.datetimepicker .datetimepicker-days td, .datetimepicker .datetimepicker-days th {width: 22px!important; padding: 1px 0 !important} -.datetimepicker .datetimepicker-days td, .datetimepicker .datetimepicker-days th.dow {border: 1px solid #ddd !important; border-radius: 0!important} -.datetimepicker .datetimepicker-days thead th {padding-bottom: 5px!important;} -.datetimepicker .datetimepicker-days th.dow {background: #e5e5e5; border-color: #ccc!important} -.datetimepicker th.switch {width: 120px!important} -.datetimepicker .datetimepicker-years table tr td span, .datetimepicker .datetimepicker-months table tr td span {width: 42px; height: 42px; line-height: 42px; border: 1px solid #ddd; margin: -1px 0 0 -1px; border-radius: 0} - -/* code */ -code {margin-left: 0;} - -/* Icons */ -i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[class*=" icon-"]{font-size: 14px} - -.dropdown-menu .disabled,i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disabled:hover,i[class*=" icon-"].disabled:hover,i[class^="icon-"].disabled:before,i[class*=" icon-"].disabled:before {color: #ccc; cursor:not-allowed} - -/* Icon rotate */ -.icon-rotate-270:before {display: inline-block; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); -o-transform: rotate(270deg); transform: rotate(270deg); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);} -.icon-rotate-180:before {display: inline-block; -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -ms-transform: rotate(180deg); -o-transform: rotate(180deg); transform: rotate(180deg); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);} -.icon-rotate-90:before {display: inline-block; -webkit-transform: rotate(90deg); -moz-transform: rotate(90deg); -ms-transform: rotate(90deg); -o-transform: rotate(90deg); transform: rotate(90deg); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);} - -/* Button icon */ -.btn-icon {border-radius: 2px; display: inline-block; width: 20px; height: 20px; border: none; background: none; padding: 0; color: #4d90fe!important; text-align: center;} -.btn-icon > i {font-size: 18px; line-height: 20px} -.btn-icon:hover {color: #002563!important} -.btn-icon.disabled:hover, .btn-icon.disabled:hover > i {background: none!important; color: #ccc!important; cursor: default} -.btn-icon.text-danger {color: #D2322D!important} -.btn-icon.text-danger:hover {color: #7e0501!important} - -/* priority icons. */ -.pri1,.pri0,.pri2,.pri3,.pri4,.pri5,.pri6,.pri{display:inline-block;width: 18px;height: 18px;font-size: 12px;line-height: 14px;font-weight: bold; text-align: center; color: #ccc; -moz-border-radius:50%; -webkit-border-radius:50%; border-radius:50%;border: 2px solid #ccc; font-family: arial, helvetica, clean, sans-serif; background-color: #fff} -.pri0 {font-size: 0} -.pri0:before {font-size: 12px} -.pri:before, .pri0:before{content: '?';} -.pri1{border-color: #d71319;color: #d71319;} -.pri2{border-color: #EA644A;color: #EA644A;} -.pri3{border-color: #BD7B46;color: #BD7B46;} -.pri4{border-color: #dcbe1a;color: #dcbe1a;} -.pri5{border-color: #d0d836;color: #d0d836} -.pri6{border-color: #99c323;color: #99c323} -.dropdown-pris > .dropdown-menu {padding: 0 5px;} -.dropdown-pris > .dropdown-menu > li {display: table-cell;} -.dropdown-pris > .dropdown-menu > li > a {opacity: 0.6; transition: all .2s; padding: 6px 5px; display: block} -.dropdown-pris > .dropdown-menu > li.active > a {opacity: 1} -.dropdown-pris > .dropdown-menu > li.active > a:before {display: none} -.dropdown-pris > .dropdown-menu > li > a:hover {background-color: #f5f5f5; opacity: 1} - -/* bug severity icons. */ -.severity,.severity1,.severity2,.severity3,.severity4,.severity5,.severity6{display:inline-block;width: 16px;height: 16px;line-height: 16px;font-weight: bold; text-align: center; font-size: 12px; color: #fff; -moz-border-radius:50%; -webkit-border-radius:50%; border-radius:50%;font-family: arial, helvetica, clean, sans-serif;} -.severity{background-color: #ccc;} -.severity:before{content: '?'} -.severity1 {background-color: #d71319;} -.severity2 {background-color: #d83615;} -.severity3 {background-color: #db7c12;} -.severity4 {background-color: #dcbe1a;} -.severity5 {background-color: #d0d836;} -.severity6 {background-color: #99c323;} - -/* actionbox */ -.change-show:before{content: "\e661";} -.change-hide:before{content: "\e662";} -.log-desc:before{content: "\e65d";} -.log-asc:before{content: "\e65c";} -.diff-all:before{content: "\e6a3";} -.diff-short:before{content: "\e633";} - -.actionbox .btn-icon {background: #f1f1f1; color: #666!important; border: 1px solid #ccc; padding: 0 1px; height: 18px; line-height: 16px; width: 18px} -.actionbox .btn-icon > .icon- {font-size: 14px!important; line-height: 16px} -.actionbox .btn-icon:hover {color: #333!important; border-color: #aaa; background: #fff} -.actionbox ol {padding-left: 25px; line-height: 20px} -.actionbox .alert {margin:2px 0 8px; padding: 5px 10px; min-height: 34px; min-height: 20px} -.actionbox #historyItem {margin:0} -.actionbox blockquote {margin:0; font-size: 12px; padding: 1px 5px;} -.actionbox > legend > i, .actionbox > .panel-heading > i {display: none} -.actionbox .history {background: #fbfbfb; padding: 4px 10px 6px; min-height: 20px; border: 1px solid #f5f5f5;} -fieldset.actionbox {padding-bottom: 10px;} - -/* actionbox, hack for ie8 */ -fieldset.actionbox ol {padding-top: 8px\0/;} -@media all and (min-width:0) {fieldset.actionbox ol {padding-top: 8px\9;}} -@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none){fieldset.actionbox ol {padding-top: 8px;}} -:root fieldset.actionbox ol {padding-top: 8px\9;} - -/* stars list */ -.stars-list {color: #E48600} - -/* status in table */ -td.done, .status-done, td[class$="-done"], -td.pass, .status-pass, td[class$="-pass"], -td.resolved, .status-resolved, td[class$="-resolved"], -td.normal, .status-normal, td[class$="-normal"], -td.status-active, .status-status, td[class$="-active"] {color:#229f24;} -td.wait, .status-wait, td[class$="-wait"] {color:#808080;} -td.pause, .status-pause, td[class$="-pause"], -td.suspended, .status-suspended, td[class$="-suspended"] {color:#E48600;} -td.delay, .status-delay, td[class$="-delay"] {color:#e84e0f;} -td.closed, .status-closed, td[class$="-closed"], -td.cancel, .status-cancel, td[class$="-cancel"] {color:#888;} -td.doing, .status-doing, td[class$="-doing"], -td.changed, .status-changed, td[class$="-changed"], -td.investigate, .status-investigate, td[class$="-investigate"] {color:#d2322d;} -td.delayed, .status-delayed, td[class$="-delayed"] {background:#e84e0f!important; color:white;} -td.blocked, .status-blocked, td[class$="-blocked"] {background:yellow!important;} -td.fail, .status-fail, td[class$="-fail"] {color:#d2322d} -td.draft, .status-draft, td[class$="-draft"] {color:#8957a1} -td.bug-active, .bug-active {color: #8957a1} -td.story-active, .testcase-normal, .story-active {color: #333} - -/* tabs */ -.nav-tabs > li > a {padding: 5px 10px; color: #333; line-height: 20px; max-height: 32px} -.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {color: #333; font-weight: bold; line-height: 20px} -.tab-content {border: 1px solid #ddd; border-top: 0; padding: 10px 10px} -.tab-pane > h6 {margin-top: 0; margin-bottom: 3px;} - -/* fieldset */ -fieldset {margin-bottom: 15px; border: 1px solid #e5e5e5; padding: 10px 15px 15px;} -fieldset.fieldset-pure {background: none; padding: 0; border: none; padding-top: 5px;} -fieldset > legend {width: auto; margin: 0 0 0 -5px; font-size: 13px; font-weight: bold; border-bottom: none; padding: 0 5px} -fieldset > .form-group {margin-bottom: 0;} -fieldset > .content table, fieldset > .article-content table{table-layout: initial !important; max-width: 100% !important;} -fieldset > .content table th, fieldset > .content table td, fieldset > .article-content table th, fieldset > .article-content table td {border:1px solid #ddd;} - -/* placeholder */ -.placeholder {color: #999} - -/* === Views === */ - -/* Table form */ -.table-form > tbody > tr > th {text-align:right;vertical-align:middle; border-bottom:none} -.table-form > tbody > tr > th.text-left, .table-form > tbody > tr > tr.text-left th {text-align:left;vertical-align:middle; border-bottom:none} -.table-form > tbody > tr > td {vertical-align:middle; border-bottom:none} -.table-form > tbody > tr > th,.table-form > tbody > tr > td {border-bottom:none} -.table th.text-middle, .table td.text-middle, .text-middle {vertical-align: middle;} -.table-form > tbody > tr > td.text-bottom {vertical-align:bottom;} -.table-form > tbody > tr > td .form-control {vertical-align:middle;margin:0;} -.table-form > tbody > tr > td .checkbox,.table-form > tbody > tr > td input[type="radio"] + label {margin-right: 10px;} -.table-form > tbody > tr > td > .row {margin-right: 0;} -.table-form > tbody > tr > td > .row > [class*="col-"] {padding-right: 0;line-height: 34px} -.table-form > tbody > tr > td .checkbox {margin: 0} -.table-form > tbody > tr > td > .radio:first-child {margin-top: 0;} -.table-form > tbody > tr > td > .radio:last-child {margin-bottom: 0;} -.table-form > tbody > tr > td .btn + .btn {margin-left: 8px;} -.table-form > tbody > tr > td .btn-group .btn + .btn {margin-left: -1px;} -.table-form tr > td > .input-group {width: 100%;} - -/* Table data */ -.table-data th, .table-data td {padding: 5px;} -.table-data th {text-align: right;} - -/* Table condensed */ -.table-condensed th, .table-condensed td {padding: 6px 5px; line-height: 18px} -.table-condensed th > a, .table-condensed td > a, .table-condensed td > .btn-icon {vertical-align: middle} - - .input-group > select.form-control {float:left; margin-left: -1px;} - .input-group-addon {background-color: #f5f5f5;} - -/* chosen container in input group */ -.input-group > .chosen-container {display: table-cell;} - -/* chosen */ -.chosen-up.chosen-container .chosen-drop {bottom: 100%; top: inherit; border-radius: 2px 2px 0 0; box-shadow: 0 -3px 5px rgba(0,0,0,.15); margin-top: auto; margin-bottom: -1px;} -.chosen-container-single .chosen-single abbr {top: 6px!important;} - -/* Condensed form */ -.form-condensed .table-form {margin-bottom: 0;} -.form-condensed .table-form td, .form-condensed .table-form th {padding: 5px; font-size: 12px;} -.form-condensed .table-form > td + td, .form-condensed .table-form > th + th, .form-condensed .table-form > tbody > td + td, .form-condensed .table-form > tbody > th + th {padding-left: 5%;} -.form-condensed .table-form > tfoot td {padding-bottom: 10px!important; border-top: none!important} -.form-condensed .table-form > tfoot td[colspan] {text-align: center;} -.form-condensed .table-form > tfoot td > .btn {margin-right: 10px;} -.form-condensed .chosen-container-single .chosen-single {padding: 4px 10px; height: 30px} -.form-condensed .chosen-container-single .chosen-single div {padding: 4px 10px} -.form-condensed .chosen-container-multi .chosen-choices {min-height: 30px} -.form-condensed .chosen-container-multi .chosen-choices li {margin: 4px 0 0 4px} -.form-condensed .chosen-container-multi .chosen-choices li.search-field {margin-bottom: 4px;} -.form-condensed .table-fixed .form-control {padding: 5px 6px} -.form-condensed .table-fixed select.form-control {padding: 5px} -.form-condensed .chosen-container {font-size: 13px} -.form-condensed .chosen-container-single .chosen-single {padding: 5px 10px} -.form-condensed .chosen-container-single .chosen-search:before {top: 10px} - -@-moz-document url-prefix() -{ -.form-condensed textarea.form-control {height: 30px;min-height: 30px;} -.form-control[type='file']{padding:0px;} -} - -/* chosen container in col-side */ -.col-side .chosen-single {max-width: 218px} - -/* help in form */ -.help-block {margin-bottom: 5px;} - -/* Required field */ -form .star {display: none;}/* hide star */ -.required:after{font-family: arial;font-size: 24px} -[class*="col-"].required {position: relative;} -[class*="col-"].required:after {position: absolute; top: 6px; right: 2px} -.control-label.required:after{right: -10px} -.input-group-required {display: table-cell; width: 100%; float: left; position: relative;} -.input-group-required > .required:after {z-index: 3; right: 6px; top: 2px;} -.input-group-required .form-control {float: none; display: block;} -.fix-pd-right.input-group-required > .required:after {right: 20px;} - -.required-wrapper{position: relative;width: 100%; height: 0;overflow: visible;} -.required-wrapper.required:after{right: -13px;top: 4px} -.table-form > thead > tr > th.required:after {top: 2px; padding-left: 4px;} -.table-form > thead > tr > th .required:after {top: -5px; right: -12px} - -/* Auto Height textarea */ -div.form-control[contenteditable='true'] {height: auto; text-align: left; outline: 0; overflow-x: hidden; overflow-y: auto; min-height: 30px; min-height: 18px\0} - -/* Panel */ -.panel > .table > thead > tr > th,.panel > form > .table > thead > tr > th {background-color: transparent;} -.panel > .panel-heading,.nav-stacked.nav-primary>li.nav-heading,.list > header, #navbar {background-color: #f1f1f1;} -.panel-pure {box-shadow: none; border: 0; border-radius: 0;} -.panel-pure .panel-heading {background: transparent;} -.panel-actions {display: inline-block; margin-left: 8px;} -.panel-actions .btn-mini {margin-top: -3px;} -.panel-actions.pull-right{display: block; margin-top: -10px;margin-right: -10px;} -.panel-actions.pull-right .btn{margin-top: 3px;} -.panel-heading > h1,.panel-heading > h2,.panel-heading > h3,.panel-heading > h4,.panel-heading > h5,.panel-heading > h6 {margin: 0} -.panel-actions > .btn.btn-link:hover{background: none; box-shadow: none;} -.panel-actions a {display: inline-block;} -.panel .table {margin-bottom: 0; border: none!important} - -.panel .table-bordered {border:none; margin-bottom: 0;} -.panel .table-bordered > thead > tr:first-child th,.panel .table-bordered > tbody > tr:first-child th,.panel .table-bordered > tr:first-child th {border-top: 0;} -.panel .table-bordered tr > td:first-child,.panel .table-bordered tr > th:first-child {border-left: 0;} -.panel .table-bordered tr > td:last-child,.panel .table-bordered tr > th:last-child {border-right: 0;} -.panel > .table tr:last-child > td {border-bottom: 0 !important;} -.panel > .table table tr:last-child > td {border-bottom: 1px solid #e5e5e5 !important;} - -/* small panel */ -.panel-sm .panel-heading {padding: 6px 10px} - -/* list group */ -.list-group-item {padding: 8px 15px} -.list-group-item.active,.list-group-item.active:hover {background: #fff; border-color: #ddd; background: #f1f1f1; color: #333; font-weight: bold;} -.list-group-item.active > a {color: #333} - -/* progressbar */ -.progressbar {display: inline-block; height: 16px; background: #229F24; position: relative; top: -1px} - -/* === Layout === */ -/* Background */ -body {color:#141414; padding-bottom: 40px;} - -/* Header */ -#header {padding: 12px 20px 0; background:#003366;} - -#topbar {color: #ACCADF;} -#topbar > .pull-right {margin-top: -4px; margin-right: -4px;} -#topnav .dropdown-submenu > a, -#topnav .dropdown-menu {min-width: 110px;} -#topnav > .dropdown .caret {border-top-color: #fff} -#topnav > .dropdown, #topnav > a {display: block; float: left;} -#topnav > .dropdown > a, #topnav > a {display: block; padding: 3px 6px; position: relative;} -#topnav > .dropdown:hover, #topnav > .dropdown.open, #topnav > a:hover {background: #185695} -#topnav > a, #topnav > .dropdown > a, #companyname a {color:#d1e4f2;text-decoration:none;} -#topnav > a:hover, #topnav > .dropdown > a:hover, #companyname a:hover {color: #fff;} -#companyname {color:#ffcc00; font-weight: normal; margin: 0} -#companyname a {display: inline-block; margin-left: 4px; font-size: 12px} - -#mainmenu {margin-top: 12px; width: 100%; position: relative;} -#mainmenu .nav > li {float: left;} -#mainmenu .nav > li > a {display: block; margin-right: 3px; white-space:nowrap; padding:7px 15px; color:#E5E5E5; font-size: 14px; background:#114f8e;-webkit-box-shadow: 0 -3px 3px rgba(0, 0, 0, 0.10);box-shadow: 0 -3px 3px rgba(0, 0, 0, 0.10);} -#mainmenu .nav > li > a:hover{background-color: #2e6dad;color: #fff; box-shadow: 0 -3px 5px rgba(0, 0, 0, 0.2);} -#mainmenu .nav > li.active > a { background-color:#e5e5e5;color:#21841d; font-weight:bold;} -#mainmenu .nav > li.custom-item {filter: alpha(opacity=0); opacity: 0; transition: opacity .4s .6s} -#mainmenu:hover .nav > li.custom-item {filter: alpha(opacity=100); opacity: 1;} -#mainmenu .nav > li.custom-item > a {background-color: transparent; box-shadow: none} -#mainmenu .nav > li.custom-item > a:hover {background-color: #2e6dad;color: #fff; box-shadow: 0 -3px 5px rgba(0, 0, 0, 0.2);} - -#searchbox {position: absolute; right: 0; top: 1px; width: 200px;} -#searchbox .form-control, #searchbox .btn {padding: 2px 5px; line-height: 20px; height: 24px;border-top: 0; border-bottom: 0; float: left; display: block;} -#typeSelector .btn{padding-left: 10px; border-right: none} -#objectSwitcher .btn{padding-right: 10px; margin-left: -1px\0;} -#searchbox .dropdown-menu {margin-top: -1px; width: 212px; padding: 0;} -#searchbox .dropdown-menu > li {float: left; width: 105px; border-bottom: 1px dotted #ddd; border-right: 1px dotted #ddd} - -/* Module menu. */ -#modulemenu {background-color: #e5e5e5; margin: 0 -20px; padding: 0 20px; font-size: 14px; position: relative; height: 40px;} -#modulemenu .nav > li {line-height: 30px; padding:5px 0px 1px;display: block; float: left; color: #808080} -#modulemenu .nav > li > .dropdown > a {border: 1px solid transparent;} -#modulemenu .nav > li > .dropdown > .dropdown-menu {border-radius: 0; margin-top: -2px; border-top: 0} -#modulemenu .nav > li > a, #modulemenu .nav > li > .dropdown > a {display: block; padding: 0 7px; color:#003366} -#modulemenu .nav > li > a:hover, #modulemenu .nav > li > .dropdown > a:hover {background: #d1d1d1; color: #000;} -#modulemenu .nav > li.active > a,#modulemenu .nav > li.active > a:hover {color:#21841d; font-weight:bold; } -#modulemenu .nav > li.right {float:right; font-weight:bold;} -#modulemenu .nav > li.right > a {font-weight:bold} -#modulemenu #myname {display: inline-block; line-height: 30px; line-height: 26px\0} - -/* Drop menu. */ -#dropMenu {background: #fff; position:absolute; display:none; font-size:12px; z-index:9999; -moz-box-shadow: 0 6px 12px rgba(0,0,0,0.175); -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);border: 1px solid #CBCBCB; border: 1px solid rgba(0, 0, 0, 0.15); top: 36px; border-top: none; min-width: 250px; min-width: 218px\0; padding: 10px 15px;} -#dropMenu > .icon-spin {display: block; text-align: center; padding: 10px;} -#currentItem {border: 1px solid transparent; padding: 1px 6px;} -.show > #dropMenu {display: block;} -.show > #currentItem, .show > #currentItem:hover, #modulemenu .nav > li > .dropdown.open > a {background: #fff; border: 1px solid #CBCBCB; -moz-box-shadow: 0 6px 12px rgba(0,0,0,0.175); -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);} -#search {padding: 2px 8px; height: 28px} -#searchResult {display: table; line-height: 20px; color: #808080} -#searchResult > .search-list, #defaultMenu, #moreMenu {display: table-cell; vertical-align: top; min-width: 218px} -#moreMenu {display: none;} -#searchResult.show-more #moreMenu {display: table-cell;} -#searchResult ul {display: block; position: relative; padding: 0; margin: 10px -15px 0 -15px; max-height: 360px; overflow-x: hidden; overflow-y: auto} -#moreMenu > ul {margin-left: 15px;} -#searchResult ul > li:first-child {border-top: 1px dashed #ddd} -#searchResult ul > li:last-child {border-bottom: 1px dashed #ddd} -#searchResult ul > li {display: block; float: none; padding: 2px 15px;} -#searchResult ul > li:hover, #searchResult ul > li.active {background: #e5e5e5} -#searchResult ul > li > a {line-height: 24px; display: block;} -#searchResult ul > li.active:before {} -#moreMenu > ul > li > a {color: #808080} -#searchResult ul > li > a:hover, #defaultMenu > ul > li.heading:hover, #searchResult li.no-result-tip:hover {background: none} -#searchResult li.no-result-tip {border: none!important;} -#defaultMenu > .actions > a {display: block; text-align: right; margin: 0 -15px; padding-right: 15px; line-height: 30px} -#searchResult.show-more #defaultMenu > ul > li, #defaultMenu > .actions > a {border-right: 1px solid #ddd} -#defaultMenu > .actions > a > i, #searchResult ul > li > a > i {font-size: 14px; display: inline-block; margin-right: 5px;} -/*#searchResult > ul {display: block; position: relative; padding: 0; min-width: 218px}*/ -#searchResult ul > li > a.closed, #searchResult ul > li > a.done{color:#808080} -#defaultMenu > div {padding-top: 6px;} - -#dropMenu.searching #searchResult, -#dropMenu.searching #defaultMenu, -#dropMenu.searching #moreMenu {display: block;} -#dropMenu.searching #defaultMenu > div, -#dropMenu.searching ul > li {display: none} -#dropMenu.searching ul > li.show-search {display: block} -#dropMenu.searching #moreMenu > ul {margin-left: -15px;} - -#projectID {background:#e5e5e5; border:1px solid #e5e5e5} - -/* Wrapper */ -#wrap {padding:0 19px 20px 19px; background:#e5e5e5;} -#wrap .outer {position: relative; text-align:left; background:#fff;border:1px solid #cfcfcf; -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.1);box-shadow: 0 1px 5px rgba(0, 0, 0, 0.1); padding: 20px} - -/* Footer. */ -#footer {width:100%;position:fixed; bottom:0; left:0; margin:0; border-top: 1px solid #ddd; background:#eef4fe;height:40px; line-height:40px;-webkit-box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.05);box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.05); z-index: 10} -#crumbs a i.icon-home{display: none;} -#crumbs {float: left;margin-left: 20px;} -#crumbs > a {display: inline-block; margin-right: -4px;} -#crumbs .icon-angle-right {margin: 0; position: relative; top: 1px;} -#footer #poweredby {float: right; margin-right: 20px;} -#qrcodePopover.show {display: block; position: fixed; right: 5px; bottom: 40px; left: inherit; top: inherit; max-width: 300px} -#qrcodePopover.popover.top .arrow {left: inherit; right: 10px} -.icon-zentao, a .icon-zentao {background: url(images/main/icon.png) center no-repeat; display: inline-block; width: 16px; height: 16px; position: relative; top: 2px} -.icon-pro-version {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAOAQMAAADDr3TWAAAABlBMVEUAAADSMi2DxVCVAAAAAXRSTlMAQObYZgAAACJJREFUCNdjYGFg4GNgkGdgsG9gqD/A8P8BkI2OpBkYBBkAfZQE9VhZ0IgAAAAASUVORK5CYII=") center no-repeat; display: inline-block!important; width: 14px; height: 14px; position: relative; top: 2px} - -/* Feature bar. */ -#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px; min-height: 30px\0;} -#featurebar:after, #featurebar:before {content: ' '; display: table;} -#featurebar:after {clear:both;} -#featurebar .heading {float: left; padding: 0 5px; color: #666} -#featurebar .heading:after {content: "\e6e1"; font-family: NewZenIcon; font-size: 14px; color: #999; display: inline-block; margin-left: 5px;} -#featurebar .heading > i {color: #808080} - -#featurebar .nav {height: 30px; float: left;} -#featurebar .nav > li {float: left; margin-right: 2px;} -#featurebar .nav > li > .form-control {margin-left: 6px; padding: 1px 8px; height: 30px; height: 26px\0; margin-right: 10px;} -#featurebar .nav > li > .form-control.form-date {width: 110px} -#featurebar .nav > li.datepicker-wrapper:before {right: 15px; top: 0; top: -2px\0;} -#featurebar .nav > li > a {padding: 0px 4px; border-radius: 2px} -#featurebar .nav > li > a:hover {background: #ddd; color: #333} -#featurebar .nav > li.active > a, #featurebar .nav > li.active > a:hover, #featurebar .nav > li.active > a:active, #featurebar .nav > li > a:focus {font-weight: bold; color: #333; background: none} -#featurebar .nav > li.active > a > .caret {border-top-color: #666} -#featurebar .nav > li.active > .form-control, #featurebar .nav > li.active > .form-control:hover, #featurebar .nav > li.active > .form-control:active, #featurebar .nav > li.active > .form-control:focus {border-color: #009900} -#featurebar .btn-group {margin-right: -4px;} -#featurebar .actions > .btn-group:last-child, #featurebar .btn-group > .btn-group {margin-right: 0;} -#featurebar .btn {padding: 4px 12px} -#featurebar .btn > i {display: inline-block; margin-right: 2px; opacity: 0.8} -#featurebar .actions {float: right; margin-top: -2px;} -#featurebar > .heading > .prefix {display: inline-block; margin-right: 5px; color: #666;} - -.outer > .alert {border: none; margin: 0} -.outer > .alert + #featurebar {border-top: 1px solid #ddd;} - -#featurebar .nav > li > .chosen-container-single {top: -2px;} -#featurebar .nav > li .chosen-drop {font-size: 13px} -#featurebar .nav > li .chosen-single {height: 30px; padding: 3px 10px;} -#featurebar .nav > li .chosen-single abbr {top: 4px;} -#featurebar .nav > li .chosen-single div {top: -2px;} -#featurebar .nav > li.active .chosen-single {border-color: #009900} -#featurebar .nav > li.active > .chosen-container-single.chosen-with-drop .chosen-single {border-color: #ddd} - -/* sub featurebar */ -.sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px; margin: -20px -20px 20px;} -.sub-featurebar > .nav > li {float: left;} -.sub-featurebar > .nav > li > a {padding: 5px 4px} -.sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;} - -#featurebar.with-sub > .nav > li.active > a {border: 1px solid #ddd; position: relative; border-bottom: none; background: #fff; padding: 2px 15px 5px} - -/* Title bar. */ -#titlebar {margin: -20px -20px 20px; background: #F8FAFE; border-bottom: 1px solid #e5e5e5; min-height: 46px; min-height: 20px\0; padding: 13px 20px; vertical-align: bottom; position: relative;} -.body-modal #titlebar {margin: 0} -#titlebar > .heading {font-size: 14px; line-height: 20px; font-weight: bold;} -#titlebar > .heading > i {display: none;} -#titlebar > .heading > .prefix {display: inline-block; margin-right: 5px; color: #666;} -#titlebar > .heading > .prefix > strong {font-weight: normal; border: 1px solid #aaa; padding: 0px 4px; background: #fff; text-align: center; min-width: 20px; color: #666; font-size: 12px} -#titlebar > .heading > .prefix > i {font-size: 14px; color: #808080; display: none} -#titlebar > .heading > strong a {color: #333} -#titlebar > .heading:hover > strong a {color: #03c} -#titlebar > .heading > strong a:hover {color: #1A53FF} -#titlebar > .heading > strong > i, #titlebar > .heading > strong > small > i {display: none} -#titlebar > .heading > small > i {position: relative; top: 1px; display: none} -#titlebar > .heading > small {font-size: 14px; color: #333;} -#titlebar > .heading > small:before {content: '\e6e1'; font-family: NewZenIcon; font-weight: normal;} -#titlebar .actions {position: absolute; right: 20px; top: 8px;} -#titlebar .actions > .btn, #titlebar .actions > .btn-group {margin-left: 8px;} -#titlebar .actions > .text {display: inline-block; margin-left: 8px; line-height: 30px} - -/* Button in titlebar and featurebar */ -#titlebar > .actions .btn {padding-top: 4px; padding-bottom: 4px;} -#featurebar > .actions .btn:not(.btn-primary), #titlebar > .actions .btn:not(.btn-primary), .main > .actions:not(.actions-form) .btn:not(.btn-primary) {border-color: transparent; background: none; box-shadow: none; padding: 4px 7px; border-radius: 2px; text-shadow: none; color: #036} -#featurebar > .actions .btn:not(.btn-primary):hover, #titlebar > .actions .btn:not(.btn-primary):hover, .main > .actions:not(.actions-form) .btn:not(.btn-primary):hover {background: #ddd; border-color: #ddd; color: #333} - -/* Following style to fixed ie8 */ -#featurebar > .actions .btn, #titlebar > .actions .btn, .main > .actions .btn {border-color: transparent\0; background: none\0; box-shadow: none\0; padding: 4px 8px\0;; color: #036\0} -#featurebar > .actions .btn:hover, #titlebar > .actions .btn:hover, .main > .actions .btn:hover {background: #ddd\0; border-color: #ddd\0; color: #333\0;} -#featurebar > .actions .btn.btn-primary, #titlebar > .actions .btn.btn-primary, .main > .actions .btn.btn-primary {border-color: #103152\0; background: #1A4F85\0; padding: 4px 8px\0; color: #e5e5e5} -#featurebar > .actions .btn.btn-primary:hover, #titlebar > .actions .btn.btn-primary:hover, .main > .actions .btn.btn-primary:hover {background: #133B63\0; border-color: #0C243C\0; color: #fff} - -/* table in outer */ -.outer .table {margin-bottom: 0; border: 1px solid #ddd;} -@-moz-document url-prefix() -{ - .outer .table.with-border thead > tr > th:first-child, - .outer .table.with-border tfoot > tr > td:first-child, - .outer .table.with-border tbody > tr > td:first-child {border-left: 1px solid #ddd} - .outer .table.with-border thead > tr > th:last-child, - .outer .table.with-border tfoot > tr > td:last-child, - .outer .table.with-border tbody > tr > td:last-child {border-right: 1px solid #ddd} - .outer .table.with-border > *:first-child > tr:first-child > th {border-top: 1px solid #ddd;} - .outer .table.with-border > *:last-child > tr:last-child > td {border-bottom: 1px solid #ddd;} -} -.outer .table thead tr th {text-align: center;} -.outer .table thead tr th.text-left {text-align: left;} -.outer .table tbody td {vertical-align: middle;} -.outer .table th {vertical-align: middle;} -.outer .table.table-form tr > th:last-child, .outer .table.table-form tr > td:last-child {padding-right: 5px} -.outer .table.table-form.table-fixed tr > th:last-child, .outer .table.table-form.table-fixed tr > td:last-child {padding-right: 15px} -.outer .table tbody > tr:last-child td {border-bottom: 1px solid #e5e5e5;} -.outer .table-form .table tr > th:first-child, .outer .table-form .table tr > td:first-child {padding-left: 5px} -.outer .table-form .table tr > th:last-child, .outer .table-form .table tr > td:last-child {padding-right: 5px} -.outer .table-form .table tbody > tr:last-child td {border-bottom: 1px solid #e5e5e5; padding-top: 5px} -.outer .table.table-data.table-borderless tbody > tr:last-child td, .outer .table.table-form tbody > tr:last-child td {border: none} -.outer .table tfoot td {border-top: 1px solid #ddd} -.outer .table tfoot .form-control {padding: 1px 8px; height: 30px} -.outer .table tfoot .btn {padding: 2px 6px; font-size: 13px; line-height: 20px; border: none; } -.outer .table tfoot .btn:not(.btn-primary) {background-color: #FAFAFA; color: #036} -.outer .table tfoot .btn > i {display: inline-block; margin-right: 1px; opacity: 0.8} -.outer .table tfoot .datepicker-wrapper:before {top: 5px} -.outer .table tfoot .form-control.form-date {width: 110px} -.outer .table tfoot .input-wrapper {display: inline-block;} -.outer .table tfoot .chosen-single {padding: 4px 6px; height: 30px; } -.outer .table tfoot .chosen-container-single .chosen-single abbr {top: 4px;} -.table-actions {float: left;} -.table-actions > .checkbox {float: left; margin: 0} -.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group, .table-actions > .text {float: left; margin-right: 5px;} -.table-actions > .text {line-height: 24px; color: #808080} -.table-actions > .text strong {color: #333} -.outer .table tfoot .pager {margin: -3px 0;} - -.table .cell-id {text-align: left; padding-left: 12px!important;} -.datatable .table > tbody > tr > td.check-btn, .datatable .table > thead > tr > th.check-btn {padding-left: 12px!important; padding-right: 0; text-align: left;} - -/* color of a when visited */ -.outer .table tbody td > a:visited, #crumbs > a:visited, .side > a:visited {color: #551A8B} - -/* Querybox */ -#querybox {margin: 5px 0 -7px; background-color: #fff; height: 0; position: relative; z-index: 1000; overflow: visible; display: none; float: left; width: 100%;} -#querybox form {padding: 10px; border-top: 1px solid #ddd; margin: 0 -10px;} -#querybox.show {display: block; height: auto} -#titlebar #querybox {margin: 5px -10px -12px; float: none; width: auto;} - -/* Container in outer */ -.outer > .container {margin: 0 auto; padding: 0; border: 1px solid #ddd;} -.outer > .container > #featurebar, .outer > .container > #titlebar {margin: 0} -.outer > .container > form, body > .container > form{padding: 10px 40px 10px 20px} -.outer > .container .table-form, .outer > .container .table-data {border: none} -.outer > .container > .table-data {margin: 10px 0} - -/* Main content in outer */ -.outer .container > .main {padding: 10px 20px} -.outer .main .article-content {font-size: 14px; padding: 0; word-break:break-all} -.outer .main .actions {text-align: center; margin-bottom: 20px;} -.outer .main .actions > .btn, .outer .main .actions > .btn-group {margin: 0 4px} - -.outer .main ul.list-unstyled:last-child {margin-bottom: 0;} -.outer .main ul.list-unstyled li {padding: 2px 0} - -.outer .main .table tr > th:first-child, .outer .main .table tr > td:first-child {padding-left: 0;} -.outer .main-side > fieldset {padding: 5px 20px 10px 10px;} -.outer .main-side > fieldset > .table {border: none} - -.outer .main .tabs {margin-bottom: 15px;} - -/* Table data in outer */ -.outer .table-data.table-condensed td, .outer .table-data.table-condensed th {padding: 3px 8px} -.outer .table-data.table-condensed th {font-weight: normal; color: #444} -.outer .table-data th.strong, .outer .table-data td.strong, .outer .table-data th > strong {font-weight: bold;} - -/* side */ -.outer.with-side #featurebar, .outer.with-side #titlebar {margin-bottom: 20px;} -.outer.with-side .main, .outer.with-side .side + form, .outer.with-side .main, .outer.with-side .side + table {margin-left: 212px; margin-right: 0;} -.outer.with-side.with-transition .main, .outer.with-side.with-transition .side + form, .outer.with-side.with-transition .main, .outer.with-side.with-transition .side + table {transition: all 0.3s;} -.outer.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child {padding-left: 5px} -.outer.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child .table-actions {padding-left: 0;} -.outer.with-side .table tr > th:last-child, .outer.with-side .table tr > td:last-child {padding-right: 5px} -.outer .side {width: 192px; position: absolute; left: 20px;} -.outer .side-body {overflow: hidden;} -.outer .side-body .panel {min-width: 180px;} -.outer .side-body .panel-body {padding: 10px;} -.outer .side-handle {position: absolute; text-align: center; cursor: pointer; right: 0; top: 0; width: 15px; padding: 0; line-height: 32px; border: 1px solid #d1d1d1; background: #d5d5d5; color: #03c; transition: all 0.3s; z-index: 99} -.outer .side-handle:hover {background: #c5c5c5; color: #04f} -.outer.with-transition .side, .outer .side-handle.with-transition {transition: all 0.3s;} - -.outer .side, .outer .side + .main {visibility: hidden;} -.outer.with-side .side, .outer.with-side .side + .main {visibility: visible;} - -.outer.hide-side .side{width: 0; border: none;} -.outer.hide-side .side .side-handle {right: -15px;} -.outer.hide-side .side .side-body {display:none;} -.outer.with-side.hide-side .main, .outer.with-side.hide-side .side + form, .outer.with-side.hide-side .main, .outer.with-side .side + table {margin-left: 0px} - -/* Form in outer */ -.outer form > .btn {margin-right: 10px;} -.outer form .panel {margin-bottom: 0;} - -/* Color picker in form */ -.colorpicker.fix-border-right > .btn {border-right-color: transparent} -.colorpicker.fix-border-left > .btn {border-left-color: transparent} -.colorpicker.fix-border-right > .btn:hover {border-right-color: #bdbdbd} -.colorpicker.fix-border-left > .btn:hover {border-left-color: #bdbdbd} - -/* Pager. */ -.pager {margin-bottom:0;line-height: 20px; color: #999} -.pager .dropdown {display: inline-block;} -.pager a {color: #444} -.pager a:hover {color: #141414} -.pager > .dropdown > a, .pager > i, .pager > a {display: inline-block; position: relative; padding: 5px; min-width: 25px; text-align: center; margin-left: -5px;} -.pager .dropdown > a:hover, .pager > a:hover {background: #e5e5e5;} -.pager .dropdown-menu {margin-top: 0; width: 212px; margin-left: -5px; padding: 0;} -.pager .dropdown-menu > li {display: block; float: left; width: 70px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd;} -#_pageID, #goto {display: none} - -/* modal */ -.modal .modal-dialog {border: 8px solid #666; border-color: rgba(0,0,0,.25)} -.modal-title {font-size: 14px;} -.modal-body > #titlebar {margin: -15px -15px 20px} - -/* modal with iframe */ -.modal-iframe .modal-body {padding: 0;} -.modal.with-titlebar .modal-header, .modal-dialog.hide-header .modal-header{position: relative; height: 0; padding: 0; border: none; z-index: 999; min-height: 0} -.modal.with-titlebar .modal-header .modal-body, .modal-dialog.hide-header .modal-header .modal-body {z-index: 990} -.modal.with-titlebar .modal-header .modal-title, .modal-dialog.hide-header .modal-header .modal-title {display: none} -.modal.with-titlebar .modal-header .close, .modal-dialog.hide-header .modal-header .close {position: absolute; right: 15px; top: 15px} -.body-modal {padding-bottom: 0; overflow: hidden;} -.body-modal .outer > .row {margin: 10px 0 0} -.body-modal .outer > form, .body-modal .outer > .container > form {margin: 10px 20px 10px; padding: 5px 20px 10px 10px;} -.body-modal .outer > form > .table-form, .body-modal .outer > .container > form > .table-form {border:none;} -.body-modal .outer > .main, .body-modal .outer > .container > .main, .body-modal > .main {padding: 10px 20px; margin: 0} -.body-modal > form {padding-bottom: 15px;} -.body-modal .outer > .container, .body-modal > .container{padding: 0; margin: 0; max-width: inherit !important; border: 0} -.body-modal #titlebar .actions {right: 40px} -.body-modal .outer, .body-modal #wrap{padding: 0!important; margin: 0!important;} - -.body-modal .row-table {padding: 20px} - -.modal-dialog.fullscreen {width: 100% !important; height: 100% !important; margin: 0; border: none !important;} -.modal-dialog.fullscreen .modal-body iframe {height: 100%} - -.modal-loading {overflow: hidden;} -.modal-loading .modal-dialog {margin-top: -100%!important;} -.loader {display: none} -.modal-loading .loader{position: absolute; display: block; text-align: center; font-size: 56px; color: #fff; top: 35%; width: 100%} - -/* Tree menu. */ -.tree li:before {width: 8px; height: 8px; background: #f1f1f1; border: 1px solid #ccc; border-radius: 2px; top: 7px;left: 6px;} -.tree-lines li > a.active{font-weight: bold;} - -/* Select all and select reverse. */ -#allchecker, #reversechecker {padding-right: 5px;padding-left: 5px;} - -/* hide debug panel */ -#debugPanel {display: none} - -/* === Responsive === */ -@media (max-width: 1199px) /* laptop */ -{ - #mainmenu .nav > li > a {padding: 7px 14px} -} -@media (max-width: 991px) /* taplet */ -{ - #mainmenu .nav > li > a {padding: 7px 12px} - #searchbox {width: 150px;} - #typeSelector .btn, #objectSwitcher .btn{padding-left: 5px;} - #modulemenu .nav > li > a {padding: 0 5px;} -} -@media (max-width: 767px) /* phone */ -{ - #mainmenu .nav > li > a {padding: 5px 9px; font-size: 14px} - #mainmenu .nav > li > a > span {display: none} - #searchbox {width: 120px;} - #featurebar .nav {float: none} - #featurebar .nav > li > a {padding: 0 2px; font-size: 13px} - #titlebar .actions {position: static;} - .body-modal #titlebar .actions {position: absolute;} - #titlebar > .heading {padding-right: 0!important;} -} -@media (max-width: 600px) /* small phone */ -{ - #searchbox {display: none} -} - -.warning{color:red;} -.nofixed td{white-space:normal;} - -#passwordStrength{display:none;} - -.fixedTfootAction {background-color: #f5f5f5; position: fixed; bottom: 40px; box-shadow: 0 -3px 4px rgba(0,0,0,0.05);} -.ranzhiFixedTfootAction .fixedTfootAction {bottom: 0px;} -.table > .fixedTfootAction > tr > td {border-bottom: none} -.table > .fixedTfootAction.scrolled > tr > td {background: #2e6dad; border: none; color: #fff} -.fixedTfootAction.scrolled .btn {border: 1px solid #fff; border-color: rgba(255,255,255,.5); background-color: #2e6dad!important; text-shadow: none; color: #e5e5e5!important;} -.fixedTfootAction.scrolled .btn:hover {background-color: #2e6dad!important;} -.fixedTfootAction.scrolled .pager, -.fixedTfootAction.scrolled .pager > a, -.fixedTfootAction.scrolled .pager > .dropdown > a, -.fixedTfootAction.scrolled .table-actions > .text {color: #e5e5e5} -.fixedTfootAction.scrolled .pager strong, -.fixedTfootAction.scrolled .table-actions > .text strong {color: #fff;} -.fixedTfootAction.scrolled .pager .dropdown > a:hover, -.fixedTfootAction.scrolled .pager > a:hover {background-color: #2e6dad} - -.fixedTheadOfList {position: fixed; top: 0px; z-index:1000;} -.datatable.head-fixed > .datatable-head .table > thead > tr > th, -.fixedTheadOfList > thead > tr > th {background-color: #2e6dad; border-bottom-color: #bbb; color: #dedede} -.tablesorter.fixedTheadOfList thead tr .headerSortDown a, -.tablesorter.fixedTheadOfList thead tr .headerSortUp a, -.tablesorter.fixedTheadOfList thead tr .headerSortUp > a:after, -.tablesorter.fixedTheadOfList thead tr .headerSortDown > a:after, -.datatable.head-fixed thead tr .headerSortUp > a:after, -.datatable.head-fixed thead tr .headerSortDown > a:after, -.datatable.head-fixed > .datatable-head .table > thead > tr > th a, .fixedTheadOfList > thead > tr > th a {color: #fff} -.datatable.head-fixed > .datatable-head .table > thead > tr > th .header a, .fixedTheadOfList > thead > tr > th .header a {color: inherit} - -/* Help tab iframe */ -#helpContent {display: none; position: absolute; left: 0; right: 0; top: 73px; bottom: 40px; background-color: #fff;} -.show-help-tab #wrap {display: none} -.show-help-tab #helpContent {display: block;} -#mainmenu .nav > li.close-help-tab > a {background-color: #2e6dad} -#mainmenu .nav > li > a > .icon-remove {display: none; margin-left: 10px; position: relative; margin-right: -6px; color: #999} -.show-help-tab #mainmenu .nav > li > a > .icon-remove {display: inline-block;} -#mainmenu .nav > li > a > .icon-remove:hover {color: #666} -#helpContent .load-error {padding: 20px; display: none} -#helpContent.show-error .load-error {display: block} - -.m-tutorial-wizard #featurebar .nav li{display:none;} -.m-tutorial-wizard #featurebar .nav li:nth-of-type(1),.m-tutorial-wizard #featurebar .nav li:nth-of-type(2),.m-tutorial-wizard #featurebar .nav li:nth-of-type(3),.m-tutorial-wizard #featurebar .nav li:nth-of-type(4){display:block;} -.hl-tutorial {position: relative!important; z-index: 1010!important; box-shadow: 0 0 0 0px #000!important; transition: box-shadow 1s!important;} -.hl-tutorial.hl-in {box-shadow: 0 0 20px 0 #FFF0D5, 0 0 0 2px #F1A325, 0 0 0 2000px rgba(0,0,0,.2)!important} -.hl-tutorial.hl-in:hover {box-shadow: 0 0 30px 0 #FFF0D5, 0 0 0 5px #F1A325, 0 0 0 2000px rgba(0,0,0,.3)!important} - -.tooltip-max .tooltip-inner {max-width: 1000px} - -/* For new zentao icon. */ -@font-face{font-family:NewZenIcon;font-style:normal;font-weight:400;src:url(fonts/zenicon.eot?v=1.0.0);src:url(fonts/zenicon.eot?#iefix&v=1.0.0) format('embedded-opentype'),url(fonts/zenicon.woff?v=1.0.0) format('woff'),url(fonts/zenicon.ttf?v=1.0.0) format('truetype'),url(fonts/zenicon.svg#regular?v=1.0.0) format('svg')} -.icon-times,.icon-search,.icon-envelope,.icon-heart,.icon-star,.icon-star-empty,.icon-user,.icon-th-large,.icon-th,.icon-check,.icon-off,.icon-cog,.icon-trash,.icon-home,.icon-time,.icon-download-alt,.icon-download,.icon-repeat,.icon-refresh,.icon-list-alt,.icon-lock,.icon-flag,.icon-volume-up,.icon-qrcode,.icon-tags,.icon-bookmark,.icon-print,.icon-align-left,.icon-align-justify,.icon-list,.icon-pencil,.icon-add,.icon-edit,.icon-checked,.icon-move,.icon-step-backward,.icon-play,.icon-pause,.icon-step-forward,.icon-chevron-left,.icon-chevron-right,.icon-plus-sign,.icon-minus-sign,.icon-remove-sign,.icon-ok-sign,.icon-question-sign,.icon-info-sign,.icon-ban-circle,.icon-arrow-left,.icon-arrow-right,.icon-arrow-up,.icon-arrow-down,.icon-sign-plus,.icon-minus,.icon-plus,.icon-eye-open,.icon-eye-close,.icon-calendar,.icon-random,.icon-chevron-up,.icon-chevron-down,.icon-resize-h,.icon-key,.icon-cogs,.icon-comments,.icon-collapse-full,.icon-upload-alt,.icon-check-empty,.icon-bullhorn,.icon-bell,.icon-hand-right,.icon-wrench,.icon-tasks,.icon-expand-full,.icon-group,.icon-link,.icon-cloud,.icon-copy,.icon-paper-clip,.icon-bars,.icon-list-ul,.icon-table,.icon-magic,.icon-caret-down,.icon-caret-up,.icon-caret-left,.icon-caret-right,.icon2-10,.icon-comment-alt,.icon-comments-alt,.icon-sitemap,.icon-lightbulb,.icon-file-text-o,.icon-building,.icon-double-angle-left,.icon-double-angle-right,.icon-double-angle-up,.icon-double-angle-down,.icon-angle-left,.icon-angle-right,.icon-angle-up,.icon-angle-down,.icon-mobile,.icon-spinner,.icon-circle,.icon-folder-close-alt,.icon-folder-open-alt,.icon-expand-alt,.icon-collapse-alt,.icon-smile,.icon-frown,.icon-terminal,.icon-star-half-full,.icon-code-fork,.icon-unlink,.icon-rocket,.icon-chevron-sign-left,.icon-chevron-sign-right,.icon-chevron-sign-up,.icon-chevron-sign-down,.icon-ellipsis-v,.icon-level-up,.icon-file,.icon-file-text,.icon-more,.icon-bug,.icon-branch,.icon-chat-dot,.icon-cube,.icon-stack,.icon-review,.icon-bar-chart,.icon-cubes,.icon-file-pdf,.icon-file-word,.icon-file-excel,.icon-file-powerpoint,.icon-file-archive,.icon-file-audio,.icon-file-movie,.icon-file-code{font-family:NewZenIcon} -.icon-remove,.change-show,.change-hide,.log-desc,.log-asc,.diff-all,.diff-short,.icon-plus-border{font-family:NewZenIcon} -.icon-more:before{content: '\e744';} -.icon-plus-border:before{content: '\e663'} -.icon-review:before{content: '\e9b8'} -.icon-checked:before{content: '\e642'} -.icon-file-text:before{content:'\e6d4'} - -body.body-modal .ke-container .ke-toolbar .ke-outline[data-name=fullscreen]{display:none;} +.modal-content {background-color:#fff;} +body.body-modal{padding-bottom:0px;} +body.body-modal .container{padding:0px;} diff --git a/www/theme/zui/css/min.css b/www/theme/zui/css/min.css index 0624fd9bca..f817921669 100644 --- a/www/theme/zui/css/min.css +++ b/www/theme/zui/css/min.css @@ -1,6 +1,16 @@ /*! - * ZUI: zui for zentao - v1.5.0 - 2017-03-02 + * ZUI: Zentao template - v1.8.1 - 2018-03-30 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git - * Copyright (c) 2017 cnezsoft.com; Licensed MIT - *//*! Some code copy from Bootstrap v3.0.0 by @fat and @mdo. (Copyright 2013 Twitter, Inc. Licensed under http://www.apache.org/licenses/)*//*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:0 0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-spacing:0;border-collapse:collapse}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.scale{-webkit-transition:all .15s ease;-o-transition:all .15s ease;transition:all .15s ease;-webkit-transform:scale(.8);-ms-transform:scale(.8);-o-transform:scale(.8);transform:scale(.8)}.scale.in{-webkit-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.btn-group-vertical>.btn-group-vertical:after,.btn-group-vertical>.btn-group-vertical:before,.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.cards:after,.cards:before,.clearfix:after,.clearfix:before,.container-fixed-md:after,.container-fixed-md:before,.container-fixed-sm:after,.container-fixed-sm:before,.container-fixed-xs:after,.container-fixed-xs:before,.container-fixed:after,.container-fixed:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group-vertical:after,.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.cards:after,.clearfix:after,.container-fixed-md:after,.container-fixed-sm:after,.container-fixed-xs:after,.container-fixed:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none}.showing{display:block}.hidden{display:none!important;visibility:hidden!important}.show{display:block!important;visibility:visible!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.affix{position:fixed}.with-padding{padding:6px 12px}.inline-block.visible-xs,.inline.visible-xs,.visible-xs,td.visible-xs,th.visible-xs,tr.visible-xs{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}.inline.visible-xs{display:inline!important}.inline-block.visible-xs{display:inline-block!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}.inline.visible-xs.visible-sm{display:inline!important}.inline-block.visible-xs.visible-sm{display:inline-block!important}tr.visible-xs.visible-sm{display:table-row!important}td.visible-xs.visible-sm,th.visible-xs.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}.inline.visible-xs.visible-md{display:inline!important}.inline-block.visible-xs.visible-md{display:inline-block!important}tr.visible-xs.visible-md{display:table-row!important}td.visible-xs.visible-md,th.visible-xs.visible-md{display:table-cell!important}}@media (min-width:1200px){.visible-xs.visible-lg{display:block!important}.inline.visible-xs.visible-lg{display:inline!important}.inline-block.visible-xs.visible-lg{display:inline-block!important}tr.visible-xs.visible-lg{display:table-row!important}td.visible-xs.visible-lg,th.visible-xs.visible-lg{display:table-cell!important}}.inline-block.visible-sm,.inline.visible-sm,.visible-sm,td.visible-sm,th.visible-sm,tr.visible-sm{display:none!important}@media (max-width:767px){.visible-sm.visible-xs{display:block!important}.inline.visible-sm.visible-xs{display:inline!important}.inline-block.visible-sm.visible-xs{display:inline-block!important}tr.visible-sm.visible-xs{display:table-row!important}td.visible-sm.visible-xs,th.visible-sm.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}.inline.visible-sm{display:inline!important}.inline-block.visible-sm{display:inline-block!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}.inline.visible-sm.visible-md{display:inline!important}.inline-block.visible-sm.visible-md{display:inline-block!important}tr.visible-sm.visible-md{display:table-row!important}td.visible-sm.visible-md,th.visible-sm.visible-md{display:table-cell!important}}@media (min-width:1200px){.visible-sm.visible-lg{display:block!important}.inline.visible-sm.visible-lg{display:inline!important}.inline-block.visible-sm.visible-lg{display:inline-block!important}tr.visible-sm.visible-lg{display:table-row!important}td.visible-sm.visible-lg,th.visible-sm.visible-lg{display:table-cell!important}}.inline-block.visible-md,.inline.visible-md,.visible-md,td.visible-md,th.visible-md,tr.visible-md{display:none!important}@media (max-width:767px){.visible-md.visible-xs{display:block!important}.inline.visible-md.visible-xs{display:inline!important}.inline-block.visible-md.visible-xs{display:inline-block!important}tr.visible-md.visible-xs{display:table-row!important}td.visible-md.visible-xs,th.visible-md.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}.inline.visible-md.visible-sm{display:inline!important}.inline-block.visible-md.visible-sm{display:inline-block!important}tr.visible-md.visible-sm{display:table-row!important}td.visible-md.visible-sm,th.visible-md.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}.inline.visible-md{display:inline!important}.inline-block.visible-md{display:inline-block!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:1200px){.visible-md.visible-lg{display:block!important}.inline.visible-md.visible-lg{display:inline!important}.inline-block.visible-md.visible-lg{display:inline-block!important}tr.visible-md.visible-lg{display:table-row!important}td.visible-md.visible-lg,th.visible-md.visible-lg{display:table-cell!important}}.inline-block.visible-lg,.inline.visible-lg,.visible-lg,td.visible-lg,th.visible-lg,tr.visible-lg{display:none!important}@media (max-width:767px){.visible-lg.visible-xs{display:block!important}.inline.visible-lg.visible-xs{display:inline!important}.inline-block.visible-lg.visible-xs{display:inline-block!important}tr.visible-lg.visible-xs{display:table-row!important}td.visible-lg.visible-xs,th.visible-lg.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}.inline.visible-lg.visible-sm{display:inline!important}.inline-block.visible-lg.visible-sm{display:inline-block!important}tr.visible-lg.visible-sm{display:table-row!important}td.visible-lg.visible-sm,th.visible-lg.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}.inline.visible-lg.visible-md{display:inline!important}.inline-block.visible-lg.visible-md{display:inline-block!important}tr.visible-lg.visible-md{display:table-row!important}td.visible-lg.visible-md,th.visible-lg.visible-md{display:table-cell!important}}@media (min-width:1200px){.visible-lg{display:block!important}.inline.visible-lg{display:inline!important}.inline-block.visible-lg{display:inline-block!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}.inline.hidden-xs{display:inline!important}.inline-block.hidden-xs{display:inline-block!important}tr.hidden-xs{display:table-row!important}td.hidden-xs,th.hidden-xs{display:table-cell!important}@media (max-width:767px){.hidden-xs,.inline-block.hidden-xs,.inline.hidden-xs,td.hidden-xs,th.hidden-xs,tr.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm,.inline-block.hidden-xs.hidden-sm,.inline.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm,th.hidden-xs.hidden-sm,tr.hidden-xs.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md,.inline-block.hidden-xs.hidden-md,.inline.hidden-xs.hidden-md,td.hidden-xs.hidden-md,th.hidden-xs.hidden-md,tr.hidden-xs.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-xs.hidden-lg,.inline-block.hidden-xs.hidden-lg,.inline.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg,th.hidden-xs.hidden-lg,tr.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}.inline.hidden-sm{display:inline!important}.inline-block.hidden-sm{display:inline-block!important}tr.hidden-sm{display:table-row!important}td.hidden-sm,th.hidden-sm{display:table-cell!important}@media (max-width:767px){.hidden-sm.hidden-xs,.inline-block.hidden-sm.hidden-xs,.inline.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs,th.hidden-sm.hidden-xs,tr.hidden-sm.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm,.inline-block.hidden-sm,.inline.hidden-sm,td.hidden-sm,th.hidden-sm,tr.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md,.inline-block.hidden-sm.hidden-md,.inline.hidden-sm.hidden-md,td.hidden-sm.hidden-md,th.hidden-sm.hidden-md,tr.hidden-sm.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-sm.hidden-lg,.inline-block.hidden-sm.hidden-lg,.inline.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg,th.hidden-sm.hidden-lg,tr.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}.inline.hidden-md{display:inline!important}.inline-block.hidden-md{display:inline-block!important}tr.hidden-md{display:table-row!important}td.hidden-md,th.hidden-md{display:table-cell!important}@media (max-width:767px){.hidden-md.hidden-xs,.inline-block.hidden-md.hidden-xs,.inline.hidden-md.hidden-xs,td.hidden-md.hidden-xs,th.hidden-md.hidden-xs,tr.hidden-md.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-md.hidden-sm,.inline-block.hidden-md.hidden-sm,.inline.hidden-md.hidden-sm,td.hidden-md.hidden-sm,th.hidden-md.hidden-sm,tr.hidden-md.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md,.inline-block.hidden-md,.inline.hidden-md,td.hidden-md,th.hidden-md,tr.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-md.hidden-lg,.inline-block.hidden-md.hidden-lg,.inline.hidden-md.hidden-lg,td.hidden-md.hidden-lg,th.hidden-md.hidden-lg,tr.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}.inline.hidden-lg{display:inline!important}.inline-block.hidden-lg{display:inline-block!important}tr.hidden-lg{display:table-row!important}td.hidden-lg,th.hidden-lg{display:table-cell!important}@media (max-width:767px){.hidden-lg.hidden-xs,.inline-block.hidden-lg.hidden-xs,.inline.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs,th.hidden-lg.hidden-xs,tr.hidden-lg.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm,.inline-block.hidden-lg.hidden-sm,.inline.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm,th.hidden-lg.hidden-sm,tr.hidden-lg.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md,.inline-block.hidden-lg.hidden-md,.inline.hidden-lg.hidden-md,td.hidden-lg.hidden-md,th.hidden-lg.hidden-md,tr.hidden-lg.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg,.inline-block.hidden-lg,.inline.hidden-lg,td.hidden-lg,th.hidden-lg,tr.hidden-lg{display:none!important}}.inline-block.visible-print,.inline.visible-print,.visible-print,td.visible-print,th.visible-print,tr.visible-print{display:none!important}@media print{.visible-print{display:block!important}.inline.visible-print{display:inline!important}.inline-block.visible-print{display:inline-block!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}.hidden-print,.inline-block.hidden-print,.inline.hidden-print,td.hidden-print,th.hidden-print,tr.hidden-print{display:none!important}}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Tahoma,Arial,sans-serif;font-size:13px;line-height:1.53846154;color:#141414;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#03c;text-decoration:none;-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}a:focus,a:hover{color:#1a53ff;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a.disabled,a.disabled:focus,a.disabled:hover,a[disabled],a[disabled]:focus,a[disabled]:hover{color:#aaa;text-decoration:none;cursor:default}audio,canvas,img,svg,video{max-width:100%;vertical-align:middle}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0 0 0 0);border:0}::-moz-selection{text-shadow:none;background:#b3d4fc}::selection{text-shadow:none;background:#b3d4fc}fieldset{padding:0;margin:0;border:0}textarea{resize:vertical}ol,ul{padding-left:20px}.container,.container-fixed,.container-fixed-md,.container-fixed-sm,.container-fixed-xs,.container-fluid{padding-right:10px;padding-left:10px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{max-width:740px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1160px}}.container-fixed{width:1160px}.container-fixed-md{width:960px}.container-fixed-sm{width:740px}.container-fixed-xs{width:440px}.row{margin-right:-10px;margin-left:-10px}.col,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:10px;padding-left:10px}.col,.col-xs,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-1{width:8.33333333%}.col-xs-2{width:16.66666667%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333%}.col-xs-5{width:41.66666667%}.col-xs-6{width:50%}.col-xs-7{width:58.33333333%}.col-xs-8{width:66.66666667%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333%}.col-xs-11{width:91.66666667%}.col-xs-12{width:100%}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-1{width:8.33333333%}.col-sm-2{width:16.66666667%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333%}.col-sm-5{width:41.66666667%}.col-sm-6{width:50%}.col-sm-7{width:58.33333333%}.col-sm-8{width:66.66666667%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333%}.col-sm-11{width:91.66666667%}.col-sm-12{width:100%}.col-sm-push-1{left:8.33333333%}.col-sm-push-2{left:16.66666667%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333%}.col-sm-push-5{left:41.66666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.33333333%}.col-sm-push-8{left:66.66666667%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333%}.col-sm-push-11{left:91.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-11{right:91.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-11{margin-left:91.66666667%}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-1{width:8.33333333%}.col-md-2{width:16.66666667%}.col-md-3{width:25%}.col-md-4{width:33.33333333%}.col-md-5{width:41.66666667%}.col-md-6{width:50%}.col-md-7{width:58.33333333%}.col-md-8{width:66.66666667%}.col-md-9{width:75%}.col-md-10{width:83.33333333%}.col-md-11{width:91.66666667%}.col-md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.33333333%}.col-md-push-2{left:16.66666667%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333%}.col-md-push-5{left:41.66666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.33333333%}.col-md-push-8{left:66.66666667%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333%}.col-md-push-11{left:91.66666667%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.33333333%}.col-md-pull-2{right:16.66666667%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333%}.col-md-pull-5{right:41.66666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.33333333%}.col-md-pull-8{right:66.66666667%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333%}.col-md-pull-11{right:91.66666667%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-11{margin-left:91.66666667%}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-1{width:8.33333333%}.col-lg-2{width:16.66666667%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333%}.col-lg-5{width:41.66666667%}.col-lg-6{width:50%}.col-lg-7{width:58.33333333%}.col-lg-8{width:66.66666667%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333%}.col-lg-11{width:91.66666667%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.33333333%}.col-lg-push-2{left:16.66666667%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333%}.col-lg-push-5{left:41.66666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.33333333%}.col-lg-push-8{left:66.66666667%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333%}.col-lg-push-11{left:91.66666667%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-11{right:91.66666667%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-11{margin-left:91.66666667%}}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:14px;line-height:1.4}@media (min-width:768px){.lead{font-size:19.5px}}.small,small{font-size:85%}cite{font-style:normal}.text-muted{color:grey}.text-muted a{color:#737373}.text-muted a:active,.text-muted a:hover{color:#03c}.text-primary{color:#1a4f85}.text-primary:hover{color:#12365a}.text-warning{color:#e48600}.text-warning:hover{color:#b16800}.text-danger{color:#d2322d}.text-danger:hover{color:#a82824}.text-success{color:#229f24}.text-success:hover{color:#19751a}.text-info{color:#39b3d7}.text-info:hover{color:#2596b8}.text-important{color:#81511c}.text-important:hover{color:#573713}.text-special{color:#8957a1}.text-special:hover{color:#6d4580}.text-link{color:#141414}.text-link:active,.text-link:hover{color:#03c}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.nobr,.text-nowrap{overflow:hidden;white-space:nowrap}.text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}dl{margin-bottom:20px}dd,dt{line-height:1.53846154}dt{font-weight:700}dd{margin-left:0}.dl-inline:after,.dl-inline:before{display:table;content:" "}.dl-inline:after{clear:both}.dl-inline:after,.dl-inline:before{display:table;content:" "}.dl-inline:after{clear:both}.dl-inline dt{display:inline-block}.dl-inline dd{display:inline-block;padding-right:1em}.dl-inline dd:last-child{padding-right:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}blockquote{padding:10px 20px;margin:0 0 20px;font-size:16.25px;border-left:5px solid #e5e5e5}blockquote ol,blockquote p,blockquote ul{font-weight:300}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.53846154;color:grey}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #e5e5e5;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}.header-dividing,.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #e5e5e5}h1,h2,h3,h4,h5,h6{font-family:"Helvetica Neue",Helvetica,Tahoma,Arial,sans-serif;font-weight:700;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:400;line-height:1;color:grey}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small{font-size:75%}h1{font-size:26px}h2{font-size:20px}h3{font-size:16px}h4{font-size:14px}h5{font-size:13px}h6{font-size:12px}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:13px;font-weight:400;line-height:1.53846154;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:0;-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:focus,.btn:hover{color:#141414;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn{color:#141414;text-shadow:0 1px 0 #fff;background-color:#f0f0f0;border-color:#bdbdbd}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#141414;background-color:#dbdbdb;border-color:#9e9e9e;-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:#c9c9c9;background-image:none;border-color:#a3a3a3;-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:#f0f0f0;border-color:#bdbdbd}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.2);background-color:#1a4f85;border-color:#164270}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#133b63;border-color:#0c243c;-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:#0d2945;background-image:none;border-color:#0d2945;-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:#1a4f85;border-color:#164270}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.2);background-color:#e48600;border-color:#cb7700}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#bb6e00;border-color:#8d5300;-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:#985900;background-image:none;border-color:#985900;-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:#e48600;border-color:#cb7700}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.2);background-color:#d2322d;border-color:#bd2d29}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#b02a26;border-color:#8b211e;-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:#932320;background-image:none;border-color:#932320;-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:#d2322d;border-color:#bd2d29}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.2);background-color:#229f24;border-color:#1e8a1f}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1b7d1c;border-color:#135814;-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:#156016;background-image:none;border-color:#156016;-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:#229f24;border-color:#1e8a1f}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.2);background-color:#39b3d7;border-color:#29a8cd}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#fff;background-color:#279dc0;border-color:#1f7e9a;-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:#2185a3;background-image:none;border-color:#2185a3;-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:#39b3d7;border-color:#29a8cd}.btn-link{font-weight:400;color:#03c;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:#1a53ff}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#ddd;text-decoration:none}.btn-lg{padding:10px 16px;font-size:17px;line-height:1.33;border-radius:0}.btn-mini,.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:0}.btn-mini,.btn-xs{padding:1px 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-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group-vertical>.btn:focus,.btn-group>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group,.btn-group-vertical .btn+.btn,.btn-group-vertical .btn+.btn-group-vertical,.btn-group-vertical .btn-group-vertical+.btn,.btn-group-vertical .btn-group-vertical+.btn-group-vertical{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .btn-group-vertical,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.btn-group-vertical,.btn-toolbar>.input-group{margin-left:5px}.btn-group-vertical>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle),.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group-vertical>.btn:first-child,.btn-group>.btn:first-child{margin-left:0}.btn-group-vertical>.btn:first-child:not(:last-child):not(.dropdown-toggle),.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child),.btn-group-vertical>.dropdown-toggle:not(:first-child),.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group-vertical,.btn-group>.btn-group{float:left}.btn-group-vertical>.btn-group-vertical:not(:first-child):not(:last-child)>.btn,.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group-vertical:first-child>.btn:last-child,.btn-group-vertical>.btn-group-vertical:first-child>.dropdown-toggle,.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group-vertical>.btn-group-vertical:last-child>.btn:first-child,.btn-group>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group-vertical .dropdown-toggle:active,.btn-group-vertical.open .dropdown-toggle,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:0}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:0}.btn-group-lg>.btn{padding:10px 16px;font-size:17px;line-height:1.33;border-radius:0}.btn-group-vertical>.btn+.dropdown-toggle,.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group-vertical>.btn-lg+.dropdown-toggle,.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group-vertical.open .dropdown-toggle,.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group-vertical.open .dropdown-toggle.btn-link,.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group,.btn-group-justified>.btn-group-vertical{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn,.btn-group-justified>.btn-group-vertical .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu,.btn-group-justified>.btn-group-vertical .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group-vertical>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group-vertical>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group-vertical,.btn-group-vertical>.btn-group-vertical>.btn,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group-vertical>.btn,.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn+.btn-group-vertical,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group,.btn-group-vertical>.btn-group-vertical+.btn,.btn-group-vertical>.btn-group-vertical+.btn-group-vertical{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:0;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-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group-vertical:not(:first-child):not(:last-child)>.btn,.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group-vertical:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group-vertical:first-child:not(:last-child)>.dropdown-toggle,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group-vertical:last-child:not(:first-child)>.btn:first-child,.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #e5e5e5}hr.divider-sm{margin-top:10px;margin-bottom:10px}hr.divider{margin:0}.label{display:inline;padding:.2em .6em .2em;font-size:75%;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:grey;border-radius:.25em}.label[href]:focus,.label[href]:hover{color:#fff;background-color:#666}.label.label-circle{color:grey;background:0 0;border:1px solid grey}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-badge{display:inline-block;min-width:18px;padding:3px 7px;font-size:12px;line-height:1;border-radius:12px}.label-dot{display:inline-block;width:10px;height:10px;padding:0;line-height:13px;text-indent:-9999em;border-radius:5px}.label-dot:empty{display:inline-block}.label-primary{background-color:#1a4f85}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#12365a}.label-primary.label-circle{color:#1a4f85;background:0 0;border:1px solid #1a4f85}.label-success{background-color:#229f24}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#19751a}.label-success.label-circle{color:#229f24;background:0 0;border:1px solid #229f24}.label-info{background-color:#39b3d7}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#2596b8}.label-info.label-circle{color:#39b3d7;background:0 0;border:1px solid #39b3d7}.label-warning{background-color:#e48600}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#b16800}.label-warning.label-circle{color:#e48600;background:0 0;border:1px solid #e48600}.label-danger{background-color:#d2322d}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#a82824}.label-danger.label-circle{color:#d2322d;background:0 0;border:1px solid #d2322d}.btn .label,.nav-primary>li>a>.label{position:relative;top:-1px}.btn-danger .label,.btn-info .label,.btn-primary .label,.btn-success .label,.btn-warning .label{background-color:rgba(0,0,0,.2)}.list-group-item.active>.label,.nav-pills>.active>a>.label,.nav-primary>.active>a>.label{color:#03c;background-color:#fff}.nav>li>a>.label{margin-left:3px}@font-face{font-family:ZenIcon;font-style:normal;font-weight:400;src:url(../fonts/zenicon.eot?v=1.0.0);src:url(../fonts/zenicon.eot?#iefix&v=1.0.0) format('embedded-opentype'),url(../fonts/zenicon.woff?v=1.0.0) format('woff'),url(../fonts/zenicon.ttf?v=1.0.0) format('truetype'),url(../fonts/zenicon.svg#regular?v=1.0.0) format('svg')}.icon,[class*=" icon-"],[class^=icon-]{font-family:ZenIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-transform:none;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{display:inline-block;min-width:14px;text-align:center}a .icon,a [class*=" icon-"],a [class^=icon-]{display:inline}.icon-lg:before{font-size:1.33333333em;vertical-align:-10%}.icon-2x{font-size:28px}.icon-3x{font-size:42px}.icon-4x{font-size:56px}.icon-5x{font-size:70px}.icon-spin{display:inline-block;-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}a .icon-spin{display:inline-block;text-decoration:none}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.icon-rotate-90:before{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:before{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:before{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:before{-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.icon-flip-vertical:before{-webkit-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.icon-flip-horizontal:before,.icon-flip-vertical:before,.icon-rotate-180:before,.icon-rotate-270:before,.icon-rotate-90:before{display:inline-block}.icon-resize:before{content:'\e667'}.icon-expand-full:before{content:'\e6a3'}.icon-arrows-alt:before{content:'\e6a3'}.icon-fullscreen:before{content:'\e6a3'}.icon-collapse-full:before{content:'\e682'}.icon-yinyang:before{content:'\e687'}.icon-taiji:before{content:'\e687'}.icon-window:before{content:'\e68e'}.icon-window-alt:before{content:'\e68f'}.icon-carousel:before{content:'\e6b0'}.icon-spinner-snake:before{content:'\e97b'}.icon-spinner-indicator:before{content:'\e97c'}.icon-check-board:before{content:'\e9b8'}.icon-bar-chart:before{content:'\f080'}.icon-bar-chart-o:before{content:'\f080'}.icon-github:before{content:'\f09b'}.icon-dot-circle:before{content:'\f192'}.icon-dot-circle-o:before{content:'\f192'}.icon-cube-alt:before{content:'\f1b2'}.icon-cubes:before{content:'\f1b3'}.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-photo:before{content:'\f1c5'}.icon-file-picture:before{content:'\f1c5'}.icon-file-archive:before{content:'\f1c6'}.icon-file-zip:before{content:'\f1c6'}.icon-file-audio:before{content:'\f1c7'}.icon-file-sound:before{content:'\f1c7'}.icon-file-movie:before{content:'\f1c8'}.icon-file-video:before{content:'\f1c8'}.icon-file-code:before{content:'\f1c9'}.icon-circle-o-notch:before{content:'\f1ce'}.icon-qq:before{content:'\f600'}.icon-wechat:before{content:'\f1d7'}.icon-weixin:before{content:'\f1d7'}.icon-history:before{content:'\f1da'}.icon-circle-thin:before{content:'\f1db'}.icon-sliders:before{content:'\f1de'}.icon-newspaper-o:before{content:'\f1ea'}.icon-calculator:before{content:'\f1ec'}.icon-paint-brush:before{content:'\f1fc'}.icon-area-chart:before{content:'\f1fe'}.icon-pie-chart:before{content:'\f200'}.icon-line-chart:before{content:'\f201'}.icon-toggle-off:before{content:'\f204'}.icon-toggle-on:before{content:'\f205'}.icon-diamond:before{content:'\f219'}.icon-venus:before{content:'\f221'}.icon-mars:before{content:'\f222'}.icon-server:before{content:'\f233'}.icon-music:before{content:'\e602'}.icon-search:before{content:'\e603'}.icon-envelope:before{content:'\e604'}.icon-heart:before{content:'\e605'}.icon-star:before{content:'\e606'}.icon-star-empty:before{content:'\e607'}.icon-user:before{content:'\e608'}.icon-film:before{content:'\e609'}.icon-th-large:before{content:'\e60a'}.icon-th:before{content:'\e60b'}.icon-th-list:before{content:'\e60c'}.icon-ok:before{content:'\e60d'}.icon-check:before{content:'\e60d'}.icon-remove:before{content:'\d7'}.icon-times:before{content:'\d7'}.icon-zoom-in:before{content:'\e60f'}.icon-zoom-out:before{content:'\e610'}.icon-off:before{content:'\e611'}.icon-cog:before{content:'\e613'}.icon-trash:before{content:'\e614'}.icon-home:before{content:'\e615'}.icon-file-o:before{content:'\e616'}.icon-file-alt:before{content:'\e616'}.icon-time:before{content:'\e617'}.icon-download-alt:before{content:'\e618'}.icon-download:before{content:'\e619'}.icon-upload:before{content:'\e61a'}.icon-inbox:before{content:'\e61b'}.icon-play-circle:before{content:'\e61c'}.icon-repeat:before{content:'\e61d'}.icon-refresh:before{content:'\e61e'}.icon-list-alt:before{content:'\e61f'}.icon-lock:before{content:'\e620'}.icon-flag:before{content:'\e621'}.icon-headphones:before{content:'\e622'}.icon-volume-off:before{content:'\e623'}.icon-volume-up:before{content:'\e625'}.icon-qrcode:before{content:'\e626'}.icon-barcode:before{content:'\e627'}.icon-tag:before{content:'\e628'}.icon-tags:before{content:'\e629'}.icon-book:before{content:'\e62a'}.icon-bookmark:before{content:'\e62b'}.icon-print:before{content:'\e62c'}.icon-camera:before{content:'\e62d'}.icon-font:before{content:'\e62e'}.icon-bold:before{content:'\e62f'}.icon-italic:before{content:'\f033'}.icon-header:before{content:'\f1dc'}.icon-underline:before{content:'\f0cd'}.icon-strikethrough:before{content:'\f0cc'}.icon-eraser:before{content:'\f12d'}.icon-align-justify:before{content:'\e636'}.icon-list:before{content:'\e637'}.icon-picture:before{content:'\e63b'}.icon-pencil:before{content:'\e63c'}.icon-map-marker:before{content:'\e63d'}.icon-adjust:before{content:'\e63e'}.icon-tint:before{content:'\e63f'}.icon-edit:before{content:'\e640'}.icon-share:before{content:'\e641'}.icon-checked:before{content:'\e642'}.icon-move:before{content:'\e643'}.icon-arrows:before{content:'\e643'}.icon-step-backward:before{content:'\e644'}.icon-fast-backward:before{content:'\e645'}.icon-backward:before{content:'\e646'}.icon-play:before{content:'\e647'}.icon-pause:before{content:'\e648'}.icon-stop:before{content:'\e649'}.icon-forward:before{content:'\e64a'}.icon-fast-forward:before{content:'\e64b'}.icon-step-forward:before{content:'\e64c'}.icon-eject:before{content:'\e64d'}.icon-chevron-left:before{content:'\e64e'}.icon-chevron-right:before{content:'\e64f'}.icon-plus-sign:before{content:'\e650'}.icon-minus-sign:before{content:'\e651'}.icon-remove-sign:before{content:'\e652'}.icon-ok-sign:before{content:'\e653'}.icon-check-circle:before{content:'\e653'}.icon-question-sign:before{content:'\e654'}.icon-info-sign:before{content:'\e655'}.icon-remove-circle:before{content:'\e657'}.icon-ok-circle:before{content:'\e658'}.icon-check-circle-o:before{content:'\e658'}.icon-ban-circle:before{content:'\e659'}.icon-arrow-left:before{content:'\e65a'}.icon-arrow-right:before{content:'\e65b'}.icon-arrow-up:before{content:'\e65c'}.icon-arrow-down:before{content:'\e65d'}.icon-share-alt:before{content:'\e65e'}.icon-resize-full:before{content:'\e65f'}.icon-resize-small:before{content:'\e660'}.icon-plus:before{content:'\e661'}.icon-minus:before{content:'\e662'}.icon-asterisk:before{content:'\e663'}.icon-exclamation-sign:before{content:'\e664'}.icon-gift:before{content:'\e665'}.icon-leaf:before{content:'\e666'}.icon-eye-open:before{content:'\e668'}.icon-eye-close:before{content:'\e669'}.icon-warning-sign:before{content:'\e66a'}.icon-plane:before{content:'\e66b'}.icon-calendar:before{content:'\e66c'}.icon-random:before{content:'\e66d'}.icon-comment:before{content:'\e66e'}.icon-chevron-up:before{content:'\e670'}.icon-chevron-down:before{content:'\e671'}.icon-shopping-cart:before{content:'\e673'}.icon-folder-close:before{content:'\e674'}.icon-folder-open:before{content:'\e675'}.icon-resize-v:before{content:'\e676'}.icon-resize-h:before{content:'\e677'}.icon-bar-chart-alt:before{content:'\e678'}.icon-camera-retro:before{content:'\e679'}.icon-key:before{content:'\e67a'}.icon-cogs:before{content:'\e67b'}.icon-comments:before{content:'\e67c'}.icon-thumbs-o-up:before{content:'\e67d'}.icon-thumbs-o-down:before{content:'\e67e'}.icon-star-half:before{content:'\e67f'}.icon-heart-empty:before{content:'\e680'}.icon-signout:before{content:'\e681'}.icon-pushpin:before{content:'\e683'}.icon-external-link:before{content:'\e684'}.icon-signin:before{content:'\e685'}.icon-trophy:before{content:'\e686'}.icon-upload-alt:before{content:'\e688'}.icon-lemon:before{content:'\e689'}.icon-phone:before{content:'\e68a'}.icon-check-empty:before{content:'\e68b'}.icon-bookmark-empty:before{content:'\e68c'}.icon-phone-sign:before{content:'\e68d'}.icon-credit:before{content:'\e690'}.icon-rss:before{content:'\e691'}.icon-hdd:before{content:'\e692'}.icon-bullhorn:before{content:'\e693'}.icon-bell:before{content:'\e694'}.icon-certificate:before{content:'\e695'}.icon-hand-right:before{content:'\e696'}.icon-hand-left:before{content:'\e697'}.icon-hand-up:before{content:'\e698'}.icon-hand-down:before{content:'\e699'}.icon-circle-arrow-left:before{content:'\e69a'}.icon-circle-arrow-right:before{content:'\e69b'}.icon-circle-arrow-up:before{content:'\e69c'}.icon-circle-arrow-down:before{content:'\e69d'}.icon-globe:before{content:'\e69e'}.icon-wrench:before{content:'\e69f'}.icon-tasks:before{content:'\e6a0'}.icon-filter:before{content:'\e6a1'}.icon-group:before{content:'\e6a4'}.icon-link:before{content:'\e6a5'}.icon-cloud:before{content:'\e6a6'}.icon-beaker:before{content:'\e6a7'}.icon-cut:before{content:'\e6a8'}.icon-copy:before{content:'\e6a9'}.icon-paper-clip:before{content:'\e6aa'}.icon-save:before{content:'\e6ab'}.icon-sign-blank:before{content:'\e6ac'}.icon-bars:before{content:'\e6ad'}.icon-reorder:before{content:'\e6ad'}.icon-list-ul:before{content:'\e6ae'}.icon-list-ol:before{content:'\e6af'}.icon-table:before{content:'\e6b2'}.icon-magic:before{content:'\e6b3'}.icon-caret-down:before{content:'\e6b8'}.icon-caret-up:before{content:'\e6b9'}.icon-caret-left:before{content:'\e6ba'}.icon-caret-right:before{content:'\e6bb'}.icon-columns:before{content:'\e6bc'}.icon-sort:before{content:'\e6bd'}.icon-sort-down:before{content:'\e6be'}.icon-sort-up:before{content:'\e6bf'}.icon-envelope-alt:before{content:'\e6c0'}.icon-undo:before{content:'\e6c1'}.icon-dashboard:before{content:'\e6c3'}.icon-comment-alt:before{content:'\e6c4'}.icon-comments-alt:before{content:'\e6c5'}.icon-bolt:before{content:'\e6c6'}.icon-sitemap:before{content:'\e6c7'}.icon-umbrella:before{content:'\e6c8'}.icon-paste:before{content:'\e6c9'}.icon-lightbulb:before{content:'\e6ca'}.icon-exchange:before{content:'\e6cb'}.icon-cloud-download:before{content:'\e6cc'}.icon-cloud-upload:before{content:'\e6cd'}.icon-bell-alt:before{content:'\e6d1'}.icon-coffee:before{content:'\e6d2'}.icon-file-text-o:before{content:'\e6d4'}.icon-file-text-alt:before{content:'\e6d4'}.icon-building:before{content:'\e6d5'}.icon-double-angle-left:before{content:'\e6dc'}.icon-double-angle-right:before{content:'\e6dd'}.icon-double-angle-up:before{content:'\e6de'}.icon-double-angle-down:before{content:'\e6df'}.icon-angle-left:before{content:'\e6e0'}.icon-angle-right:before{content:'\e6e1'}.icon-angle-up:before{content:'\e6e2'}.icon-angle-down:before{content:'\e6e3'}.icon-desktop:before{content:'\e6e4'}.icon-laptop:before{content:'\e6e5'}.icon-tablet:before{content:'\e6e6'}.icon-mobile:before{content:'\e6e7'}.icon-circle-blank:before{content:'\e6e8'}.icon-quote-left:before{content:'\e6e9'}.icon-quote-right:before{content:'\e6ea'}.icon-spinner:before{content:'\e6eb'}.icon-circle:before{content:'\e6ec'}.icon-reply:before{content:'\e6ed'}.icon-folder-close-alt:before{content:'\e6ef'}.icon-folder-open-alt:before{content:'\e6f0'}.icon-expand-alt:before{content:'\e6f1'}.icon-collapse-alt:before{content:'\e6f2'}.icon-smile:before{content:'\e6f3'}.icon-frown:before{content:'\e6f4'}.icon-meh:before{content:'\e6f5'}.icon-gamepad:before{content:'\e6f6'}.icon-keyboard:before{content:'\e6f7'}.icon-flag-alt:before{content:'\e6f8'}.icon-flag-checkered:before{content:'\e6f9'}.icon-terminal:before{content:'\e6fa'}.icon-code:before{content:'\e6fb'}.icon-reply-all:before{content:'\e6fc'}.icon-star-half-full:before{content:'\e6fd'}.icon-location-arrow:before{content:'\e6fe'}.icon-crop:before{content:'\e6ff'}.icon-code-fork:before{content:'\e700'}.icon-unlink:before{content:'\e701'}.icon-question:before{content:'\e702'}.icon-info:before{content:'\e703'}.icon-shield:before{content:'\e70b'}.icon-calendar-empty:before{content:'\e70c'}.icon-rocket:before{content:'\e70e'}.icon-chevron-sign-left:before{content:'\e70f'}.icon-chevron-sign-right:before{content:'\e710'}.icon-chevron-sign-up:before{content:'\e711'}.icon-chevron-sign-down:before{content:'\e712'}.icon-html5:before{content:'\e713'}.icon-anchor:before{content:'\e714'}.icon-unlock-alt:before{content:'\e715'}.icon-bullseye:before{content:'\e716'}.icon-ellipsis-h:before{content:'\e717'}.icon-ellipsis-v:before{content:'\e718'}.icon-rss-sign:before{content:'\e719'}.icon-play-sign:before{content:'\e71a'}.icon-minus-sign-alt:before{content:'\e71c'}.icon-check-minus:before{content:'\e71d'}.icon-level-up:before{content:'\e71e'}.icon-level-down:before{content:'\e71f'}.icon-check-sign:before{content:'\e720'}.icon-edit-sign:before{content:'\e721'}.icon-external-link-sign:before{content:'\e722'}.icon-share-sign:before{content:'\e723'}.icon-compass:before{content:'\e724'}.icon-collapse:before{content:'\e725'}.icon-collapse-top:before{content:'\e726'}.icon-expand:before{content:'\e727'}.icon-dollar:before{content:'\e728'}.icon-yen:before{content:'\e729'}.icon-file:before{content:'\e72b'}.icon-file-text:before{content:'\e72c'}.icon-sort-by-alphabet:before{content:'\e72d'}.icon-sort-by-alphabet-alt:before{content:'\e72e'}.icon-sort-by-attributes:before{content:'\e72f'}.icon-sort-by-attributes-alt:before{content:'\e730'}.icon-sort-by-order:before{content:'\e731'}.icon-sort-by-order-alt:before{content:'\e732'}.icon-thumbs-up:before{content:'\e733'}.icon-thumbs-down:before{content:'\e734'}.icon-long-arrow-down:before{content:'\e736'}.icon-long-arrow-up:before{content:'\e737'}.icon-long-arrow-left:before{content:'\e738'}.icon-long-arrow-right:before{content:'\e739'}.icon-apple:before{content:'\e73a'}.icon-windows:before{content:'\e73b'}.icon-android:before{content:'\e73c'}.icon-linux:before{content:'\e73d'}.icon-sun:before{content:'\e742'}.icon-moon:before{content:'\e743'}.icon-archive:before{content:'\e744'}.icon-bug:before{content:'\e745'}.icon-alipay:before,.icon-zhifubao:before{content:'\e901'}.icon-alipay-square:before,.icon-zhifubao-square:before{content:'\e900'}.icon-taobao:before{content:'\e902'}.icon-weibo:before{content:'\e746'}.icon-renren:before{content:'\e747'}.icon-chrome:before{content:'\e76c'}.icon-firefox:before{content:'\e76d'}.icon-ie:before{content:'\e76e'}.icon-opera:before{content:'\e76f'}.icon-safari:before{content:'\e770'}.icon-node:before{content:'\e76a'}.icon-layout:before{content:'\e768'}.icon-usecase:before{content:'\e74a'}.icon-stack:before{content:'\e769'}.icon-branch:before{content:'\e74b'}.icon-chat:before{content:'\e74c'}.icon-chat-line:before{content:'\e74f'}.icon-comment-line:before{content:'\e74f'}.icon-chat-dot:before{content:'\e750'}.icon-cube:before{content:'\e751'}.icon-database:before{content:'\f1c0'}.icon-align-left:before{content:'\e633'}.close{float:right;font-size:19.5px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.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,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:13px;font-weight:400;line-height:1;color:#222;text-align:center;background-color:#e5e5e5;border:1px solid #ccc;border-radius:0}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group-addon.fix-border{border-right:0;border-left:0}.input-group-addon.fix-padding,.input-group-addon:empty{width:1px;padding:0}.input-group-btn.fix-border>.btn{border-right:0;border-left:0;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-vertical>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group-vertical:not(:last-child)>.btn,.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-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group-vertical:not(:first-child)>.btn,.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-vertical>.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}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group,.input-group-btn:first-child>.btn-group-vertical{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group,.input-group-btn:last-child>.btn-group-vertical{margin-left:-1px}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:44px;padding:10px 16px;font-size:17px;line-height:1.33;border-radius:0}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:44px;line-height:44px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:0}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:0}.input-group-addon.input-lg{padding:10px 16px;font-size:17px;border-radius:0}table{max-width:100%;background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:grey;text-align:left}th{text-align:left}.table{width:100%;margin-bottom:20px}.table td,.table th{padding:8px;line-height:1.53846154;vertical-align:top;border-bottom:1px solid #ddd;-webkit-transition:background .3s cubic-bezier(.175,.885,.32,1);-o-transition:background .3s cubic-bezier(.175,.885,.32,1);transition:background .3s cubic-bezier(.175,.885,.32,1)}.table>thead>tr>th{vertical-align:bottom;background-color:#f1f1f1;border-bottom:1px solid #ddd}.table>tbody+tbody{border-top:2px solid #ddd}.table-fixed{table-layout:fixed}.table-fixed td,.table-fixed th{overflow:hidden;white-space:nowrap}.table-fixed .nofixed,.table-fixed tfoot>tr>td,.table-fixed tfoot>tr>th{overflow:visible}.table-borderless td,.table-borderless th,.table-borderless thead>tr>th{border:none}.table-auto{width:auto;max-width:100%}.table-condensed td,.table-condensed th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered td,.table-bordered th{border:1px solid #ddd}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#edf3fe}table col[class*=col-]{display:table-column;float:none}table td[class*=col-],table th[class*=col-]{display:table-cell;float:none}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#edf3fe}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#e5ffe6;border-color:#d4ffcc}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#ccffcd;border-color:#beffb2}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#ffe6e5;border-color:#ffccd3}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ffcecc;border-color:#ffb2bd}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fff4e5;border-color:#ffe1cc}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#ffeacc;border-color:#ffd3b2}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.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}.list-group-item>.label-badge{float:right}.list-group-item>.label-badge+.label-badge{margin-right:5px}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:#141414;text-decoration:none;background-color:#edf3fe}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#1a4f85;border-color:#1a4f85}.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{margin-top:0;margin-bottom:5px;color:#333}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-color:#ddd;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-body{padding:15px}.panel>.table{margin-bottom:0}.panel>.panel-body+.table{border-top:1px solid #ddd}.panel-heading{padding:8px 15px;border-bottom:1px solid transparent;border-top-left-radius:-1;border-top-right-radius:-1}.panel-title{margin-top:0;margin-bottom:0;font-size:15px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:-1;border-bottom-left-radius:-1}.caret{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}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:13px;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #cbcbcb;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.53846154;color:#141414;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#1a4f85;text-decoration:none;background-color:#ddd}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#141414;text-decoration:none;background-color:#ddd;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#ddd}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.dropdown-hover .dropdown-menu{margin:-1px 0}.dropdown-hover:hover>.dropdown-menu,.open>.dropdown-menu{display:block}.dropdown-hover:hover>a,.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;font-weight:700;line-height:1.53846154;color:grey}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0 dotted;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;border-radius:0}.dropdown-submenu.open>.dropdown-menu,.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;border-radius:0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;content:" ";border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc}.dropdown-submenu:hover>a:after{border-left-color:#1a4f85}.dropdown-submenu>a{min-width:160px}.dropdown-submenu>.dropdown-menu.pull-left{left:-100%}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#1a4f85;text-decoration:none;background-color:#ddd}.alert{padding:15px;margin-bottom:20px;color:#070707;background-color:#f1f1f1;border-radius:0;-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}.alert hr{border-top-color:#e4e4e4}.alert .alert-link{color:#000}.alert h4{margin-top:0;color:inherit}.alert hr{margin:10px 0}.alert p,.alert ul{margin-bottom:0}.alert p+p{margin-top:5px}.alert-link{font-weight:700}.alert>[class*=icon-]{float:left;margin-top:-5px;font-size:42px;opacity:.6;-webkit-transition:opacity .3s cubic-bezier(.175,.885,.32,1);-o-transition:opacity .3s cubic-bezier(.175,.885,.32,1);transition:opacity .3s cubic-bezier(.175,.885,.32,1)}.alert>[class*=icon-]+.content{min-height:30px;margin-left:64px}.alert.with-icon{display:table;width:100%}.alert.with-icon>[class*=icon-],.alert.with-icon>[class*=icon-]+.content{display:table-cell;float:none;min-height:0;margin:0;vertical-align:middle}.alert.with-icon>[class*=icon-]{width:48px;text-align:center}.alert.with-icon>[class*=icon-]+.content{padding-left:1em}.alert-block{margin:0;border-radius:0}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-6px;right:-21px;color:inherit}.alert-primary{color:#070707;background-color:#edf3fe}.alert-primary hr{border-top-color:#cbdcfc}.alert-primary .alert-link{color:#000}.alert-success{color:#1e8a1f;background-color:#e5ffe6}.alert-success hr{border-top-color:#d4ffcc}.alert-success .alert-link{color:#176d19}.alert-info{color:#29a8cd;background-color:#e5f9ff}.alert-info hr{border-top-color:#c2fbff}.alert-info .alert-link{color:#238faf}.alert-warning{color:#cb7700;background-color:#fff4e5}.alert-warning hr{border-top-color:#ffe1cc}.alert-warning .alert-link{color:#a76200}.alert-danger{color:#bd2d29;background-color:#ffe6e5}.alert-danger hr{border-top-color:#ffccd3}.alert-danger .alert-link{color:#a02622}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:19.5px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:5px 0 0;margin-top:0\9;line-height:normal}input[type=file]{display:block}select[multiple],select[size]{height:auto}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}.form-control::-webkit-input-placeholder{color:grey}.form-control::-moz-placeholder{color:grey}.form-control:-ms-input-placeholder{color:grey}.form-control::placeholder{color:grey}.form-control{display:block;width:100%;height:34px;padding:6px 10px;font-size:13px;line-height:1.53846154;color:#222;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-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}.form-control:focus{border-color:#4d90fe;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(77,144,254,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(77,144,254,.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#e5e5e5}.form-control[readonly]{cursor:default}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:3px;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:0}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:44px;padding:10px 16px;font-size:17px;line-height:1.33;border-radius:0}select.input-lg{height:44px;line-height:44px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning>label{color:#e48600}.has-warning .form-control{border-color:#e48600;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#b16800;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ffb54b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ffb54b}.has-warning .input-group-addon{color:#e48600;background-color:#fff4e5;border-color:#e48600}.has-error .help-block,.has-error>label{color:#d2322d}.has-error .form-control{border-color:#d2322d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#a82824;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #e48481;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #e48481}.has-error .input-group-addon{color:#d2322d;background-color:#ffe6e5;border-color:#d2322d}.has-success .help-block,.has-success>label{color:#229f24}.has-success .form-control{border-color:#229f24;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#19751a;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #4ed950;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #4ed950}.has-success .input-group-addon{color:#229f24;background-color:#e5ffe6;border-color:#229f24}.form-control-static{min-height:33px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.help-block{display:block;margin:5px 0;color:#545454}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{float:none;margin-left:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .form-group>label,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-10px;margin-left:-10px}@media (min-width:768px){.form-horizontal .form-group>label{text-align:right}}.required{position:relative}.required:after{position:absolute;top:0;right:-10px;display:inline-block;font-size:17px;color:#d2322d;content:'*'}.form-horizontal .required:after{top:5px;right:-1px}.form-condensed .form-group{margin-bottom:10px}.form-condensed .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:0}select.form-condensed .form-control{height:30px;line-height:30px}textarea.form-condensed .form-control{height:auto}.form-condensed textarea.form-control{height:auto}.form-condensed .btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:0}.form-condensed .input-group>.form-control,.form-condensed .input-group>.input-group-addon,.form-condensed .input-group>.input-group-btn>.btn{padding:5px 10px;font-size:12px;border-top-right-radius:0;border-bottom-right-radius:0}.form-condensed.form-horizontal .checkbox,.form-condensed.form-horizontal .checkbox-inline,.form-condensed.form-horizontal .form-group>label,.form-condensed.form-horizontal .radio,.form-condensed.form-horizontal .radio-inline{padding-top:1px}.code,code,kbd,pre,samp{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code,kbd{padding:2px 4px;font-size:90%;color:#d2322d;background-color:#f1f1f1;border-radius:0}kbd{padding:1px 4px;font-weight:700;color:#666;background-color:#f1f1f1;border:1px solid #d7d7d7;border-bottom-width:2px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:12px;line-height:1.38461538;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:0}pre code{padding:0;margin:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.com{color:#93a1a1}.lit{color:#195f91}.clo,.opn,.pun{color:#93a1a1}.fun{color:#dc322f}.atv,.str{color:#d14}.kwd,.prettyprint .tag{color:#1e347b}.atn,.dec,.typ,.var{color:teal}.pln{color:#48484c}.prettyprint.linenums{-webkit-box-shadow:inset 40px 0 0 #fbfbfc,inset 41px 0 0 #ececf0;box-shadow:inset 40px 0 0 #fbfbfc,inset 41px 0 0 #ececf0}.prettyprint ol.linenums{padding-left:35px;margin-bottom:0;line-height:20px;color:#bebec5;text-shadow:0 1px 0 #fff}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>.nav-heading{padding:10px 15px;font-weight:700;color:grey}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px;color:#141414}.nav>li>a:focus,.nav>li>a:hover{color:#1a53ff;text-decoration:none;background-color:#f1f1f1}.nav>li.disabled>a{color:#ddd}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#ddd;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#f1f1f1;border-color:#03c}.nav>li>a>img{max-width:none}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:20px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#1a4f85}.nav-primary>li{float:left;margin-left:-1px}.nav-primary>li:first-child>a{margin-left:0;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 #ddd}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#1a4f85;border-color:#1a4f85}.nav-secondary>li{float:left}.nav-secondary>li>a{border-bottom:2px solid #e5e5e5}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#1a4f85;border-bottom-color:#1a4f85}.nav-secondary>li.nav-heading{border-bottom:2px solid #e5e5e5}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-stacked.nav-primary>li,.nav-stacked.nav-primary>li>a{margin-left:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li+li{margin-top:-1px}.nav-stacked.nav-primary>li:first-child{margin-top:0}.nav-stacked.nav-primary>li:first-child.nav-heading,.nav-stacked.nav-primary>li:first-child>a{margin-left:0;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 #ddd}.nav-stacked.nav-secondary>li>a{border:none;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 #e5e5e5;box-shadow:inset 2px 0 0 #e5e5e5}.nav-stacked.nav-secondary>li+li{margin-top:-1px}.nav-stacked.nav-secondary>li:first-child{margin-top:0}.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 #1a4f85;box-shadow:inset 2px 0 0 #1a4f85}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #ddd}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}.nav-justified.nav-primary>li+li>a{border-left:0}}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.53846154;border:1px solid transparent;border-radius:0}.nav-tabs>li>a:hover{border-color:#e5e5e5 #e5e5e5 #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:grey;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}.nav-tabs.nav-justified.nav-primary>li+li>a{border-left:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}@-moz-document url-prefix(){.nav-tabs>li.active>a:focus .nav-tabs>li>a:focus{outline:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:transform .3s ease-out,-o-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out,-o-transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal>.loader{display:none}.modal.modal-loading .modal-dialog{opacity:0}.modal.modal-loading .loader{position:absolute;top:35%;left:50%;display:block;width:80px;margin-left:-40px;font-size:56px;color:#fff;text-align:center}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-iframe .modal-body>iframe{border-radius:0}.modal-dialog{position:relative;width:auto;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:0;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-dialog.modal-moveable{position:absolute;margin:0}.modal-dialog.modal-moveable .modal-header{cursor:move}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.54px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.53846154}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn,.modal-footer .btn-group-vertical .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto;-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.modal-fullscreen{position:relative;width:100%!important;height:100%!important;margin:0;border-radius:0}.modal-fullscreen .modal-body{position:absolute;top:52px;right:0;bottom:0;left:0;overflow-y:auto}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=100);opacity:1}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#141414;border-radius:0}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#141414}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-width:5px 5px 0;border-top-color:#141414}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-width:5px 5px 0;border-top-color:#141414}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#141414}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#141414}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#141414}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#141414}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#141414}.tooltip-primary .tooltip-inner{background-color:#1a4f85}.tooltip-primary.tooltip.top .tooltip-arrow{border-top-color:#1a4f85}.tooltip-primary.tooltip.top-left .tooltip-arrow{border-top-color:#1a4f85}.tooltip-primary.tooltip.top-right .tooltip-arrow{border-top-color:#1a4f85}.tooltip-primary.tooltip.right .tooltip-arrow{border-right-color:#1a4f85}.tooltip-primary.tooltip.left .tooltip-arrow{border-left-color:#1a4f85}.tooltip-primary.tooltip.bottom .tooltip-arrow{border-bottom-color:#1a4f85}.tooltip-primary.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#1a4f85}.tooltip-primary.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#1a4f85}.tooltip-success .tooltip-inner{background-color:#229f24}.tooltip-success.tooltip.top .tooltip-arrow{border-top-color:#229f24}.tooltip-success.tooltip.top-left .tooltip-arrow{border-top-color:#229f24}.tooltip-success.tooltip.top-right .tooltip-arrow{border-top-color:#229f24}.tooltip-success.tooltip.right .tooltip-arrow{border-right-color:#229f24}.tooltip-success.tooltip.left .tooltip-arrow{border-left-color:#229f24}.tooltip-success.tooltip.bottom .tooltip-arrow{border-bottom-color:#229f24}.tooltip-success.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#229f24}.tooltip-success.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#229f24}.tooltip-info .tooltip-inner{background-color:#39b3d7}.tooltip-info.tooltip.top .tooltip-arrow{border-top-color:#39b3d7}.tooltip-info.tooltip.top-left .tooltip-arrow{border-top-color:#39b3d7}.tooltip-info.tooltip.top-right .tooltip-arrow{border-top-color:#39b3d7}.tooltip-info.tooltip.right .tooltip-arrow{border-right-color:#39b3d7}.tooltip-info.tooltip.left .tooltip-arrow{border-left-color:#39b3d7}.tooltip-info.tooltip.bottom .tooltip-arrow{border-bottom-color:#39b3d7}.tooltip-info.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#39b3d7}.tooltip-info.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#39b3d7}.tooltip-warning .tooltip-inner{background-color:#e48600}.tooltip-warning.tooltip.top .tooltip-arrow{border-top-color:#e48600}.tooltip-warning.tooltip.top-left .tooltip-arrow{border-top-color:#e48600}.tooltip-warning.tooltip.top-right .tooltip-arrow{border-top-color:#e48600}.tooltip-warning.tooltip.right .tooltip-arrow{border-right-color:#e48600}.tooltip-warning.tooltip.left .tooltip-arrow{border-left-color:#e48600}.tooltip-warning.tooltip.bottom .tooltip-arrow{border-bottom-color:#e48600}.tooltip-warning.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#e48600}.tooltip-warning.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#e48600}.tooltip-danger .tooltip-inner{background-color:#d2322d}.tooltip-danger.tooltip.top .tooltip-arrow{border-top-color:#d2322d}.tooltip-danger.tooltip.top-left .tooltip-arrow{border-top-color:#d2322d}.tooltip-danger.tooltip.top-right .tooltip-arrow{border-top-color:#d2322d}.tooltip-danger.tooltip.right .tooltip-arrow{border-right-color:#d2322d}.tooltip-danger.tooltip.left .tooltip-arrow{border-left-color:#d2322d}.tooltip-danger.tooltip.bottom .tooltip-arrow{border-bottom-color:#d2322d}.tooltip-danger.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#d2322d}.tooltip-danger.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#d2322d}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:300px;padding:1px;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:0;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover.no-arrow.top{margin-top:0}.popover.no-arrow.right{margin-left:0}.popover.no-arrow.bottom{margin-top:0}.popover.no-arrow.left{margin-left:0}.popover-title{padding:8px 14px;margin:0;font-size:13px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{content:"";border-width:10px}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom .arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left .arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.cards{padding-top:10px;padding-bottom:10px;margin-right:-10px;margin-left:-10px}.card{position:relative;display:block;padding:0;margin-bottom:20px;overflow:hidden;border:1px solid #ddd;border-radius:0;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075);-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}.card>img{display:block;max-width:100%;height:auto;filter:alpha(opacity=100);opacity:1}.card>.media-wrapper{display:block;width:100%;overflow:hidden;text-align:center;background-color:#f1f1f1;filter:alpha(opacity=100);opacity:1;-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}.card>.media-wrapper>img{max-width:100%;vertical-align:middle}.card .card-heading{display:block;padding:10px;margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.card .card-actions,.card .card-content{padding:0 10px 10px 10px;overflow:hidden;text-overflow:ellipsis}.card .card-actions .btn+.pull-right{padding:6px 0;line-height:20px}.card:hover{text-decoration:none;-webkit-box-shadow:0 1px 5px rgba(0,0,0,.175);box-shadow:0 1px 5px rgba(0,0,0,.175)}.card:hover>.media-wrapper,.card:hover>img{background-color:#e5e5e5;filter:alpha(opacity=90);opacity:.9}.card:hover>.card-reveal{top:0}.cards-borderless .card{border:none;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.cards-borderless .card>.media-wrapper,.cards-borderless .card>img{overflow:hidden;border-radius:0}.cards-borderless .card>.card-actions,.cards-borderless .card>.card-content,.cards-borderless .card>.card-heading{padding-right:0;padding-left:0}.card>.caption{position:absolute;top:-100%;left:0;display:block;width:100%;padding:5px 10px;overflow:hidden;color:#fff;text-align:center;background-color:#666;background-color:rgba(0,0,0,.7);filter:alpha(opacity=0);opacity:0;-webkit-transition:all .8s cubic-bezier(.175,.885,.32,1);-o-transition:all .8s cubic-bezier(.175,.885,.32,1);transition:all .8s cubic-bezier(.175,.885,.32,1)}.card:hover>.caption{top:0;filter:alpha(opacity=100);opacity:1}.cards-condensed{padding:0;border:1px solid #ddd;border-top:0;border-left:0}.cards-condensed>[class*=" col-"],.cards-condensed>[class^=col-]{padding:0}.cards-condensed .card{padding:10px;margin:0;border-right:0;border-bottom:0;border-radius:0;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.015);box-shadow:0 1px 2px rgba(0,0,0,.015)}.card>.card-reveal{position:absolute;top:100%;left:0;width:100%;height:100%;background-color:#f1f1f1;-webkit-transition:all .8s cubic-bezier(.175,.885,.32,1);-o-transition:all .8s cubic-bezier(.175,.885,.32,1);transition:all .8s cubic-bezier(.175,.885,.32,1)}.card>.card-reveal>.card-heading{padding:20px 10px}.card:hover>.card-reveal{top:0}.bg-default{color:#fff;background-color:#141414}a.bg-default:hover{background-color:#000}.bg-primary{color:#fff;background-color:#1a4f85}a.bg-primary:hover{background-color:#12365a}.bg-success{color:#fff;background-color:#229f24}a.bg-success:hover{background-color:#19751a}.bg-info{color:#fff;background-color:#39b3d7}a.bg-info:hover{background-color:#2596b8}.bg-warning{color:#fff;background-color:#e48600}a.bg-warning:hover{background-color:#b16800}.bg-danger{color:#fff;background-color:#d2322d}a.bg-danger:hover{background-color:#a82824}.bg-important{color:#fff;background-color:#81511c}a.bg-important:hover{background-color:#573713}.bg-special{color:#fff;background-color:#8957a1}a.bg-special:hover{background-color:#6d4580}.hl-default{background-color:#f1f1f1}a.hl-default:hover{background-color:#d7d7d7}.hl-primary{background-color:#edf3fe}a.hl-primary:hover{background-color:#bdd3fb}.hl-success{background-color:#e5ffe6}a.hl-success:hover{background-color:#b3ffb4}.hl-info{background-color:#e5f9ff}a.hl-info:hover{background-color:#b3eeff}.hl-warning{background-color:#fff4e5}a.hl-warning:hover{background-color:#ffdfb3}.hl-danger{background-color:#ffe6e5}a.hl-danger:hover{background-color:#ffb5b3}.hl-important{background-color:#fff3e5}a.hl-important:hover{background-color:#ffdbb3}.hl-special{background-color:#f7e5ff}a.hl-special:hover{background-color:#e6b3ff}.article{padding:20px}.article>header h1,.article>header h2,.article>header h3{margin-bottom:20px;line-height:1.5}.article>header>.abstract,.article>header>dl{padding:10px 15px;font-size:12px;color:#474747;background-color:#f1f1f1}.article>header>.abstract>p:last-child,.article>header>dl>p:last-child{margin-bottom:0}.article>header>dl{margin:0;border-bottom:1px solid #e9e9e9}.article>header>dl.pull-right{background-color:transparent;border:none}.article>footer{border-top:1px dashed #d7d7d7}.article>footer>p{padding:10px 15px}.article-content,.article>.content{padding:20px 0;font-size:14px;line-height:1.57142857}.article-content h1,.article>.content h1{font-size:20px}.article-content h2,.article>.content h2{font-size:18px}.article-content h3,.article>.content h3{font-size:16px}.article-content h4,.article>.content h4{margin-top:15px;font-size:14px}.article-content h5,.article>.content h5{margin-top:15px;font-size:13px}.article-content h6,.article>.content h6{margin-top:15px;font-size:11px}.article-content img,.article>.content img{margin:10px 0}.article-content p>img,.article>.content p>img{margin-right:10px}.article-content p>img[align=right],.article>.content p>img[align=right]{margin-left:10px}.article-content dl,.article>.content dl{padding-right:2em;padding-left:2em}.article-content table,.article>.content table{margin-bottom:20px}.article-content table td,.article-content table th,.article>.content table td,.article>.content table th{padding:8px;line-height:1.53846154;vertical-align:top;border-bottom:1px solid #ddd}.article-content table>thead>tr>th,.article>.content table>thead>tr>th{vertical-align:bottom;background-color:#f1f1f1;border-bottom:1px solid #ddd}.article-content p{margin-bottom:0}.article-content table{width:100%}.article>.content table td,.article>.content table th,.article>.content table>thead>tr>th{border:1px solid #ddd}body.article-content{padding:8px}.article-condensed{padding:20px 0}.article-condensed>header{padding:0 20px}.article-condensed>header>.abstract,.article-condensed>header>dl{padding:10px 15px;margin:0 -20px}.article-condensed>.article-content,.article-condensed>.content{padding:20px}.article-condensed>.article-content>img,.article-condensed>.article-content>pre,.article-condensed>.content>img,.article-condensed>.content>pre{margin-right:-20px;margin-left:-20px;border-radius:0}.article-condensed>.article-content>pre,.article-condensed>.content>pre{border-right:none;border-left:none}.article-condensed>footer{border-top:1px dashed #d7d7d7}.article-condensed>footer>p{padding:10px 15px}.article-condensed>footer>.pager-justify>.previous>a{border-left:none;border-radius:0}.article-condensed>footer>.pager-justify>.next>a{border-right:none;border-radius:0}.bootbox.modal .modal-dialog{width:400px}.tree{padding-left:0}.tree ul{position:relative;display:none;padding-left:0}.tree li{position:relative;padding:2px 0 2px 20px;list-style:none}.tree li:before{position:absolute;top:10px;left:8px;display:block;width:3px;height:3px;content:' ';background-color:#999}.tree li.has-list:before{display:none}.tree li>.list-toggle{position:absolute;top:-1px;left:0;z-index:10;width:20px;line-height:24px;color:grey;text-align:center;cursor:pointer}.tree li>.list-toggle:before{content:'\e6f1'}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#1a53ff}.tree li.open>ul{display:block}.tree li.open>.list-toggle:before{content:'\e6f2'}.tree-actions{display:inline-block;margin-left:5px;opacity:0;-webkit-transition:opacity .1s;-o-transition:opacity .1s;transition:opacity .1s}.tree-action{display:inline-block;margin-left:5px;color:grey}.tree-action:active,.tree-action:hover{text-decoration:none}.tree li:hover>.tree-actions,.tree-item-wrapper:hover>.tree-actions{opacity:1}.tree-drag-holder{background-color:#edf3fe;opacity:.4}.tree .sort-handler{cursor:move}.tree-animate ul{opacity:0;-webkit-transition:opacity .3s cubic-bezier(.175,.885,.32,1),-webkit-transform .3s cubic-bezier(.175,.885,.32,1);-o-transition:opacity .3s cubic-bezier(.175,.885,.32,1),transform .3s cubic-bezier(.175,.885,.32,1),-o-transform .3s cubic-bezier(.175,.885,.32,1);transition:opacity .3s cubic-bezier(.175,.885,.32,1),-webkit-transform .3s cubic-bezier(.175,.885,.32,1);transition:opacity .3s cubic-bezier(.175,.885,.32,1),transform .3s cubic-bezier(.175,.885,.32,1);transition:opacity .3s cubic-bezier(.175,.885,.32,1),transform .3s cubic-bezier(.175,.885,.32,1),-webkit-transform .3s cubic-bezier(.175,.885,.32,1),-o-transform .3s cubic-bezier(.175,.885,.32,1);-webkit-transform:scale(1,.5);-ms-transform:scale(1,.5);-o-transform:scale(1,.5);transform:scale(1,.5)}.tree-animate li.open.in>ul{opacity:1;-webkit-transform:scale(1,1);-ms-transform:scale(1,1);-o-transform:scale(1,1);transform:scale(1,1)}.tree-animate.tree-lines li.has-list.open>ul:after{top:-5px;bottom:12px;left:-11px}.tree-lines ul>li:after{position:absolute;top:11px;left:-10px;z-index:1;display:block;width:22px;content:' ';border-top:1px dotted #999}.tree-lines ul>li.has-list:before,.tree-lines ul>li:before{position:absolute;top:-12px;bottom:13px;left:-11px;display:block;width:auto;height:auto;content:' ';background:0 0;border:none;border-left:1px dotted #999}.tree-lines ul>li:last-child:before{bottom:auto;height:23px}.tree-lines ul>li:first-child:before{top:-7px}.tree-lines ul>li.tree-single-item:before{height:19px}.tree-lines ul>li.has-list:after{width:14px}.tree-lines ul>li.drag-shadow:after{display:none}.tree-folders li>.list-toggle:before{content:'\e6ef'}.tree-folders li.open>.list-toggle:before{content:'\e6f0'}.tree-folders.tree-lines ul>li:first-child:before{top:-6px}.tree-folders.tree-lines li.has-list.open>ul:after{top:16px}.tree-folders ul>li.has-list:after{width:13px}.tree-folders ul>li.has-list.open:after{width:15px}.tree-chevrons li>.list-toggle:before{content:'\e710'}.tree-chevrons li.open>.list-toggle:before{content:'\e712'}.tree-chevrons li:before{top:6px;left:4px;width:10px;height:10px;background-color:#ddd;border-radius:5px}.tree-chevrons ul>li:after{width:13px}.tree-angles li>.list-toggle:before{content:'\e6e1'}.tree-angles li.open>.list-toggle:before{content:'\e6e3'}.tree-angles ul>li.has-list:after{width:15px}.panel-primary{border-color:#1a4f85}.panel-primary>.panel-heading{color:#fff;background-color:#1a4f85;border-color:#1a4f85}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#1a4f85}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#1a4f85}.panel-success{border-color:#d4ffcc}.panel-success>.panel-heading{color:#229f24;background-color:#e5ffe6;border-color:#d4ffcc}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d4ffcc}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d4ffcc}.panel-warning{border-color:#ffe1cc}.panel-warning>.panel-heading{color:#e48600;background-color:#fff4e5;border-color:#ffe1cc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#ffe1cc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ffe1cc}.panel-danger{border-color:#ffccd3}.panel-danger>.panel-heading{color:#d2322d;background-color:#ffe6e5;border-color:#ffccd3}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ffccd3}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ffccd3}.panel-info{border-color:#c2fbff}.panel-info>.panel-heading{color:#39b3d7;background-color:#e5f9ff;border-color:#c2fbff}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#c2fbff}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#c2fbff}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:0}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:-1;border-top-right-radius:-1}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:-1;border-bottom-left-radius:-1}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.dashboard{position:relative}.dashboard .panel{position:relative}.dashboard .panel-actions{position:absolute;top:0;right:0}.dashboard .panel-actions .dropdown-menu{min-width:80px}.dashboard .panel-actions .dropdown-menu>li>a{padding:3px 10px}.dashboard .panel-actions>.dropdown>a,.dashboard .panel-actions>a{color:grey;text-decoration:none!important}.dashboard .panel-actions>.btn,.dashboard .panel-actions>.dropdown,.dashboard .panel-actions>a{display:block;float:left}.dashboard .panel-actions>.btn,.dashboard .panel-actions>.dropdown>.btn,.dashboard .panel-actions>.dropdown>a,.dashboard .panel-actions>a{display:block;min-width:28px;height:31px;padding:0 3px;line-height:30px;text-align:center;filter:alpha(opacity=70);border:none;border-radius:0;opacity:.7}.dashboard .panel-actions>.dropdown>a:hover,.dashboard .panel-actions>a:hover{background-color:rgba(0,0,0,.1)}.dashboard .panel-heading{height:32px;padding:6px 60px 6px 6px;font-weight:700;text-overflow:ellipsis;white-space:nowrap}.dashboard .panel-heading>.icon{filter:alpha(opacity=70);opacity:.7}.dashboard .panel-heading:hover>.panel-actions>.btn,.dashboard .panel-heading:hover>.panel-actions>.dropdown>.btn,.dashboard .panel-heading:hover>.panel-actions>.dropdown>a,.dashboard .panel-heading:hover>.panel-actions>a{filter:alpha(opacity=100);opacity:1}.dashboard .panel-body{position:absolute;top:32px;right:0;bottom:0;left:0;padding:10px;overflow:auto}.dashboard .panel-body.no-padding{padding:0}.dashboard .panel-body>:last-child{margin:0}.dashboard .panel-body>.list-group .list-group-item{border-right:none;border-left:none;border-radius:0}.dashboard .panel-body>.list-group .list-group-item:first-child{border-top:none}.dashboard.dashboard-draggable .panel-heading{cursor:move}.dashboard .panel-dragging{color:#fff;background:rgba(0,0,0,.1);border:1px solid #fff;-webkit-box-shadow:none!important;box-shadow:none!important}.dashboard .panel-dragging>*{filter:alpha(opacity=10);opacity:.1}.dashboard .panel-dragging-shadow{position:absolute;cursor:move;background:rgba(255,255,255,.5);border:2px solid rgba(255,255,255,.9);-webkit-box-shadow:1px 5px 15px rgba(0,0,0,.5)!important;box-shadow:1px 5px 15px rgba(0,0,0,.5)!important}.dashboard .panel-dragging-shadow>*{filter:alpha(opacity=70);opacity:.7}.dashboard .panel-dragging-shadow.circle{overflow:hidden;border-radius:50%;-webkit-transition:width .2s,height .2s;-o-transition:width .2s,height .2s;transition:width .2s,height .2s}.dashboard .panel-dragging-shadow.circle .panel-actions{display:none}.dashboard .dragging-col-holder{display:none}.dashboard.dashboard-holding .dragging-col-holder{display:block}.dashboard.dashboard-holding .dragging-col{display:none}.dashboard .resize-handle{position:absolute;top:0;right:4px;bottom:20px;width:12px;cursor:e-resize;filter:alpha(opacity=0);border-radius:0;opacity:0;-webkit-transition:opacity .5s cubic-bezier(.175,.885,.32,1);-o-transition:opacity .5s cubic-bezier(.175,.885,.32,1);transition:opacity .5s cubic-bezier(.175,.885,.32,1)}.dashboard .resize-handle>.icon{position:absolute;top:50%;left:0;display:block;width:20px;height:20px;margin-top:-10px;line-height:20px;color:#1a4f85;text-align:center;background-color:rgba(26,79,133,.2);-webkit-transition:left .5s cubic-bezier(.175,.885,.32,1),top .5s cubic-bezier(.175,.885,.32,1);-o-transition:left .5s cubic-bezier(.175,.885,.32,1),top .5s cubic-bezier(.175,.885,.32,1);transition:left .5s cubic-bezier(.175,.885,.32,1),top .5s cubic-bezier(.175,.885,.32,1)}.dashboard .resize-handle:hover{background-color:rgba(26,79,133,.12);filter:alpha(opacity=100);opacity:1}.dashboard .resize-handle:hover>.icon{left:-4px}.dashboard .resize-handle.resize-vertical{top:auto;right:10px;bottom:14px;left:10px;width:auto;height:12px;cursor:n-resize}.dashboard .resize-handle.resize-vertical>.icon{top:0;left:50%;margin-top:0;margin-left:-10px}.dashboard .resize-handle.resize-vertical:hover{background-color:rgba(26,79,133,.12);filter:alpha(opacity=100);opacity:1}.dashboard .resize-handle.resize-vertical:hover>.icon{top:-4px}.dashboard .resizing{-webkit-transition:width .3s cubic-bezier(.175,.885,.32,1);-o-transition:width .3s cubic-bezier(.175,.885,.32,1);transition:width .3s cubic-bezier(.175,.885,.32,1)}.dashboard .resizing-v .resize-vertical{opacity:1}.dashboard .resizing-v .resize-vertical>.icon{top:-4px}.dashboard .resizing-h .resize-horizontal{opacity:1}.dashboard .resizing-h .resize-horizontal>.icon{left:-4px}.dashboard .resizing .resize-handle{background-color:rgba(26,79,133,.12)}.dashboard .panel-body:after,.dashboard .panel-body:before{display:block;visibility:hidden;content:' ';opacity:0;-webkit-transition:visibility .2s,opacity .2s;-o-transition:visibility .2s,opacity .2s;transition:visibility .2s,opacity .2s}.dashboard .panel-body:before{position:absolute;top:0;right:0;bottom:0;left:0;background-color:#fff}.dashboard .panel-body:after{position:absolute;top:50%;left:50%;width:40px;height:40px;margin-top:-20px;margin-left:-20px;font-family:ZenIcon;font-size:14px;font-size:28px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:40px;text-align:center;text-transform:none;content:'\e97c';-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.dashboard .panel-loading>.panel-body{overflow:hidden}.dashboard .panel-loading>.panel-body:after,.dashboard .panel-loading>.panel-body:before{visibility:visible;opacity:.5}.dashboard-inverse{background-color:#1a4f85}.dashboard-inverse .panel{-webkit-box-shadow:0 1px 5px rgba(0,0,0,.15);box-shadow:0 1px 5px rgba(0,0,0,.15)}.dashboard-inverse .panel-dragging{background:rgba(0,0,0,.3)}.dashboard-inverse .panel-dragging-shadow{-webkit-box-shadow:1px 2px 15px rgba(0,0,0,.5)!important;box-shadow:1px 2px 15px rgba(0,0,0,.5)!important}.colorpicker .dropdown-menu{min-width:0;padding:2px}.colorpicker .dropdown-menu>li{display:block;float:left;padding:2px}.colorpicker .dropdown-menu>li>a{position:relative;display:block;width:100%;height:100%;padding:0;font-family:ZenIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-align:center;text-transform:none;border:1px solid transparent;border-radius:0;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.colorpicker .dropdown-menu>li>a:before{position:absolute;top:50%;display:block;width:100%;height:20px;margin-top:-8px}.colorpicker .dropdown-menu>li>a:hover{border-color:#333;-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{content:'\e60d'}.colorpicker .dropdown-menu>li>a.empty{color:#666;background:#f0f0f0}.colorpicker .dropdown-menu>li>a.empty:before{content:'\d7'}.colorpicker .btn{text-shadow:none}.colorpicker .btn .cp-title{display:inline-block;margin-right:5px}.colorpicker.btn-wrapper{position:relative;display:inline-block}.messager{display:table;margin:10px;overflow:hidden;color:#fff;pointer-events:auto;background-color:#141414;background-color:rgba(0,0,0,.8);border-radius:0}.messager-content{display:table-cell;padding:10px 15px;vertical-align:top}.messager-content>[class^=icon-]{display:inline-block;margin-right:8px}.messager-actions{display:table-cell;vertical-align:top}.messager-actions>.action{min-width:40px;height:40px;padding:0 12px;color:#fafafa;color:rgba(255,255,255,.6);text-align:center;text-shadow:none;background:0 0;border:none}.messager-actions>.action.close{padding-bottom:5px;font-size:20px;font-weight:400;opacity:1}.messager-actions>.action:hover{color:#fff;background:rgba(0,0,0,.1)}.messager-actions .action-icon+.action-text{margin-left:8px}.messagers-holder{position:fixed;z-index:99999;padding:10px;pointer-events:none;-webkit-transition:top .3s cubic-bezier(.175,.885,.32,1);-o-transition:top .3s cubic-bezier(.175,.885,.32,1);transition:top .3s cubic-bezier(.175,.885,.32,1)}.messagers-holder.top{top:0}.messagers-holder.top-left{top:0;left:0}.messagers-holder.top-right{top:0;right:0}.messagers-holder.bottom{bottom:0}.messagers-holder.bottom-left{bottom:0;left:0}.messagers-holder.bottom-right{right:0;bottom:0}.messagers-holder.bottom-right .messager,.messagers-holder.top-right .messager{margin-left:auto}.messagers-holder.center{top:0}.messagers-holder.bottom,.messagers-holder.center,.messagers-holder.top{right:0;left:0}.messagers-holder.bottom .messager,.messagers-holder.center .messager,.messagers-holder.top .messager{margin:10px auto}.messager-primary{background-color:#1a4f85}.messager-success{background-color:#229f24}.messager-info{background-color:#39b3d7}.messager-warning{background-color:#e48600}.messager-danger{background-color:#d2322d}.messager-important{background-color:#81511c}.messager-special{background-color:#8957a1}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered th{border-top:none}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}.datatable-head,.datatable-rows{display:table;width:100%;table-layout:fixed}.datatable{margin-bottom:20px}.datatable>.datatable-head{-webkit-transition:-webkit-box-shadow .2s;-o-transition:box-shadow .2s;transition:-webkit-box-shadow .2s;transition:box-shadow .2s;transition:box-shadow .2s,-webkit-box-shadow .2s}.datatable .table{margin:0;table-layout:fixed}.datatable .table>tbody>tr>td,.datatable .table>thead>tr>th{min-width:20px}.datatable .table>tbody>tr>td.check-btn,.datatable .table>thead>tr>th.check-btn{width:30px;color:#7a7a7a;text-align:center;cursor:pointer}.datatable .table>tbody>tr.active>td.check-btn,.datatable .table>tbody>tr.hover>td.check-btn,.datatable .table>tbody>tr>td.check-btn.checked,.datatable .table>tbody>tr>td.check-btn:hover,.datatable .table>thead>tr>th.check-btn.checked,.datatable .table>thead>tr>th.check-btn:hover{color:#2e2e2e}.datatable .table>tbody>tr.active>td.check-btn>.icon-check-empty:before,.datatable .table>tbody>tr>td.check-btn.checked>.icon-check-empty:before,.datatable .table>thead>tr>th.check-btn.checked>.icon-check-empty:before{content:'\e642'}.datatable .table>thead>tr>th.col-hover{background-color:#e2e2e2}.datatable .table>tbody>tr.hover>td,.datatable .table>tbody>tr>td.col-hover{background-color:#edf3fe}.datatable .table>tbody>tr.active.hover td{background-color:#d5e3fd}.datatable.head-fixed>.datatable-head{position:fixed;z-index:1030;-webkit-box-shadow:0 1px 4px 0 rgba(0,0,0,.15);box-shadow:0 1px 4px 0 rgba(0,0,0,.15)}.datatable.sortable .datatable-head-span .table>thead>tr>th{overflow:hidden;white-space:nowrap;cursor:pointer}.datatable.sortable .datatable-head-span .table>thead>tr>th.text-center{padding-right:0;padding-left:0}.datatable.sortable .datatable-head-span .table>thead>tr>th:after{display:inline-block;margin-left:5px;font-family:ZenIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:grey;text-transform:none;content:'\e6bd';speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.datatable.sortable .datatable-head-span .table>thead>tr>th.sort-down:after{color:#03c;content:'\e6b8'}.datatable.sortable .datatable-head-span .table>thead>tr>th.sort-up:after{color:#03c;content:'\e6b9'}.datatable.sortable .datatable-head-span .table>thead>tr>th.check-btn:after,.datatable.sortable .datatable-head-span .table>thead>tr>th.sort-disabled:after{display:none}.datatable.sortable .datatable-head-span .table>thead>tr>th.sort-disabled{cursor:default}.datatable-wrapper{position:relative}.datatable-span{display:table-cell;vertical-align:top}.datatable-span.flexarea{overflow:hidden}.datatable-span.flexarea.datatable-head-span.dragging{cursor:move!important}.datatable-span.flexarea .table{position:relative;top:0;left:0}.datatable-span.flexarea .scrolled-shadow{position:absolute;top:0;bottom:0;display:none;width:20px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.15);box-shadow:0 0 10px rgba(0,0,0,.15);opacity:0;-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}.datatable-span.flexarea .scrolled-in-shadow{left:-30px}.datatable-span.flexarea .scrolled-out-shadow{right:-30px}.datatable>.scroll-wrapper{position:relative;width:100%}.datatable .scroll-slide{position:absolute;right:-1px;bottom:0;left:-1px;display:none;height:11px;background:#e5e5e5;background:rgba(128,128,128,.1);border:1px solid #e5e5e5;border-bottom:none;opacity:0;-webkit-transition:opacity .5s,background .3s;-o-transition:opacity .5s,background .3s;transition:opacity .5s,background .3s}.datatable .scroll-slide>.bar{position:absolute;top:0;left:0;min-width:50px;height:10px;cursor:move;background-color:#a6a6a6}.datatable .scroll-slide:hover>.bar{background-color:grey}.datatable .scroll-slide.scroll-pos-out{bottom:-14px;height:15px}.datatable .scroll-slide.scroll-pos-out>.bar{height:14px}.datatable.show-scroll-slide.scrolling .scroll-slide,.datatable.show-scroll-slide.scrolling .scrolled-shadow,.datatable.show-scroll-slide:hover .scroll-slide,.datatable.show-scroll-slide:hover .scrolled-shadow{opacity:1}.datatable.show-scroll-slide .scroll-slide,.datatable.show-scroll-slide .scrolled-shadow{display:block}.datatable.show-scroll-slide.scrolled-in .scrolled-in-shadow{left:-20px}.datatable.show-scroll-slide.scrolled-out .scrolled-out-shadow{right:-20px} \ No newline at end of file + * Copyright (c) 2018 cnezsoft.com; Licensed MIT + *//*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:0 0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-spacing:0;border-collapse:collapse}#userMenu:after,#userMenu:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fixed-md:after,.container-fixed-md:before,.container-fixed-sm:after,.container-fixed-sm:before,.container-fixed-xs:after,.container-fixed-xs:before,.container-fixed:after,.container-fixed:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.dl-inline:after,.dl-inline:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager-justify:after,.pager-justify:before,.pager-loose:after,.pager-loose:before,.row:after,.row:before,.table-footer:after,.table-footer:before{display:table;content:" "}#userMenu:after,.btn-toolbar:after,.clearfix:after,.container-fixed-md:after,.container-fixed-sm:after,.container-fixed-xs:after,.container-fixed:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.dl-inline:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager-justify:after,.pager-loose:after,.row:after,.table-footer:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none}.showing{display:block}.hidden{display:none!important;visibility:hidden!important}.show{display:block!important;visibility:visible!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.affix{position:fixed}.with-padding{padding:5px 12px}.no-padding{padding:0!important}.no-margin{margin:0!important}.inline-block.visible-xs,.inline.visible-xs,.visible-xs,td.visible-xs,th.visible-xs,tr.visible-xs{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}.inline.visible-xs{display:inline!important}.inline-block.visible-xs{display:inline-block!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}.inline.visible-xs.visible-sm{display:inline!important}.inline-block.visible-xs.visible-sm{display:inline-block!important}tr.visible-xs.visible-sm{display:table-row!important}td.visible-xs.visible-sm,th.visible-xs.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1379px){.visible-xs.visible-md{display:block!important}.inline.visible-xs.visible-md{display:inline!important}.inline-block.visible-xs.visible-md{display:inline-block!important}tr.visible-xs.visible-md{display:table-row!important}td.visible-xs.visible-md,th.visible-xs.visible-md{display:table-cell!important}}@media (min-width:1380px){.visible-xs.visible-lg{display:block!important}.inline.visible-xs.visible-lg{display:inline!important}.inline-block.visible-xs.visible-lg{display:inline-block!important}tr.visible-xs.visible-lg{display:table-row!important}td.visible-xs.visible-lg,th.visible-xs.visible-lg{display:table-cell!important}}.inline-block.visible-sm,.inline.visible-sm,.visible-sm,td.visible-sm,th.visible-sm,tr.visible-sm{display:none!important}@media (max-width:767px){.visible-sm.visible-xs{display:block!important}.inline.visible-sm.visible-xs{display:inline!important}.inline-block.visible-sm.visible-xs{display:inline-block!important}tr.visible-sm.visible-xs{display:table-row!important}td.visible-sm.visible-xs,th.visible-sm.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}.inline.visible-sm{display:inline!important}.inline-block.visible-sm{display:inline-block!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1379px){.visible-sm.visible-md{display:block!important}.inline.visible-sm.visible-md{display:inline!important}.inline-block.visible-sm.visible-md{display:inline-block!important}tr.visible-sm.visible-md{display:table-row!important}td.visible-sm.visible-md,th.visible-sm.visible-md{display:table-cell!important}}@media (min-width:1380px){.visible-sm.visible-lg{display:block!important}.inline.visible-sm.visible-lg{display:inline!important}.inline-block.visible-sm.visible-lg{display:inline-block!important}tr.visible-sm.visible-lg{display:table-row!important}td.visible-sm.visible-lg,th.visible-sm.visible-lg{display:table-cell!important}}.inline-block.visible-md,.inline.visible-md,.visible-md,td.visible-md,th.visible-md,tr.visible-md{display:none!important}@media (max-width:767px){.visible-md.visible-xs{display:block!important}.inline.visible-md.visible-xs{display:inline!important}.inline-block.visible-md.visible-xs{display:inline-block!important}tr.visible-md.visible-xs{display:table-row!important}td.visible-md.visible-xs,th.visible-md.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}.inline.visible-md.visible-sm{display:inline!important}.inline-block.visible-md.visible-sm{display:inline-block!important}tr.visible-md.visible-sm{display:table-row!important}td.visible-md.visible-sm,th.visible-md.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1379px){.visible-md{display:block!important}.inline.visible-md{display:inline!important}.inline-block.visible-md{display:inline-block!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:1380px){.visible-md.visible-lg{display:block!important}.inline.visible-md.visible-lg{display:inline!important}.inline-block.visible-md.visible-lg{display:inline-block!important}tr.visible-md.visible-lg{display:table-row!important}td.visible-md.visible-lg,th.visible-md.visible-lg{display:table-cell!important}}.inline-block.visible-lg,.inline.visible-lg,.visible-lg,td.visible-lg,th.visible-lg,tr.visible-lg{display:none!important}@media (max-width:767px){.visible-lg.visible-xs{display:block!important}.inline.visible-lg.visible-xs{display:inline!important}.inline-block.visible-lg.visible-xs{display:inline-block!important}tr.visible-lg.visible-xs{display:table-row!important}td.visible-lg.visible-xs,th.visible-lg.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}.inline.visible-lg.visible-sm{display:inline!important}.inline-block.visible-lg.visible-sm{display:inline-block!important}tr.visible-lg.visible-sm{display:table-row!important}td.visible-lg.visible-sm,th.visible-lg.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1379px){.visible-lg.visible-md{display:block!important}.inline.visible-lg.visible-md{display:inline!important}.inline-block.visible-lg.visible-md{display:inline-block!important}tr.visible-lg.visible-md{display:table-row!important}td.visible-lg.visible-md,th.visible-lg.visible-md{display:table-cell!important}}@media (min-width:1380px){.visible-lg{display:block!important}.inline.visible-lg{display:inline!important}.inline-block.visible-lg{display:inline-block!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}.inline.hidden-xs{display:inline!important}.inline-block.hidden-xs{display:inline-block!important}tr.hidden-xs{display:table-row!important}td.hidden-xs,th.hidden-xs{display:table-cell!important}@media (max-width:767px){.hidden-xs,.inline-block.hidden-xs,.inline.hidden-xs,td.hidden-xs,th.hidden-xs,tr.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm,.inline-block.hidden-xs.hidden-sm,.inline.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm,th.hidden-xs.hidden-sm,tr.hidden-xs.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1379px){.hidden-xs.hidden-md,.inline-block.hidden-xs.hidden-md,.inline.hidden-xs.hidden-md,td.hidden-xs.hidden-md,th.hidden-xs.hidden-md,tr.hidden-xs.hidden-md{display:none!important}}@media (min-width:1380px){.hidden-xs.hidden-lg,.inline-block.hidden-xs.hidden-lg,.inline.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg,th.hidden-xs.hidden-lg,tr.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}.inline.hidden-sm{display:inline!important}.inline-block.hidden-sm{display:inline-block!important}tr.hidden-sm{display:table-row!important}td.hidden-sm,th.hidden-sm{display:table-cell!important}@media (max-width:767px){.hidden-sm.hidden-xs,.inline-block.hidden-sm.hidden-xs,.inline.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs,th.hidden-sm.hidden-xs,tr.hidden-sm.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm,.inline-block.hidden-sm,.inline.hidden-sm,td.hidden-sm,th.hidden-sm,tr.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1379px){.hidden-sm.hidden-md,.inline-block.hidden-sm.hidden-md,.inline.hidden-sm.hidden-md,td.hidden-sm.hidden-md,th.hidden-sm.hidden-md,tr.hidden-sm.hidden-md{display:none!important}}@media (min-width:1380px){.hidden-sm.hidden-lg,.inline-block.hidden-sm.hidden-lg,.inline.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg,th.hidden-sm.hidden-lg,tr.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}.inline.hidden-md{display:inline!important}.inline-block.hidden-md{display:inline-block!important}tr.hidden-md{display:table-row!important}td.hidden-md,th.hidden-md{display:table-cell!important}@media (max-width:767px){.hidden-md.hidden-xs,.inline-block.hidden-md.hidden-xs,.inline.hidden-md.hidden-xs,td.hidden-md.hidden-xs,th.hidden-md.hidden-xs,tr.hidden-md.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-md.hidden-sm,.inline-block.hidden-md.hidden-sm,.inline.hidden-md.hidden-sm,td.hidden-md.hidden-sm,th.hidden-md.hidden-sm,tr.hidden-md.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1379px){.hidden-md,.inline-block.hidden-md,.inline.hidden-md,td.hidden-md,th.hidden-md,tr.hidden-md{display:none!important}}@media (min-width:1380px){.hidden-md.hidden-lg,.inline-block.hidden-md.hidden-lg,.inline.hidden-md.hidden-lg,td.hidden-md.hidden-lg,th.hidden-md.hidden-lg,tr.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}.inline.hidden-lg{display:inline!important}.inline-block.hidden-lg{display:inline-block!important}tr.hidden-lg{display:table-row!important}td.hidden-lg,th.hidden-lg{display:table-cell!important}@media (max-width:767px){.hidden-lg.hidden-xs,.inline-block.hidden-lg.hidden-xs,.inline.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs,th.hidden-lg.hidden-xs,tr.hidden-lg.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm,.inline-block.hidden-lg.hidden-sm,.inline.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm,th.hidden-lg.hidden-sm,tr.hidden-lg.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1379px){.hidden-lg.hidden-md,.inline-block.hidden-lg.hidden-md,.inline.hidden-lg.hidden-md,td.hidden-lg.hidden-md,th.hidden-lg.hidden-md,tr.hidden-lg.hidden-md{display:none!important}}@media (min-width:1380px){.hidden-lg,.inline-block.hidden-lg,.inline.hidden-lg,td.hidden-lg,th.hidden-lg,tr.hidden-lg{display:none!important}}.inline-block.visible-print,.inline.visible-print,.visible-print,td.visible-print,th.visible-print,tr.visible-print{display:none!important}@media print{.visible-print{display:block!important}.inline.visible-print{display:inline!important}.inline-block.visible-print{display:inline-block!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}.hidden-print,.inline-block.hidden-print,.inline.hidden-print,td.hidden-print,th.hidden-print,tr.hidden-print{display:none!important}}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,Tahoma,'Microsoft Yahei','PingFang SC','Hiragino Sans GB','WenQuanYi Micro Hei',sans-serif;font-size:14px;line-height:1.42857143;color:#3c4353;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#3c4353;text-decoration:none;cursor:pointer;-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:color,background,opacity,left,top,right,bottom,-webkit-transform;-o-transition-property:color,background,opacity,left,top,right,bottom,-o-transform;transition-property:color,background,opacity,left,top,right,bottom,-webkit-transform;transition-property:color,background,transform,opacity,left,top,right,bottom;transition-property:color,background,transform,opacity,left,top,right,bottom,-webkit-transform,-o-transform}a:focus,a:hover{color:#006af1;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a.disabled,a.disabled:focus,a.disabled:hover,a[disabled],a[disabled]:focus,a[disabled]:hover{color:#aaa;text-decoration:none;cursor:default}audio,canvas,img,video{max-width:100%;vertical-align:middle}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0 0 0 0);border:0}::-moz-selection{text-shadow:none;background:#b3d4fc}::selection{text-shadow:none;background:#b3d4fc}fieldset{padding:0;margin:0;border:0}textarea{resize:vertical}ol,ul{padding-left:20px}.container,.container-fixed,.container-fixed-md,.container-fixed-sm,.container-fixed-xs,.container-fluid{padding-right:10px;padding-left:10px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{max-width:992px}}@media (min-width:992px){.container{max-width:1380px}}@media (min-width:1380px){.container{max-width:1380px}}.container-fixed{width:1380px}.container-fixed-md{width:1380px}.container-fixed-sm{width:992px}.container-fixed-xs{width:768px}.row{margin-right:-10px;margin-left:-10px}.col,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:10px;padding-left:10px}.col,.col-xs,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-1,.col-xs-1{width:8.33333333%}.col-2,.col-xs-2{width:16.66666667%}.col-3,.col-xs-3{width:25%}.col-4,.col-xs-4{width:33.33333333%}.col-5,.col-xs-5{width:41.66666667%}.col-6,.col-xs-6{width:50%}.col-7,.col-xs-7{width:58.33333333%}.col-8,.col-xs-8{width:66.66666667%}.col-9,.col-xs-9{width:75%}.col-10,.col-xs-10{width:83.33333333%}.col-11,.col-xs-11{width:91.66666667%}.col-12,.col-xs-12{width:100%}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-1{width:8.33333333%}.col-sm-2{width:16.66666667%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333%}.col-sm-5{width:41.66666667%}.col-sm-6{width:50%}.col-sm-7{width:58.33333333%}.col-sm-8{width:66.66666667%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333%}.col-sm-11{width:91.66666667%}.col-sm-12{width:100%}.col-sm-push-1{left:8.33333333%}.col-sm-push-2{left:16.66666667%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333%}.col-sm-push-5{left:41.66666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.33333333%}.col-sm-push-8{left:66.66666667%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333%}.col-sm-push-11{left:91.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-11{right:91.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-11{margin-left:91.66666667%}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-1{width:8.33333333%}.col-md-2{width:16.66666667%}.col-md-3{width:25%}.col-md-4{width:33.33333333%}.col-md-5{width:41.66666667%}.col-md-6{width:50%}.col-md-7{width:58.33333333%}.col-md-8{width:66.66666667%}.col-md-9{width:75%}.col-md-10{width:83.33333333%}.col-md-11{width:91.66666667%}.col-md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.33333333%}.col-md-push-2{left:16.66666667%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333%}.col-md-push-5{left:41.66666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.33333333%}.col-md-push-8{left:66.66666667%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333%}.col-md-push-11{left:91.66666667%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.33333333%}.col-md-pull-2{right:16.66666667%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333%}.col-md-pull-5{right:41.66666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.33333333%}.col-md-pull-8{right:66.66666667%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333%}.col-md-pull-11{right:91.66666667%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-11{margin-left:91.66666667%}}@media (min-width:1380px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-1{width:8.33333333%}.col-lg-2{width:16.66666667%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333%}.col-lg-5{width:41.66666667%}.col-lg-6{width:50%}.col-lg-7{width:58.33333333%}.col-lg-8{width:66.66666667%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333%}.col-lg-11{width:91.66666667%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.33333333%}.col-lg-push-2{left:16.66666667%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333%}.col-lg-push-5{left:41.66666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.33333333%}.col-lg-push-8{left:66.66666667%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333%}.col-lg-push-11{left:91.66666667%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-11{right:91.66666667%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-11{margin-left:91.66666667%}}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}cite{font-style:normal}.text-gray,.text-muted{color:#a6aab8}.text-gray a,.text-muted a{color:#989cad}.text-gray a:active,.text-gray a:hover,.text-muted a:active,.text-muted a:hover{color:#3c4353}.text-primary{color:#006af1}.text-warning,.text-yellow{color:#fdc137}.text-danger,.text-red{color:#ff5d5d}.text-green,.text-success{color:#00da88}.text-blue,.text-info{color:#7ec5ff}.text-brown,.text-important{color:#bd7b46}.text-purple,.text-special{color:#8666b8}.text-link{color:#3c4353}.text-link:active,.text-link:hover{color:#3c4353}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.nobr,.text-nowrap{overflow:hidden;white-space:nowrap}.text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}dl{margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}.dl-inline dt{display:inline-block}.dl-inline dd{display:inline-block;padding-right:1em}.dl-inline dd:last-child{padding-right:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol,blockquote p,blockquote ul{font-weight:300}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.42857143;color:#a6aab8}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}.ol-pd-2{padding-left:40px}.ol-pd-3{padding-left:60px}.ol-pd-4{padding-left:80px}.bg-black,.bg-default{color:#fff;background-color:#3c4353}.bg-primary{color:#fff;background-color:#006af1}.bg-green,.bg-success{color:#fff;background-color:#00da88}.bg-blue,.bg-info{color:#fff;background-color:#7ec5ff}.bg-warning,.bg-yellow{color:#fff;background-color:#fdc137}.bg-danger,.bg-red{color:#fff;background-color:#ff5d5d}.bg-brown,.bg-important{color:#fff;background-color:#bd7b46}.bg-purple,.bg-special{color:#fff;background-color:#8666b8}.hl-default,.hl-gray{background-color:#f1f1f1}.hl-primary{background-color:#e9f2fb}.hl-green,.hl-success{background-color:#ddf4df}.hl-blue,.hl-info{background-color:#ddf3f5}.hl-warning,.hl-yellow{background-color:#fff0d5}.hl-danger,.hl-red{background-color:#ffe5e0}.hl-brown,.hl-important{background-color:#f7ebe1}.hl-purple,.hl-special{background-color:#f5eeff}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}hr.divider-sm{margin-top:10px;margin-bottom:10px}hr.divider{margin:0}.label{display:inline;padding:.2em .6em .2em;font-size:85.71428571%;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#a6aab8;border-radius:.25em}.label[href]:focus,.label[href]:hover{color:#fff;background-color:#8a8fa1}.label.label-outline{color:#a6aab8;background:0 0;border:1px solid #a6aab8}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-badge{display:inline-block;min-width:18px;padding:3px 7px;font-size:12px;line-height:1;border-radius:9px}.label-dot{display:inline-block;width:8px;height:8px;padding:0;line-height:20px;text-indent:-9999em;border-radius:50%}.label-dot:empty{display:inline-block}.label-primary{background-color:#006af1}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#0054be}.label-primary.label-outline{color:#006af1;background:0 0;border:1px solid #006af1}.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-info{background-color:#7ec5ff}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#4baeff}.label-info.label-outline{color:#7ec5ff;background:0 0;border:1px solid #7ec5ff}.label-warning{background-color:#fdc137}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#fcb105}.label-warning.label-outline{color:#fdc137;background:0 0;border:1px solid #fdc137}.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}.btn .label,.nav-primary>li>a>.label{position:relative;top:-1px}.btn-danger .label,.btn-info .label,.btn-primary .label,.btn-success .label,.btn-warning .label{background-color:rgba(0,0,0,.2)}.list-group-item.active>.label,.nav-pills>.active>a>.label,.nav-primary>.active>a>.label{color:#3c4353;background-color:#fff}.nav>li>a>.label{margin-left:3px}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#a6aab8}.avatar{position:relative;display:block;width:30px;height:30px;overflow:hidden;line-height:30px;text-align:center;background-position:center;-webkit-background-size:cover;background-size:cover;border-radius:4px}.avatar img{display:block;width:100%;height:100%;margin:0}.avatar-sm{width:20px;height:20px;font-size:12px;line-height:20px}.avatar-lg{width:40px;height:40px;font-size:20px;line-height:40px}.avatar-lg>.icon{font-size:20px}.avatar-xl{width:70px;height:70px;font-size:35px;line-height:70px}.avatar-xl>.icon{font-size:35px}.avatar-circle{border-radius:50%}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#838a9d;border:0;border-bottom:1px solid #eee}label{display:inline-block;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:5px 0 0;margin-top:0\9;line-height:normal}input[type=file]{display:block}select[multiple],select[size]{height:auto}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}.form-control::-webkit-input-placeholder{color:#a6aab8}.form-control::-moz-placeholder{color:#a6aab8}.form-control:-ms-input-placeholder{color:#a6aab8}.form-control::placeholder{color:#a6aab8}.form-control{display:block;width:100%;height:32px;padding:5px 8px;font-size:14px;line-height:1.42857143;color:#3c4353;vertical-align:middle;background-color:#fff;border:1px solid #e8e9ee;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}.form-control.focus,.form-control:focus{border-color:#006af1;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,106,241,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(0,106,241,.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}.form-control[readonly]{cursor:default}textarea.form-control{height:auto}.form-group{margin-bottom:10px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:3px;margin-top:4px\9;margin-left:-20px}.os-android .checkbox input[type=checkbox],.os-android .checkbox-inline input[type=checkbox],.os-android .radio input[type=radio],.os-android .radio-inline input[type=radio]{margin-top:0}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.input-sm{height:24px;padding:2px 8px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:24px;line-height:24px}textarea.input-sm{height:auto}.input-lg{height:44px;padding:10px 16px;font-size:18px;line-height:1.25;border-radius:6px}select.input-lg{height:44px;line-height:44px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning>label{color:#fdc137}.has-warning .form-control{border-color:#fdc137;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#fcb105;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #fee09c;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #fee09c}.has-warning .input-group-addon{color:#fdc137;background-color:#fff0d5;border-color:#fdc137}.has-error .help-block,.has-error>label{color:#ff5d5d}.has-error .form-control{border-color:#ff5d5d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#ff2a2a;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ffc3c3;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ffc3c3}.has-error .input-group-addon{color:#ff5d5d;background-color:#ffe5e0;border-color:#ff5d5d}.has-success .help-block,.has-success>label{color:#00da88}.has-success .form-control{border-color:#00da88;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#00a768;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #41ffb8;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #41ffb8}.has-success .input-group-addon{color:#00da88;background-color:#ddf4df;border-color:#00da88}.form-control-static{min-height:34px;padding-top:6px;padding-bottom:6px;margin-bottom:0}.help-block{display:block;margin:5px 0;color:#74809b}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{float:none;margin-left:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .form-group>label,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:6px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-10px;margin-left:-10px}@media (min-width:768px){.form-horizontal .form-group>label{text-align:right}}.required{position:relative}.required:after{position:absolute;top:0;right:-10px;display:inline-block;font-size:18px;color:#ff5d5d;content:'*'}.form-horizontal .required:after{top:5px;right:-1px}.form-condensed .form-group{margin-bottom:10px}.form-condensed .form-control{height:24px;padding:2px 8px;font-size:12px;line-height:1.5;border-radius:3px}select.form-condensed .form-control{height:24px;line-height:24px}textarea.form-condensed .form-control{height:auto}.form-condensed textarea.form-control{height:auto}.form-condensed .btn{padding:2px 8px;font-size:12px;line-height:1.5;border-radius:4px}.form-condensed .input-group>.form-control,.form-condensed .input-group>.input-group-addon,.form-condensed .input-group>.input-group-btn>.btn{padding:2px 8px;font-size:12px;border-radius:3px}.form-condensed .input-group .form-control:first-child,.form-condensed .input-group-addon:first-child,.form-condensed .input-group-btn:first-child>.btn,.form-condensed .input-group-btn:first-child>.btn-group>.btn,.form-condensed .input-group-btn:first-child>.dropdown-toggle,.form-condensed .input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.form-condensed .input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.form-condensed .input-group .form-control:last-child,.form-condensed .input-group-addon:last-child,.form-condensed .input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.form-condensed .input-group-btn:first-child>.btn:not(:first-child),.form-condensed .input-group-btn:last-child>.btn,.form-condensed .input-group-btn:last-child>.btn-group>.btn,.form-condensed .input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.form-condensed .input-group-addon:first-child{border-right:0}.form-condensed .input-group-addon:last-child{border-left:0}.form-condensed .input-group-addon.fix-border,.form-condensed .input-group-btn.fix-border>.btn{border-right:0;border-left:0;border-radius:0}.form-condensed.form-horizontal .checkbox,.form-condensed.form-horizontal .checkbox-inline,.form-condensed.form-horizontal .form-group>label,.form-condensed.form-horizontal .radio,.form-condensed.form-horizontal .radio-inline{padding-top:1px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.load-indicator{position:relative}.load-indicator:after,.load-indicator:before{position:absolute;color:#a6aab8;text-align:center;visibility:hidden;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:visibility,opacity;-o-transition-property:visibility,opacity;transition-property:visibility,opacity}.load-indicator:before{top:0;right:0;bottom:0;left:0;z-index:10;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;padding-top:50px;font-size:12px;content:attr(data-loading);background-color:rgba(255,255,255,.65);-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.load-indicator:after{top:50%;left:50%;z-index:11;display:block;width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-family:ZentaoIcon;font-size:18px;font-size:24px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:30px;text-transform:none;content:"\e982";-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.load-indicator.loading:after,.load-indicator.loading:before{visibility:visible;opacity:1}table{max-width:100%;background-color:transparent}caption{padding:8px 10px;color:#a6aab8;text-align:left}th{text-align:left}.table{width:100%;margin-bottom:20px}.table td,.table th{padding:8px 10px;line-height:1.42857143;vertical-align:top;border-bottom:1px solid #ecf0f4;-webkit-transition:background .2s cubic-bezier(.175,.885,.32,1);-o-transition:background .2s cubic-bezier(.175,.885,.32,1);transition:background .2s cubic-bezier(.175,.885,.32,1)}.table>thead>tr>th{font-weight:400;color:#a6aab8;vertical-align:bottom;background-color:transparent;border-bottom:1px solid #ecf0f4}.table>tbody+tbody{border-top:2px solid #ecf0f4}.table-fixed{table-layout:fixed}.table-fixed td,.table-fixed th{overflow:hidden;white-space:nowrap}.table-fixed .nofixed,.table-fixed tfoot>tr>td,.table-fixed tfoot>tr>th{overflow:visible}.table-borderless td,.table-borderless th,.table-borderless thead>tr>th{border:none}.table-auto{width:auto;max-width:100%}.table-condensed td,.table-condensed th{padding:5px}.table-bordered{border:1px solid #ecf0f4}.table-bordered td,.table-bordered th{border:1px solid #ecf0f4}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#e9f2fb}table col[class*=col-]{display:table-column;float:none}table td[class*=col-],table th[class*=col-]{display:table-cell;float:none}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe7bc}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#ddf4df;border-color:#bae8b6}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#caeecd;border-color:#a8e1a3}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#ffe5e0;border-color:#ffc6c7}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ffd0c6;border-color:#ffadad}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fff0d5;border-color:#ffdcbc}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#ffe7bc;border-color:#ffcea2}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ecf0f4}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered th{border-top:none}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}.alert{padding:15px;margin-bottom:20px;color:#313744;background-color:#f1f1f1;border-radius:3px;-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)}.alert hr{border-top-color:#e4e4e4}.alert .alert-link{color:#22262f}.alert h4{margin-top:0;color:inherit}.alert hr{margin:10px 0}.alert p,.alert ul{margin-bottom:0}.alert p+p{margin-top:5px}.alert-link{font-weight:700}.alert>[class*=icon-]{float:left;margin-top:-5px;font-size:42px;opacity:.6;-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)}.alert>[class*=icon-]+.content{min-height:30px;margin-left:64px}.alert.with-icon{display:table;width:100%}.alert.with-icon>[class*=icon-],.alert.with-icon>[class*=icon-]+.content{display:table-cell;float:none;min-height:0;margin:0;vertical-align:middle}.alert.with-icon>[class*=icon-]{width:48px;text-align:center}.alert.with-icon>[class*=icon-]+.content{padding-left:1em}.alert-block{margin:0;border-radius:0}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-6px;right:-21px;color:inherit}.alert-primary{color:#313744;background-color:#e9f2fb}.alert-primary hr{border-top-color:#cbe0f6}.alert-primary .alert-link{color:#22262f}.alert-success{color:#00c178;background-color:#ddf4df}.alert-success hr{border-top-color:#bae8b6}.alert-success .alert-link{color:#009d62}.alert-info{color:#64baff;background-color:#ddf3f5}.alert-info hr{border-top-color:#a2e4de}.alert-info .alert-link{color:#41a9ff}.alert-warning{color:#fdb91e;background-color:#fff0d5}.alert-warning hr{border-top-color:#ffdcbc}.alert-warning .alert-link{color:#f4ab02}.alert-danger{color:#ff4343;background-color:#ffe5e0}.alert-danger hr{border-top-color:#ffc6c7}.alert-danger .alert-link{color:#ff2020}.alert-inverse{color:#fff;background-color:#3c4353;border-color:#3c4353}.alert-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.25)}.alert-inverse .alert-link{color:rgba(255,255,255,.8)}.alert-primary-inverse{color:#fff;background-color:#006af1;border-color:#006af1}.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)}.alert-success-inverse{color:#fff;background-color:#00da88;border-color:#00da88}.alert-success-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.25)}.alert-success-inverse .alert-link{color:rgba(255,255,255,.8)}.alert-info-inverse{color:#fff;background-color:#7ec5ff;border-color:#7ec5ff}.alert-info-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.25)}.alert-info-inverse .alert-link{color:rgba(255,255,255,.8)}.alert-warning-inverse{color:#fff;background-color:#fdc137;border-color:#fdc137}.alert-warning-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.25)}.alert-warning-inverse .alert-link{color:rgba(255,255,255,.8)}.alert-danger-inverse{color:#fff;background-color:#ff5d5d;border-color:#ff5d5d}.alert-danger-inverse hr{border-top-color:#cbd0db;border-top-color:rgba(203,208,219,.25)}.alert-danger-inverse .alert-link{color:rgba(255,255,255,.8)}.input-control-icon-left,.input-control-icon-right,.input-control-label-left,.input-control-label-right{position:absolute;top:1px;z-index:5;height:30px;line-height:30px;opacity:.5}.input-control-icon-left,.input-control-icon-right{width:30px;text-align:center}.input-control-icon-left,.input-control-label-left{left:1px}.input-control-icon-right,.input-control-label-right{right:1px}.input-control-label-left,.input-control-label-right{width:70px;padding:0 8px;overflow:hidden;text-overflow:ellipsis}.has-label-left-sm>.input-control-label-left,.has-label-left-sm>.input-control-label-right{width:55px}.has-label-left-lg>.input-control-label-left,.has-label-left-lg>.input-control-label-right{width:95px}.input-control{position:relative}.input-control.has-icon-left>.form-control{padding-left:30px}.input-control.has-icon-right>.form-control{padding-right:30px}.input-control.has-label-left>.form-control{padding-left:70px}.input-control.has-label-right>.form-control{padding-right:70px}.input-control.has-label-left-sm>.form-control{padding-left:55px}.input-control.has-label-right-sm>.form-control{padding-right:55px}.input-control.has-label-left-lg>.form-control{padding-left:95px}.input-control.has-label-right-lg>.form-control{padding-right:95px}.input-control>a:hover{background-color:#f1f1f1;opacity:1}.form-control:focus+[class^=input-control-],.form-control:focus+[class^=input-control-]+[class^=input-control-]{opacity:1}.form-control:focus+.input-control-label-left{color:#00a9fc}.empty+.search-clear-btn,.empty+.search-icon+.search-clear-btn{opacity:0!important}input:placeholder-shown+.search-clear-btn,input:placeholder-shown+.search-icon+.search-clear-btn{opacity:0!important}.search-box-circle .input-control-icon-left,.search-box-circle .input-control-icon-right,.search-box-circle>.form-control{border-radius:16px}.search-box-circle+.input-group-btn>.btn{border-radius:0 16px 16px 0}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.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,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:5px 12px;font-size:14px;font-weight:400;line-height:1;color:#838a9d;text-align:center;background-color:#eee;border:1px solid #e8e9ee;border-radius:4px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group-addon.fix-border{border-right:0;border-left:0}.input-group-addon:empty{width:1px;padding:0}.input-group-addon.fix-padding{width:1px;padding:0}.input-group-btn.fix-border>.btn{border-right:0;border-left:0;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}.input-group-addon:first-child{border-right:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:44px;padding:10px 16px;font-size:18px;line-height:1.25;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:44px;line-height:44px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:24px;padding:2px 8px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:24px;line-height:24px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon.input-sm{padding:2px 8px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.code,code,kbd,pre,samp{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code,kbd{padding:2px 4px;font-size:90%;color:#37474f;background-color:#f3f5f7;border-radius:4px}kbd{padding:1px 4px;font-weight:700;color:#666;background-color:#f1f1f1;border:1px solid #d8d8d8;border-bottom-width:2px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.38461538;color:#838a9d;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;margin:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.com{color:#93a1a1}.lit{color:#195f91}.clo,.opn,.pun{color:#93a1a1}.fun{color:#dc322f}.atv,.str{color:#d14}.kwd,.prettyprint .tag{color:#1e347b}.atn,.dec,.typ,.var{color:teal}.pln{color:#48484c}.prettyprint.linenums{-webkit-box-shadow:inset 40px 0 0 #fbfbfc,inset 41px 0 0 #ececf0;box-shadow:inset 40px 0 0 #fbfbfc,inset 41px 0 0 #ececf0}.prettyprint ol.linenums{padding-left:35px;margin-bottom:0;line-height:20px;color:#bebec5;text-shadow:0 1px 0 #fff}.pager{display:inline-block;padding-left:0;margin:20px 0;list-style:none}.pager>li{display:inline}.pager>li>a,.pager>li>span{position:relative;float:left;padding:5px 12px;margin-left:-1px;line-height:1.42857143;text-decoration:none;background-color:#fff;border:1px solid #cbd0db}.pager>li:first-child>a,.pager>li:first-child>span{margin-left:0;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{z-index:2;background-color:#eee}.pager>li.active>a,.pager>li.active>a:hover,.pager>li.active>span,.pager>li.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#006af1;border-color:#006af1}.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;pointer-events:none;cursor:not-allowed;background-color:#fff;border-color:#cbd0db}.pager-justify{display:block}.pager-justify .next>a,.pager-justify .next>span{float:right;border-radius:4px}.pager-justify .previous>a,.pager-justify .previous>span{float:left;border-radius:4px}.pager-goto{width:100px;text-align:center}.pager>li>div{float:left}.pager>li .pager-goto,.pager>li .pager-size-menu,.pager>li.space{margin:0 5px}.pager-label{position:relative;float:left;padding:5px 4px;margin-left:-1px;line-height:1.42857143;text-decoration:none;border:1px solid transparent}.pager-item-left>a{border-top-left-radius:4px;border-bottom-left-radius:4px}.pager-item-right>a{border-top-right-radius:4px;border-bottom-right-radius:4px}.pager-lg>li>a,.pager-lg>li>span{padding:10px 16px;font-size:18px}.pager-lg>li:first-child>a,.pager-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pager-lg>li:last-child>a,.pager-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pager-sm>li>a,.pager-sm>li>span{padding:2px 8px;font-size:12px}.pager-sm>li:first-child>a,.pager-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pager-sm>li:last-child>a,.pager-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager-pills>li:first-child>a,.pager-pills>li:first-child>span{border-radius:16px 0 0 16px}.pager-pills>li:last-child>a,.pager-pills>li:last-child>span{border-radius:0 16px 16px 0}.pager-pills.pager-justify>li>a,.pager-pills.pager-justify>li>span{border-radius:16px}.pager-loose{display:block;margin:20px 0}.pager-loose.pager-pills>li>a,.pager-loose.pager-pills>li>span{border-radius:16px}.pager-loose>li>a,.pager-loose>li>span{margin-left:5px;border-radius:4px}.pager-loose>li:first-child>a,.pager-loose>li:first-child>span{margin-left:0}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>.nav-heading{padding:8px 15px;font-weight:700;color:#a6aab8}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:8px 15px;color:#3c4353}.nav>li>a:focus,.nav>li>a:hover{color:#006af1;text-decoration:none;background-color:#f1f1f1}.nav>li.disabled>a{color:#cbd0db}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#cbd0db;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#f1f1f1;border-color:#3c4353}.nav>li>a>img{max-width:none}.nav-default>li{float:left}.nav-default>li>a{border-radius:4px}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:20px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#006af1}.nav-primary>li{float:left;margin-left:-1px}.nav-primary>li:first-child>a{margin-left:0;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:#006af1;border-color:#006af1}.nav-secondary>li{float:left}.nav-secondary>li>a{border-bottom:2px solid #eee}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#006af1;border-bottom-color:#006af1}.nav-secondary>li.nav-heading{border-bottom:2px solid #eee}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-stacked.nav-primary>li,.nav-stacked.nav-primary>li>a{margin-left:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li+li{margin-top:-1px}.nav-stacked.nav-primary>li:first-child{margin-top:0}.nav-stacked.nav-primary>li:first-child.nav-heading,.nav-stacked.nav-primary>li:first-child>a{margin-left:0;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:none;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+li{margin-top:-1px}.nav-stacked.nav-secondary>li:first-child{margin-top:0}.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 #006af1;box-shadow:inset 2px 0 0 #006af1}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #cbd0db}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{padding-right:0;padding-left:0;margin-bottom:5px;text-align:center}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}.nav-justified.nav-primary>li+li>a{border-left:0}}.nav-tabs{border-bottom:1px solid #cbd0db}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #cbd0db}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#a6aab8;cursor:default;background-color:#fff;border:1px solid #cbd0db;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{padding-right:0;padding-left:0;margin-bottom:5px;text-align:center}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}.nav-tabs.nav-justified.nav-primary>li+li>a{border-left:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #cbd0db}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #cbd0db;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}@-moz-document url-prefix(){.nav-tabs>li.active>a:focus .nav-tabs>li>a:focus{outline:0}}.nav-tabs.nav-stacked{border-right:1px solid #cbd0db;border-bottom:none}.nav-tabs.nav-stacked>li{float:none;margin-right:-1px;margin-bottom:0}.nav-tabs.nav-stacked>li>a{margin-right:0;border-radius:4px 0 0 4px}.nav-tabs.nav-stacked>li.active>a,.nav-tabs.nav-stacked>li.active>a:focus,.nav-tabs.nav-stacked>li.active>a:hover{border:1px solid #cbd0db;border-right-color:transparent}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #cbd0db}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #cbd0db;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:40px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:10px;padding-left:10px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-10px;margin-left:-10px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:40px;padding:10px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-10px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:3px;margin-right:3px;margin-bottom:3px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:5px -10px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px}.navbar-nav.nav-justified>li{float:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:4px;margin-bottom:4px}.navbar-text{float:left;margin-top:10px;margin-bottom:10px}@media (min-width:768px){.navbar-text{margin-right:10px;margin-left:10px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-10px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f7f7f7;border-color:#dedede}.navbar-default .navbar-brand{color:#838a9d}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#697084;background-color:transparent}.navbar-default .navbar-text{color:#838a9d}.navbar-default .navbar-nav>li>a{color:#838a9d}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#3c4353;background-color:#eee}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#cbd0db}.navbar-default .navbar-toggle .icon-bar{background-color:#a6aab8}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#dedede}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#838a9d}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#3c4353;background-color:#eee}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#838a9d}.navbar-default .navbar-link:hover{color:#3c4353}.navbar-default .btn-link{color:#838a9d}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#3c4353}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#00a9fc;border-color:#0087c9}.navbar-inverse .navbar-brand{color:#cbd0db}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#cbd0db}.navbar-inverse .navbar-nav>li>a{color:#cbd0db}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:#1cb4ff}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#30bbff}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#0098e3}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#0091d8}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#30bbff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#0087c9}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#0087c9}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#cbd0db}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:#1cb4ff}.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{color:#fff;background-color:#30bbff}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#cbd0db}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-form{padding:10px 10px;margin-top:4px;margin-right:-10px;margin-bottom:4px;margin-left:-10px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{float:none;margin-left:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.scale{-webkit-transition:all .15s ease;-o-transition:all .15s ease;transition:all .15s ease;-webkit-transform:scale(.8);-ms-transform:scale(.8);-o-transform:scale(.8);transform:scale(.8)}.scale.in{-webkit-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;pointer-events:none;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out,-o-transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal>.loader{display:none}.modal.modal-loading .modal-dialog{opacity:0}.modal.modal-loading .loader{position:absolute;top:35%;left:50%;display:block;width:80px;margin-left:-40px;font-size:56px;color:#fff;text-align:center}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-iframe .modal-body>iframe{border-radius:0 0 6px 6px}.modal-dialog{position:relative;width:auto;pointer-events:initial;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-dialog.modal-moveable{position:absolute;margin:0}.modal-dialog.modal-moveable .modal-header{cursor:move}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto;-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.modal-fullscreen{position:relative;width:100%!important;height:100%!important;margin:0;border-radius:0}.modal-fullscreen .modal-body{position:absolute;top:52px;right:0;bottom:0;left:0;overflow-y:auto}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=100);opacity:1}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#3c4353;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#3c4353}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-width:5px 5px 0;border-top-color:#3c4353}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-width:5px 5px 0;border-top-color:#3c4353}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#3c4353}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#3c4353}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#3c4353}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#3c4353}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#3c4353}.tooltip-primary .tooltip-inner{background-color:#006af1}.tooltip-primary.tooltip.top .tooltip-arrow{border-top-color:#006af1}.tooltip-primary.tooltip.top-left .tooltip-arrow{border-top-color:#006af1}.tooltip-primary.tooltip.top-right .tooltip-arrow{border-top-color:#006af1}.tooltip-primary.tooltip.right .tooltip-arrow{border-right-color:#006af1}.tooltip-primary.tooltip.left .tooltip-arrow{border-left-color:#006af1}.tooltip-primary.tooltip.bottom .tooltip-arrow{border-bottom-color:#006af1}.tooltip-primary.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#006af1}.tooltip-primary.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#006af1}.tooltip-success .tooltip-inner{background-color:#00da88}.tooltip-success.tooltip.top .tooltip-arrow{border-top-color:#00da88}.tooltip-success.tooltip.top-left .tooltip-arrow{border-top-color:#00da88}.tooltip-success.tooltip.top-right .tooltip-arrow{border-top-color:#00da88}.tooltip-success.tooltip.right .tooltip-arrow{border-right-color:#00da88}.tooltip-success.tooltip.left .tooltip-arrow{border-left-color:#00da88}.tooltip-success.tooltip.bottom .tooltip-arrow{border-bottom-color:#00da88}.tooltip-success.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#00da88}.tooltip-success.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#00da88}.tooltip-info .tooltip-inner{background-color:#7ec5ff}.tooltip-info.tooltip.top .tooltip-arrow{border-top-color:#7ec5ff}.tooltip-info.tooltip.top-left .tooltip-arrow{border-top-color:#7ec5ff}.tooltip-info.tooltip.top-right .tooltip-arrow{border-top-color:#7ec5ff}.tooltip-info.tooltip.right .tooltip-arrow{border-right-color:#7ec5ff}.tooltip-info.tooltip.left .tooltip-arrow{border-left-color:#7ec5ff}.tooltip-info.tooltip.bottom .tooltip-arrow{border-bottom-color:#7ec5ff}.tooltip-info.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#7ec5ff}.tooltip-info.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#7ec5ff}.tooltip-warning .tooltip-inner{background-color:#fdc137}.tooltip-warning.tooltip.top .tooltip-arrow{border-top-color:#fdc137}.tooltip-warning.tooltip.top-left .tooltip-arrow{border-top-color:#fdc137}.tooltip-warning.tooltip.top-right .tooltip-arrow{border-top-color:#fdc137}.tooltip-warning.tooltip.right .tooltip-arrow{border-right-color:#fdc137}.tooltip-warning.tooltip.left .tooltip-arrow{border-left-color:#fdc137}.tooltip-warning.tooltip.bottom .tooltip-arrow{border-bottom-color:#fdc137}.tooltip-warning.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#fdc137}.tooltip-warning.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#fdc137}.tooltip-danger .tooltip-inner{background-color:#ff5d5d}.tooltip-danger.tooltip.top .tooltip-arrow{border-top-color:#ff5d5d}.tooltip-danger.tooltip.top-left .tooltip-arrow{border-top-color:#ff5d5d}.tooltip-danger.tooltip.top-right .tooltip-arrow{border-top-color:#ff5d5d}.tooltip-danger.tooltip.right .tooltip-arrow{border-right-color:#ff5d5d}.tooltip-danger.tooltip.left .tooltip-arrow{border-left-color:#ff5d5d}.tooltip-danger.tooltip.bottom .tooltip-arrow{border-bottom-color:#ff5d5d}.tooltip-danger.tooltip.bottom-left .tooltip-arrow{border-bottom-color:#ff5d5d}.tooltip-danger.tooltip.bottom-right .tooltip-arrow{border-bottom-color:#ff5d5d}.caret{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}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:100px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #b6bdcc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#eee}.dropdown-menu>li>a{display:block;padding:5px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#3c4353;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#fff;text-decoration:none;background-color:#006af1}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#006af1;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#cbd0db}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.dropdown-hover .dropdown-menu{margin:-1px 0}.dropdown-hover:hover>.dropdown-menu,.open>.dropdown-menu{display:block}.dropdown-hover:hover>a,.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;font-weight:700;line-height:1.42857143;color:#a6aab8}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0 dotted;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;border-radius:4px}.dropdown-submenu.open>.dropdown-menu,.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;border-radius:4px}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;content:" ";border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu>a{min-width:100px}.dropdown-submenu>.dropdown-menu.pull-left{left:-100%}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#fff;text-decoration:none;background-color:#006af1}.messager{display:table;margin:10px;overflow:hidden;color:#fff;pointer-events:auto;background-color:#3c4353;background-color:rgba(0,0,0,.8);border-radius:20px;-webkit-transition-property:opacity,-webkit-transform!important;-o-transition-property:opacity,-o-transform!important;transition-property:opacity,-webkit-transform!important;transition-property:opacity,transform!important;transition-property:opacity,transform,-webkit-transform,-o-transform!important}.messager-content{display:table-cell;padding:10px 15px;vertical-align:top}.messager-content>[class^=icon-]{display:inline-block;margin-right:8px}.messager-actions{display:table-cell;vertical-align:top}.messager-actions>.action{min-width:40px;height:40px;padding:0 12px;color:#fafafa;color:rgba(255,255,255,.6);text-align:center;text-shadow:none;background:0 0;border:none}.messager-actions>.action.close{padding-bottom:5px;font-size:20px;font-weight:400;opacity:1}.messager-actions>.action:hover{color:#fff;background:rgba(0,0,0,.1)}.messager-actions .action-icon+.action-text{margin-left:8px}.messagers-holder{position:fixed;z-index:99999;padding:10px;pointer-events:none}.messagers-holder.top{top:0}.messagers-holder.top-left{top:0;left:0}.messagers-holder.top-right{top:0;right:0}.messagers-holder.bottom{bottom:0}.messagers-holder.bottom-left{bottom:0;left:0}.messagers-holder.bottom-right{right:0;bottom:0}.messagers-holder.bottom-right .messager,.messagers-holder.top-right .messager{margin-left:auto}.messagers-holder.center{top:0}.messagers-holder.bottom,.messagers-holder.center,.messagers-holder.top{right:0;left:0}.messagers-holder.bottom .messager,.messagers-holder.center .messager,.messagers-holder.top .messager{margin:10px auto}.messager-primary{background-color:#006af1}.messager-success{background-color:#00da88}.messager-info{background-color:#7ec5ff}.messager-warning{background-color:#fdc137}.messager-danger{background-color:#ff5d5d}.messager-important{background-color:#bd7b46}.messager-special{background-color:#8666b8}.article{padding:20px}.article>header h1,.article>header h2,.article>header h3{margin-bottom:20px;line-height:1.5}.article>header>.abstract,.article>header>dl{padding:10px 15px;font-size:12px;color:#67738e;background-color:#f1f1f1}.article>header>.abstract>p:last-child,.article>header>dl>p:last-child{margin-bottom:0}.article>header>dl{margin:0;border-bottom:1px solid #e9e9e9}.article>header>dl.pull-right{background-color:transparent;border:none}.article>footer{border-top:1px dashed #d8d8d8}.article>footer>p{padding:10px 15px}.article-content,.article>.content{padding:20px 0;font-size:14px;line-height:1.78571429}.article-content h1,.article>.content h1{font-size:22px}.article-content h2,.article>.content h2{font-size:20px}.article-content h3,.article>.content h3{font-size:18px}.article-content h4,.article>.content h4{margin-top:15px;font-size:16px}.article-content h5,.article>.content h5{margin-top:15px;font-size:14px}.article-content h6,.article>.content h6{margin-top:15px;font-size:12px}.article-content img,.article>.content img{margin:10px 0}.article-content p>img,.article>.content p>img{margin-right:10px}.article-content p>img[align=right],.article>.content p>img[align=right]{margin-left:10px}.article-content dl,.article>.content dl{padding-right:2em;padding-left:2em}.article-content table,.article>.content table{margin-bottom:20px}.article-content table td,.article-content table th,.article>.content table td,.article>.content table th{padding:8px 10px;line-height:1.42857143;vertical-align:top;border-bottom:1px solid #ecf0f4}.article-content table>thead>tr>th,.article>.content table>thead>tr>th{vertical-align:bottom;background-color:transparent;border-bottom:1px solid #ecf0f4}.article-content p{margin-bottom:0}.article-content table{width:100%}.article>.content table td,.article>.content table th,.article>.content table>thead>tr>th{border:1px solid #ecf0f4}body.article-content{padding:8px}.article-condensed{padding:20px 0}.article-condensed>header{padding:0 20px}.article-condensed>header>.abstract,.article-condensed>header>dl{padding:10px 15px;margin:0 -20px}.article-condensed>.article-content,.article-condensed>.content{padding:20px}.article-condensed>.article-content>img,.article-condensed>.article-content>pre,.article-condensed>.content>img,.article-condensed>.content>pre{margin-right:-20px;margin-left:-20px;border-radius:0}.article-condensed>.article-content>pre,.article-condensed>.content>pre{border-right:none;border-left:none}.article-condensed>footer{border-top:1px dashed #d8d8d8}.article-condensed>footer>p{padding:10px 15px}.article-condensed>footer>.pager-justify>.previous>a{border-left:none;border-radius:0}.article-condensed>footer>.pager-justify>.next>a{border-right:none;border-radius:0}.tree{padding-left:0}.tree ul{position:relative;display:none;padding-left:0}.tree li{position:relative;padding:2px 0 2px 20px;list-style:none}.tree li:before{position:absolute;top:10px;left:8px;display:block;width:3px;height:3px;content:' ';background-color:#999}.tree li.has-list:before{display:none}.tree li>.list-toggle{position:absolute;top:-1px;left:0;z-index:10;width:20px;line-height:24px;color:#a6aab8;text-align:center;cursor:pointer}.tree li>.list-toggle:before{content:'\f196'}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#006af1}.tree li.open>ul{display:block}.tree li.open>.list-toggle:before{content:'\e71d'}.tree-actions{display:inline-block;margin-left:5px;opacity:0;-webkit-transition:opacity .1s;-o-transition:opacity .1s;transition:opacity .1s}.tree-action{display:inline-block;margin-left:5px;color:#a6aab8}.tree-action:active,.tree-action:hover{text-decoration:none}.tree li:hover>.tree-actions,.tree-item-wrapper:hover>.tree-actions{opacity:1}.tree-drag-holder{background-color:#e9f2fb;opacity:.4}.tree .sort-handler{cursor:move}.tree-animate ul{opacity:0;-webkit-transition:opacity .2s cubic-bezier(.175,.885,.32,1),-webkit-transform .2s cubic-bezier(.175,.885,.32,1);-o-transition:opacity .2s cubic-bezier(.175,.885,.32,1),-o-transform .2s cubic-bezier(.175,.885,.32,1);transition:opacity .2s cubic-bezier(.175,.885,.32,1),-webkit-transform .2s cubic-bezier(.175,.885,.32,1);transition:opacity .2s cubic-bezier(.175,.885,.32,1),transform .2s cubic-bezier(.175,.885,.32,1);transition:opacity .2s cubic-bezier(.175,.885,.32,1),transform .2s cubic-bezier(.175,.885,.32,1),-webkit-transform .2s cubic-bezier(.175,.885,.32,1),-o-transform .2s cubic-bezier(.175,.885,.32,1);-webkit-transform:scale(1,.5);-ms-transform:scale(1,.5);-o-transform:scale(1,.5);transform:scale(1,.5)}.tree-animate li.open.in>ul{opacity:1;-webkit-transform:scale(1,1);-ms-transform:scale(1,1);-o-transform:scale(1,1);transform:scale(1,1)}.tree-animate.tree-lines li.has-list.open>ul:after{top:-5px;bottom:12px;left:-11px}.tree-lines ul>li:after{position:absolute;top:11px;left:-10px;z-index:1;display:block;width:22px;content:' ';border-top:1px dotted #999}.tree-lines ul>li.has-list:before,.tree-lines ul>li:before{position:absolute;top:-12px;bottom:12px;left:-11px;display:block;width:auto;height:auto;content:' ';background:0 0;border:none;border-left:1px dotted #999}.tree-lines ul>li:last-child:before{bottom:auto;height:23px}.tree-lines ul>li:first-child:before{top:-5px}.tree-lines ul>li.tree-single-item:before{height:19px}.tree-lines ul>li.has-list:after{width:14px}.tree-lines ul>li.drag-shadow:after{display:none}.tree-folders li>.list-toggle:before{content:'\e6ef'}.tree-folders li.open>.list-toggle:before{content:'\e6f0'}.tree-folders.tree-lines ul>li:first-child:before{top:-6px}.tree-folders.tree-lines li.has-list.open>ul:after{top:16px}.tree-folders ul>li.has-list:after{width:13px}.tree-folders ul>li.has-list.open:after{width:15px}.tree-chevrons li>.list-toggle:before{content:'\e710'}.tree-chevrons li.open>.list-toggle:before{content:'\e712'}.tree-chevrons li:before{top:6px;left:4px;width:10px;height:10px;background-color:#cbd0db;border-radius:5px}.tree-chevrons ul>li:after{width:13px}.tree-angles li>.list-toggle:before{content:'\e6e1'}.tree-angles li.open>.list-toggle:before{content:'\e6e3'}.tree-angles ul>li.has-list:after{width:15px}.tree-menu{overflow:hidden;border:1px solid #cbd0db;border-radius:4px}.tree-menu li{padding:0}.tree-menu li:before{display:none}.tree-menu li>a{display:block;padding:8px;margin-bottom:-1px;color:#3c4353}.tree-menu li>a>.icon{display:inline-block;width:20px;color:inherit;text-align:left;opacity:.6}.tree-menu li>a:active,.tree-menu li>a:focus,.tree-menu li>a:hover{color:#006af1;text-decoration:none;background-color:rgba(0,0,0,.04)}.tree-menu li>a:active>.icon,.tree-menu li>a:focus>.icon,.tree-menu li>a:hover>.icon{opacity:.9}.tree-menu li .list-toggle{top:6px;right:4px;left:auto;width:24px;height:24px;filter:alpha(opacity=45);opacity:.45;-webkit-transition:all .3s;-o-transition:all .3s;transition:all .3s}.tree-menu li .list-toggle:before{content:"\e935"}.tree-menu li.open>.list-toggle{filter:alpha(opacity=75);opacity:.75;-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.tree-menu li.open>.list-toggle:before{content:"\e935"}.tree-menu li>ul{background-color:rgba(0,0,0,.04)}.tree-menu li li a{padding-left:28px;border-top-color:transparent;border-bottom-color:transparent}.tree-menu li li li a{padding-left:48px}.tree-menu li li li li a{padding-left:68px}.tree-menu li.active>a{color:#fff;background-color:#006af1;border-color:#006af1}.tree-menu li.active>.list-toggle{color:#fff}.tree-menu>li>a{border:1px solid transparent;border-bottom-color:#cbd0db}.tree-menu>li.open+li>a{border-top-color:#cbd0db}/*! + * Datetimepicker for Bootstrap + * Copyright 2012 Stefan Petre + * Licensed under the Apache License v2.0 + */.datetimepicker{padding:4px;margin-top:1px;white-space:normal;border-radius:4px;direction:ltr}.datetimepicker.datetimepicker-rtl{direction:rtl}.datetimepicker.datetimepicker-rtl table tr td span{float:right}.datetimepicker>div{display:none}.datetimepicker.minutes div.datetimepicker-minutes{display:block}.datetimepicker.hours div.datetimepicker-hours{display:block}.datetimepicker.days div.datetimepicker-days{display:block}.datetimepicker.months div.datetimepicker-months{display:block}.datetimepicker.years div.datetimepicker-years{display:block}.datetimepicker table{margin:0}.datetimepicker table tr td.minute:hover{cursor:pointer;background:#eee}.datetimepicker table tr td.hour:hover{cursor:pointer;background:#eee}.datetimepicker table tr td.day:hover{cursor:pointer;background:#eee}.datetimepicker table tr td span{display:block;float:left;width:23%;height:54px;margin:1%;line-height:54px;cursor:pointer;border-radius:4px}.datetimepicker table tr td span:hover{background:#eee}.datetimepicker table tr td span.old{color:#999}.datetimepicker .datetimepicker-hours span{height:26px;line-height:26px}.datetimepicker .datetimepicker-minutes span{height:26px;line-height:26px}.datetimepicker th.switch{width:145px}.datetimepicker-inline{width:220px}.datetimepicker-dropdown,.datetimepicker-dropdown-left{top:0;left:0}[class*=datetimepicker-dropdown]:before{position:absolute;display:inline-block;content:'';border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);border-left:7px solid transparent}[class*=datetimepicker-dropdown]:after{position:absolute;display:inline-block;content:'';border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent}[class*=datetimepicker-dropdown-top]:before{display:inline-block;content:'';border-top:7px solid #ccc;border-top-color:rgba(0,0,0,.2);border-right:7px solid transparent;border-bottom:0;border-left:7px solid transparent}[class*=datetimepicker-dropdown-top]:after{display:inline-block;content:'';border-top:6px solid #fff;border-right:6px solid transparent;border-bottom:0;border-left:6px solid transparent}.datetimepicker-dropdown-bottom-left:before{top:-7px;right:6px}.datetimepicker-dropdown-bottom-left:after{top:-6px;right:7px}.datetimepicker-dropdown-bottom-right:before{top:-7px;left:6px}.datetimepicker-dropdown-bottom-right:after{top:-6px;left:7px}.datetimepicker-dropdown-top-left:before{right:6px;bottom:-7px}.datetimepicker-dropdown-top-left:after{right:7px;bottom:-6px}.datetimepicker-dropdown-top-right:before{bottom:-7px;left:6px}.datetimepicker-dropdown-top-right:after{bottom:-6px;left:7px}.datetimepicker td,.datetimepicker th{width:22px;height:20px;padding:3px 0;text-align:center;border:none;border-radius:4px}.table-striped .datetimepicker td,.table-striped .datetimepicker th{background-color:transparent}.datetimepicker td.new,.datetimepicker td.old{color:#999}.datetimepicker td.disabled,.datetimepicker td.disabled:hover{color:#999;cursor:default;background:0 0}.datetimepicker td.day.today{color:#fff;background-color:#fdc137;border-color:#fdc137;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25)}.datetimepicker td.day.active{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#006af1;border-color:#0054be;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25)}.datetimepicker td.day.active:hover{background-color:#0054be}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#fcb105}.datetimepicker .datetimepicker-hours td span.hour_am,.datetimepicker .datetimepicker-hours td span.hour_pm{width:14.6%}.datetimepicker .datetimepicker-hours fieldset legend,.datetimepicker .datetimepicker-minutes fieldset legend{margin-bottom:inherit;line-height:30px}.datetimepicker td span.disabled,.datetimepicker td span.disabled:hover{color:#999;cursor:default;background:0 0}.datetimepicker td span.active,.datetimepicker td span.active.disabled,.datetimepicker td span.active.disabled:hover,.datetimepicker td span.active:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#006af1;border-color:#0054be;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25)}.datetimepicker tfoot tr:first-child th,.datetimepicker thead tr:first-child th{cursor:pointer}.datetimepicker tfoot tr:first-child th:hover,.datetimepicker thead tr:first-child th:hover{background:#eee}.input-group.date>.input-group-addon{border-left:none}.input-append.date .add-on i,.input-group.date .input-group-addon span,.input-prepend.date .add-on i{width:14px;height:14px;cursor:pointer}/*! + * Chosen, a Select Box Enhancer for jQuery and Prototype + * by Patrick Filler for Harvest, http://getharvest.com + * + * Copyright (c) 2011-2016 Harvest http://getharvest.com + * MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md +*/.chosen-container{position:relative;display:inline-block;font-size:14px;vertical-align:middle;zoom:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;*display:inline}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;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-with-drop .chosen-drop{left:0}.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-single .chosen-single{display:block;width:100%;height:32px;padding:5px 8px;overflow:hidden;line-height:1.42857143;color:#3c4353;text-decoration:none;white-space:nowrap;vertical-align:middle;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e8e9ee;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:#a6aab8}.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:7px;right:24px;display:block;width:20px;height:20px;font-size:21px;font-weight:700;line-height:14px;color:#000;text-align:center;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-single .chosen-single abbr:before{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}.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 #e8e9ee;border-radius:2px;outline:0}.chosen-container-single .chosen-search input[type=text]:focus{border-color:#006af1}.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:#a6aab8;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:#006af1}.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 #e8e9ee;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 0 0 6px;list-style:none}.chosen-container-multi .chosen-choices li.search-field{padding:0;margin-bottom:4px;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{height:20px;font-size:100%;color:#a6aab8;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:#a6aab8;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:0;right:0;display:block;width:20px;height:20px;font-size:16.8px;font-weight:700;line-height:14px;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{content:'×'}.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:#006af1;-webkit-box-shadow:none,0 0 8px rgba(0,106,241,.6);box-shadow:none,0 0 8px rgba(0,106,241,.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;border-bottom-left-radius:0;-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:#006af1;-webkit-box-shadow:none,0 0 8px rgba(0,106,241,.6);box-shadow:none,0 0 8px rgba(0,106,241,.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}.container,.container-fixed,.container-fluid{position:relative}body{padding-bottom:40px;background-color:#f6f6f6}.text-middle{vertical-align:middle!important}.layer{border-radius:4px;-webkit-box-shadow:0 0 20px 0 #bdc9d8;box-shadow:0 0 20px 0 #bdc9d8}.muted{opacity:.5}.table-row{display:table;width:100%}.table-col{display:table-cell;vertical-align:top}.nav-primary>li>a{min-width:100px;padding:5px 8px;color:#838a9d;border-color:#e7f1fc}.nav-primary>li.active>a{color:#006af1;background-color:#e7f1fc;border-color:#e7f1fc}.nav-primary>li.active>a:hover{color:#006af1;background-color:#c3dcf7;border-color:#c3dcf7}.end-marker{margin-bottom:20px;color:#cbd0db;text-align:center}@font-face{font-family:ZentaoIcon;font-style:normal;font-weight:400;src:url(../fonts/ZentaoIcon.eot?v=1.1.0);src:url(../fonts/ZentaoIcon.eot?#iefix&v=1.1.0) format('embedded-opentype'),url(../fonts/ZentaoIcon.woff?v=1.1.0) format('woff'),url(../fonts/ZentaoIcon.ttf?v=1.1.0) format('truetype'),url(../fonts/ZentaoIcon.svg#regular?v=1.1.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-angle-down:before{content:"\e313"}.icon-angle-left:before{content:"\e314"}.icon-angle-right:before{content:"\e315"}.icon-angle-top:before{content:"\e316"}.icon-caret-down2:before{content:"\f0d7"}.icon-caret-up2:before{content:"\f0d8"}.icon-caret-left2:before{content:"\f0d9"}.icon-caret-right2:before{content:"\f0da"}.icon-sort2:before{content:"\f0dc"}.icon-sort-down2:before{content:"\f0dd"}.icon-sort-up2:before{content:"\f0de"}.icon-zentao-alt:before{content:"\e900"}.icon-zentao:before{content:"\e901"}.icon-severity:before{content:"\e902"}.icon-bar-chart:before{content:"\e903"}.icon-import:before{content:"\e904"}.icon-export:before{content:"\e905"}.icon-printer:before{content:"\e906"}.icon-hand-right:before{content:"\e907"}.icon-checked:before{content:"\e908"}.icon-off:before{content:"\e909"}.icon-start:before{content:"\e90a"}.icon-play:before{content:"\e90a"}.icon-time:before{content:"\e90b"}.icon-edit:before{content:"\e90c"}.icon-trash:before{content:"\e90d"}.icon-link:before{content:"\e90e"}.icon-unlink:before{content:"\e90f"}.icon-bullhorn:before{content:"\e910"}.icon-bug:before{content:"\e911"}.icon-list-alt:before{content:"\e912"}.icon-fork:before{content:"\e913"}.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-chat-line:before{content:"\e940"}.icon-person:before{content:"\e941"}.icon-cube:before{content:"\e942"}.icon-stack:before{content:"\e943"}.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-file-empty:before{content:"\e94c"}.icon-file-text:before{content:"\e94d"}.icon-file-picture:before{content:"\e94e"}.icon-file-zip:before{content:"\e94f"}.icon-file-music:before{content:"\e950"}.icon-file-video:before{content:"\e951"}.icon-file-play:before{content:"\e953"}.icon-file-pdf:before{content:"\e954"}.icon-file-word:before{content:"\e955"}.icon-file-excel:before{content:"\e956"}.icon-file-code:before{content:"\f1c9"}.icon-ellipsis-v:before{content:"\e5d4"}.icon-spinner-indicator:before{content:"\e982"}.icon-text:before{content:"\e929"}.icon-code:before{content:"\e957"}.icon-sm:before{font-size:14px;vertical-align:10%}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;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,.btn:active{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:#d9e0e7}.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:#bac7d3}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#e6e6e6;background-image:none;border-color:#bac7d3}.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:#d9e0e7}.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:#d8d8d8;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:#006af1;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,106,241,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#0054be;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:#006af1;border-color:transparent}.btn-secondary{color:#fff;background-color:#00a9fc;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(0,169,252,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#0087c9;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:#00a9fc;border-color:transparent}.btn-warning{color:#fff;background-color:#fdc137;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(253,193,55,.8);border-color:rgba(0,0,0,0)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#fcb105;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:#fdc137;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:#ff2a2a;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:#00a768;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:#006af1;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:#006af1;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:#bed8f3;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,106,241,.3);background-color:#e9f2fb;border-color:transparent}.btn-link{padding-right:6px;padding-left:6px;font-weight:400;color:#838a9d;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:#3c4353;background-color:#f1f1f1}.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:10px 16px;font-size:18px;line-height:1.25;border-radius:4px}.btn-mini,.btn-sm,.btn-xs{padding:2px 8px;font-size:12px;line-height:1.5;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:150px;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{padding:3px;margin:-2px;background-color:rgba(0,0,0,.1);border-radius:12px}.btn>.label-icon>.icon{font-size:16px;line-height:18px}.btn>.icon+.text{margin-left:5px}.btn-icon-left{position:relative;padding-left:35px;text-align:right}.btn-icon-left>.label-icon{position:absolute;top:4px;left:5px;margin:0}.btn-icon-right{position:relative;padding-right:35px;text-align:left}.btn-icon-right>.label-icon{position:absolute;top:4px;right:5px;margin:0}.btn-icon{min-width:30px;padding-right:0;padding-left:0}.btn-icon.btn-mini{width:16px;min-width:16px;height:16px;line-height:16px;color:#cbd0db;vertical-align:-8%;border-radius:1px}.btn-icon.btn-mini>.icon{position:relative;top:-2px;left:-2px}.btn-icon.btn-mini:hover{color:#006af1;border-color:#006af1}.btn-toolbar .btn+.btn,.btn-toolbar .btn+.btn-group,.btn-toolbar .btn-group+.btn,.btn-toolbar .btn-group+.btn-group{margin-left:10px}.btn-toolbar .divider{float:left;height:20px;margin:7px 5px 4px 10px;border-left:1px solid rgba(0,0,0,.05)}.btn-toolbar .space{float:left;min-height:1px;margin-left:20px}.btn-toolbar .input-control{float:left}.btn-toolbar .page-title{float:left;margin-left:15px;line-height:34px}.btn-toolbar .page-title .text{font-size:18px}.btn-toolbar .page-title .label{top:-3px;margin-right:10px}.btn-active-text .text{position:relative;display:inline-block;font-weight:700;color:#006af1}.btn-active-text .text:after{position:absolute;bottom:-5px;display:block;width:100%;content:' ';border-bottom:2px solid #006af1}.btn-group{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn{position:relative;float:left}.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:2px 8px;padding:0 5px;font-size:12px;line-height:1.5;border-radius:4px}.btn-group-sm>.btn{padding:2px 8px;font-size:12px;line-height:1.5;border-radius:4px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.25;border-radius:4px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.angle-btn{position:relative;padding:1px;border:1px solid #d9e0e7;border-right:none;border-radius:3px 0 0 3px}.angle-btn:after,.angle-btn:before{position:absolute;top:-1px;right:-8px;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #d9e0e7;border-style:solid;border-width:18px 0 18px 8px}.angle-btn:after{right:-7px;border-color:transparent transparent transparent #fff;border-width:18px 0 18px 8px}.angle-btn .btn{color:#838a9d;border:none;border-radius:4px!important}.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:-1px;left:0;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #d9e0e7;border-style:solid;border-width:18px 0 18px 8px}.angle-btn+.angle-btn>.btn-group:first-child:after{left:-1px;border-color:transparent transparent transparent #fff;border-width:18px 0 18px 8px}.label-outline.label-danger{color:#ff5d5d;background-color:#ffe5e0;border:1px solid rgba(255,93,93,.25)}.label-light{color:#333;color:#838a9d;background-color:#e7e7e7}.label-dot{position:relative;top:-1px}.label-dot+.status-text{display:inline-block;margin-left:5px}.label-icon{padding:1px;border-radius:10px}.label-id{position:relative;top:-2px;display:inline-block;min-width:30px;padding:0 5px;font-size:12px;line-height:14px;color:#838a9d;background-color:transparent;border:1px solid #cbd0db;border-radius:2px}.pri-1,.todo-pri-1{color:#ff5d5d}.project-status-delayed{color:#ff5d5d}.project-status-delayed>.label-dot{background-color:#ff5d5d}.project-status-wait,.status-wait{color:#a6aab8}.project-status-wait>.label-dot,.status-wait>.label-dot{background-color:#7ec5ff}.project-status-doing,.status-active,.status-doing{color:#a6aab8}.project-status-doing>.label-dot,.status-active>.label-dot,.status-doing>.label-dot{background-color:#006af1}.project-status-done,.status-done{color:#a6aab8}.project-status-done>.label-dot,.status-done>.label-dot{background-color:#00da88}.status-changed,.status-postpone{color:#a6aab8}.status-changed>.label-dot,.status-postpone>.label-dot{background-color:#ff5d5d}.project-status-suspended{color:#fdc137}.project-status-suspended>.label-dot{background-color:#fdc137}.status-draft{color:#a6aab8}.status-draft>.label-dot{background-color:#8666b8}.status-closed{color:#a6aab8}.status-closed>.label-dot{background-color:#a6aab8}.label-pri{display:inline-block;min-width:20px;height:20px;line-height:20px;color:#a6aab8;text-align:center;background-color:#f0f2f5;border-radius:10px}.label-pri-1{color:#fff;background:#51a1ff}.label-pri-2{color:#fff;background:#72b3ff}.label-pri-3{color:#fff;background:#98c8ff}.label-pri-4{color:#fff;background:#c4dfff}.label-level{position:relative;display:inline-block;width:24px;height:20px;text-align:center}.label-level:before{position:absolute;top:-3px;left:0;z-index:0;font-family:ZentaoIcon;font-size:18px;font-size:24px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:#f0f2f5;text-transform:none;content:"\e902";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.label-level:after{position:relative;top:1px;z-index:1;display:inline-block;font-size:12px;line-height:18px;color:#fff;content:attr(data-level)}.label-level[data-level="1"]:before{color:#f65f28}.label-level[data-level="2"]:before{color:#f86e29}.label-level[data-level="3"]:before{color:#f77036}.label-level[data-level="4"]:before{color:#f7824c}.label-level[data-level="5"]:before{color:#fe9527}.label-level[data-level="6"]:before{color:#fea429}.task-status-wait{color:#a6aab8}.task-status-wait>.label-dot{background-color:#7ec5ff}.task-status-doing{color:#a6aab8}.task-status-doing>.label-dot{background-color:#006af1}.task-status-done{color:#a6aab8}.task-status-done>.label-dot{background-color:#00da88}.story-status-draft{color:#7ec5ff}.story-status-draft>.label-dot{background-color:#7ec5ff}.story-status-active{color:#a6aab8}.story-status-active>.label-dot{background-color:#006af1}.story-status-changed{color:#ff5d5d}.story-status-changed>.label-dot{background-color:#ff5d5d}.story-status-closed{color:#a6aab8}.bug-status-active{color:#a6aab8}.bug-status-active>.label-dot{background-color:#006af1}.bug-status-resolved{color:#a6aab8}.bug-status-resolved>.label-dot{background-color:#00da88}.bug-status-closed{color:#a6aab8}.checkbox-primary,.radio-primary{position:relative;display:block}.checkbox-primary>input,.radio-primary>input{position:absolute;top:0;left:0;z-index:3;width:100%;width:20px;height:100%;margin:0;opacity:0}.checkbox-primary>label,.radio-primary>label{padding-left:30px;font-weight:400;cursor:pointer}.checkbox-primary>label:after,.checkbox-primary>label:before,.radio-primary>label:after,.radio-primary>label:before{position:absolute;top:0;right:0;left:0;display:block;width:20px;height:20px;line-height:20px;text-align:center;content:' ';border-radius:4px}.checkbox-primary>label:after,.radio-primary>label:after{z-index:1;border:2px solid #eee;-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 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}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#00da88}.radio-primary>label:after{border-radius:50%}.radio-primary>label:before{top:6px;left:6px;width:8px;height:8px;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);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:20px}.panel-body.has-table{padding:10px}.panel-body.has-table .table{margin-bottom:0}.panel-heading{padding:18px 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:16px;font-weight:700;line-height:20px}.panel-actions{position:absolute;top:0;right:0;z-index:10;padding:13px 10px}.panel-actions>li>a{display:inline-block;min-width:30px;padding:0 5px;line-height:30px;color:#cbd0db}.panel-actions>li>a:hover{color:#a6aab8;text-decoration:initial;background-color:#f1f1f1}.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:#a6aab8;text-align:right}.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-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-content>.icon{color:#006af1}.messagger-zt .messager-actions>.action{color:#a6aab8}.messagger-zt.messager-success .messager-content>.icon{color:#00da88}.messagger-zt.messager-danger .messager-content>.icon{color:#ff5d5d}.messagger-zt.messager-warning .messager-content>.icon{color:#fdc137}.messagger-zt.messager-info .messager-content>.icon{color:#7ec5ff}.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:#00a9fc}.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:#006af1}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager .btn{padding:3px 10px}.pager .btn .caret{opacity:.3}.pager>li>.pager-label{padding:3px 4px}.pager>li>.pager-item{min-width:24px;padding:1px 3px;margin:2px;font-size:16px;line-height:20px;text-align:center;background:0 0;border-color:transparent;border-radius:50%}.pager>li>.pager-item:hover{background-color:rgba(0,0,0,.1)}.pager>li.disabled>a.pager-item{background:0 0;border-color:transparent}.pager>li.pager-item-left>.pager-item,.pager>li.pager-item-right>.pager-item{min-width:28px;padding:3px 4px;border-color:#d9e0e7!important;border-radius:2px!important}.pager>li.active>a{background-color:#00a9fc}.pager>li.pager-item-left>.pager-item{margin:0 5px 0 15px}.pager>li.pager-item-right>.pager-item{margin:0 0 0 5px}.pager .dropdown-menu{width:200px}.pager .dropdown-menu>li{float:left;width:33.333333%}.modal-dialog{max-width:1360px;border:none;-webkit-box-shadow:0 0 20px 0 rgba(0,0,0,.25);box-shadow:0 0 20px 0 rgba(0,0,0,.25)}.modal-header{padding:20px 0;margin:0 20px}.modal-header>.close{color:#838a9d;opacity:1}.modal-header>.close:hover{color:#3c4353}.modal-title{font-size:18px;font-weight:400}.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.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)}.tile{text-align:center}.tile-title{line-height:20px;color:#838a9d}.tile-amount{font-size:36px;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:14px;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:13px;left:-17px;z-index:3;width:9px;height:9px;background-color:#006af1;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:10px;left:-20px;width:15px;height:15px;background-color:rgba(0,106,241,.2);border:none}.timeline>li>a,.timeline>li>div{display:block;padding:5px;line-height:24px;color:#a6aab8}.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 label{font-weight:400;color:#838a9d}.form-group .btn+.btn{margin-left:5px}.table-form{margin-bottom:0}.table-form>thead>tr>th.required{padding-left:18px}.table-form>thead>tr>th.required:after{top:7px;right:auto;left:5px}.table-form>tbody>tr>td,.table-form>tfoot>tr>td,.table-form>thead>tr>th{padding:7px 5px;vertical-align:middle;border-bottom:none}.table-form>tfoot>tr>td{padding:20px 7px 10px}.chosen-container-single .chosen-single{color:#838a9d}.chosen-container-single .chosen-single div b{color:#cbd0db}.chosen-container-single .chosen-search:before{top:8px}.datetimepicker{padding:10px}.datetimepicker td.day.today{background-color:#ff5d5d}.datetimepicker td,.datetimepicker th{border-radius:13px}.datetimepicker tfoot th,.datetimepicker thead th{color:#a6aab8}#mainHeader{min-height:66px;color:#fff;background:#00b1fd -webkit-gradient(linear,right top,left top,from(#0072f3),to(#00b1fd));background:#00b1fd -webkit-linear-gradient(right,#0072f3 0,#00b1fd 100%);background:#00b1fd -o-linear-gradient(right,#0072f3 0,#00b1fd 100%);background:#00b1fd linear-gradient(-90deg,#0072f3 0,#00b1fd 100%)}#mainHeader>.container{padding:0}#heading{position:absolute;top:18px;left:10px}#heading h1{float:left;max-width:240px;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 .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:12px auto 0;font-size:16px;text-align:center}#navbar .nav{display:inline-block}#navbar .nav>li>a{line-height:24px;color:#fff;opacity:.75}@media (max-width:1380px){#navbar .nav>li>a{padding:8px 10px}}@media (max-width:992px){#navbar .nav>li>a{padding:5px 10px}}#navbar .nav>li>a:hover{background-color:rgba(0,0,0,.1);opacity:1}#navbar .nav>li.active>a{opacity:1}#navbar .nav>li.divider{display:block;width:2px;height:20px;margin:9px 15px;background-color:rgba(255,255,255,.4)}#toolbar{position:absolute;top:0;right:10px;padding:10px 0;font-size:12px;color:#fff}#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}#userMenu{margin-top:5px}#searchbox{position:relative;float:left;width:150px}#searchbox .input-group-btn .btn{position:relative;padding:1px 4px 1px 8px;font-size:12px;line-height:20px;color:#fff;background-color:rgba(255,255,255,.15);border-right:none;border-radius:12px 0 0 12px}#searchbox .input-group-btn .btn:after{position:absolute;top:3px;right:-1px;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:10;min-width:24px;height:24px;padding:2px 3px;font-size:12px;line-height:20px;color:#fff;background-color:#52b3fd;border-radius:12px}#searchGo:hover{color:#fff!important;background-color:#006af1}#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:#6bcbff}#searchInput::-moz-placeholder{font-size:12px;color:#6bcbff}#searchInput:-ms-input-placeholder{font-size:12px;color:#6bcbff}#searchInput::placeholder{font-size:12px;color:#6bcbff}#searchTypeMenu{min-width:220px}#searchTypeMenu>li{float:left;width:50%}#searchTypeMenu>li>a{margin:4px 0}#userNav{float:right;margin:0 -6px 0 10px}#userNav .avatar{display:inline-block;vertical-align:middle}#userNav>li>a{padding:2px 6px;margin-left:3px;line-height:20px;color:#fff;opacity:.9}#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}#subHeader{min-height:54px;background:#fff}#pageNav{position:absolute;top:8px;left:0;left:10px}#subNavbar{margin-top:7px;font-size:16px;text-align:center}#subNavbar .nav{display:inline-block}#subNavbar .nav>li>a{line-height:24px;color:#cbd0db}#subNavbar .nav>li>a:hover{color:#838a9d;background-color:rgba(0,0,0,.05)}#subNavbar .nav>li.active>a{color:#006af1}#subNavbar .nav>li.divider{display:block;width:2px;height:20px;margin:9px 15px;background-color:rgba(255,255,255,.4)}#pageActions{position:absolute;top:11px;right:10px}@media (max-width:1200px){#navbar{margin-top:45px}#heading{top:8px}#extraNav{float:right;margin:5px 0 0 15px}#userMenu{float:left;margin:0}}@media (max-width:750px){#extraNav{display:none}}@media (max-width:650px){#heading>h1{font-size:18px}#searchbox{display:none}#navbar .nav>li>a{padding:5px 6px;font-size:15px}#navbar .nav>li.divider{height:16px}}@media (max-width:500px){#navbar{padding-top:5px;margin-top:75px;background-color:rgba(0,0,0,.1)}#toolbar{top:35px;right:auto;left:-10px}#navbar .nav>li.divider{width:100%;height:1px;margin:0;background:0 0}}#main{padding:20px 0}#mainMenu{margin:-8px 0 10px}.main-row{display:table;width:100%}.main-row>*{display:table-cell;vertical-align:top}.main-row .side-col{width:210px;padding-left:20px}.main-row .cell{padding:10px;background-color:#fff;border-radius:4px}.main-row .cell+.cell{margin-top:10px}@media (max-width:720px){.main-row{display:block}.main-row>*{display:block}.main-row .side-col{width:100%;padding:0}.main-row .main-col+.side-col,.main-row .side-col+.main-col{margin-top:10px}}#mainActions{position:fixed;top:0;right:0;bottom:0;left:0;text-align:center;pointer-events:none}#mainActions .btn-toolbar{position:relative;top:-100px;display:inline-block;padding:4px 15px;color:#fff;pointer-events:auto;background-color:rgba(0,0,0,.7);border-radius:4px}#mainActions .btn-toolbar .divider{margin-right:15px;margin-left:20px;border-color:rgba(255,255,255,.1)}#mainActions .btn-toolbar .btn{padding-right:10px;padding-left:10px;color:#fff;background-color:transparent;border:none}#mainActions .btn-toolbar .btn:focus,#mainActions .btn-toolbar .btn:hover{background-color:rgba(255,255,255,.2)}#mainActions .btn-toolbar .btn.btn-icon{min-width:32px;padding-right:0;padding-left:0}#mainActions .dropdown-menu{text-align:left}#mainActions>.container{height:100%}#nextPage,#prevPage{position:absolute;top:50%;left:-10px;width:40px;height:60px;padding:10px 0;margin-top:-30px;line-height:40px;text-align:center;pointer-events:auto;-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}th.c-id{width:90px}th.c-date{width:100px}th.c-type{width:80px}th.c-pri{width:50px}th.c-begin,th.c-end,th.c-time{width:65px}th.c-hours{width:65px}th.c-actions{width:135px}th.c-actions-2{width:95px!important}th.c-actions-3{width:175px}th.c-actions-4{width:215px}th.c-product{width:180px}th.c-plan{width:130px}th.c-stage,th.c-status,th.c-user{width:100px}td.c-begin,td.c-date,td.c-end,td.c-hours,td.c-plan,td.c-pri,td.c-stage,td.c-time,td.c-type,td.c-user{color:#a6aab8}td.c-name,td.c-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}td.c-actions{padding-top:0;padding-bottom:0;vertical-align:middle}td.c-actions .btn{padding:4px 5px;color:#00a9fc;background-color:#e9f2fb;border-color:transparent}td.c-actions .btn .icon{font-size:18px}td.c-actions .btn:hover{color:#006af1;background-color:#d3e5f7}.main-table{background-color:#fff;border-radius:4px}.main-table table{table-layout:fixed}.main-table tbody>tr>td,.main-table thead>tr>th{padding:5px 10px;line-height:30px}.main-table tbody>tr>td:first-child,.main-table thead>tr>th:first-child{padding-left:20px}.main-table thead>tr>th{border-bottom:2px solid #ecf0f4}.main-table tbody>tr>td{position:relative;border-bottom:none}.main-table tbody>tr>td.c-actions{padding-right:15px}.main-table tbody>tr>td:first-child:before{position:absolute;top:0;bottom:0;left:0;display:block;width:0;content:'';background:#006af1;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}.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-color:#fafafa;-webkit-box-shadow:0 0 4px rgba(0,0,0,.15);box-shadow:0 0 4px rgba(0,0,0,.15)}.main-table tbody>tr.checked{-webkit-box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05);box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05)}.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;-webkit-box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05),0 -1px 0 0 rgba(203,208,219,.3),0 -2px 0 0 rgba(203,208,219,.1),0 -3px 0 0 rgba(203,208,219,.15),0 -4px 0 0 rgba(203,208,219,.05);box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05),0 -1px 0 0 rgba(203,208,219,.3),0 -2px 0 0 rgba(203,208,219,.1),0 -3px 0 0 rgba(203,208,219,.15),0 -4px 0 0 rgba(203,208,219,.05)}.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;-webkit-box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05),0 1px 0 0 rgba(203,208,219,.3),0 2px 0 0 rgba(203,208,219,.15),0 3px 0 0 rgba(203,208,219,.1),0 4px 0 0 rgba(203,208,219,.05);box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05),0 1px 0 0 rgba(203,208,219,.3),0 2px 0 0 rgba(203,208,219,.15),0 3px 0 0 rgba(203,208,219,.1),0 4px 0 0 rgba(203,208,219,.05)}.main-table tbody>tr.checked.row-check-end>td:first-child:before{border-bottom-left-radius:4px}.main-table tbody>tr.checked.row-check-end.row-check-begin{-webkit-box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05),0 1px 0 0 rgba(203,208,219,.3),0 2px 0 0 rgba(203,208,219,.15),0 3px 0 0 rgba(203,208,219,.1),0 4px 0 0 rgba(203,208,219,.05),0 -1px 0 0 rgba(203,208,219,.3),0 -2px 0 0 rgba(203,208,219,.1),0 -3px 0 0 rgba(203,208,219,.15),0 -4px 0 0 rgba(203,208,219,.05);box-shadow:1px 0 0 0 rgba(203,208,219,.3),2px 0 0 0 rgba(203,208,219,.15),3px 0 0 0 rgba(203,208,219,.1),4px 0 0 0 rgba(203,208,219,.05),0 1px 0 0 rgba(203,208,219,.3),0 2px 0 0 rgba(203,208,219,.15),0 3px 0 0 rgba(203,208,219,.1),0 4px 0 0 rgba(203,208,219,.05),0 -1px 0 0 rgba(203,208,219,.3),0 -2px 0 0 rgba(203,208,219,.1),0 -3px 0 0 rgba(203,208,219,.15),0 -4px 0 0 rgba(203,208,219,.05)}.main-table .checkbox-primary{display:inline-block;line-height:20px}.main-table .checkbox-primary label{margin:0}.main-table .table{margin:0}.main-table a:focus{text-decoration:underline}.table-footer{padding:11px 20px;color:#fff;background:rgba(0,0,0,.7)}.table-footer .btn-toolbar,.table-footer .checkbox-primary{float:left}.table-footer .checkbox-primary{margin:5px 20px 0 0}.table-footer .checkbox-primary label{color:#fff}.table-footer .btn{padding:3px 10px;border-radius:2px}.table-footer .pager{float:right;margin:0}.table-footer .pager>li>.pager-item{color:#fff}.table-footer .pager>li.pager-item-left>.pager-item,.table-footer .pager>li.pager-item-right>.pager-item{color:#595959;background-color:#fff}.table-footer .pager>li.pager-item-left.disabled>.pager-item,.table-footer .pager>li.pager-item-right.disabled>.pager-item{color:#bbb;background-color:#eee}.table-footer .form-control{height:28px;padding:3px 8px}.table-footer .input-control-icon-right{top:0;height:28px;line-height:28px}.table-footer.fixed-footer{position:fixed;z-index:10}.table-footer .table-statistic{float:left;margin-left:20px;line-height:28px}.table-footer .search-list .input-control-icon-left{top:-1px}.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}.has-row-checked .table-actions{width:auto;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>a{position:relative;display:inline-block;padding-right:16px;color:#a6aab8}.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:#a6aab8;text-transform:none;content:'\e6bf';opacity:.5;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.table.has-sort-head thead>tr>th>a:after{content:'\e6be'}.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:#006af1;text-decoration:none}.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:#006af1;opacity:1}.table.fixed-header-copy{z-index:10;color:#fff;background:rgba(0,0,0,.7)}.table.fixed-header-copy thead>tr>th>a{color:#cbd0db}.table.fixed-header-copy thead>tr>th>a:hover{color:#fff}.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:#e9f2fb}.table-data{margin:0}.table-data tbody>tr>td,.table-data tbody>tr>th{padding:6px 8px;border:none}.table-data tbody>tr>th{width:70px;padding-left:0;font-weight:400;color:#838a9d;text-align:right}.table-data tbody>tr>td{padding-right:0}.block-welcome .col-left{width:25%}.block-welcome .col-left>h4{margin:5px 0;line-height:30px}.block-welcome .col-left .timeline{margin:10px 0 0;font-size:12px}.block-welcome .col-right{width:75%}.block-welcome .col-right>h4{font-weight:400}.block-welcome .col-right>h4 small{display:inline-block;margin-right:8px;font-size:14px}.block-welcome .col-right .tiles{padding:10px 0 0 16px;border-left:1px solid #e5e8ec}.block-welcome .col-right .tile{width:20%}.block-welcome .panel-body{padding-top:15px}.block-welcome .user-notification-icon{position:relative;display:inline-block;margin-left:5px}.block-welcome .user-notification-icon .label-badge{position:absolute;top:1px;right:-8px;min-width:16px;padding:2px;font-size:12px;font-weight:400}.block-dynamic .timeline{margin:0}.block-flowchart{padding:10px}.block-flowchart .table{margin-bottom:0}.block-flowchart .table>tbody>tr>td,.block-flowchart .table>tbody>tr>th,.block-flowchart .table>thead>tr>th{padding:10px;font-weight:400;text-align:center}.block-flowchart .table>tbody>tr>td:first-child,.block-flowchart .table>tbody>tr>th:first-child,.block-flowchart .table>thead>tr>th:first-child{text-align:left}.block-flowchart .table>thead>tr>th{width:18%;vertical-align:top}.block-flowchart .table>thead>tr>th:first-child{width:auto;padding:10px 10px 15px 10px;background:0 0}.block-flowchart .table>thead>tr>th:first-child+th>div{background:0 0}.block-flowchart .table>thead>tr>th,.block-flowchart .table>thead>tr>th>div{padding:0;background:url(data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJPlIY5psn92jrSUGVrRFlfvHHh9JGS6aVQ2K2l+LYOO6KuCpby/No8DjvtgrfiD+gj5ozLpvMIfSanu2FyiKX1qqOsrsaNdbXCcfm8Ok1OBQA7) no-repeat;background-position:right -22px top 15px}.block-flowchart .table>thead>tr>th>div{padding:10px 10px 15px 10px;background-position:left -23px top 15px}.block-flowchart .table>thead>tr>th:last-child{background:0 0}.block-flowchart .table>tbody>tr>td{color:#838a9d}.block-flowchart .table>tbody>tr:nth-child(even)>td{background:#f7f8f9}.block-flowchart .flowchart-title{font-size:16px;font-weight:700;color:#3c4353}.block-flowchart .flowchart-step{display:inline-block;width:24px;height:24px;font-size:16px;line-height:24px;color:#fff;background-color:#00a9fc;border-radius:50%}.block-projects .c-deadline{width:100px;color:#a6aab8;text-align:center}.block-projects .c-status{width:90px}.block-projects .c-estimate{width:60px;text-align:right}.block-projects .c-consumed{width:60px;text-align:right}.block-projects .c-left{width:60px;text-align:right}.block-projects .c-progress{width:155px}.block-projects .c-spark{width:120px}.block-projects td.c-spark{padding:0}.block-stories .c-id{width:55px;color:#a6aab8}.block-stories .c-pri{width:45px;text-align:center}.block-stories .c-estimate{width:55px;color:#a6aab8}.block-stories .c-status{width:80px}.block-stories .c-stage{width:80px;color:#a6aab8}.block-stories.block-sm .c-stage,.block-stories.block-sm .c-status .status-text,.block-stories.block-sm .estimate{display:none}.block-stories.block-sm .c-status{text-align:center}.block-tasks .c-id{width:55px;color:#a6aab8}.block-tasks .c-pri{width:45px;text-align:center}.block-tasks .c-estimate{width:55px;color:#a6aab8}.block-tasks .c-deadline{width:95px;color:#a6aab8}.block-tasks .c-status{width:80px}.block-tasks.block-sm .c-deadline,.block-tasks.block-sm .c-status .status-text,.block-tasks.block-sm .estimate{display:none}.block-tasks.block-sm .c-status{text-align:center}.block-bugs .c-id{width:55px;color:#a6aab8}.block-bugs .c-level{width:50px;text-align:center}.block-bugs .c-pri{width:35px;text-align:center}.block-bugs .c-deadline{width:95px;color:#a6aab8}.block-bugs .c-status{width:80px}.block-bugs.block-sm .c-pri,.block-bugs.block-sm .c-status .status-text{display:none}.block-bugs.block-sm .c-status{text-align:center}.block-todoes .panel-body{position:relative;padding-top:42px}.block-todoes .todoes-input{position:absolute;top:-20px;right:0;left:0;padding:20px}.block-todoes .todoes-input .form-control::-webkit-input-placeholder{font-size:12px;line-height:20px;color:#a4a8b6}.block-todoes .todoes-input .form-control::-moz-placeholder{font-size:12px;line-height:20px;color:#a4a8b6}.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-left:0;margin:0 -10px}.block-todoes .todoes>li{position:relative;padding:5px 10px 5px 35px;list-style:none}.block-todoes .todoes>li:hover{background-color:#e9f2fb}.block-todoes .todo-title{display:block;padding:5px}.block-todoes .todo-pri{display:inline-block;padding:0 5px;font-size:12px;color:#838a9d}.block-todoes .todo-time{display:inline-block;padding:0 5px;font-size:12px;color:#a6aab8}.block-todoes .todo-check{position:absolute;top:10px;left:10px;display:block;width:20px;height:20px;font-size:20px;color:transparent;cursor:pointer;background:#fff;border:2px solid #eee;border-radius:50%}.block-todoes .todo-check:hover{border-color:#a6aab8}.block-todoes .active>.todo-check{color:#00da88;background:0 0;border:none}.block-todoes .todoes-form{position:absolute;top:-51px;right:0;left:0;z-index:15;padding:20px;visibility:hidden;background:#fff;-webkit-box-shadow:0 0 20px 0 #bdc9d8;box-shadow:0 0 20px 0 #bdc9d8;opacity:0;-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:opacity,visibility;-o-transition-property:opacity,visibility;transition-property:opacity,visibility}.block-todoes .todoes-form .form-group>label{padding-left:0}.block-todoes .todoes-form .form-group>label.text-center{text-align:center!important}.block-todoes .todoes-form>.form-group:last-child{margin-bottom:0}.block-todoes .todoes-form>h3{padding:0 20px 15px;margin:0 -20px 15px;font-size:16px;line-height:20px;border-bottom:1px solid #eee}.block-todoes.show-form .todoes-form{visibility:visible;opacity:1}.block-products .c-plans{width:70px;color:#a6aab8;text-align:center}.block-products .c-publishs{width:70px;color:#a6aab8;text-align:center}.block-products .c-stories{width:80px;color:#a6aab8;text-align:center}.block-products .c-bugs{width:90px;color:#a6aab8;text-align:center}.block-products.block-sm .c-project{display:none}.article-content img,.article>.content img{margin-top:0}.detail{padding:20px 0;margin:0 10px}.detail+.detail{padding-top:25px;border-top:1px solid #eee}.detail-title{font-size:16px;line-height:20px}.detail-title>.pull-right{position:relative;top:-8px}.detail-content{padding:5px 0 0 20px;margin-top:10px;color:#838a9d}.detail-content em{font-style:normal;color:#3c4353}.detail-content .list-unstyled>li+li{margin-top:5px}details.detail{padding:10px 0}details.detail .detail-content{padding-left:0}details.detail summary{position:relative}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;color:#838a9d}.files-list>li>a>.icon{display:inline-block;margin-right:5px;opacity:.7}.files-list>li>a:hover{color:#006af1}.histories-list{margin-bottom:0}.histories-list .btn-mini{position:relative;top:1px}.histories-list>li+li{margin-top:10px}.histories-list>li strong{color:#3c4353}.history-changes{padding:5px;margin-bottom:-5px;margin-left:5px;font-size:12px;line-height:20px;opacity:.65}.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}.search-list{min-width:200px;max-width:300px;padding:0}.search-list .search-box{float:none;margin:10px 10px 5px}.search-list .search-box .icon-search{opacity:.5}.search-list .list-group{max-height:248px;padding:0 10px 5px 10px;overflow-y:auto}.search-list .list-group>a{display:block;padding:2px 10px 2px 5px;margin:5px 0;line-height:20px;border-radius:4px}.search-list .list-group>a>.icon{display:inline-block;margin-right:3px;opacity:.5}.search-list .list-group>a.active{color:#006af1;background-color:#e9f2fb}.search-list .list-group>a.active:hover,.search-list .list-group>a:hover{color:#fff;background-color:#006af1}.dropup .search-list .list-group{height:214px}#footer{position:fixed;right:0;bottom:0;left:0;z-index:1100;height:40px;background:#fff;border-top:1px solid #eff1f7}#footer .breadcrumb{padding:10px 0;margin:0}#footer .breadcrumb>.active,#footer .breadcrumb>li>a{color:#cbd0db}#footer .breadcrumb>li+li:before{content:'>'}#poweredBy{position:absolute;top:0;right:0;padding:10px}#poweredBy .icon-zentao{color:#0097fd}#poweredBy a{color:#3c4353}#poweredBy a+a{margin-left:15px}#poweredBy a:hover{color:#006af1}#poweredBy a:hover .icon-zentao{color:#006af1}#poweredBy #aiux{color:#cbd0dc} \ No newline at end of file diff --git a/www/theme/zui/fonts/ZentaoIcon.eot b/www/theme/zui/fonts/ZentaoIcon.eot new file mode 100644 index 0000000000..f437620d41 Binary files /dev/null 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 new file mode 100644 index 0000000000..b443c0bc25 --- /dev/null +++ b/www/theme/zui/fonts/ZentaoIcon.svg @@ -0,0 +1,114 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/theme/zui/fonts/ZentaoIcon.ttf b/www/theme/zui/fonts/ZentaoIcon.ttf new file mode 100644 index 0000000000..6807051a22 Binary files /dev/null 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 new file mode 100644 index 0000000000..26141ccacd Binary files /dev/null and b/www/theme/zui/fonts/ZentaoIcon.woff differ diff --git a/www/upgrade.php.tmp b/www/upgrade.php.tmp index e06df6eab8..609ed1c84b 100644 --- a/www/upgrade.php.tmp +++ b/www/upgrade.php.tmp @@ -11,12 +11,29 @@ */ /* Judge my.php exists or not. */ define('IN_UPGRADE', true); -$myConfig = dirname(dirname(__FILE__)) . '/config/my.php'; -if(!file_exists($myConfig)) +$dbConfig = dirname(dirname(__FILE__)) . '/config/db.php'; +if(file_exists($dbConfig)) { - echo "文件" . $myConfig . "不存在！ 提示：不要重命名原来的禅道安装目录，下载最新的源码包，覆盖即可。" . "
                  "; - echo $myConfig . " doesn't exists! Please don't rename zentao before overriding the source code!"; - exit; + $myConfig = dirname(dirname(__FILE__)) . '/config/my.php'; + if(file_exists($myConfig)) + { + $myContent = trim(file_get_contents($myConfig)); + $myContent = str_replace('"; + echo "Please execute the command 'chmod 777 $configDir' to modify the permissions to ensure that the ZenTao has operating file permissions in this directory"; + exit; + } + + if(!empty($myContent)) + { + $myContent = file_get_contents($myConfig) . "\n" . $myContent; + file_put_contents($myConfig, $myContent); + } } error_reporting(0);