Merge branch 'sprint/272_wzm_79625' into 'sprint/272'

* finish task 79625

See merge request easycorp/zentaopms!6600

module/block/lang/de.php

@@ -623,6 +623,15 @@ $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['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.';
 $lang->block->customModes['light'] = 'Light Mode';
 $lang->block->customModes['ALM']   = 'ALM Mode';
 

module/block/lang/en.php

@@ -623,6 +623,15 @@ $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['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.';
 $lang->block->customModes['light'] = 'Light Mode';
 $lang->block->customModes['ALM']   = 'ALM Mode';
 

module/block/lang/fr.php

@@ -623,6 +623,15 @@ $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['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.';
 $lang->block->customModes['light'] = 'Light Mode';
 $lang->block->customModes['ALM']   = 'ALM Mode';
 

module/block/lang/zh-cn.php

@@ -623,6 +623,15 @@ $lang->block->themes['blackberry'] = '露莓黑';
 $lang->block->themes['classic']    = '经典蓝';
 $lang->block->themes['purple']     = '玉烟紫';
 
+$lang->block->visionTitle            = '禅道使用界面分为【研发综合界面】和【运营管理界面】。';
+$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  = '专为非研发团队打造，主要以直观、可视化的看板项目管理模型为主。';
 $lang->block->customModes['light'] = '轻量管理模式';
 $lang->block->customModes['ALM']   = '全生命周期管理模式';
 

module/block/view/guide.html.php

@@ -57,18 +57,39 @@ $(function()
         {
             $('.block-guide .tutorialBtn').addClass('hidden');
         }
+        if($(this).attr('id') === 'visionSwitch')
+        {
+            var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $(('#guideBody')).offset().top;
+            localStorage.setItem('visionPosition', scrollTop);
+        }
+        else
+        {
+            localStorage.getItem('visionPosition') && localStorage.removeItem('visionPosition');
+        }
     })
+    if(localStorage.getItem('visionPosition') && Number(localStorage.getItem('visionPosition')))
+    {
+        var scrollTopNum = Number(localStorage.getItem('visionPosition'));
+        document.getElementById('guideBody').scrollTo = scrollTopNum;
+        $('#visionSwitch > a').click();
+        window.scrollTo(0, scrollTopNum);
+    }
+    else
+    {
+        $('#flowchart > a').click();
+    }
 });
 </script>
-<div class="panel-body">
+
+<div class="panel-body" id="guideBody">
   <div class="table-row">
     <div class="col col-nav">
-      <ul class="nav nav-stacked nav-secondary scrollbar-hover" id='<?php echo $blockNavId;?>'>
+      <ul class="nav nav-stacked nav-secondary scrollbar-hover guide-nav" 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;?>
         <?php if(($tab == 'preference' or $tab == 'systemMode') and $this->config->vision == 'lite') continue;?>
-        <li <?php if($tab == 'flowchart') echo "class='active'";?> id="<?php echo $tab;?>">
+        <li id="<?php echo $tab;?>">
           <a href="###" title="<?php echo $tabName?>" data-target='<?php echo "#tab3{$blockNavId}Content{$tab}";?>' data-toggle="tab">
             <?php echo $tabName;?>
             <span class='btn-view'><i class='icon-arrow-right text-primary'></i><span>
@@ -84,7 +105,9 @@ $(function()
       <div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}ContentsystemMode";?>'>
         <?php include 'systemmodeswitch.html.php';?>
       </div>
-      <div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}ContentvisionSwitch";?>'></div>
+      <div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}ContentvisionSwitch";?>'>
+        <?php include 'visionswitch.html.php';?>
+      </div>
       <div class="tab-pane fade" id='<?php echo "tab3{$blockNavId}ContentthemeSwitch";?>'>
         <?php include 'themeswitch.html.php';?>
       </div>

module/block/view/visionswitch.html.php

@@ -0,0 +1,41 @@
+<style>
+.vision-switch {padding: 14px;}
+.vision-switch-container {display: flex;}
+#vision-rnd {background: url('/theme/default/images/guide/vision_rnd.png') no-repeat;}
+#vision-lite {background: url('/theme/default/images/guide/vision_lite.png') no-repeat;}
+.vision {width: 47%; border: none; background: #E6F0FF; cursor:pointer; border-radius: 2px;}
+.vision + .vision {margin-left: 10px;}
+.vision:hover, .vision.active {box-shadow: 0 0 0 2px #2E7FFF;}
+.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;}
+</style>
+<?php js::set('vision', $this->config->vision);?>
+<div class='vision-switch'>
+  <p><?php echo $lang->block->visionTitle;?></p>
+  <div class="vision-switch-container">
+    <?php foreach($lang->block->visions as $vision):?>
+    <?php $active = $this->config->vision == $vision->key ? 'active' : '';?>
+    <a href="/index.php?m=my&f=ajaxSwitchVision&vision=<?php echo $vision->key;?>" data-type="ajax" class='vision <?php echo $active;?>' data-value="<?php echo $vision->key;?>">
+      <div class='vision-img' id="<?php echo 'vision-' . $vision->key;?>"></div>
+      <div class='vision-title'><?php echo $vision->title;?></div>
+      <div class='vision-text'><?php echo $vision->text;?></div>
+    </a>
+    <?php endforeach;?>
+  </div>
+</div>
+
+<script>
+$(function()
+{
+    $('.vision-switch .vision').click(function(e)
+    {
+        var selectedVision = $(this).data('value');
+        if (vision == selectedVision)
+        {
+          e.preventDefault();
+          return false;
+        }
+    })
+})
+</script>