diff --git a/config/config.php b/config/config.php index da195e1d10..6dd1b548ff 100644 --- a/config/config.php +++ b/config/config.php @@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '5.0'; // The version of zentaopms. Don't change it. +$config->version = '5.1'; // The version of zentaopms. Don't change it. $config->charset = 'UTF-8'; // The charset of zentaopms. $config->cookieLife = time() + 2592000; // The cookie life time. $config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php diff --git a/module/group/lang/en.php b/module/group/lang/en.php index d9b742a2a9..eca5b28531 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge'; $lang->group->copyOptions['copyUser'] = 'Copy user'; $lang->group->versions[''] = 'History'; +$lang->group->versions['5_1'] = 'Zentao 5.1'; $lang->group->versions['5_0_beta2'] = 'Zentao 5.0.beta2'; $lang->group->versions['5_0_beta1'] = 'Zentao 5.0.beta1'; $lang->group->versions['4_3_beta'] = 'Zentao 4.3.beta'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 17b14bd562..acc8db0c37 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; $lang->group->versions[''] = '修改历史'; +$lang->group->versions['5_1'] = '禅道5.1'; $lang->group->versions['5_0_beta2'] = '禅道5.0.beta2'; $lang->group->versions['5_0_beta1'] = '禅道5.0.beta1'; $lang->group->versions['4_3_beta'] = '禅道4.3.beta'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 33d80cd4fe..a8465b1e2e 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -75,3 +75,4 @@ $lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; $lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; $lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; +$lang->upgrade->fromVersions['5_0'] = '5.0'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 962998ebc4..67b959e2e6 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -75,3 +75,4 @@ $lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; $lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; $lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; +$lang->upgrade->fromVersions['5_0'] = '5.0'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 87a82680b2..2f1f62deae 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -95,6 +95,7 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('4.3')); case '5_0_beta1': case '5_0_beta2': + case '5_0': default: if(!$this->isError()) $this->setting->updateVersion($this->config->version); } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 11888102b6..e3b832330a 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -484,7 +484,7 @@ table.data-table td:last-child{padding-right: 20px;} #projectID {background:#e5e5e5; border:1px solid #e5e5e5} /* Feature bar. */ -#featurebar,#wrap .outer>table.table-1>caption{height:34px; line-height:34px;background-color: #f8fafe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;} +#featurebar,#wrap .outer>table.table-1>caption,#wrap .outer>form>table.table-1>caption{height:34px; line-height:34px;background-color: #f8fafe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;} #featurebar span {font-size:14px;} #featurebar a,.outer>table.table-1>caption a{text-decoration:none; display: inline-block;padding: 0px 7px; line-height: 34px;height: 34px; font-size:14px;-webkit-transition: all .2s;-o-transition: all .2s;-moz-transition: all .2s;transition: all .2s;} #featurebar a:hover,.outer>table.table-1>caption a:hover{color:#000;background-color: #e5e5e5;} @@ -579,6 +579,7 @@ table.data-table td:last-child{padding-right: 20px;} /* Footer. */ /*#divider {margin-bottom:49px;}*/ #footer {position: relative; width:100%;position:fixed; bottom:0; left:0; margin:0; border-top: 1px solid #e1e1e1; background:#eef4fe;height:40px; line-height:40px;-webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);} +#crumbs a i.icon-home{display: none;} #crumbs {float: left;margin-left: 20px;} #crumbs .icon-angle-right{margin-right: 6px;} #poweredby {float: right;margin-right: 20px;}