From 93ece5bb70859a7cf00ffbb493b1ae764ebac0d7 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Tue, 20 Dec 2022 08:04:27 +0800 Subject: [PATCH 1/5] * ztask 79625 --- module/block/lang/de.php | 10 +++++ module/block/lang/en.php | 10 +++++ module/block/lang/fr.php | 10 +++++ module/block/lang/zh-cn.php | 10 +++++ module/block/view/guide.html.php | 37 ++++++++++++++++-- module/block/view/visionswitch.html.php | 32 +++++++++++++++ www/theme/default/images/guide/vision_alm.png | Bin 0 -> 26609 bytes .../default/images/guide/vision_light.png | Bin 0 -> 5453 bytes 8 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 module/block/view/visionswitch.html.php create mode 100644 www/theme/default/images/guide/vision_alm.png create mode 100644 www/theme/default/images/guide/vision_light.png diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 615ae698a0..11918b17e1 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -622,3 +622,13 @@ $lang->block->themes['pink'] = 'Pink'; $lang->block->themes['blackberry'] = 'Blackberry'; $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; + +$lang->block->visionTitle = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.'; +$lang->block->visions['ALM'] = new stdclass(); +$lang->block->visions['ALM']->key = 'ALM'; +$lang->block->visions['ALM']->title = 'Full feature interface'; +$lang->block->visions['ALM']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; +$lang->block->visions['light'] = new stdclass(); +$lang->block->visions['light']->key = 'light'; +$lang->block->visions['light']->title = 'Operation Management Interface'; +$lang->block->visions['light']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index a1ea970f15..8603635775 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -622,3 +622,13 @@ $lang->block->themes['pink'] = 'Pink'; $lang->block->themes['blackberry'] = 'Blackberry'; $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; + +$lang->block->visionTitle = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.'; +$lang->block->visions['ALM'] = new stdclass(); +$lang->block->visions['ALM']->key = 'ALM'; +$lang->block->visions['ALM']->title = 'Full feature interface'; +$lang->block->visions['ALM']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; +$lang->block->visions['light'] = new stdclass(); +$lang->block->visions['light']->key = 'light'; +$lang->block->visions['light']->title = 'Operation Management Interface'; +$lang->block->visions['light']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 3703522621..f7af1b7f84 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -622,3 +622,13 @@ $lang->block->themes['pink'] = 'Pink'; $lang->block->themes['blackberry'] = 'Blackberry'; $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; + +$lang->block->visionTitle = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.'; +$lang->block->visions['ALM'] = new stdclass(); +$lang->block->visions['ALM']->key = 'ALM'; +$lang->block->visions['ALM']->title = 'Full feature interface'; +$lang->block->visions['ALM']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; +$lang->block->visions['light'] = new stdclass(); +$lang->block->visions['light']->key = 'light'; +$lang->block->visions['light']->title = 'Operation Management Interface'; +$lang->block->visions['light']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index e57cd01991..0856db6fac 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -622,3 +622,13 @@ $lang->block->themes['pink'] = '芙蕖粉'; $lang->block->themes['blackberry'] = '露莓黑'; $lang->block->themes['classic'] = '经典蓝'; $lang->block->themes['purple'] = '玉烟紫'; + +$lang->block->visionTitle = '禅道使用界面分为【研发综合界面】和【运营管理界面】。'; +$lang->block->visions['ALM'] = new stdclass(); +$lang->block->visions['ALM']->key = 'ALM'; +$lang->block->visions['ALM']->title = '研发综合界面'; +$lang->block->visions['ALM']->text = '集项目集、产品、项目、执行、测试等多维度管理于一体，提供全过程项目管理解决方案。'; +$lang->block->visions['light'] = new stdclass(); +$lang->block->visions['light']->key = 'light'; +$lang->block->visions['light']->title = '运营管理界面'; +$lang->block->visions['light']->text = '专为非研发团队打造，主要以直观、可视化的看板项目管理模型为主。'; diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index d7f9fcbce7..d7ca6fe2c3 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -44,6 +44,7 @@ $(function() else $nav.children('li:not(.switch-icon)')[isPrev ? 'last' : 'first']().find('a[data-toggle="tab"]').trigger('click'); e.preventDefault(); }); + $nav.find('li').click(function() { if($(this).attr('id') == 'flowchart') @@ -54,18 +55,44 @@ $(function() { $('.block-guide .tutorialBtn').addClass('hidden'); } + + if($(this).attr('id') === 'visionSwitch') + { + var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || 0; + localStorage.setItem('visionPosition', scrollTop); + } + }) + if(localStorage.getItem('visionPosition')) + { + $('#visionSwitch > a').click(); + localStorage.removeItem('visionPosition'); + } + else + { + $('#flowchart > a').click(); + } + }); + +window.onunload = function () { + if(!localStorage.getItem('visionPosition')) + { + return; + } + document.getElementById('guideBody').scrollTo = Number(localStorage.getItem('visionPosition')); +} -
+ +
-
-
+
+ +
diff --git a/module/block/view/visionswitch.html.php b/module/block/view/visionswitch.html.php new file mode 100644 index 0000000000..87bf360874 --- /dev/null +++ b/module/block/view/visionswitch.html.php @@ -0,0 +1,32 @@ + + + +
+

block->visionTitle;?>

+
+ block->visions as $vision):?> + config->systemMode == $vision->key ? 'active' : '';?> +
+
+
title;?>
+
text;?>
+
+ +
+
diff --git a/www/theme/default/images/guide/vision_alm.png b/www/theme/default/images/guide/vision_alm.png new file mode 100644 index 0000000000000000000000000000000000000000..f7ea0fcbfd7395a1e7f715b97cb7f7430090cb73 GIT binary patch literal 26609 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 literal 0 HcmV?d00001 diff --git a/www/theme/default/images/guide/vision_light.png b/www/theme/default/images/guide/vision_light.png new file mode 100644 index 0000000000000000000000000000000000000000..aceef98905d92075de8741f77bda70ae2ca64a50 GIT binary patch literal 5453 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 literal 0 HcmV?d00001 From 6b8c4daf06badeaa038b2ef71b5425583fb9a826 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Tue, 20 Dec 2022 09:33:25 +0800 Subject: [PATCH 2/5] * add modal --- module/block/view/guide.html.php | 18 +++-- module/block/view/visionswitch.html.php | 93 +++++++++++++++++++++---- 2 files changed, 86 insertions(+), 25 deletions(-) diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index d7ca6fe2c3..a0c9eb69f5 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -61,12 +61,18 @@ $(function() var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || 0; localStorage.setItem('visionPosition', scrollTop); } + else + { + localStorage.getItem('visionPosition') && localStorage.removeItem('visionPosition'); + } }) - if(localStorage.getItem('visionPosition')) + if(localStorage.getItem('visionPosition') && Number(localStorage.getItem('visionPosition'))) { + var scrollTopNum = Number(localStorage.getItem('visionPosition')); + document.getElementById('guideBody').scrollTo = 0; $('#visionSwitch > a').click(); - localStorage.removeItem('visionPosition'); + window.scrollTo(0, scrollTopNum); } else { @@ -74,14 +80,6 @@ $(function() } }); - -window.onunload = function () { - if(!localStorage.getItem('visionPosition')) - { - return; - } - document.getElementById('guideBody').scrollTo = Number(localStorage.getItem('visionPosition')); -}
diff --git a/module/block/view/visionswitch.html.php b/module/block/view/visionswitch.html.php index 87bf360874..f20287b55e 100644 --- a/module/block/view/visionswitch.html.php +++ b/module/block/view/visionswitch.html.php @@ -9,24 +9,87 @@ .vision-img {height: 118px; width: 100%; background-size: 100% !important;} .vision-title {font-size: 14px; color: #0B0F18; padding: 0 8px;} .vision-text {font-size: 12px; color: #5E626D; padding: 8px;} +#selectProgramModal .modal-dialog {width: 550px} +#selectProgramModal .modal-header {border-bottom: 0px} +#selectProgramModal .modal-header h4.modal-title{font-weight: 700} +#selectProgramModal .modal-footer {border-top: 0px; text-align: center} +.btn-wide {padding: 6px 85px;} +custom->changeModeTips, $lang->custom->modeList[$this->config->systemMode == 'light' ? 'ALM' : 'light']));?> + +config->systemMode);?> + +
+
+

block->visionTitle;?>

+
+ block->visions as $vision):?> + config->systemMode == $vision->key ? 'active' : '';?> +
+
+
title;?>
+
text;?>
+
+ +
+
+ +
-
-

block->visionTitle;?>

-
- block->visions as $vision):?> - config->systemMode == $vision->key ? 'active' : '';?> -
-
-
title;?>
-
text;?>
-
- -
-
From 1868b3155d662374f8eed520772652899d7a522b Mon Sep 17 00:00:00 2001 From: wangzemei Date: Tue, 20 Dec 2022 09:59:43 +0800 Subject: [PATCH 3/5] * finish task 79625 --- module/block/lang/de.php | 16 ++-- module/block/lang/en.php | 16 ++-- module/block/lang/fr.php | 16 ++-- module/block/lang/zh-cn.php | 16 ++-- module/block/view/visionswitch.html.php | 88 ++++-------------- .../{vision_light.png => vision_lite.png} | Bin .../guide/{vision_alm.png => vision_rnd.png} | Bin 7 files changed, 49 insertions(+), 103 deletions(-) rename www/theme/default/images/guide/{vision_light.png => vision_lite.png} (100%) rename www/theme/default/images/guide/{vision_alm.png => vision_rnd.png} (100%) diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 11918b17e1..f7042583c6 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -624,11 +624,11 @@ $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; $lang->block->visionTitle = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.'; -$lang->block->visions['ALM'] = new stdclass(); -$lang->block->visions['ALM']->key = 'ALM'; -$lang->block->visions['ALM']->title = 'Full feature interface'; -$lang->block->visions['ALM']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; -$lang->block->visions['light'] = new stdclass(); -$lang->block->visions['light']->key = 'light'; -$lang->block->visions['light']->title = 'Operation Management Interface'; -$lang->block->visions['light']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; +$lang->block->visions['rnd'] = new stdclass(); +$lang->block->visions['rnd']->key = 'rnd'; +$lang->block->visions['rnd']->title = 'Full feature interface'; +$lang->block->visions['rnd']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; +$lang->block->visions['lite'] = new stdclass(); +$lang->block->visions['lite']->key = 'lite'; +$lang->block->visions['lite']->title = 'Operation Management Interface'; +$lang->block->visions['lite']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 8603635775..5927f38399 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -624,11 +624,11 @@ $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; $lang->block->visionTitle = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.'; -$lang->block->visions['ALM'] = new stdclass(); -$lang->block->visions['ALM']->key = 'ALM'; -$lang->block->visions['ALM']->title = 'Full feature interface'; -$lang->block->visions['ALM']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; -$lang->block->visions['light'] = new stdclass(); -$lang->block->visions['light']->key = 'light'; -$lang->block->visions['light']->title = 'Operation Management Interface'; -$lang->block->visions['light']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; +$lang->block->visions['rnd'] = new stdclass(); +$lang->block->visions['rnd']->key = 'rnd'; +$lang->block->visions['rnd']->title = 'Full feature interface'; +$lang->block->visions['rnd']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; +$lang->block->visions['lite'] = new stdclass(); +$lang->block->visions['lite']->key = 'lite'; +$lang->block->visions['lite']->title = 'Operation Management Interface'; +$lang->block->visions['lite']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index f7af1b7f84..1814b10382 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -624,11 +624,11 @@ $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; $lang->block->visionTitle = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.'; -$lang->block->visions['ALM'] = new stdclass(); -$lang->block->visions['ALM']->key = 'ALM'; -$lang->block->visions['ALM']->title = 'Full feature interface'; -$lang->block->visions['ALM']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; -$lang->block->visions['light'] = new stdclass(); -$lang->block->visions['light']->key = 'light'; -$lang->block->visions['light']->title = 'Operation Management Interface'; -$lang->block->visions['light']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; +$lang->block->visions['rnd'] = new stdclass(); +$lang->block->visions['rnd']->key = 'rnd'; +$lang->block->visions['rnd']->title = 'Full feature interface'; +$lang->block->visions['rnd']->text = 'Integrates multi-dimensional management of program, product, project, execution, test, etc., and provides a whole-process project management solution.'; +$lang->block->visions['lite'] = new stdclass(); +$lang->block->visions['lite']->key = 'lite'; +$lang->block->visions['lite']->title = 'Operation Management Interface'; +$lang->block->visions['lite']->text = 'Specially designed for Non-R&D teams, mainly based on the intuitive and visual Kanban project management model.'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 0856db6fac..a77cced22b 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -624,11 +624,11 @@ $lang->block->themes['classic'] = '经典蓝'; $lang->block->themes['purple'] = '玉烟紫'; $lang->block->visionTitle = '禅道使用界面分为【研发综合界面】和【运营管理界面】。'; -$lang->block->visions['ALM'] = new stdclass(); -$lang->block->visions['ALM']->key = 'ALM'; -$lang->block->visions['ALM']->title = '研发综合界面'; -$lang->block->visions['ALM']->text = '集项目集、产品、项目、执行、测试等多维度管理于一体，提供全过程项目管理解决方案。'; -$lang->block->visions['light'] = new stdclass(); -$lang->block->visions['light']->key = 'light'; -$lang->block->visions['light']->title = '运营管理界面'; -$lang->block->visions['light']->text = '专为非研发团队打造，主要以直观、可视化的看板项目管理模型为主。'; +$lang->block->visions['rnd'] = new stdclass(); +$lang->block->visions['rnd']->key = 'rnd'; +$lang->block->visions['rnd']->title = '研发综合界面'; +$lang->block->visions['rnd']->text = '集项目集、产品、项目、执行、测试等多维度管理于一体，提供全过程项目管理解决方案。'; +$lang->block->visions['lite'] = new stdclass(); +$lang->block->visions['lite']->key = 'lite'; +$lang->block->visions['lite']->title = '运营管理界面'; +$lang->block->visions['lite']->text = '专为非研发团队打造，主要以直观、可视化的看板项目管理模型为主。'; diff --git a/module/block/view/visionswitch.html.php b/module/block/view/visionswitch.html.php index f20287b55e..7a34a585a0 100644 --- a/module/block/view/visionswitch.html.php +++ b/module/block/view/visionswitch.html.php @@ -1,95 +1,41 @@ -custom->changeModeTips, $lang->custom->modeList[$this->config->systemMode == 'light' ? 'ALM' : 'light']));?> - -config->systemMode);?> - -
-
+config->vision);?> +

block->visionTitle;?>

block->visions as $vision):?> - config->systemMode == $vision->key ? 'active' : '';?> -
-
-
title;?>
-
text;?>
-
+ config->vision == $vision->key ? 'active' : '';?> + +
+
title;?>
+
text;?>
+ -
- - +
diff --git a/www/theme/default/images/guide/vision_light.png b/www/theme/default/images/guide/vision_lite.png similarity index 100% rename from www/theme/default/images/guide/vision_light.png rename to www/theme/default/images/guide/vision_lite.png diff --git a/www/theme/default/images/guide/vision_alm.png b/www/theme/default/images/guide/vision_rnd.png similarity index 100% rename from www/theme/default/images/guide/vision_alm.png rename to www/theme/default/images/guide/vision_rnd.png From 7719edcc82b2b20946961d4b241cf59255eb8744 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Tue, 20 Dec 2022 10:42:26 +0800 Subject: [PATCH 4/5] Merge br* code format --- module/block/view/guide.html.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index d16652d22d..935ed84a25 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -57,10 +57,9 @@ $(function() { $('.block-guide .tutorialBtn').addClass('hidden'); } - if($(this).attr('id') === 'visionSwitch') { - var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || 0; + var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $(('#guideBody')).offset().top; localStorage.setItem('visionPosition', scrollTop); } else @@ -72,7 +71,7 @@ $(function() if(localStorage.getItem('visionPosition') && Number(localStorage.getItem('visionPosition'))) { var scrollTopNum = Number(localStorage.getItem('visionPosition')); - document.getElementById('guideBody').scrollTo = 0; + document.getElementById('guideBody').scrollTo = scrollTopNum; $('#visionSwitch > a').click(); window.scrollTo(0, scrollTopNum); } @@ -80,7 +79,6 @@ $(function() { $('#flowchart > a').click(); } - }); From 3495f621bf4a7987bf79fac6aae336a5708a0a30 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Tue, 20 Dec 2022 10:49:06 +0800 Subject: [PATCH 5/5] * Delete space --- module/block/view/guide.html.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index 935ed84a25..8c2e0cb2c9 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -66,7 +66,6 @@ $(function() { localStorage.getItem('visionPosition') && localStorage.removeItem('visionPosition'); } - }) if(localStorage.getItem('visionPosition') && Number(localStorage.getItem('visionPosition'))) {