From 56e8978654ea1eae7372187af69d9254ab13d0d7 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Tue, 20 Nov 2018 09:29:50 +0800
Subject: [PATCH] * Fix doc fullscreen.

---
 module/doc/js/view.js         | 15 +++++++++++++--
 module/doc/lang/en.php        |  2 ++
 module/doc/lang/zh-cn.php     |  2 ++
 module/doc/view/view.html.php |  8 +++++---
 module/project/lang/zh-cn.php | 12 ++++++------
 module/tree/model.php         |  5 +++--
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/module/doc/js/view.js b/module/doc/js/view.js
index 18a31d0849..562365543a 100644
--- a/module/doc/js/view.js
+++ b/module/doc/js/view.js
@@ -1,9 +1,20 @@
 $(function()
 {
     $('#urlIframe').height($('#mainContent').height() - 35);
-    $('#mainMenu .fullscreen-btn').click(function()
+    $('body').addClass('doc-fullscreen');
+    $('#mainContent .fullscreen-btn').attr('title', reset);
+    setTimeout($.resetToolbarPosition, 50);
+    $('#mainContent .fullscreen-btn').click(function()
     {
         $('body').toggleClass('doc-fullscreen');
-        setTimeout($.resetToolbarPosition, 250);
+        if($('body').hasClass('doc-fullscreen')) 
+        {
+            $('#mainContent .fullscreen-btn').attr('title', reset);
+        }
+        else
+        {
+            $('#mainContent .fullscreen-btn').attr('title', fullscreen);
+        }
+        setTimeout($.resetToolbarPosition, 50);
     });
 })
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 2e350f2304..546f756511 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -59,6 +59,8 @@ $lang->doc->todayEdited    = 'Update Today';
 $lang->doc->pastEdited     = 'Updated';
 $lang->doc->myDoc          = 'My Doc';
 $lang->doc->myCollection   = 'My Favorite';
+$lang->doc->fullscreen     = 'Full Screen';
+$lang->doc->reset          = 'Reset';
 
 /* 方法列表。*/
 $lang->doc->index            = 'Doc Home';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index c315e20b5a..6f26f91781 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -46,6 +46,8 @@ $lang->doc->users          = '用户';
 $lang->doc->item           = '项';
 $lang->doc->num            = '文档数量';
 $lang->doc->searchResult   = '搜索结果';
+$lang->doc->fullscreen     = '全屏';
+$lang->doc->reset          = '恢复';
 
 $lang->doc->moduleDoc      = '按模块浏览';
 $lang->doc->searchDoc      = '搜索';
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 98931f105f..0f67cdf001 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -14,6 +14,10 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php echo css::internal($keTableCSS);?>
 <?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse');?>
+<?php
+js::set('fullscreen', $lang->doc->fullscreen);
+js::set('reset', $lang->doc->reset);
+?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-primary'");?>
@@ -64,9 +68,6 @@
       <?php endif; ?>
     </div>
   </div>
-  <div class="btn-toolbar pull-right">
-    <button type='button' class='btn fullscreen-btn'><i class='icon icon-fullscreen'></i></button>
-  </div>
 </div>
 <div id="mainContent" class="main-row">
   <div class="main-col col-8">
@@ -128,6 +129,7 @@
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php common::printBack($browseLink);?>
+        <button type='button' class='btn fullscreen-btn' title='<?php echo $lang->doc->fullscreen?>'><i class='icon icon-fullscreen'></i></button>
         <?php
         if(!$doc->deleted)
         {
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 9456fa7908..36c3a6bc73 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -60,12 +60,12 @@ $lang->project->readjustTask  = '顺延任务的起止时间';
 $lang->project->effort        = '日志';
 $lang->project->relatedMember = '相关成员';
 
-$lang->project->start    = "开始$lang->projectCommon";
-$lang->project->activate = "激活$lang->projectCommon";
-$lang->project->putoff   = "延期$lang->projectCommon";
-$lang->project->suspend  = "挂起$lang->projectCommon";
-$lang->project->close    = "关闭$lang->projectCommon";
-$lang->project->export   = "导出$lang->projectCommon";
+$lang->project->start    = "开始";
+$lang->project->activate = "激活";
+$lang->project->putoff   = "延期";
+$lang->project->suspend  = "挂起";
+$lang->project->close    = "关闭";
+$lang->project->export   = "导出";
 
 $lang->project->typeList['sprint']    = "短期$lang->projectCommon";
 $lang->project->typeList['waterfall'] = "长期$lang->projectCommon";
diff --git a/module/tree/model.php b/module/tree/model.php
index 1faf374cdf..c7e17caf12 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -226,7 +226,7 @@ class treeModel extends model
                     $modules = $this->dao->select('*')->from(TABLE_MODULE)->where("((root = '" . (int)$rootID . "' and type = 'task' and parent != 0) OR (root = $id and type = 'story'))")
                         ->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
                         ->andWhere('deleted')->eq(0)
-                        ->orderBy('grade desc, type, `order`')
+                        ->orderBy('grade desc, branch, type, `order`')
                         ->fetchAll('id');
                 }
                 else
@@ -240,7 +240,8 @@ class treeModel extends model
 
                 foreach($modules as $module)
                 {
-                    if($type == 'product' and !isset($projectModules[$module->id])) continue;
+                    $parentModules = explode(',', trim($module->path, ','));
+                    if($type == 'product' and isset($noProductModules[$parentModules[0]])) continue;
                     $rootName = ($productNum > 1 and $type == 'product') ? "/$rootModule/" : '/';
                     if($type == 'product' and $module->branch and isset($branchGroups[$id][$module->branch])) $rootName .= $branchGroups[$id][$module->branch] . '/';
                     $this->buildTreeArray($treeMenu, $modules, $module, $rootName);