* finish task 79625

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.';

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.';

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.';

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  = '专为非研发团队打造，主要以直观、可视化的看板项目管理模型为主。';

module/block/view/visionswitch.html.php

@@ -1,95 +1,41 @@
 <style>
 .vision-switch {padding: 14px;}
 .vision-switch-container {display: flex;}
-#vision-ALM {background: url('/theme/default/images/guide/vision_alm.png') no-repeat;}
-#vision-light {background: url('/theme/default/images/guide/vision_light.png') no-repeat;}
+#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.active {box-shadow: 0 0 0 2px #2E7FFF;}
+.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;}
-#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;}
 </style>
-<?php js::set('changeModeTips', sprintf($lang->custom->changeModeTips, $lang->custom->modeList[$this->config->systemMode == 'light' ? 'ALM' : 'light']));?>
-<?php js::set('hasProgram', !empty($programs));?>
-<?php js::set('systemMode', $this->config->systemMode);?>
-
-<form id='modeForm' class="load-indicator main-form form-ajax"  method='post'>
-  <div class='vision-switch'>
+<?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->systemMode == $vision->key ? 'active' : '';?>
-    <div 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>
-      </div>
+    <?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>
-  <div class='modal fade' id='selectProgramModal'>
-    <div class='modal-dialog'>
-      <div class='modal-content'>
-        <div class='modal-header'>
-          <button type='button' class='close' data-dismiss='modal'><span aria-hidden='true'>×</span><span class='sr-only'><?php echo $this->lang->close;?></span></button>
-          <h4 class='modal-title'><?php echo $lang->custom->selectDefaultProgram;?></h4>
-        </div>
-        <div class='modal-body'>
-          <div class='alert alert-primary'>
-            <p class='text-info'><?php echo $lang->custom->selectProgramTips;?></p>
-          </div>
-          <table class='table table-form'>
-            <tr>
-              <th><?php echo $lang->custom->defaultProgram;?></th>
-              <td><?php echo html::select('program', $programs, $programID, "class='form-control chosen'");?></td>
-            </tr>
-          </table>
-        </div>
-        <div class='modal-footer'>
-          <button type='button' class='btn btn-primary btn-wide btn-save'><?php echo $lang->save;?></button>
-        </div>
-      </div>
-    </div>
-  </div>
-</form>
+</div>
 
 <script>
 $(function()
 {
-    $('.vision-switch .vision').click(function()
+    $('.vision-switch .vision').click(function(e)
     {
-        var selectedMode = $(this).data('value');
-        if (systemMode == selectedMode) return false;
-        $('#mode').val(selectedMode);
-
-        if(selectedMode == 'light' && hasProgram)
+        var selectedVision = $(this).data('value');
+        if (vision == selectedVision)
         {
-            $('#selectProgramModal').modal('show');
+          e.preventDefault();
+          return false;
         }
-        else
-        {
-            bootbox.confirm(changeModeTips, function(result)
-            {
-                if(result) $('#modeForm').submit();
-            });
-        }
-
-        return false;
     })
-
-    $(document).on('click', '.btn-save', function()
-    {
-        setTimeout(function()
-        {
-            $('#selectProgramModal').modal('hide');
-            $('#modeForm').submit();
-        }, 1000);
-    });
 })
 </script>