From 7c5208c61a4e42ee6bc52cce66ca89d9fd60a217 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Fri, 22 Jun 2018 10:48:22 +0800
Subject: [PATCH] * Hide tutorial menu if the global flow is not full.

---
 module/build/view/create.html.php |  2 +-
 module/common/model.php           |  4 ++--
 module/project/js/tree.js         |  2 +-
 module/project/view/tree.html.php | 18 ++++++++++--------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index c48ffa2315..60265f81b7 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -75,7 +75,7 @@
         <tr>
           <td colspan="3" class="text-center form-actions">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo "<a href='/project-build-$projectID.html' class='btn btn-back btn btn-wide'>$lang->backhome</a>";?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </table>
diff --git a/module/common/model.php b/module/common/model.php
index 72c5c8c595..e2f9c9f37b 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -301,12 +301,12 @@ class commonModel extends model
      */
     public static function printAboutBar()
     {
-        global $app, $lang;
+        global $app, $config, $lang;
         echo "<ul id='extraNav' class='nav nav-default'>";
         echo "<li class='dropdown'>";
         echo "<a data-toggle='dropdown'>" . $lang->help . " <span class='caret'></span></a>";
         echo "<ul class='dropdown-menu'>";
-        if(!commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
+        if($config->global->flow == 'full' && !commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
         echo '<li>' . html::a($lang->manualUrl, $lang->manual, '_blank', "class='open-help-tab'") . '</li>';
         echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
         echo "</ul></li>\n";
diff --git a/module/project/js/tree.js b/module/project/js/tree.js
index 9dffd125ca..d00f28dffd 100644
--- a/module/project/js/tree.js
+++ b/module/project/js/tree.js
@@ -32,9 +32,9 @@ $(function()
         }
         else if (level === 'story')
         {
+            $('[data-type=story]').addClass('btn-active-text');
             taskTree.collapse();
             taskTree.show($taskTree.find('li.item-story').parent().parent(), true);
-            $('[data-type=story]').addClass('btn-active-text');
         }
         $('#main').toggleClass('tree-show-root', level === 'root');
     };
diff --git a/module/project/view/tree.html.php b/module/project/view/tree.html.php
index 481fb736a2..8059dc165b 100644
--- a/module/project/view/tree.html.php
+++ b/module/project/view/tree.html.php
@@ -14,14 +14,16 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach ($lang->project->treeLevel as $name => $btnLevel):?>
-      <?php
-      $icon = '';
-      if($name == 'root') $icon = ' <i class="icon-fold-all"></i>';
-      if($name == 'all') $icon = ' <i class="icon-unfold-all"></i>';
-      ?>
-      <a href='' class='btn btn-link btn-tree-view' data-type='<?php echo $name ?>'><span class='text'><?php echo $btnLevel . $icon;?></span></button>
-    <?php endforeach; ?>
+    <?php
+    foreach($lang->project->treeLevel as $name => $btnLevel)
+    {
+        if(empty($tree) && ($name == 'root' or $name == 'all')) continue;
+        $icon = '';
+        if($name == 'root') $icon = ' <i class="icon-fold-all"></i>';
+        if($name == 'all')  $icon = ' <i class="icon-unfold-all"></i>';
+        echo html::a('javascript:;', "<span class='text'>$btnLevel$icon</span>", '', "class='btn btn-link btn-tree-view' data-type='{$name}'");
+    }
+    ?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php