From dfc8de0b652adb37b916f94acaa4f3a2b777097a Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 30 Apr 2020 16:42:52 +0800 Subject: [PATCH] * finish task #7085. --- module/admin/lang/zh-cn.php | 4 ++-- module/common/lang/zh-cn.php | 2 +- module/install/css/index.css | 1 - module/install/lang/de.php | 12 ++++++------ module/install/lang/en.php | 12 ++++++------ module/install/lang/fr.php | 12 ++++++------ module/install/lang/vi.php | 12 ++++++------ module/install/lang/zh-cn.php | 12 ++++++------ module/misc/lang/de.php | 2 +- module/misc/lang/en.php | 2 +- module/misc/lang/fr.php | 2 +- module/misc/lang/vi.php | 2 +- module/misc/lang/zh-cn.php | 4 ++-- module/misc/view/links.html.php | 2 +- module/my/lang/zh-cn.php | 2 +- module/sso/lang/zh-cn.php | 6 +++--- module/upgrade/css/afterexec.css | 1 - module/user/lang/zh-cn.php | 6 +++--- www/theme/default/images/main/chanzhi.ico | Bin 5619 -> 809 bytes www/theme/default/images/main/chanzhi.png | Bin 2994 -> 0 bytes www/theme/default/images/main/chanzhi_en.png | Bin 7916 -> 0 bytes www/theme/default/images/main/meshiot.ico | Bin 1852 -> 562 bytes www/theme/default/images/main/meshiot.png | Bin 20964 -> 0 bytes www/theme/default/images/main/ranzhi.ico | Bin 3776 -> 0 bytes www/theme/default/images/main/ranzhi.png | Bin 4674 -> 0 bytes www/theme/default/images/main/xuanxuan.ico | Bin 2818 -> 646 bytes www/theme/default/images/main/xuanxuan.png | Bin 3887 -> 0 bytes www/theme/default/images/main/ydisk.ico | Bin 3068 -> 655 bytes www/theme/default/images/main/ydisk.png | Bin 4273 -> 0 bytes www/theme/default/images/main/yidou.png | Bin 8850 -> 0 bytes www/theme/default/images/main/zdoo.ico | Bin 4286 -> 783 bytes www/theme/default/images/main/zdoo.png | Bin 5441 -> 0 bytes www/theme/default/images/main/zdoo_org.png | Bin 20914 -> 0 bytes 33 files changed, 47 insertions(+), 49 deletions(-) delete mode 100644 www/theme/default/images/main/chanzhi.png delete mode 100644 www/theme/default/images/main/chanzhi_en.png delete mode 100644 www/theme/default/images/main/meshiot.png delete mode 100644 www/theme/default/images/main/ranzhi.ico delete mode 100644 www/theme/default/images/main/ranzhi.png delete mode 100644 www/theme/default/images/main/xuanxuan.png delete mode 100644 www/theme/default/images/main/ydisk.png delete mode 100644 www/theme/default/images/main/yidou.png delete mode 100755 www/theme/default/images/main/zdoo.png delete mode 100644 www/theme/default/images/main/zdoo_org.png 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 = <<Sie haben ZenTao %s installiert. Bitte löschen Sie die install.php schnellstmöglich.

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 = << EOD; -$lang->install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = 'ZDOO'; -$lang->install->ranzhi->logo = 'images/main/ranzhi.ico'; -$lang->install->ranzhi->url = 'http://www.zdoo.org'; -$lang->install->ranzhi->desc = <<install->zdoo = new stdclass(); +$lang->install->zdoo->name = 'ZDOO'; +$lang->install->zdoo->logo = 'images/main/zdoo.ico'; +$lang->install->zdoo->url = 'http://www.zdoo.com'; +$lang->install->zdoo->desc = <<
  • CRM: Customer Management und Bestellvervollgung
  • OA: Freigaben, Ankündigungen, Reisen, Abwesenheiten und mehr.
    • diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 92db3910ce..150457bdb2 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -177,7 +177,7 @@ $lang->install->joinZentao = <<You have installed ZenTao %s. Please delete install.php.

    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 = << EOD; -$lang->install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = 'ZDOO'; -$lang->install->ranzhi->logo = 'images/main/zdoo.ico'; -$lang->install->ranzhi->url = 'http://www.zdoo.org'; -$lang->install->ranzhi->desc = <<install->zdoo = new stdclass(); +$lang->install->zdoo->name = 'ZDOO'; +$lang->install->zdoo->logo = 'images/main/zdoo.ico'; +$lang->install->zdoo->url = 'http://www.zdoo.com'; +$lang->install->zdoo->desc = <<
  • CRM: Customer Management and Order Tracking
  • OA: Approve, Announce, Trip, Leave and more
    • diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index 4252c3d032..154b07fcf0 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -177,7 +177,7 @@ $lang->install->joinZentao = <<Vous avez installé ZenTao %s. Supprimez install.php asap.

    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 = << EOD; -$lang->install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = 'ZDOO'; -$lang->install->ranzhi->logo = 'images/main/ranzhi.ico'; -$lang->install->ranzhi->url = 'http://www.zdoo.org'; -$lang->install->ranzhi->desc = <<install->zdoo = new stdclass(); +$lang->install->zdoo->name = 'ZDOO'; +$lang->install->zdoo->logo = 'images/main/zdoo.ico'; +$lang->install->zdoo->url = 'http://www.zdoo.com'; +$lang->install->zdoo->desc = <<
  • CRM: Customer Management and Order Tracking
  • OA: Approve, Announce, Trip, Leave and so on.
    • diff --git a/module/install/lang/vi.php b/module/install/lang/vi.php index fbe77a3b9b..ec5fb82fac 100644 --- a/module/install/lang/vi.php +++ b/module/install/lang/vi.php @@ -177,7 +177,7 @@ $lang->install->joinZentao = <<Bạn đã cài đặt ZenTao %s. Vui lòng xóa install.php.

    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 = << EOD; -$lang->install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = 'ZDOO'; -$lang->install->ranzhi->logo = 'images/main/zdoo.ico'; -$lang->install->ranzhi->url = 'http://www.zdoo.org'; -$lang->install->ranzhi->desc = <<install->zdoo = new stdclass(); +$lang->install->zdoo->name = 'ZDOO'; +$lang->install->zdoo->logo = 'images/main/zdoo.ico'; +$lang->install->zdoo->url = 'http://www.zdoo.com'; +$lang->install->zdoo->desc = <<
  • CRM: Customer Management and Order Tracking
  • OA: Approve, Announce, Trip, Leave and more
    • diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 38dfc9ef27..ce0c78b080 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -177,7 +177,7 @@ $lang->install->joinZentao = <<您已经成功安装禅道管理系统%s，请及时删除install.php。

    友情提示：为了您及时获得禅道的最新动态，请在禅道社区(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 = << EOD; -$lang->install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = '然之协同'; -$lang->install->ranzhi->logo = 'images/main/ranzhi.ico'; -$lang->install->ranzhi->url = 'http://www.ranzhi.org'; -$lang->install->ranzhi->desc = <<install->zdoo = new stdclass(); +$lang->install->zdoo->name = 'ZDOO'; +$lang->install->zdoo->logo = 'images/main/zdoo.ico'; +$lang->install->zdoo->url = 'http://www.zdoo.com'; +$lang->install->zdoo->desc = <<
  • 客户管理，订单跟踪
  • 项目任务，公告文档
    • diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index 8492498d00..8f970a5f1c 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -54,7 +54,7 @@ $lang->misc->zentao->service['servicemore']= 'Mehr'; global $config; $lang->misc->zentao->others['chanzhi'] = " Zsite"; -$lang->misc->zentao->others['ranzhi'] = " Zdoo"; +$lang->misc->zentao->others['zdoo'] = " ZDOO"; $lang->misc->zentao->others['ydisk'] = " Y Disk"; $lang->misc->zentao->others['meshiot' ] = " MeshioT"; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 5549601738..ae36338aae 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -54,7 +54,7 @@ $lang->misc->zentao->service['servicemore']= 'More'; global $config; $lang->misc->zentao->others['chanzhi'] = " Zsite"; -$lang->misc->zentao->others['ranzhi'] = " Zdoo"; +$lang->misc->zentao->others['zdoo'] = " ZDOO"; $lang->misc->zentao->others['ydisk'] = " Y Disk"; $lang->misc->zentao->others['meshiot' ] = " MeshioT"; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 14d22b1663..918e607cfd 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -54,7 +54,7 @@ $lang->misc->zentao->service['servicemore']= 'Plus...'; global $config; $lang->misc->zentao->others['chanzhi'] = " Zsite"; -$lang->misc->zentao->others['ranzhi'] = " Zdoo"; +$lang->misc->zentao->others['zdoo'] = " ZDOO"; $lang->misc->zentao->others['ydisk'] = " Y Disk"; $lang->misc->zentao->others['meshiot' ] = " MeshioT"; diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php index 3b345a911b..4e741f65e9 100644 --- a/module/misc/lang/vi.php +++ b/module/misc/lang/vi.php @@ -54,7 +54,7 @@ $lang->misc->zentao->service['servicemore'] = 'Thêm'; global $config; $lang->misc->zentao->others['chanzhi'] = " Zsite"; -$lang->misc->zentao->others['ranzhi'] = " Zdoo"; +$lang->misc->zentao->others['zdoo'] = " ZDOO"; $lang->misc->zentao->others['ydisk'] = " Y Disk"; $lang->misc->zentao->others['meshiot' ] = " MeshioT"; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 9de2786dbe..c2ce9dc77c 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -54,7 +54,7 @@ $lang->misc->zentao->service['servicemore']= '更多服务...'; global $config; $lang->misc->zentao->others['chanzhi'] = " 蝉知门户"; -$lang->misc->zentao->others['ranzhi'] = " 然之协同"; +$lang->misc->zentao->others['zdoo'] = " ZDOO"; $lang->misc->zentao->others['xuanxuan'] = " 喧喧聊天"; $lang->misc->zentao->others['ydisk'] = " 悦库网盘"; $lang->misc->zentao->others['meshiot' ] = " 易天物联"; @@ -180,7 +180,7 @@ $lang->misc->feature->all['10.2.stable'][] = array('title'=>'集成喧喧IM', 'd $lang->misc->feature->all['10.0.stable'][] = array('title'=>'全新的界面和交互体验', 'desc' => '
    1. 全新的我的地盘
    2. 全新的动态页面
    3. 全新的产品主页
    4. 全新的产品概况
    5. 全新的路线图
    6. 全新的项目主页
    7. 全新的项目概况
    8. 全新的测试主页
    9. 全新的文档主页
    10. 我的地盘新增工作统计区块
    11. 我的地盘待办区块可以直接添加、编辑、完成待办
    12. 产品主页新增产品统计区块
    13. 产品主页新增产品总览区块
    14. 项目主页新增项目统计区块
    15. 项目主页新增项目总览区块
    16. 测试主页新增测试统计区块
    17. 所有产品、产品主页、所有项目、项目主页、测试主页等按钮从二级导航右侧移动到了左侧
    18. 项目任务列表看板、燃尽图、树状图、分组查看等按钮从三级导航中移动到二级导航中，树状图、分组查看和任务列表集成到一个下拉列表中
    19. 项目下二级导航中Bug、版本、测试单三个跟测试相关的导航集成到一个下拉列表中
    20. 版本、测试单列表按照产品分组展示，布局更加合理
    21. 文档左侧增加树状图显示
    22. 文档增加快速访问功能，包括最近更新、我的文档、我的收藏三个入口
    23. 文档增加收藏功能
        24. '); -$lang->misc->feature->all['9.8.stable'][] = array('title'=>'实现集中的消息处理机制', '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;}