Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/272_cyy' into 'sprint/272'

Browse Source 
Sprint/272 cyy

See merge request easycorp/zentaopms!6588
This commit is contained in:
王怡栋
2022-12-19 02:17:59 +00:00
parent edd54c534e 46085e314d
commit b1238c8fae
10 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/lang/de.php
+10 -1
View File
@@ -574,7 +574,7 @@ $lang->block->flowchart['dev'] = array('Entwickler', 'Aufgabe/Bugs anfordern
$lang->block->flowchart['tester'] = array('QS Team', 'Fälle erstellen', 'Fälle ausführen', 'Bug Berichte', 'Bugs überprüfen', 'Bugs schließen');
$lang->block->zentaoapp = new stdclass();
$lang->block->zentaoapp->commom = 'Zentao App';
$lang->block->zentaoapp->commom = 'ZenTao App';
$lang->block->zentaoapp->thisYearInvestment = 'Investment The Year';
$lang->block->zentaoapp->sinceTotalInvestment = 'Total Investment';
$lang->block->zentaoapp->myStory = 'My Story';
@@ -597,6 +597,15 @@ $lang->block->zentaoapp->canNotGetVersion = 'Failed to get ZenTao version, p
$lang->block->zentaoapp->desc = 'ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking project progress, and enhancing the flexibility and agility of project management.';
$lang->block->zentaoapp->downloadTip = 'Scan QR code to download';
$lang->block->zentaoclient = new stdClass();
$lang->block->zentaoclient->common = 'ZenTao Client';
$lang->block->zentaoclient->desc = 'You can directly use ZenTao through the ZenTao desktop client without frequently switching browsers. In addition, the ZenTao client also provides functions such as chat, information notification, robot, and embedding Zen Tao applet, which makes teamwork more convenient.';
$lang->block->zentaoclient->edition = new stdclass();
$lang->block->zentaoclient->edition->win64 = 'Windows';
$lang->block->zentaoclient->edition->linux64 = 'Linux';
$lang->block->zentaoclient->edition->mac64 = 'Mac OS';
$lang->block->guideTabs['flowchart'] = 'Flowchart';
$lang->block->guideTabs['systemMode'] = 'Operating Modes';
$lang->block->guideTabs['visionSwitch'] = 'Interface Switch';
module/block/lang/en.php
+10 -1
View File
@@ -574,7 +574,7 @@ $lang->block->flowchart['dev'] = array('Dev Team', 'Claim Tasks/Bugs', 'Desi
$lang->block->flowchart['tester'] = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
$lang->block->zentaoapp = new stdclass();
$lang->block->zentaoapp->commom = 'Zentao App';
$lang->block->zentaoapp->commom = 'ZenTao App';
$lang->block->zentaoapp->thisYearInvestment = 'Investment The Year';
$lang->block->zentaoapp->sinceTotalInvestment = 'Total Investment';
$lang->block->zentaoapp->myStory = 'My Story';
@@ -597,6 +597,15 @@ $lang->block->zentaoapp->canNotGetVersion = 'Failed to get ZenTao version, p
$lang->block->zentaoapp->desc = 'ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking project progress, and enhancing the flexibility and agility of project management.';
$lang->block->zentaoapp->downloadTip = 'Scan QR code to download';
$lang->block->zentaoclient = new stdClass();
$lang->block->zentaoclient->common = 'ZenTao Client';
$lang->block->zentaoclient->desc = 'You can directly use ZenTao through the ZenTao desktop client without frequently switching browsers. In addition, the ZenTao client also provides functions such as chat, information notification, robot, and embedding Zen Tao applet, which makes teamwork more convenient.';
$lang->block->zentaoclient->edition = new stdclass();
$lang->block->zentaoclient->edition->win64 = 'Windows';
$lang->block->zentaoclient->edition->linux64 = 'Linux';
$lang->block->zentaoclient->edition->mac64 = 'Mac OS';
$lang->block->guideTabs['flowchart'] = 'Flowchart';
$lang->block->guideTabs['systemMode'] = 'Operating Modes';
$lang->block->guideTabs['visionSwitch'] = 'Interface Switch';
module/block/lang/fr.php
+10 -1
View File
@@ -574,7 +574,7 @@ $lang->block->flowchart['dev'] = array('Développeurs', 'Réclament Tâches/
$lang->block->flowchart['tester'] = array('Testeurs', 'Rédigent CasTests', 'Jouent CasTests', 'Détectent Bugs', 'Vérifient Corrections', 'Ferment Bugs');
$lang->block->zentaoapp = new stdclass();
$lang->block->zentaoapp->commom = 'Zentao App';
$lang->block->zentaoapp->commom = 'ZenTao App';
$lang->block->zentaoapp->thisYearInvestment = 'Investment The Year';
$lang->block->zentaoapp->sinceTotalInvestment = 'Total Investment';
$lang->block->zentaoapp->myStory = 'My Story';
@@ -597,6 +597,15 @@ $lang->block->zentaoapp->canNotGetVersion = 'Failed to get ZenTao version, p
$lang->block->zentaoapp->desc = 'ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking project progress, and enhancing the flexibility and agility of project management.';
$lang->block->zentaoapp->downloadTip = 'Scan QR code to download';
$lang->block->zentaoclient = new stdClass();
$lang->block->zentaoclient->common = 'ZenTao Client';
$lang->block->zentaoclient->desc = 'You can directly use ZenTao through the ZenTao desktop client without frequently switching browsers. In addition, the ZenTao client also provides functions such as chat, information notification, robot, and embedding Zen Tao applet, which makes teamwork more convenient.';
$lang->block->zentaoclient->edition = new stdclass();
$lang->block->zentaoclient->edition->win64 = 'Windows';
$lang->block->zentaoclient->edition->linux64 = 'Linux';
$lang->block->zentaoclient->edition->mac64 = 'Mac OS';
$lang->block->guideTabs['flowchart'] = 'Flowchart';
$lang->block->guideTabs['systemMode'] = 'Operating Modes';
$lang->block->guideTabs['visionSwitch'] = 'Interface Switch';
module/block/lang/zh-cn.php
+10 -1
View File
@@ -574,7 +574,7 @@ $lang->block->flowchart['dev'] = array('研发人员', '领取任务和Bug',
$lang->block->flowchart['tester'] = array('测试人员', '撰写用例', '执行用例', '提交Bug', '验证Bug', '关闭Bug');
$lang->block->zentaoapp = new stdclass();
$lang->block->zentaoapp->commom = '禅道移动端';
$lang->block->zentaoapp->common = '禅道移动端';
$lang->block->zentaoapp->thisYearInvestment = '今年投入';
$lang->block->zentaoapp->sinceTotalInvestment = '从使用至今，总投入';
$lang->block->zentaoapp->myStory = '我的需求';
@@ -597,6 +597,15 @@ $lang->block->zentaoapp->canNotGetVersion = '获取禅道版本失败，请
$lang->block->zentaoapp->desc = '禅道移动端为您提供移动办公的环境，方便随时管理个人待办事务，跟进项目进度，增强了项目管理的灵活性和敏捷性。';
$lang->block->zentaoapp->downloadTip = '扫描二维码下载';
$lang->block->zentaoclient = new stdClass();
$lang->block->zentaoclient->common = '禅道客户端';
$lang->block->zentaoclient->desc = '您可以使用禅道桌面客户端直接使用禅道，无需频繁切换浏览器。除此之外客户端还提供了聊天、消息通知、机器人、内嵌禅道小程序等功能，团队协作更方便快捷。';
$lang->block->zentaoclient->edition = new stdclass();
$lang->block->zentaoclient->edition->win64 = 'Windows版';
$lang->block->zentaoclient->edition->linux64 = 'Linux版';
$lang->block->zentaoclient->edition->mac64 = 'Mac版';
$lang->block->guideTabs['flowchart'] = '流程图';
$lang->block->guideTabs['systemMode'] = '运行模式';
$lang->block->guideTabs['visionSwitch'] = '界面切换';
module/block/view/guide.html.php
+29 -2
View File
@@ -17,6 +17,13 @@
.block-guide .nav-secondary > li.active > a > span.btn-view,
.block-guide .nav-secondary > li:hover > a > span.btn-view {opacity: 1;}
.block-guide .nav-secondary > li.switch-icon {display: none;}
.block-guide .tab-pane .app-client .menu,
.block-guide .tab-pane .app-client .tree-menu li {padding-left: 0;}
.block-guide .tab-pane .app-client .tree-menu li {line-height: 56px; border-bottom: 1px solid #EDEEF2;}
.block-guide .tab-pane .app-client .tree-menu li a.iframe {display: flex;}
.block-guide .tab-pane .app-client .tree-menu li .avatar {background: #E6EAF1; width: 24px; height: 24px; margin-top: 16px; margin-right: 5px;}
.block-guide .tab-pane .app-client .tree-menu li .avatar img {padding: 6px;}
.block-guide .tab-pane .app-client .client-desc {padding-top: 12px;}
.block-guide .tab-pane .app-qrcode {padding: 10px 20px;}
.block-guide .tab-pane .app-qrcode .col-md-12 {padding-left: 0; padding-top: 10px;}
.block-guide .tab-pane .app-qrcode .qrcode-down img {padding-top: 24px; width: 120px;}
@@ -58,6 +65,7 @@ $(function()
<ul class="nav nav-stacked nav-secondary scrollbar-hover" id='<?php echo $blockNavId;?>'>
<?php foreach($lang->block->guideTabs as $tab => $tabName):?>
<?php if(strpos($tab, 'download') !== false and (!isset($config->xxserver->installed) or !$config->xuanxuan->turnon)) continue;?>
<?php if($tab == 'downloadMoblie' and common::checkNotCN()) continue;?>
<li <?php if($tab == 'flowchart') echo "class='active'";?> id="<?php echo $tab;?>">
<a href="###" title="<?php echo $tabName?>" data-target='<?php echo "#tab3{$blockNavId}Content{$tab}";?>' data-toggle="tab">
<?php echo $tabName;?>
@@ -77,11 +85,30 @@ $(function()
<?php include 'themeswitch.html.php';?>
</div>
<div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}Contentpreference";?>'></div>
<div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}ContentdownloadClient";?>'></div>
<div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}ContentdownloadClient";?>'>
<div class='table-row app-client'>
<div class="col-4">
<div class='col'><h4><?php echo $lang->block->zentaoclient->common;?></h4></div>
<div class="col dataTitle"><?php echo $lang->block->zentaoclient->desc;?></div>
<div class='col pull-left col-md-12'>
<nav class="menu pull-left col-md-3" data-ride="menu">
<ul class="tree tree-menu" data-ride="tree">
<?php foreach($lang->block->zentaoclient->edition as $edition => $editionName):?>
<li><?php echo html::a($this->createLink('misc', 'downloadClient', "action=getPackage&os=$edition", '', true), '<div class="avatar has-img avatar-circle">' . html::image($config->webRoot . "theme/default/images/guide/edition_{$edition}.png") . "</div> $editionName", '', 'class="iframe"');?></li>
<?php endforeach;?>
</ul>
</nav>
<div class="pull-left col-md-9 text-center client-desc">
<?php echo html::image($config->webRoot . 'theme/default/images/guide/' . (common::checkNotCN() ? 'client_en.png' : 'client_cn.png'));?>
</div>
</div>
</div>
</div>
</div>
<div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}ContentdownloadMoblie";?>'>
<div class='table-row app-qrcode'>
<div class="col-4">
<div class='col'><h4><?php echo $lang->block->zentaoapp->commom;?></h4></div>
<div class='col'><h4><?php echo $lang->block->zentaoapp->common;?></h4></div>
<div class="col dataTitle"><?php echo $lang->block->zentaoapp->desc;?></div>
<div class='col pull-left col-md-12'>
<div class="pull-left col-md-7">
www/theme/default/images/guide/client_cn.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 KiB

www/theme/default/images/guide/client_en.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 143 KiB

www/theme/default/images/guide/edition_linux64.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1015 B

www/theme/default/images/guide/edition_mac64.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 420 B

www/theme/default/images/guide/edition_win64.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 410 B