diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index d5765300d1..b622f08be9 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -12,8 +12,8 @@
$lang->admin->common = '后台管理';
$lang->admin->index = '后台管理首页';
$lang->admin->checkDB = '检查数据库';
-$lang->admin->sso = '然之集成';
-$lang->admin->ssoAction = '然之集成';
+$lang->admin->sso = 'ZDOO集成';
+$lang->admin->ssoAction = 'ZDOO集成';
$lang->admin->safeIndex = '安全';
$lang->admin->checkWeak = '弱口令检查';
$lang->admin->certifyMobile = '认证手机';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index c5febad524..848e5a62d1 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -420,7 +420,7 @@ $lang->admin->subMenu->message->browser = array('link' => '浏览器|message|bro
$lang->admin->subMenu->message->setting = array('link' => '设置|message|setting');
$lang->admin->subMenu->sso = new stdclass();
-$lang->admin->subMenu->sso->ranzhi = '然之协同|admin|sso';
+$lang->admin->subMenu->sso->ranzhi = 'ZDOO|admin|sso';
$lang->admin->subMenu->dev = new stdclass();
$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api');
diff --git a/module/install/css/index.css b/module/install/css/index.css
index 430c73aaee..03dd846a23 100644
--- a/module/install/css/index.css
+++ b/module/install/css/index.css
@@ -60,7 +60,6 @@ li{line-height: 2em}
font-size:25px;
width: 100%;
}
-.card.ad > .img-wrapper > img{width:35px; height:35px}
.card.ad > .card-heading {text-align: center;}
.card.ad > .card-reveal > .card-heading { padding: 12px 10px 10px 15px;}
.card.ad > .card-reveal {color: #333;}
diff --git a/module/install/lang/de.php b/module/install/lang/de.php
index e78325460a..69046aaa21 100644
--- a/module/install/lang/de.php
+++ b/module/install/lang/de.php
@@ -177,7 +177,7 @@ $lang->install->joinZentao = <<
Hinweis: Wenn Sie über ZenTao informiert bleiben möchten, registieren Sie sich bitte unter (www.zentao.pm).
EOT; -$lang->install->product = array('chanzhi', 'ranzhi'); +$lang->install->product = array('chanzhi', 'zdoo'); $lang->install->promotion = "Produkte von Nature Easy Soft:"; $lang->install->chanzhi = new stdclass(); @@ -193,11 +193,11 @@ $lang->install->chanzhi->desc = <<Note: In order to get the latest news of ZenTao, please sign up on ZenTao Community(www.zentao.pm).
EOT; -$lang->install->product = array('chanzhi', 'ranzhi', 'ydisk', 'meshiot'); +$lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot'); $lang->install->promotion = "Products also from EasyCorp:"; $lang->install->chanzhi = new stdclass(); @@ -193,11 +193,11 @@ $lang->install->chanzhi->desc = <<Note : Afin d'obtenir les dernières infos de ZenTao, enregistrz-vous chez ZenTao(www.zentao.pm).
EOT; -$lang->install->product = array('chanzhi', 'ranzhi'); +$lang->install->product = array('chanzhi', 'zdoo'); $lang->install->promotion = "Products also from Nature Easy Soft team:"; $lang->install->chanzhi = new stdclass(); @@ -193,11 +193,11 @@ $lang->install->chanzhi->desc = <<Chú ý: Để nhận tin tức mới nhất về ZenTao, vui lòng đăng ký trên Cộng đồng ZenTao(www.zentao.pm).
EOT; -$lang->install->product = array('chanzhi', 'ranzhi', 'ydisk', 'meshiot'); +$lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot'); $lang->install->promotion = "Sản phẩm từ EasyCorp:"; $lang->install->chanzhi = new stdclass(); @@ -193,11 +193,11 @@ $lang->install->chanzhi->desc = <<友情提示:为了您及时获得禅道的最新动态,请在禅道社区(www.zentao.net)进行登记。
EOT; -$lang->install->product = array('chanzhi', 'ranzhi', 'xuanxuan', 'ydisk', 'meshiot'); +$lang->install->product = array('chanzhi', 'zdoo', 'xuanxuan', 'ydisk', 'meshiot'); $lang->install->promotion = "为您推荐易软天创旗下其他产品:"; $lang->install->chanzhi = new stdclass(); @@ -193,11 +193,11 @@ $lang->install->chanzhi->desc = <<邮件,短信,webhook都放统一的消息发送
移植然之里面的消息通知功能
'); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'实现集中的消息处理机制', 'desc' => '邮件,短信,webhook都放统一的消息发送
移植ZDOO里面的消息通知功能
'); $lang->misc->feature->all['9.8.stable'][] = array('title'=>'实现周期性待办功能', 'desc' => ''); $lang->misc->feature->all['9.8.stable'][] = array('title'=>'增加指派给我的区块', 'desc' => ''); $lang->misc->feature->all['9.8.stable'][] = array('title'=>'项目可以选择多个测试单生成报告', 'desc' => ''); diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php index c689e4f284..afa3d0864e 100755 --- a/module/misc/view/links.html.php +++ b/module/misc/view/links.html.php @@ -2,7 +2,7 @@ #zentaoLinks .col-sm-2{width:20%;} #zentaoLinks .col-sm-2 .others ul{padding-left: 0px;} #zentaoLinks .col-sm-2 .others li{list-style: none; text-align:left;} -#zentaoLinks .col-sm-2 .others img{height:15px; padding-right:10px;} +#zentaoLinks .col-sm-2 .others img{height:25px; padding-right:5px;}2、代号和密钥必须与然之后台设置的一致。
+1、接口地址的填写,如果是PATH_INFO :http://ZDOO网址/sys/sso-check.html,如果是GET:http://ZDOO网址/sys/index.php?m=sso&f=check
+2、代号和密钥必须与ZDOO后台设置的一致。
EOD; $lang->sso->bindNotice = '添加的新用户暂时没有权限,需要联系禅道管理员,给该用户分配权限。'; $lang->sso->bindNoPassword = '密码不能为空'; diff --git a/module/upgrade/css/afterexec.css b/module/upgrade/css/afterexec.css index 9290e737f6..abdebdab7c 100644 --- a/module/upgrade/css/afterexec.css +++ b/module/upgrade/css/afterexec.css @@ -65,7 +65,6 @@ width: 100%; } -.card.ad > .img-wrapper > img{width:35px; height:35px} .card.ad > .card-heading {text-align: center;} .card.ad > .card-reveal > .card-heading { padding: 12px 10px 10px 15px;} .card.ad > .card-reveal {color: #333;} diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 33593f9cd3..ea0c152b89 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -42,7 +42,7 @@ $lang->user->join = '入职日期'; $lang->user->visits = '访问次数'; $lang->user->ip = '最后IP'; $lang->user->last = '最后登录'; -$lang->user->ranzhi = '然之帐号'; +$lang->user->ranzhi = 'ZDOO帐号'; $lang->user->ditto = '同上'; $lang->user->originalPassword = '原密码'; $lang->user->newPassword = '新密码'; @@ -61,14 +61,14 @@ $lang->user->edit = "编辑用户"; $lang->user->batchEdit = "批量编辑"; $lang->user->unlock = "解锁用户"; $lang->user->delete = "删除用户"; -$lang->user->unbind = "解除然之绑定"; +$lang->user->unbind = "解除ZDOO绑定"; $lang->user->login = "用户登录"; $lang->user->mobileLogin = "手机访问"; $lang->user->editProfile = "修改档案"; $lang->user->deny = "访问受限"; $lang->user->confirmDelete = "您确定删除该用户吗?"; $lang->user->confirmUnlock = "您确定解除该用户的锁定状态吗?"; -$lang->user->confirmUnbind = "您确定解除该用户跟然之的绑定吗?"; +$lang->user->confirmUnbind = "您确定解除该用户跟ZDOO的绑定吗?"; $lang->user->relogin = "重新登录"; $lang->user->asGuest = "游客访问"; $lang->user->goback = "返回前一页"; diff --git a/www/theme/default/images/main/chanzhi.ico b/www/theme/default/images/main/chanzhi.ico index 796f70c023..0741d4f87f 100644 Binary files a/www/theme/default/images/main/chanzhi.ico and b/www/theme/default/images/main/chanzhi.ico differ diff --git a/www/theme/default/images/main/chanzhi.png b/www/theme/default/images/main/chanzhi.png deleted file mode 100644 index 50d54f095e..0000000000 Binary files a/www/theme/default/images/main/chanzhi.png and /dev/null differ diff --git a/www/theme/default/images/main/chanzhi_en.png b/www/theme/default/images/main/chanzhi_en.png deleted file mode 100644 index a54579801a..0000000000 Binary files a/www/theme/default/images/main/chanzhi_en.png and /dev/null differ diff --git a/www/theme/default/images/main/meshiot.ico b/www/theme/default/images/main/meshiot.ico index d3d94a6b47..6abf68e1b2 100644 Binary files a/www/theme/default/images/main/meshiot.ico and b/www/theme/default/images/main/meshiot.ico differ diff --git a/www/theme/default/images/main/meshiot.png b/www/theme/default/images/main/meshiot.png deleted file mode 100644 index d254360e1f..0000000000 Binary files a/www/theme/default/images/main/meshiot.png and /dev/null differ diff --git a/www/theme/default/images/main/ranzhi.ico b/www/theme/default/images/main/ranzhi.ico deleted file mode 100644 index a44f41006c..0000000000 Binary files a/www/theme/default/images/main/ranzhi.ico and /dev/null differ diff --git a/www/theme/default/images/main/ranzhi.png b/www/theme/default/images/main/ranzhi.png deleted file mode 100644 index 32256691bf..0000000000 Binary files a/www/theme/default/images/main/ranzhi.png and /dev/null differ diff --git a/www/theme/default/images/main/xuanxuan.ico b/www/theme/default/images/main/xuanxuan.ico index f8fefe9f57..67103434ce 100644 Binary files a/www/theme/default/images/main/xuanxuan.ico and b/www/theme/default/images/main/xuanxuan.ico differ diff --git a/www/theme/default/images/main/xuanxuan.png b/www/theme/default/images/main/xuanxuan.png deleted file mode 100644 index 1f9f929f00..0000000000 Binary files a/www/theme/default/images/main/xuanxuan.png and /dev/null differ diff --git a/www/theme/default/images/main/ydisk.ico b/www/theme/default/images/main/ydisk.ico index 6335c900d7..3e6f039cf5 100644 Binary files a/www/theme/default/images/main/ydisk.ico and b/www/theme/default/images/main/ydisk.ico differ diff --git a/www/theme/default/images/main/ydisk.png b/www/theme/default/images/main/ydisk.png deleted file mode 100644 index 0cca83cbe4..0000000000 Binary files a/www/theme/default/images/main/ydisk.png and /dev/null differ diff --git a/www/theme/default/images/main/yidou.png b/www/theme/default/images/main/yidou.png deleted file mode 100644 index 6ea67862d1..0000000000 Binary files a/www/theme/default/images/main/yidou.png and /dev/null differ diff --git a/www/theme/default/images/main/zdoo.ico b/www/theme/default/images/main/zdoo.ico index c990161259..97f4b80c8d 100644 Binary files a/www/theme/default/images/main/zdoo.ico and b/www/theme/default/images/main/zdoo.ico differ diff --git a/www/theme/default/images/main/zdoo.png b/www/theme/default/images/main/zdoo.png deleted file mode 100755 index cce643c6a0..0000000000 Binary files a/www/theme/default/images/main/zdoo.png and /dev/null differ diff --git a/www/theme/default/images/main/zdoo_org.png b/www/theme/default/images/main/zdoo_org.png deleted file mode 100644 index e59a4f2c87..0000000000 Binary files a/www/theme/default/images/main/zdoo_org.png and /dev/null differ