From bedeaaf39ef7084b9a455b9d9dba71e2db357201 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 5 Dec 2019 13:16:27 +0800
Subject: [PATCH]  * code for tutorial.

---
 module/bug/view/browse.html.php     | 15 ++++++++++++---
 module/product/view/browse.html.php | 15 ++++++++++++---
 module/tutorial/lang/en.php         |  2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 10494edbbc..8cce81e2d0 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -132,14 +132,23 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
     <?php else:?>
     <div class='btn-group dropdown-hover'>
       <?php
-      $link = common::hasPriv('bug', 'create') ? $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID") : '###';
       if(commonModel::isTutorialMode())
       {
           $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
           $link = $this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams");
+          echo html::a($link, "<i class='icon icon-plus'></i> {$lang->bug->create} </span><span class='caret'>", '', "class='btn btn-primary btn-bug-create'");
+      }
+      else
+      {
+          $link     = $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID");
+          $disabled = '';
+          if(!common::hasPriv('bug', 'create'))
+          {
+              $link     = '###';
+              $disabled = "disabled";
+          }
+          echo html::a($link, "<i class='icon icon-plus'></i> {$lang->bug->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
       }
-      $disabled = common::hasPriv('bug', 'create') ? '' : "disabled";
-      echo html::a($link, "<i class='icon icon-plus'></i> {$lang->bug->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
       ?>
       <ul class='dropdown-menu'>
         <?php $disabled = common::hasPriv('bug', 'batchCreate') ? '' : "class='disabled'";?>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index b6646f80ca..3d40e01592 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -102,14 +102,23 @@
     <?php else:?>
     <div class='btn-group dropdown-hover'>
       <?php
-      $link = common::hasPriv('story', 'create') ? $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID") : '###';
       if(commonModel::isTutorialMode())
       {
           $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
           $link = $this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams");
+          echo html::a($link, "<i class='icon icon-plus'></i> {$lang->story->create} </span><span class='caret'>", '', "class='btn btn-primary create-story-btn'");
+      }
+      else
+      {
+          $link     = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID");
+          $disabled = '';
+          if(!common::hasPriv('story', 'create'))
+          {
+              $link     = '###';
+              $disabled = 'disabled';
+          }
+          echo html::a($link, "<i class='icon icon-plus'></i> {$lang->story->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
       }
-      $disabled = common::hasPriv('story', 'create') ? '' : "disabled";
-      echo html::a($link, "<i class='icon icon-plus'></i> {$lang->story->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
       ?>
       <ul class='dropdown-menu'>
         <?php $disabled = common::hasPriv('story', 'batchCreate') ? '' : "class='disabled'";?>
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index c289e117bf..38ea8aaec7 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -63,5 +63,5 @@ $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method
 $lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
-$lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report  Bug');
+$lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
 $lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";